use MkNote insteadof MkNoteSub
This commit is contained in:
parent
adafd62710
commit
e5a21bae13
2 changed files with 15 additions and 10 deletions
|
@ -164,7 +164,7 @@
|
|||
tabindex="-1"
|
||||
>
|
||||
<XReactionsViewer
|
||||
v-if="enableEmojiReactions"
|
||||
v-if="enableEmojiReactions && !hideEmojiViewer"
|
||||
ref="reactionsViewer"
|
||||
:note="appearNote"
|
||||
/>
|
||||
|
@ -191,12 +191,7 @@
|
|||
v-if="!enableEmojiReactions"
|
||||
class="button"
|
||||
:note="appearNote"
|
||||
:count="
|
||||
Object.values(appearNote.reactions).reduce(
|
||||
(partialSum, val) => partialSum + val,
|
||||
0,
|
||||
)
|
||||
"
|
||||
:count="reactionCount"
|
||||
:reacted="appearNote.myReaction != null"
|
||||
/>
|
||||
<XStarButton
|
||||
|
@ -219,6 +214,7 @@
|
|||
@click.stop="react()"
|
||||
>
|
||||
<i :class="icon('ph-smiley')"></i>
|
||||
<p class="count" v-if="reactionCount > 0 && hideEmojiViewer">{{reactionCount}}</p>
|
||||
</button>
|
||||
<button
|
||||
v-if="
|
||||
|
@ -231,6 +227,7 @@
|
|||
@click.stop="undoReact(appearNote)"
|
||||
>
|
||||
<i :class="icon('ph-minus')"></i>
|
||||
<p class="count" v-if="reactionCount > 0 && hideEmojiViewer">{{reactionCount}}</p>
|
||||
</button>
|
||||
<XQuoteButton class="button" :note="appearNote" />
|
||||
<button
|
||||
|
@ -327,6 +324,7 @@ const props = defineProps<{
|
|||
detailedView?: boolean;
|
||||
collapsedReply?: boolean;
|
||||
hideFooter?: boolean;
|
||||
hideEmojiViewer?: boolean;
|
||||
}>();
|
||||
|
||||
const inChannel = inject("inChannel", null);
|
||||
|
@ -397,6 +395,13 @@ const isForeignLanguage: boolean =
|
|||
return postLang !== "" && postLang !== targetLang;
|
||||
})();
|
||||
|
||||
const reactionCount = computed(() =>
|
||||
Object.values(appearNote.value.reactions).reduce(
|
||||
(partialSum, val) => partialSum + val,
|
||||
0,
|
||||
),
|
||||
);
|
||||
|
||||
async function translate_(noteId: string, targetLang: string) {
|
||||
return await os.api("notes/translate", {
|
||||
noteId,
|
||||
|
|
|
@ -55,13 +55,13 @@
|
|||
/>
|
||||
</div>
|
||||
<!-- Since the reacted user list is actually shown above, the emoji-viewer is hidden to prevent visual noise -->
|
||||
<XNoteSub
|
||||
<XNote
|
||||
v-if="notification.type === 'renote'"
|
||||
class="content"
|
||||
:note="removeReplyTo(notification.note.renote)"
|
||||
:hide-emoji-viewer="true"
|
||||
/>
|
||||
<XNoteSub
|
||||
<XNote
|
||||
v-else
|
||||
class="content"
|
||||
:note="removeReplyTo(notification.note)"
|
||||
|
@ -87,7 +87,7 @@ import type {
|
|||
NotificationFolded,
|
||||
ReactionNotificationFolded,
|
||||
} from "@/types/notification";
|
||||
import XNoteSub from "@/components/MkNoteSub.vue";
|
||||
import XNote from "@/components/MkNote.vue";
|
||||
import type { entities } from "firefish-js";
|
||||
|
||||
const props = withDefaults(
|
||||
|
|
Loading…
Reference in a new issue