Merge branch 'fix-discoverable-setting' into 'develop'

fix "allow discovery" setting misbehaving See merge request pleroma/pleroma-fe!1518
fix "allow discovery" setting misbehaving
2022-04-29 07:56:18 +00:00 · 2022-04-29 10:52:16 +03:00 · 2022-04-20 17:27:01 +00:00 · 2022-04-20 20:19:22 +03:00 · 2022-04-20 09:15:18 +00:00 · 2022-04-19 20:24:24 -04:00
5 changed files with 90 additions and 87 deletions
--- a/package.json
+++ b/package.json
@ -37,10 +37,10 @@
    "punycode.js": "2.1.0",
    "qrcode": "1",
    "ruffle-mirror": "2021.12.31",
-    "vue": "3.2.33",
+    "vue": "^3.2.31",
    "vue-i18n": "^9.2.0-beta.34",
    "vue-router": "4.0.14",
-    "vue-template-compiler": "2.6.14",
+    "vue-template-compiler": "2.6.11",
    "vuex": "4.0.2"
  },
  "devDependencies": {
@ -52,7 +52,7 @@
    "@ungap/event-target": "0.2.3",
    "@vue/babel-helper-vue-jsx-merge-props": "1.2.1",
    "@vue/babel-plugin-jsx": "1.1.1",
-    "@vue/compiler-sfc": "3.2.33",
+    "@vue/compiler-sfc": "^3.1.0",
    "@vue/test-utils": "2.0.0-rc.17",
    "autoprefixer": "6.7.7",
    "babel-eslint": "7.2.3",
@ -116,7 +116,7 @@
    "stylelint-rscss": "0.4.0",
    "url-loader": "1.1.2",
    "vue-loader": "^16.0.0",
-    "vue-style-loader": "4.1.3",
+    "vue-style-loader": "4.1.2",
    "webpack": "4.46.0",
    "webpack-dev-middleware": "3.7.3",
    "webpack-hot-middleware": "2.24.3",
--- a/src/components/chat_title/chat_title.vue
+++ b/src/components/chat_title/chat_title.vue
@ -14,10 +14,11 @@
      />
    </router-link>
    <RichContent
      v-if="user"
      class="username"
      :title="'@'+user.screen_name_ui"
      :html="htmlTitle"
-      :emoji="user.emoji"
+      :emoji="user.emoji || []"
    />
  </div>
 </template>
--- a/src/components/status_body/status_body.vue
+++ b/src/components/status_body/status_body.vue
@ -15,14 +15,14 @@
          :emoji="status.emojis"
        />
        <button
-          v-if="longSubject && showingLongSubject"
+          v-show="longSubject && showingLongSubject"
          class="button-unstyled -link tall-subject-hider"
          @click.prevent="toggleShowingLongSubject"
        >
          {{ $t("status.hide_full_subject") }}
        </button>
        <button
-          v-else-if="longSubject"
+          v-show="longSubject && !showingLongSubject"
          class="button-unstyled -link tall-subject-hider"
          @click.prevent="toggleShowingLongSubject"
        >
@ -34,7 +34,7 @@
        class="text-wrapper"
      >
        <button
-          v-if="hideTallStatus"
+          v-show="hideTallStatus"
          class="button-unstyled -link tall-status-hider"
          :class="{ '-focused': focused }"
          @click.prevent="toggleShowMore"
@ -54,7 +54,7 @@
        />
        <button
-          v-if="hideSubjectStatus"
+          v-show="hideSubjectStatus"
          class="button-unstyled -link cw-status-hider"
          @click.prevent="toggleShowMore"
        >
@ -85,7 +85,7 @@
          />
        </button>
        <button
-          v-if="showingMore && !fullContent"
+          v-show="showingMore && !fullContent"
          class="button-unstyled -link status-unhider"
          @click.prevent="toggleShowMore"
        >
--- a/src/modules/serverSideConfig.js
+++ b/src/modules/serverSideConfig.js
@ -55,7 +55,10 @@ export const settingsMap = {
    get: 'pleroma.allow_following_move',
    set: 'allow_following_move'
  },
-  'discoverable': 'source.discoverable',
+  'discoverable': {
    get: 'source.pleroma.discoverable',
    set: 'discoverable'
  },
  'hideFavorites': {
    get: 'pleroma.hide_favorites',
    set: 'hide_favorites'
--- a/yarn.lock
+++ b/yarn.lock
@ -1454,47 +1454,47 @@
    html-tags "^3.1.0"
    svg-tags "^1.0.0"
-"@vue/compiler-core@3.2.33":
+"@vue/compiler-core@3.2.31":
-  version "3.2.33"
+  version "3.2.31"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.33.tgz#e915d59cce85898f5c5cfebe4c09e539278c3d59"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.31.tgz#d38f06c2cf845742403b523ab4596a3fda152e89"
-  integrity sha512-AAmr52ji3Zhk7IKIuigX2osWWsb2nQE5xsdFYjdnmtQ4gymmqXbjLvkSE174+fF3A3kstYrTgGkqgOEbsdLDpw==
+  integrity sha512-aKno00qoA4o+V/kR6i/pE+aP+esng5siNAVQ422TkBNM6qA4veXiZbSe8OTXHXquEi/f6Akc+nLfB4JGfe4/WQ==
  dependencies:
    "@babel/parser" "^7.16.4"
-    "@vue/shared" "3.2.33"
+    "@vue/shared" "3.2.31"
    estree-walker "^2.0.2"
    source-map "^0.6.1"
-"@vue/compiler-dom@3.2.33":
+"@vue/compiler-dom@3.2.31":
-  version "3.2.33"
+  version "3.2.31"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.33.tgz#6db84296f949f18e5d3e7fd5e80f943dbed7d5ec"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.31.tgz#b1b7dfad55c96c8cc2b919cd7eb5fd7e4ddbf00e"
-  integrity sha512-GhiG1C8X98Xz9QUX/RlA6/kgPBWJkjq0Rq6//5XTAGSYrTMBgcLpP9+CnlUg1TFxnnCVughAG+KZl28XJqw8uQ==
+  integrity sha512-60zIlFfzIDf3u91cqfqy9KhCKIJgPeqxgveH2L+87RcGU/alT6BRrk5JtUso0OibH3O7NXuNOQ0cDc9beT0wrg==
  dependencies:
-    "@vue/compiler-core" "3.2.33"
+    "@vue/compiler-core" "3.2.31"
-    "@vue/shared" "3.2.33"
+    "@vue/shared" "3.2.31"
-"@vue/compiler-sfc@3.2.33":
+"@vue/compiler-sfc@3.2.31", "@vue/compiler-sfc@^3.1.0":
-  version "3.2.33"
+  version "3.2.31"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.33.tgz#7ce01dc947a8b76c099811dc6ca58494d4dc773d"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.31.tgz#d02b29c3fe34d599a52c5ae1c6937b4d69f11c2f"
-  integrity sha512-H8D0WqagCr295pQjUYyO8P3IejM3vEzeCO1apzByAEaAR/WimhMYczHfZVvlCE/9yBaEu/eu9RdiWr0kF8b71Q==
+  integrity sha512-748adc9msSPGzXgibHiO6T7RWgfnDcVQD+VVwYgSsyyY8Ans64tALHZANrKtOzvkwznV/F4H7OAod/jIlp/dkQ==
  dependencies:
    "@babel/parser" "^7.16.4"
-    "@vue/compiler-core" "3.2.33"
+    "@vue/compiler-core" "3.2.31"
-    "@vue/compiler-dom" "3.2.33"
+    "@vue/compiler-dom" "3.2.31"
-    "@vue/compiler-ssr" "3.2.33"
+    "@vue/compiler-ssr" "3.2.31"
-    "@vue/reactivity-transform" "3.2.33"
+    "@vue/reactivity-transform" "3.2.31"
-    "@vue/shared" "3.2.33"
+    "@vue/shared" "3.2.31"
    estree-walker "^2.0.2"
    magic-string "^0.25.7"
    postcss "^8.1.10"
    source-map "^0.6.1"
-"@vue/compiler-ssr@3.2.33":
+"@vue/compiler-ssr@3.2.31":
-  version "3.2.33"
+  version "3.2.31"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.33.tgz#3e820267e4eea48fde9519f006dedca3f5e42e71"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.31.tgz#4fa00f486c9c4580b40a4177871ebbd650ecb99c"
-  integrity sha512-XQh1Xdk3VquDpXsnoCd7JnMoWec9CfAzQDQsaMcSU79OrrO2PNR0ErlIjm/mGq3GmBfkQjzZACV+7GhfRB8xMQ==
+  integrity sha512-mjN0rqig+A8TVDnsGPYJM5dpbjlXeHUm2oZHZwGyMYiGT/F4fhJf/cXy8QpjnLQK4Y9Et4GWzHn9PS8AHUnSkw==
  dependencies:
-    "@vue/compiler-dom" "3.2.33"
+    "@vue/compiler-dom" "3.2.31"
-    "@vue/shared" "3.2.33"
+    "@vue/shared" "3.2.31"
 "@vue/devtools-api@^6.0.0", "@vue/devtools-api@^6.0.0-beta.11":
  version "6.1.3"
@ -1506,53 +1506,53 @@
  resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.1.4.tgz#b4aec2f4b4599e11ba774a50c67fa378c9824e53"
  integrity sha512-IiA0SvDrJEgXvVxjNkHPFfDx6SXw0b/TUkqMcDZWNg9fnCAHbTpoo59YfJ9QLFkwa3raau5vSlRVzMSLDnfdtQ==
-"@vue/reactivity-transform@3.2.33":
+"@vue/reactivity-transform@3.2.31":
-  version "3.2.33"
+  version "3.2.31"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.33.tgz#286063f44ca56150ae9b52f8346a26e5913fa699"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.31.tgz#0f5b25c24e70edab2b613d5305c465b50fc00911"
-  integrity sha512-4UL5KOIvSQb254aqenW4q34qMXbfZcmEsV/yVidLUgvwYQQ/D21bGX3DlgPUGI3c4C+iOnNmDCkIxkILoX/Pyw==
+  integrity sha512-uS4l4z/W7wXdI+Va5pgVxBJ345wyGFKvpPYtdSgvfJfX/x2Ymm6ophQlXXB6acqGHtXuBqNyyO3zVp9b1r0MOA==
  dependencies:
    "@babel/parser" "^7.16.4"
-    "@vue/compiler-core" "3.2.33"
+    "@vue/compiler-core" "3.2.31"
-    "@vue/shared" "3.2.33"
+    "@vue/shared" "3.2.31"
    estree-walker "^2.0.2"
    magic-string "^0.25.7"
-"@vue/reactivity@3.2.33":
+"@vue/reactivity@3.2.31":
-  version "3.2.33"
+  version "3.2.31"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.33.tgz#c84eedb5225138dbfc2472864c151d3efbb4b673"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.31.tgz#fc90aa2cdf695418b79e534783aca90d63a46bbd"
-  integrity sha512-62Sq0mp9/0bLmDuxuLD5CIaMG2susFAGARLuZ/5jkU1FCf9EDbwUuF+BO8Ub3Rbodx0ziIecM/NsmyjardBxfQ==
+  integrity sha512-HVr0l211gbhpEKYr2hYe7hRsV91uIVGFYNHj73njbARVGHQvIojkImKMaZNDdoDZOIkMsBc9a1sMqR+WZwfSCw==
  dependencies:
-    "@vue/shared" "3.2.33"
+    "@vue/shared" "3.2.31"
-"@vue/runtime-core@3.2.33":
+"@vue/runtime-core@3.2.31":
-  version "3.2.33"
+  version "3.2.31"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.33.tgz#2df8907c85c37c3419fbd1bdf1a2df097fa40df2"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.31.tgz#9d284c382f5f981b7a7b5971052a1dc4ef39ac7a"
-  integrity sha512-N2D2vfaXsBPhzCV3JsXQa2NECjxP3eXgZlFqKh4tgakp3iX6LCGv76DLlc+IfFZq+TW10Y8QUfeihXOupJ1dGw==
+  integrity sha512-Kcog5XmSY7VHFEMuk4+Gap8gUssYMZ2+w+cmGI6OpZWYOEIcbE0TPzzPHi+8XTzAgx1w/ZxDFcXhZeXN5eKWsA==
  dependencies:
-    "@vue/reactivity" "3.2.33"
+    "@vue/reactivity" "3.2.31"
-    "@vue/shared" "3.2.33"
+    "@vue/shared" "3.2.31"
-"@vue/runtime-dom@3.2.33":
+"@vue/runtime-dom@3.2.31":
-  version "3.2.33"
+  version "3.2.31"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.33.tgz#123b8969247029ea0d9c1983676d4706a962d848"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.31.tgz#79ce01817cb3caf2c9d923f669b738d2d7953eff"
-  integrity sha512-LSrJ6W7CZTSUygX5s8aFkraDWlO6K4geOwA3quFF2O+hC3QuAMZt/0Xb7JKE3C4JD4pFwCSO7oCrZmZ0BIJUnw==
+  integrity sha512-N+o0sICVLScUjfLG7u9u5XCjvmsexAiPt17GNnaWHJUfsKed5e85/A3SWgKxzlxx2SW/Hw7RQxzxbXez9PtY3g==
  dependencies:
-    "@vue/runtime-core" "3.2.33"
+    "@vue/runtime-core" "3.2.31"
-    "@vue/shared" "3.2.33"
+    "@vue/shared" "3.2.31"
    csstype "^2.6.8"
-"@vue/server-renderer@3.2.33":
+"@vue/server-renderer@3.2.31":
-  version "3.2.33"
+  version "3.2.31"
-  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.33.tgz#4b45d6d2ae10ea4e3d2cf8e676804cf60f331979"
+  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.31.tgz#201e9d6ce735847d5989403af81ef80960da7141"
-  integrity sha512-4jpJHRD4ORv8PlbYi+/MfP8ec1okz6rybe36MdpkDrGIdEItHEUyaHSKvz+ptNEyQpALmmVfRteHkU9F8vxOew==
+  integrity sha512-8CN3Zj2HyR2LQQBHZ61HexF5NReqngLT3oahyiVRfSSvak+oAvVmu8iNLSu6XR77Ili2AOpnAt1y8ywjjqtmkg==
  dependencies:
-    "@vue/compiler-ssr" "3.2.33"
+    "@vue/compiler-ssr" "3.2.31"
-    "@vue/shared" "3.2.33"
+    "@vue/shared" "3.2.31"
-"@vue/shared@3.2.33":
+"@vue/shared@3.2.31":
-  version "3.2.33"
+  version "3.2.31"
-  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.33.tgz#69a8c99ceb37c1b031d5cc4aec2ff1dc77e1161e"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.31.tgz#c90de7126d833dcd3a4c7534d534be2fb41faa4e"
-  integrity sha512-UBc1Pg1T3yZ97vsA2ueER0F6GbJebLHYlEi4ou1H5YL4KWvMOOWwpYo9/QpWq93wxKG6Wo13IY74Hcn/f7c7Bg==
+  integrity sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ==
 "@vue/test-utils@2.0.0-rc.17":
  version "2.0.0-rc.17"
@ -10014,32 +10014,31 @@ vue-router@4.0.14:
  dependencies:
    "@vue/devtools-api" "^6.0.0"
-vue-style-loader@4.1.3:
+vue-style-loader@4.1.2:
-  version "4.1.3"
+  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz#6d55863a51fa757ab24e89d9371465072aa7bc35"
+  resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.2.tgz#dedf349806f25ceb4e64f3ad7c0a44fba735fcf8"
  integrity sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==
  dependencies:
    hash-sum "^1.0.2"
    loader-utils "^1.0.2"
-vue-template-compiler@2.6.14:
+vue-template-compiler@2.6.11:
-  version "2.6.14"
+  version "2.6.11"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz#a2f0e7d985670d42c9c9ee0d044fed7690f4f763"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz#c04704ef8f498b153130018993e56309d4698080"
-  integrity sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g==
+  integrity sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA==
  dependencies:
    de-indent "^1.0.2"
    he "^1.1.0"
-vue@3.2.33:
+vue@^3.2.31:
-  version "3.2.33"
+  version "3.2.31"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.33.tgz#7867eb16a3293a28c4d190a837bc447878bd64c2"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.31.tgz#e0c49924335e9f188352816788a4cca10f817ce6"
-  integrity sha512-si1ExAlDUrLSIg/V7D/GgA4twJwfsfgG+t9w10z38HhL/HA07132pUQ2KuwAo8qbCyMJ9e6OqrmWrOCr+jW7ZQ==
+  integrity sha512-odT3W2tcffTiQCy57nOT93INw1auq5lYLLYtWpPYQQYQOOdHiqFct9Xhna6GJ+pJQaF67yZABraH47oywkJgFw==
  dependencies:
-    "@vue/compiler-dom" "3.2.33"
+    "@vue/compiler-dom" "3.2.31"
-    "@vue/compiler-sfc" "3.2.33"
+    "@vue/compiler-sfc" "3.2.31"
-    "@vue/runtime-dom" "3.2.33"
+    "@vue/runtime-dom" "3.2.31"
-    "@vue/server-renderer" "3.2.33"
+    "@vue/server-renderer" "3.2.31"
-    "@vue/shared" "3.2.33"
+    "@vue/shared" "3.2.31"
 vuex@4.0.2:
  version "4.0.2"
Author	SHA1	Message	Date
HJ	96a24ec625	Merge branch 'fix-discoverable-setting' into 'develop' fix "allow discovery" setting misbehaving See merge request pleroma/pleroma-fe!1518	2022-04-29 07:56:18 +00:00
Henry Jameson	91f833d1f0	fix "allow discovery" setting misbehaving	2022-04-29 10:52:16 +03:00
HJ	92b04ba7df	Merge branch 'fix-chat-errors' into 'develop' fix some chat errors/warnings that sometimes happen See merge request pleroma/pleroma-fe!1515	2022-04-20 17:27:01 +00:00
Henry Jameson	895eda3714	fix some chat errors/warnings that sometimes happen	2022-04-20 20:19:22 +03:00
HJ	fb63e81ed1	Merge branch 'from/develop/tusooa/1157-popover-trigger' into 'develop' Fix incorrect close of a status popover when clicking Expand inside it Closes #1157 See merge request pleroma/pleroma-fe!1514	2022-04-20 09:15:18 +00:00
Tusooa Zhu	a4ea0a30bf	Fix incorrect close of a status popover when clicking Expand inside it basically Vue (3 in particular?) will make changes to DOM before this event listener is called, and if the target is displayed using v-if, it will not be part of the DOM at that time, and contains() will return false. so it goes to call hidePopover() which caused this bug.	2022-04-19 20:24:24 -04:00