From 7cb8ad01d5634bf0bfcb2c1d964ec1acab47ef10 Mon Sep 17 00:00:00 2001
From: patak-dev <matias.capeletto@gmail.com>
Date: Sat, 23 Nov 2024 23:35:34 +0100
Subject: [PATCH] refactor: remove visibility

---
 .../publish/PublishVisibilityPicker.vue       | 36 -------------------
 components/publish/PublishWidget.vue          | 16 ---------
 components/publish/PublishWidgetList.vue      |  4 ---
 components/status/StatusCard.vue              |  4 +--
 components/status/StatusContent.vue           | 11 ++----
 components/status/StatusDetails.vue           |  1 -
 components/status/StatusSpoiler.vue           |  5 ++-
 .../status/StatusVisibilityIndicator.vue      | 15 --------
 composables/masto/status.ts                   |  5 +--
 composables/masto/statusDrafts.ts             | 21 +----------
 composables/thread.ts                         |  1 -
 pages/[[server]]/@[account]/[status].vue      |  2 +-
 pages/intent/post.vue                         |  3 --
 service-worker/types.ts                       |  2 --
 types/index.ts                                |  2 +-
 15 files changed, 9 insertions(+), 119 deletions(-)
 delete mode 100644 components/publish/PublishVisibilityPicker.vue
 delete mode 100644 components/status/StatusVisibilityIndicator.vue

diff --git a/components/publish/PublishVisibilityPicker.vue b/components/publish/PublishVisibilityPicker.vue
deleted file mode 100644
index b86850cb7..000000000
--- a/components/publish/PublishVisibilityPicker.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<script setup lang="ts">
-const { editing } = defineProps<{
-  editing?: boolean
-}>()
-
-const modelValue = defineModel<string>({
-  required: true,
-})
-
-const currentVisibility = computed(() =>
-  statusVisibilities.find(v => v.value === modelValue.value) || statusVisibilities[0],
-)
-
-function chooseVisibility(visibility: string) {
-  modelValue.value = visibility
-}
-</script>
-
-<template>
-  <CommonTooltip placement="top" :content="editing ? $t(`visibility.${currentVisibility.value}`) : $t('tooltip.change_content_visibility')">
-    <CommonDropdown placement="bottom">
-      <slot :visibility="currentVisibility" />
-      <template #popper>
-        <CommonDropdownItem
-          v-for="visibility in statusVisibilities"
-          :key="visibility.value"
-          :icon="visibility.icon"
-          :text="$t(`visibility.${visibility.value}`)"
-          :description="$t(`visibility.${visibility.value}_desc`)"
-          :checked="visibility.value === modelValue"
-          @click="chooseVisibility(visibility.value)"
-        />
-      </template>
-    </CommonDropdown>
-  </CommonTooltip>
-</template>
diff --git a/components/publish/PublishWidget.vue b/components/publish/PublishWidget.vue
index 8955815b6..f1dfeba6e 100644
--- a/components/publish/PublishWidget.vue
+++ b/components/publish/PublishWidget.vue
@@ -19,7 +19,6 @@ const {
   threadComposer?: ReturnType<typeof useThreadComposer>
   placeholder?: string
   inReplyToId?: string
-  inReplyToVisibility?: mastodon.v1.StatusVisibility
   expanded?: boolean
   dialogLabelledBy?: string
 }>()
@@ -173,8 +172,6 @@ const isExceedingCharacterLimit = computed(() => {
 
 const postLanguageDisplay = computed(() => languagesNameList.find(i => i.code === (draft.value.params.language || preferredLanguage.value))?.nativeName)
 
-const isDM = computed(() => draft.value.params.visibility === 'direct')
-
 async function handlePaste(evt: ClipboardEvent) {
   const files = evt.clipboardData?.files
   if (!files || files.length === 0)
@@ -301,7 +298,6 @@ function stopQuestionMarkPropagation(e: KeyboardEvent) {
                 :editor="editor" flex max-w-full
                 :class="{
                   'md:max-h-[calc(100vh-200px)] sm:max-h-[calc(100vh-400px)] max-h-35 of-y-auto overscroll-contain': shouldExpanded,
-                  'py2 px3.5 bg-dm rounded-4 me--1 ms--1 mt--1': isDM,
                 }"
                 @keydown="stopQuestionMarkPropagation"
                 @keydown.esc.prevent="editor?.commands.blur()"
@@ -482,18 +478,6 @@ function stopQuestionMarkPropagation(e: KeyboardEvent) {
               </button>
             </CommonTooltip>
 
-            <PublishVisibilityPicker v-model="draft.params.visibility" :editing="!!draft.editingStatus">
-              <template #default="{ visibility }">
-                <button
-                  :disabled="!!draft.editingStatus" :aria-label="$t('tooltip.change_content_visibility')"
-                  btn-action-icon :class="{ 'w-12': !draft.editingStatus }"
-                >
-                  <div :class="visibility.icon" />
-                  <div v-if="!draft.editingStatus" i-ri:arrow-down-s-line text-sm text-secondary me--1 />
-                </button>
-              </template>
-            </PublishVisibilityPicker>
-
             <PublishThreadTools :draft-item-index="draftItemIndex" :draft-key="draftKey" />
 
             <CommonTooltip
diff --git a/components/publish/PublishWidgetList.vue b/components/publish/PublishWidgetList.vue
index 9e625d2a7..d92e6eb15 100644
--- a/components/publish/PublishWidgetList.vue
+++ b/components/publish/PublishWidgetList.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import type { mastodon } from 'masto'
 import type { DraftItem } from '~/types'
 
 const {
@@ -9,13 +8,11 @@ const {
   placeholder,
   dialogLabelledBy,
   inReplyToId,
-  inReplyToVisibility,
 } = defineProps<{
   draftKey: string
   initial?: () => DraftItem
   placeholder?: string
   inReplyToId?: string
-  inReplyToVisibility?: mastodon.v1.StatusVisibility
   expanded?: boolean
   dialogLabelledBy?: string
 }>()
@@ -44,7 +41,6 @@ function isFirstItem(index: number) {
       :placeholder="placeholder"
       :dialog-labelled-by="dialogLabelledBy"
       :in-reply-to-id="isFirstItem(index) ? inReplyToId : undefined"
-      :in-reply-to-visibility="inReplyToVisibility"
     />
   </template>
 </template>
diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
index 6d416b038..9c1c77716 100644
--- a/components/status/StatusCard.vue
+++ b/components/status/StatusCard.vue
@@ -61,7 +61,6 @@ const timeago = useTimeAgo(() => status.value.createdAt, timeAgoOptions)
 
 const isSelfReply = computed(() => status.value.inReplyToAccountId === status.value.account.id)
 const collapseRebloggedBy = computed(() => rebloggedBy.value?.id === status.value.account.id)
-const isDM = computed(() => status.value.visibility === 'direct')
 
 const showUpperBorder = computed(() => props.newer && !directReply.value)
 const showReplyTo = computed(() => !replyToMain.value && !directReply.value)
@@ -158,7 +157,6 @@ const forceShow = ref(false)
               <AccountLockIndicator v-if="status.account.locked" me-2 />
               <AccountBotIndicator v-if="status.account.bot" me-2 />
               <div flex="~ gap1" items-center>
-                <StatusVisibilityIndicator v-if="status.visibility !== 'public'" :status="status" />
                 <div flex>
                   <CommonTooltip :content="createdAt">
                     <NuxtLink :title="status.createdAt" :href="statusRoute.href" @click.prevent="go($event)">
@@ -180,7 +178,7 @@ const forceShow = ref(false)
             :context="context"
             :is-preview="isPreview"
             :in-notification="inNotification"
-            mb2 :class="{ 'mt-2 mb1': isDM }"
+            mb2
           />
           <StatusActions v-if="actions !== false" v-show="!getPreferences(userSettings, 'zenMode')" :status="status" />
         </div>
diff --git a/components/status/StatusContent.vue b/components/status/StatusContent.vue
index e347ef17f..f76fe30ee 100644
--- a/components/status/StatusContent.vue
+++ b/components/status/StatusContent.vue
@@ -9,7 +9,6 @@ const { status, context } = defineProps<{
   inNotification?: boolean
 }>()
 
-const isDM = computed(() => status.visibility === 'direct')
 const isDetails = computed(() => context === 'details')
 
 // Content Filter logic
@@ -34,15 +33,9 @@ const allowEmbeddedMedia = computed(() => status.card?.html && embeddedMediaPref
 </script>
 
 <template>
-  <div
-    space-y-3
-    :class="{
-      'py2 px3.5 bg-dm rounded-4 me--1': isDM,
-      'ms--3.5 mt--1 ms--1': isDM && context !== 'details',
-    }"
-  >
+  <div space-y-3>
     <StatusBody v-if="(!isFiltered && isSensitiveNonSpoiler) || hideAllMedia" :status="status" :newer="newer" :with-action="!isDetails" :class="isDetails ? 'text-xl' : ''" />
-    <StatusSpoiler :enabled="hasSpoilerOrSensitiveMedia || isFiltered" :filter="isFiltered" :sensitive-non-spoiler="isSensitiveNonSpoiler || hideAllMedia" :is-d-m="isDM">
+    <StatusSpoiler :enabled="hasSpoilerOrSensitiveMedia || isFiltered" :filter="isFiltered" :sensitive-non-spoiler="isSensitiveNonSpoiler || hideAllMedia">
       <template v-if="spoilerTextPresent" #spoiler>
         <p>
           <ContentRich :content="status.spoilerText" :emojis="status.emojis" :markdown="false" />
diff --git a/components/status/StatusDetails.vue b/components/status/StatusDetails.vue
index 79056b5c9..c338380ce 100644
--- a/components/status/StatusDetails.vue
+++ b/components/status/StatusDetails.vue
@@ -45,7 +45,6 @@ useHydratedHead({
       <div aria-hidden="true">
         &middot;
       </div>
-      <StatusVisibilityIndicator :status="status" />
       <div v-if="status.application?.name" aria-hidden="true">
         &middot;
       </div>
diff --git a/components/status/StatusSpoiler.vue b/components/status/StatusSpoiler.vue
index 6d96a2f46..f5c484c70 100644
--- a/components/status/StatusSpoiler.vue
+++ b/components/status/StatusSpoiler.vue
@@ -2,7 +2,6 @@
 const props = defineProps<{
   enabled?: boolean
   filter?: boolean
-  isDM?: boolean
   sensitiveNonSpoiler?: boolean
 }>()
 
@@ -34,8 +33,8 @@ function getToggleText() {
     <div class="content-rich" p="x-4 b-2.5" text-center text-secondary w-full border="~ base" border-0 border-b-dotted border-b-3 mt-2>
       <slot name="spoiler" />
     </div>
-    <div flex="~ gap-1 center" w-full :mb="isDM && !showContent ? '4' : ''" mt="-4.5">
-      <button btn-text px-2 py-1 rounded-lg :bg="isDM ? 'transparent' : 'base'" flex="~ center gap-2" :class="showContent ? '' : 'filter-saturate-0 hover:filter-saturate-100'" :aria-expanded="showContent" @click="toggleContent()">
+    <div flex="~ gap-1 center" w-full mb mt="-4.5">
+      <button btn-text px-2 py-1 rounded-lg bg-base flex="~ center gap-2" :class="showContent ? '' : 'filter-saturate-0 hover:filter-saturate-100'" :aria-expanded="showContent" @click="toggleContent()">
         <div v-if="showContent" i-ri:eye-line />
         <div v-else i-ri:eye-close-line />
         {{ showContent ? $t('status.spoiler_show_less') : $t(getToggleText()) }}
diff --git a/components/status/StatusVisibilityIndicator.vue b/components/status/StatusVisibilityIndicator.vue
deleted file mode 100644
index ee072ba13..000000000
--- a/components/status/StatusVisibilityIndicator.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<script setup lang="ts">
-import type { mastodon } from 'masto'
-
-const { status } = defineProps<{
-  status: mastodon.v1.Status
-}>()
-
-const visibility = computed(() => statusVisibilities.find(v => v.value === status.visibility)!)
-</script>
-
-<template>
-  <CommonTooltip :content="$t(`visibility.${visibility.value}`)" placement="bottom">
-    <div :class="visibility.icon" :aria-label="$t(`visibility.${visibility.value}`)" />
-  </CommonTooltip>
-</template>
diff --git a/composables/masto/status.ts b/composables/masto/status.ts
index 501df2c3e..9978da59b 100644
--- a/composables/masto/status.ts
+++ b/composables/masto/status.ts
@@ -53,10 +53,7 @@ export function useStatusActions(props: StatusActionsProps) {
       status.value[countField] += status.value[action] ? 1 : -1
   }
 
-  const canReblog = computed(() =>
-    status.value.visibility !== 'direct'
-    && (status.value.visibility !== 'private' || status.value.account.id === currentUser.value?.account.id),
-  )
+  const canReblog = computed(() => true) // TODO: repost rules
 
   const toggleReblog = () => toggleStatusAction(
     'reblogged',
diff --git a/composables/masto/statusDrafts.ts b/composables/masto/statusDrafts.ts
index c2896e775..5619d3ad2 100644
--- a/composables/masto/statusDrafts.ts
+++ b/composables/masto/statusDrafts.ts
@@ -13,25 +13,12 @@ export const builtinDraftKeys = [
   'home',
 ]
 
-const ALL_VISIBILITY = ['public', 'unlisted', 'private', 'direct'] as const
-
-function getDefaultVisibility(currentVisibility: mastodon.v1.StatusVisibility) {
-  // The default privacy only should be taken into account if it makes
-  // the post more private than the replying to post
-  const preferredVisibility = currentUser.value?.account.source.privacy || 'public'
-  return ALL_VISIBILITY.indexOf(currentVisibility)
-    > ALL_VISIBILITY.indexOf(preferredVisibility)
-    ? currentVisibility
-    : preferredVisibility
-}
-
 export function getDefaultDraftItem(options: Partial<Mutable<mastodon.rest.v1.CreateStatusParams> & Omit<DraftItem, 'params'>> = {}): DraftItem {
   const {
     attachments = [],
     initialText = '',
     status,
     inReplyToId,
-    visibility,
     sensitive,
     spoilerText,
     language,
@@ -46,7 +33,6 @@ export function getDefaultDraftItem(options: Partial<Mutable<mastodon.rest.v1.Cr
       status: status || '',
       poll,
       inReplyToId,
-      visibility: getDefaultVisibility(visibility || 'public'),
       sensitive: sensitive ?? false,
       spoilerText: spoilerText || '',
       language: language || '', // auto inferred from current language on posting
@@ -59,7 +45,6 @@ export function getDefaultDraftItem(options: Partial<Mutable<mastodon.rest.v1.Cr
 export async function getDraftFromStatus(status: mastodon.v1.Status): Promise<DraftItem> {
   const info = {
     status: await convertMastodonHTML(status.content),
-    visibility: status.visibility,
     attachments: status.mediaAttachments,
     sensitive: status.sensitive,
     spoilerText: status.spoilerText,
@@ -104,7 +89,6 @@ export function getReplyDraft(status: mastodon.v1.Status) {
         inReplyToId: status!.id,
         sensitive: status.sensitive,
         spoilerText: status.spoilerText,
-        visibility: status.visibility,
         mentions: accountsToMention,
         language: status.language,
       })
@@ -176,10 +160,7 @@ export function mentionUser(account: mastodon.v1.Account) {
 }
 
 export function directMessageUser(account: mastodon.v1.Account) {
-  openPublishDialog('dialog', getDefaultDraftItem({
-    status: `@${account.acct} `,
-    visibility: 'direct',
-  }))
+  openPublishDialog('dialog', getDefaultDraftItem({ status: `@${account.acct} ` }))
 }
 
 export function clearEmptyDrafts() {
diff --git a/composables/thread.ts b/composables/thread.ts
index d92632a46..1d3e8124a 100644
--- a/composables/thread.ts
+++ b/composables/thread.ts
@@ -26,7 +26,6 @@ export function useThreadComposer(draftKey: string, initial?: () => DraftItem) {
       language: lastItem.params.language,
       sensitive: lastItem.params.sensitive,
       spoilerText: lastItem.params.spoilerText,
-      visibility: lastItem.params.visibility,
     }))
   }
 
diff --git a/pages/[[server]]/@[account]/[status].vue b/pages/[[server]]/@[account]/[status].vue
index 280b6f05d..579393482 100644
--- a/pages/[[server]]/@[account]/[status].vue
+++ b/pages/[[server]]/@[account]/[status].vue
@@ -72,7 +72,7 @@ onReactivated(() => {
           <template v-if="!pendingContext">
             <StatusCard
               v-for="(comment, i) of context?.ancestors" :key="comment.id"
-              :status="comment" :actions="comment.visibility !== 'direct'" context="account"
+              :status="comment" context="account"
               :has-older="true" :newer="context?.ancestors[i - 1]"
             />
           </template>
diff --git a/pages/intent/post.vue b/pages/intent/post.vue
index 105938169..c5584ea75 100644
--- a/pages/intent/post.vue
+++ b/pages/intent/post.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import type { mastodon } from 'masto'
-
 const router = useRouter()
 const route = useRoute()
 
@@ -10,7 +8,6 @@ onMounted(async () => {
     status: route.query.text as string,
     sensitive: route.query.sensitive === 'true' || route.query.sensitive === null,
     spoilerText: route.query.spoiler_text as string,
-    visibility: route.query.visibility as mastodon.v1.StatusVisibility,
     language: route.query.language as string,
   }), true)
   // TODO: need a better idea 👀
diff --git a/service-worker/types.ts b/service-worker/types.ts
index 5e492a9ac..e44879761 100644
--- a/service-worker/types.ts
+++ b/service-worker/types.ts
@@ -117,8 +117,6 @@ export interface Status {
   account: MastoAccount
   /** HTML-encoded status content. */
   content: string
-  /** Visibility of this status. */
-  visibility: mastodon.v1.StatusVisibility
   /** Is this status marked as sensitive content? */
   sensitive: boolean
   /** Subject or summary line, below which status content is collapsed until expanded. */
diff --git a/types/index.ts b/types/index.ts
index 4faa023f9..147ab37a1 100644
--- a/types/index.ts
+++ b/types/index.ts
@@ -48,7 +48,7 @@ export type TranslateFn = ReturnType<typeof useI18n>['t']
 export interface DraftItem {
   editingStatus?: mastodon.v1.Status
   initialText?: string
-  params: MarkNonNullable<Mutable<Omit<mastodon.rest.v1.CreateStatusParams, 'poll'>>, 'status' | 'language' | 'sensitive' | 'spoilerText' | 'visibility'> & { poll: Mutable<mastodon.rest.v1.CreateStatusParams['poll']> }
+  params: MarkNonNullable<Mutable<Omit<mastodon.rest.v1.CreateStatusParams, 'poll'>>, 'status' | 'language' | 'sensitive' | 'spoilerText'> & { poll: Mutable<mastodon.rest.v1.CreateStatusParams['poll']> }
   attachments: mastodon.v1.MediaAttachment[]
   lastUpdated: number
   mentions?: string[]