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
3 changed files with 11 additions and 7 deletions
--- 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'
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