From c808147292b78ec9fe3b0ad1e607a9b49c0b9932 Mon Sep 17 00:00:00 2001
From: Sugar <sugar@sylveon.social>
Date: Tue, 11 Jun 2024 16:28:09 +0200
Subject: [PATCH] replace reply with inReplyTo in in-reply-to collapse code
---
locales/en-US.yml | 2 +-
packages/frontend/src/components/MkNote.vue | 20 ++++++-------
packages/frontend/src/components/SkNote.vue | 30 +++++++++----------
.../frontend/src/pages/settings/general.vue | 4 +--
.../pages/settings/preferences-backups.vue | 2 +-
packages/frontend/src/store.ts | 2 +-
6 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 67980552de..d9a04ea783 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1058,7 +1058,7 @@ thisPostIsMissingAltTextCancel: "Cancel"
thisPostIsMissingAltTextIgnore: "Post anyway"
thisPostIsMissingAltText: "One of the files attached to this post is missing alt text. Please ensure all the attachments have alt text."
collapseRenotes: "Collapse boosts you've already seen"
-collapseReplies: "Collapse replies"
+collapseNotesRepliedTo: "Collapse notes replied to"
collapseFiles: "Collapse files"
autoloadConversation: "Load conversation on replies"
internalServerError: "Internal Server Error"
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 068a99a59e..67991a4e1c 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -12,11 +12,11 @@ SPDX-License-Identifier: AGPL-3.0-only
:class="[$style.root, { [$style.showActionsOnlyHover]: defaultStore.state.showNoteActionsOnlyHover }]"
:tabindex="!isDeleted ? '-1' : undefined"
>
- <div v-if="appearNote.reply && replyCollapsed" :class="$style.collapsedReply">
- <MkAvatar :class="$style.collapsedReplyAvatar" :user="appearNote.reply.user" link preview/>
- <Mfm :text="getNoteSummary(appearNote.reply)" :plain="true" :nowrap="true" :author="appearNote.reply.user" :nyaize="'respect'" :class="$style.collapsedReplyText" @click="replyCollapsed = false"/>
+ <div v-if="appearNote.reply && inReplyToCollapsed" :class="$style.collapsedInReplyTo">
+ <MkAvatar :class="$style.collapsedInReplyToAvatar" :user="appearNote.reply.user" link preview/>
+ <Mfm :text="getNoteSummary(appearNote.reply)" :plain="true" :nowrap="true" :author="appearNote.reply.user" :nyaize="'respect'" :class="$style.collapsedInReplyToText" @click="inReplyToCollapsed = false"/>
</div>
- <MkNoteSub v-if="appearNote.reply && !renoteCollapsed && !replyCollapsed" :note="appearNote.reply" :class="$style.replyTo"/>
+ <MkNoteSub v-if="appearNote.reply && !renoteCollapsed && !inReplyToCollapsed" :note="appearNote.reply" :class="$style.replyTo"/>
<div v-if="pinned" :class="$style.tip"><i class="ph-push-pin ph-bold ph-lg"></i> {{ i18n.ts.pinnedNote }}</div>
<!--<div v-if="appearNote._prId_" class="tip"><i class="ph-megaphone ph-bold ph-lg"></i> {{ i18n.ts.promotion }}<button class="_textButton hide" @click="readPromo()">{{ i18n.ts.hideThisNote }} <i class="ph-x ph-bold ph-lg"></i></button></div>-->
<!--<div v-if="appearNote._featuredId_" class="tip"><i class="ph-lightning ph-bold ph-lg"></i> {{ i18n.ts.featured }}</div>-->
@@ -314,7 +314,7 @@ const renoteCollapsed = ref(
(appearNote.value.myReaction != null)
)
);
-const replyCollapsed = ref(defaultStore.state.collapseReplies && !renoteCollapsed.value);
+const inReplyToCollapsed = ref(defaultStore.state.collapseNotesRepliedTo && !renoteCollapsed.value);
const defaultLike = computed(() => defaultStore.state.like ? defaultStore.state.like : null);
const animated = computed(() => parsed.value ? checkAnimationFromMfm(parsed.value) : null);
const allowAnim = ref(defaultStore.state.advancedMfm && defaultStore.state.animatedMfm ? true : false);
@@ -924,7 +924,7 @@ function emitUpdReaction(emoji: string, delta: number) {
margin-right: 4px;
}
-.collapsedRenoteTarget, .collapsedReply {
+.collapsedRenoteTarget, .collapsedInReplyTo {
display: flex;
align-items: center;
line-height: 28px;
@@ -932,12 +932,12 @@ function emitUpdReaction(emoji: string, delta: number) {
padding: 0 32px 18px;
}
-.collapsedReply {
+.collapsedInReplyTo {
padding: 28px 32px 0;
opacity: 0.7;
}
-.collapsedRenoteTargetAvatar, .collapsedReplyAvatar {
+.collapsedRenoteTargetAvatar, .collapsedInReplyToAvatar {
flex-shrink: 0;
display: inline-block;
width: 28px;
@@ -949,7 +949,7 @@ function emitUpdReaction(emoji: string, delta: number) {
opacity: 0.7;
}
-.collapsedRenoteTargetText, .collapsedReplyText {
+.collapsedRenoteTargetText, .collapsedInReplyToText {
overflow: hidden;
flex-shrink: 1;
text-overflow: ellipsis;
@@ -1167,7 +1167,7 @@ function emitUpdReaction(emoji: string, delta: number) {
margin-top: 4px;
}
- .collapsedReply {
+ .collapsedInReplyTo {
padding: 28px 16px 0;
}
diff --git a/packages/frontend/src/components/SkNote.vue b/packages/frontend/src/components/SkNote.vue
index 553c38eed8..306bd1c3f8 100644
--- a/packages/frontend/src/components/SkNote.vue
+++ b/packages/frontend/src/components/SkNote.vue
@@ -12,11 +12,11 @@ SPDX-License-Identifier: AGPL-3.0-only
:class="[$style.root, { [$style.showActionsOnlyHover]: defaultStore.state.showNoteActionsOnlyHover }]"
:tabindex="!isDeleted ? '-1' : undefined"
>
- <SkNoteSub v-if="appearNote.reply && !renoteCollapsed && !replyCollapsed" :note="appearNote.reply" :class="$style.replyTo"/>
- <div v-if="appearNote.reply && replyCollapsed && !renoteCollapsed" :class="$style.collapsedReply">
- <div :class="$style.collapsedReplyLine"></div>
- <MkAvatar :class="$style.collapsedReplyAvatar" :user="appearNote.reply.user" link preview/>
- <Mfm :text="getNoteSummary(appearNote.reply)" :plain="true" :nowrap="true" :author="appearNote.reply.user" :nyaize="'respect'" :class="$style.collapsedReplyText" @click="replyCollapsed = false"/>
+ <SkNoteSub v-if="appearNote.reply && !renoteCollapsed && !inReplyToCollapsed" :note="appearNote.reply" :class="$style.replyTo"/>
+ <div v-if="appearNote.reply && inReplyToCollapsed && !renoteCollapsed" :class="$style.collapsedInReplyTo">
+ <div :class="$style.collapsedInReplyToLine"></div>
+ <MkAvatar :class="$style.collapsedInReplyToAvatar" :user="appearNote.reply.user" link preview/>
+ <Mfm :text="getNoteSummary(appearNote.reply)" :plain="true" :nowrap="true" :author="appearNote.reply.user" :nyaize="'respect'" :class="$style.collapsedInReplyToText" @click="inReplyToCollapsed = false"/>
</div>
<div v-if="pinned" :class="$style.tip"><i class="ph-push-pin ph-bold ph-lg"></i> {{ i18n.ts.pinnedNote }}</div>
<!--<div v-if="appearNote._prId_" class="tip"><i class="ph-megaphone ph-bold ph-lg"></i> {{ i18n.ts.promotion }}<button class="_textButton hide" @click="readPromo()">{{ i18n.ts.hideThisNote }} <i class="ph-x ph-bold ph-lg"></i></button></div>-->
@@ -314,7 +314,7 @@ const renoteCollapsed = ref(
(appearNote.value.myReaction != null)
)
);
-const replyCollapsed = ref(defaultStore.state.collapseReplies && !renoteCollapsed.value);
+const inReplyToCollapsed = ref(defaultStore.state.collapseNotesRepliedTo && !renoteCollapsed.value);
const defaultLike = computed(() => defaultStore.state.like ? defaultStore.state.like : null);
const animated = computed(() => parsed.value ? checkAnimationFromMfm(parsed.value) : null);
const allowAnim = ref(defaultStore.state.advancedMfm && defaultStore.state.animatedMfm ? true : false);
@@ -940,7 +940,7 @@ function emitUpdReaction(emoji: string, delta: number) {
margin-right: 4px;
}
-.collapsedRenoteTarget, .collapsedReply {
+.collapsedRenoteTarget, .collapsedInReplyTo {
display: flex;
align-items: center;
line-height: 28px;
@@ -948,11 +948,11 @@ function emitUpdReaction(emoji: string, delta: number) {
padding: 8px 38px 24px;
}
-.collapsedReply {
+.collapsedInReplyTo {
padding: 28px 44px 0;
}
-.collapsedRenoteTargetAvatar, .collapsedReplyAvatar {
+.collapsedRenoteTargetAvatar, .collapsedInReplyToAvatar {
flex-shrink: 0;
display: inline-block;
width: 28px;
@@ -960,7 +960,7 @@ function emitUpdReaction(emoji: string, delta: number) {
margin: 0 8px 0 0;
}
-.collapsedRenoteTargetText, .collapsedReplyText {
+.collapsedRenoteTargetText, .collapsedInReplyToText {
overflow: hidden;
flex-shrink: 1;
text-overflow: ellipsis;
@@ -974,7 +974,7 @@ function emitUpdReaction(emoji: string, delta: number) {
}
}
-.collapsedReplyLine {
+.collapsedInReplyToLine {
position: absolute;
left: 56px;
// using solid instead of dotted, stylelistic choice
@@ -1161,11 +1161,11 @@ function emitUpdReaction(emoji: string, delta: number) {
padding: 8px 26px 24px;
}
- .collapsedReply {
+ .collapsedInReplyTo {
padding: 28px 35px 0;
}
- .collapsedReplyLine {
+ .collapsedInReplyToLine {
left: 47px;
}
@@ -1216,11 +1216,11 @@ function emitUpdReaction(emoji: string, delta: number) {
margin-top: 4px;
}
- .collapsedReply {
+ .collapsedInReplyTo {
padding: 28px 33px 0;
}
- .collapsedReplyLine {
+ .collapsedInReplyToLine {
left: 45px;
}
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 0f428b6d30..696178d3ae 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -53,7 +53,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkSwitch v-model="showNoteActionsOnlyHover">{{ i18n.ts.showNoteActionsOnlyHover }}</MkSwitch>
<MkSwitch v-model="showClipButtonInNoteFooter">{{ i18n.ts.showClipButtonInNoteFooter }}</MkSwitch>
<MkSwitch v-model="collapseRenotes">{{ i18n.ts.collapseRenotes }}</MkSwitch>
- <MkSwitch v-model="collapseReplies">{{ i18n.ts.collapseReplies }}</MkSwitch>
+ <MkSwitch v-model="collapseNotesRepliedTo">{{ i18n.ts.collapseNotesRepliedTo }}</MkSwitch>
<MkSwitch v-model="collapseFiles">{{ i18n.ts.collapseFiles }}</MkSwitch>
<MkSwitch v-model="uncollapseCW">Uncollapse CWs on notes</MkSwitch>
<MkSwitch v-model="autoloadConversation">{{ i18n.ts.autoloadConversation }}</MkSwitch>
@@ -322,7 +322,7 @@ const showClipButtonInNoteFooter = computed(defaultStore.makeGetterSetter('showC
const reactionsDisplaySize = computed(defaultStore.makeGetterSetter('reactionsDisplaySize'));
const limitWidthOfReaction = computed(defaultStore.makeGetterSetter('limitWidthOfReaction'));
const collapseRenotes = computed(defaultStore.makeGetterSetter('collapseRenotes'));
-const collapseReplies = computed(defaultStore.makeGetterSetter('collapseReplies'));
+const collapseNotesRepliedTo = computed(defaultStore.makeGetterSetter('collapseNotesRepliedTo'));
const clickToOpen = computed(defaultStore.makeGetterSetter('clickToOpen'));
// copied from src/pages/timeline.vue
const showBots = computed<boolean>({
diff --git a/packages/frontend/src/pages/settings/preferences-backups.vue b/packages/frontend/src/pages/settings/preferences-backups.vue
index 514a37a3ff..eeedcca3c8 100644
--- a/packages/frontend/src/pages/settings/preferences-backups.vue
+++ b/packages/frontend/src/pages/settings/preferences-backups.vue
@@ -56,7 +56,7 @@ const { t, ts } = i18n;
const defaultStoreSaveKeys: (keyof typeof defaultStore['state'])[] = [
'collapseRenotes',
- 'collapseReplies',
+ 'collapseNotesRepliedTo',
'menu',
'visibility',
'localOnly',
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index ba77f96dd5..07c1eaaf69 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -89,7 +89,7 @@ export const defaultStore = markRaw(new Storage('base', {
where: 'account',
default: false,
},
- collapseReplies: {
+ collapseNotesRepliedTo: {
where: 'account',
default: false,
},