Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1205-pinned-post-for-admins

2025-12-13 07:46:06 +00:00 · 2019-10-18 19:03:45 +02:00 · 2019-10-18 19:03:45 +02:00 · 7e40295129
commit 7e40295129
parent 8872dc16cf 73002cf694
5 changed files with 79 additions and 63 deletions
--- a/backend/package.json
+++ b/backend/package.json
@ -82,7 +82,7 @@
    "metascraper-lang-detector": "^4.8.5",
    "metascraper-logo": "^5.7.6",
    "metascraper-publisher": "^5.7.6",
-    "metascraper-soundcloud": "^5.7.6",
+    "metascraper-soundcloud": "^5.7.7",
    "metascraper-title": "^5.7.6",
    "metascraper-url": "^5.7.6",
    "metascraper-video": "^5.7.6",
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@ -5802,14 +5802,14 @@ metascraper-publisher@^5.7.6:
  dependencies:
    "@metascraper/helpers" "^5.7.6"

-metascraper-soundcloud@^5.7.6:
-  version "5.7.6"
-  resolved "https://registry.yarnpkg.com/metascraper-soundcloud/-/metascraper-soundcloud-5.7.6.tgz#80c725e8746d94c992b5bdd07ac6bd987d09944d"
-  integrity sha512-fBxX5mYPFf8rWhhEX2XZD5QrmvtUI5IIPzryGuwEWsbPuMGuUkvFA9JjHJiC46uYXoi6UuKLXwSmYHcAACG3Jg==
+metascraper-soundcloud@^5.7.7:
+  version "5.7.7"
+  resolved "https://registry.yarnpkg.com/metascraper-soundcloud/-/metascraper-soundcloud-5.7.7.tgz#b7cb56e5ce7744aed90c83e37303e9b40ad3ff9d"
+  integrity sha512-TDJxUwFJCxU4bTrrx3GWiGeZdNhvRhlI61JiprLkYBriM65uzCfaJ5FjS5uzZy1CfMYhvQgxLZ7XRq1bgbPpTg==
  dependencies:
    "@metascraper/helpers" "^5.7.6"
    memoize-one "~5.1.1"
-    tldts "~5.5.0"
+    tldts "~5.6.1"

 metascraper-title@^5.7.6:
  version "5.7.6"
@ -8026,17 +8026,17 @@ tlds@^1.187.0, tlds@^1.203.0:
  resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.203.1.tgz#4dc9b02f53de3315bc98b80665e13de3edfc1dfc"
  integrity sha512-7MUlYyGJ6rSitEZ3r1Q1QNV8uSIzapS8SmmhSusBuIc7uIxPPwsKllEP0GRp1NS6Ik6F+fRZvnjDWm3ecv2hDw==

-tldts-core@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.5.0.tgz#ae22afe586541ac5ecacc520038068639b3420b4"
-  integrity sha512-o0JzahqioihXz8wj7/1OYtefyhXz/PwLno7VRm5MTwQitEOPpvMPZpj2yjXtjgOMKbi3A5OHvvJwhFf0Hutzng==
+tldts-core@^5.6.1:
+  version "5.6.1"
+  resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.6.1.tgz#943fd020b564018fae308c12ec2435e53101c257"
+  integrity sha512-ikhUCHoiRu0QzQpba0f0q1Km5YBnn4qsBzGlYCzT3y3wSCGG2GlV0xeEOcXTzp2pRne6bQaHRry4TINMZpDFKQ==

-tldts@~5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/tldts/-/tldts-5.5.0.tgz#12ea124593bc5abebd12107c6223986f97972bc1"
-  integrity sha512-CZ/d7Y4k8onxwerMWz/mTCeKJtX3VAMiL+ajXVFnxsKhH4BV+QavjnZ1Mb9OeCHo3jX0S3Dw6ERNRXqOMVsDvw==
+tldts@~5.6.1:
+  version "5.6.1"
+  resolved "https://registry.yarnpkg.com/tldts/-/tldts-5.6.1.tgz#36f4ac97505b9202f2872f6246f326589f49d78b"
+  integrity sha512-I+imSP592J9GUYApIoiDdJk3KlroHY4zmDmpAp+TlIDZZAPxx192yOUViMB2QmlcRtZUz5XLEM3cS2F0V7P1Fw==
  dependencies:
-    tldts-core "^5.5.0"
+    tldts-core "^5.6.1"

 tmp@^0.0.33:
  version "0.0.33"
--- a/webapp/package.json
+++ b/webapp/package.json
@ -79,7 +79,7 @@
    "string-hash": "^1.1.3",
    "tippy.js": "^4.3.5",
    "tiptap": "~1.26.3",
-    "tiptap-extensions": "~1.28.3",
+    "tiptap-extensions": "~1.28.4",
    "trunc-html": "^1.1.2",
    "v-tooltip": "~2.0.2",
    "vue-count-to": "~1.0.13",
--- a/webapp/pages/post/_id/_slug/index.spec.js
+++ b/webapp/pages/post/_id/_slug/index.spec.js
@ -32,6 +32,9 @@ describe('PostSlug', () => {
        truncate: a => a,
      },
      // If you are mocking the router, then don't use VueRouter with localVue: https://vue-test-utils.vuejs.org/guides/using-with-vue-router.html
+      $route: {
+        hash: '',
+      },
      $router: {
        history: {
          push: jest.fn(),
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@ -12901,10 +12901,10 @@ prosemirror-commands@^1.0.8:
    prosemirror-state "^1.0.0"
    prosemirror-transform "^1.0.0"

-prosemirror-dropcursor@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.1.2.tgz#d54428e0fdbc0fb3d4c5809acd1ad031e6cb6855"
-  integrity sha512-QHZbYPr8AY0g88TC/Wp7jpYbUoSpTSO8sqHNGvvZOInsAyylIdOpsrfhY1NC+/lh+iuwka0YogGtq2mmE7cr4g==
+prosemirror-dropcursor@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.2.0.tgz#00b1bdb803ac28f5a68d7e0a16a47c9c11aab97d"
+  integrity sha512-D7JrvOgN32PmOgfimdDMKCuYp4tGyCulpsd39/Nzvn9A+tCJmM8XY1PB07zkr2vjrjF09WYD3Ifer7Z3pk/YRw==
  dependencies:
    prosemirror-state "^1.0.0"
    prosemirror-transform "^1.1.0"
@ -12937,7 +12937,7 @@ prosemirror-inputrules@^1.0.4:
    prosemirror-state "^1.0.0"
    prosemirror-transform "^1.0.0"

-prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.0.1:
+prosemirror-keymap@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.0.1.tgz#03ef32b828e3a859dfb570eb84928bf2e5330bc2"
  integrity sha512-e79ApE7PXXZMFtPz7WbjycjAFd1NPjgY1MkecVz98tqwlBSggXWXYQnWFk6x7UkmnBYRHHbXHkR/RXmu2wyBJg==
@ -12945,17 +12945,25 @@ prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.0.1:
    prosemirror-state "^1.0.0"
    w3c-keyname "^1.1.8"

-prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.7.3.tgz#d843b9338ebb1c22db85681452cf5724f785906e"
-  integrity sha512-Es71i2qXdkJNyIFyH7QoKDnKCTVC4LaQgiAaQV5Zd5XCKHg09m9NIJCEgePrF2yN/1tB/C5NYDY/4QsPvEM59A==
+prosemirror-keymap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.0.2.tgz#e4e8b876a586ec6a170615fce19c4450f4075bef"
+  integrity sha512-aq3fBT3WMbwGNacUtMbS/mxd87hjJyjtUx5/h3q/P3FiVqHxmeA9snxQsZHYe0cWRziZePun8zw6kHFKLp/DAQ==
+  dependencies:
+    prosemirror-state "^1.0.0"
+    w3c-keyname "^2.0.0"
+
+prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.7.4.tgz#fadefad98ef9d71ca1749d18a82005313c978e4b"
+  integrity sha512-yxdpPh9Uv5vAOZvmbhg4fsGUK1oHuQs69iX7cFZ0A4Y+AyMMWRCNKUt21uv84HbXb4I180l4pJE8ibaH/SwYiw==
  dependencies:
    orderedmap "^1.0.0"

-prosemirror-schema-list@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.0.3.tgz#539caafa4f9314000943bd783be4017165ec0bd6"
-  integrity sha512-+zzSawVds8LsZpl/bLTCYk2lYactF93W219Czh81zBILikCRDOHjp1CQ1os4ZXBp6LlD+JnBqF1h59Q+hilOoQ==
+prosemirror-schema-list@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.0.4.tgz#cbb11936e306aa45586af4279529ce61b52cfb6e"
+  integrity sha512-7Y0b6FIG6ATnCcDSLrZfU9yIfOG5Yad3DMNZ9W7GGfMSzdIl0aHExrsIUgviJZjovO2jtLJVbxWGjMR3OrTupA==
  dependencies:
    prosemirror-model "^1.0.0"
    prosemirror-transform "^1.0.0"
@ -12991,10 +12999,10 @@ prosemirror-utils@^0.9.6:
  resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.9.6.tgz#3d97bd85897e3b535555867dc95a51399116a973"
  integrity sha512-UC+j9hQQ1POYfMc5p7UFxBTptRiGPR7Kkmbl3jVvU8VgQbkI89tR/GK+3QYC8n+VvBZrtAoCrJItNhWSxX3slA==

-prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.11.4:
-  version "1.11.4"
-  resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.11.4.tgz#f80aec8924d59d4c3456dcc5bfea733758ec9b40"
-  integrity sha512-J0g7xiCDx+p3CtpC69E7HvMmnW7yCILEhOXxSANZPX8iIwUrVTfdWKAzufi9F9MoM08ewsaF254xV90NpkGWVQ==
+prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.11.7:
+  version "1.11.7"
+  resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.11.7.tgz#537020acab43e18d51e18717fb1f39466317ce21"
+  integrity sha512-RDll1mhrOQ5JPOsUZlISH3VP/4zyHm3RAuqh9Cg5HdpfSQow0nsx8xL5YQZ976UdhvwbkiKamLtxhSRKES9wsA==
  dependencies:
    prosemirror-model "^1.1.0"
    prosemirror-state "^1.0.0"
@ -15410,62 +15418,62 @@ tippy.js@^4.3.5:
  dependencies:
    popper.js "^1.14.7"

-tiptap-commands@^1.12.2:
-  version "1.12.2"
-  resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.12.2.tgz#5d478604f03ab5bc5b05e3f94f8c75cec175c8c3"
-  integrity sha512-wE19avtU0N/pNQlwDhfsJH1M3QT0Bc3oukfoB7K+K0H7xAXyfukbVPoZGjItWoyawtPk11A80OIBQCrO63fO4Q==
+tiptap-commands@^1.12.3:
+  version "1.12.3"
+  resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.12.3.tgz#604767878073e6344d1daf7a376fd89fc62e4742"
+  integrity sha512-Dck51lePBwuHmkvkJ6+8V3DbInxAhZwtS2mPvVwz74pDUIcy17tCFw1eHUN50JoXIAci7acuxPKO/weVO1JAyw==
  dependencies:
    prosemirror-commands "^1.0.8"
    prosemirror-inputrules "^1.0.4"
-    prosemirror-model "^1.7.3"
-    prosemirror-schema-list "^1.0.3"
+    prosemirror-model "^1.7.4"
+    prosemirror-schema-list "^1.0.4"
    prosemirror-state "^1.2.4"
    prosemirror-tables "^0.9.5"
    prosemirror-utils "^0.9.6"
-    tiptap-utils "^1.8.1"
+    tiptap-utils "^1.8.2"

-tiptap-extensions@~1.28.3:
-  version "1.28.3"
-  resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.28.3.tgz#6278ed247c35c97cec41395671433408977cd9ef"
-  integrity sha512-iTUY5HQ+gYCHlyGMqcfKqO7JAvCqDEuvO4vEUrVxx0RgoYQfEf+Y17Kw8AJlVR6bB/Y/bEmMIuzVPjsgWNWdbw==
+tiptap-extensions@~1.28.4:
+  version "1.28.4"
+  resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.28.4.tgz#0e729d081a80105730101512e7eb5acdce8b9bde"
+  integrity sha512-UAtxngKifjrMtJFmi3D9RCNC5LJutq4yn1Np0cqJ4dTnvhWR49PqN6gKjlMYyzyutiLLQk+/3GM/E6EfVwmHOA==
  dependencies:
    lowlight "^1.12.1"
    prosemirror-collab "^1.1.2"
    prosemirror-history "^1.0.4"
-    prosemirror-model "^1.7.3"
+    prosemirror-model "^1.7.4"
    prosemirror-state "^1.2.4"
    prosemirror-tables "^0.9.5"
    prosemirror-transform "^1.1.5"
    prosemirror-utils "^0.9.6"
-    prosemirror-view "^1.11.4"
-    tiptap "^1.26.3"
-    tiptap-commands "^1.12.2"
+    prosemirror-view "^1.11.7"
+    tiptap "^1.26.4"
+    tiptap-commands "^1.12.3"

-tiptap-utils@^1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/tiptap-utils/-/tiptap-utils-1.8.1.tgz#52eb90524f1ec95e66ddc84a20d892aaac879630"
-  integrity sha512-FcceXo+yVZni54aB/R3nTpdtcHmFM6QwW6PZg1aHH2u2fhkeV/MB7sXBkx3wIrvOtw8WPT2Kjpou2to27CCtbA==
+tiptap-utils@^1.8.2:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/tiptap-utils/-/tiptap-utils-1.8.2.tgz#f07a2053c6ac9fbbb4f02e0844b326d0e6c8b7fb"
+  integrity sha512-pyx+3p4fICGM7JU1mcsnRx5jXvLrCL8Nm/9yjeWEZXpAC85L/btY0eFo2Oz4+dKg39+1EGNHheodujx3ngw4lQ==
  dependencies:
-    prosemirror-model "^1.7.3"
+    prosemirror-model "^1.7.4"
    prosemirror-state "^1.2.4"
    prosemirror-tables "^0.9.5"
    prosemirror-utils "^0.9.6"

-tiptap@^1.26.3, tiptap@~1.26.3:
-  version "1.26.3"
-  resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.26.3.tgz#a08e1db4f1dce17a14309532e65a3949b0ceed91"
-  integrity sha512-EcTEM8GLuMa1jNxGg5cWR7NqyiFwtRat6im8A5EvL6iiLiOhIaqgkQnZJ5qUxWNgQTfjgCO5IWA85yoRSJWNMQ==
+tiptap@^1.26.4, tiptap@~1.26.3:
+  version "1.26.4"
+  resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.26.4.tgz#bfa289841bc45c6401cbd1661a02b81c3d3f14f0"
+  integrity sha512-UCH0wufjGdKMuCUydL896sFYXEUWC3bE20h/oONABSf0gull+pqBEm7J1yCl7j50eYa9FiLgUBGPqPTzKLluxQ==
  dependencies:
    prosemirror-commands "^1.0.8"
-    prosemirror-dropcursor "^1.1.2"
+    prosemirror-dropcursor "^1.2.0"
    prosemirror-gapcursor "^1.0.4"
    prosemirror-inputrules "^1.0.4"
-    prosemirror-keymap "^1.0.1"
-    prosemirror-model "^1.7.3"
+    prosemirror-keymap "^1.0.2"
+    prosemirror-model "^1.7.4"
    prosemirror-state "^1.2.4"
-    prosemirror-view "^1.11.4"
-    tiptap-commands "^1.12.2"
-    tiptap-utils "^1.8.1"
+    prosemirror-view "^1.11.7"
+    tiptap-commands "^1.12.3"
+    tiptap-utils "^1.8.2"

 title-case@^2.1.0:
  version "2.1.1"
@ -16347,6 +16355,11 @@ w3c-keyname@^1.1.8:
  resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-1.1.8.tgz#4e2219663760fd6535b7a1550f1552d71fc9372c"
  integrity sha512-2HAdug8GTiu3b4NYhssdtY8PXRue3ICnh1IlxvZYl+hiINRq0GfNWei3XOPDg8L0PsxbmYjWVLuLj6BMRR/9vA==

+w3c-keyname@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.1.1.tgz#d234195b0a79913d06a0bc636f17f00050a5de56"
+  integrity sha512-8kSrsGClLiL4kb5/pTxglejUlEAPk3GXtkBblSMrQDxKz0NkMRTVTPBZm6QCNqPOCPsdNvae5XfV+RJZgeGXEA==
+
 walker@^1.0.7, walker@~1.0.5:
  version "1.0.7"
  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"