Add loading spinners + remove unused
This commit is contained in:
parent
3bf08a9610
commit
095ac9d929
|
@ -10,11 +10,13 @@
|
||||||
:class="{ renote: isRenote }"
|
:class="{ renote: isRenote }"
|
||||||
>
|
>
|
||||||
<MkNoteSub
|
<MkNoteSub
|
||||||
|
v-if="conversation"
|
||||||
v-for="note in conversation"
|
v-for="note in conversation"
|
||||||
:key="note.id"
|
:key="note.id"
|
||||||
class="reply-to"
|
class="reply-to"
|
||||||
:note="note"
|
:note="note"
|
||||||
/>
|
/>
|
||||||
|
<MkLoading v-else-if="appearNote.reply" mini />
|
||||||
<MkNoteSub
|
<MkNoteSub
|
||||||
v-if="appearNote.reply"
|
v-if="appearNote.reply"
|
||||||
:note="appearNote.reply"
|
:note="appearNote.reply"
|
||||||
|
@ -31,12 +33,14 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<MkNoteSub
|
<MkNoteSub
|
||||||
|
v-if="directReplies"
|
||||||
v-for="note in directReplies"
|
v-for="note in directReplies"
|
||||||
:key="note.id"
|
:key="note.id"
|
||||||
:note="note"
|
:note="note"
|
||||||
class="reply"
|
class="reply"
|
||||||
:conversation="replies"
|
:conversation="replies"
|
||||||
/>
|
/>
|
||||||
|
<MkLoading v-else-if="appearNote.repliesCount > 0" />
|
||||||
</div>
|
</div>
|
||||||
<div v-else class="_panel muted" @click="muted.muted = false">
|
<div v-else class="_panel muted" @click="muted.muted = false">
|
||||||
<I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
|
<I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
|
||||||
|
@ -66,31 +70,18 @@ import {
|
||||||
reactive,
|
reactive,
|
||||||
ref,
|
ref,
|
||||||
} from "vue";
|
} from "vue";
|
||||||
import * as mfm from "mfm-js";
|
|
||||||
import type * as misskey from "calckey-js";
|
import type * as misskey from "calckey-js";
|
||||||
import MkNote from "@/components/MkNote.vue";
|
import MkNote from "@/components/MkNote.vue";
|
||||||
import MkNoteSub from "@/components/MkNoteSub.vue";
|
import MkNoteSub from "@/components/MkNoteSub.vue";
|
||||||
import XNoteSimple from "@/components/MkNoteSimple.vue";
|
|
||||||
import XReactionsViewer from "@/components/MkReactionsViewer.vue";
|
|
||||||
import XMediaList from "@/components/MkMediaList.vue";
|
|
||||||
import XCwButton from "@/components/MkCwButton.vue";
|
|
||||||
import XPoll from "@/components/MkPoll.vue";
|
|
||||||
import XStarButton from "@/components/MkStarButton.vue";
|
import XStarButton from "@/components/MkStarButton.vue";
|
||||||
import XStarButtonNoEmoji from "@/components/MkStarButtonNoEmoji.vue";
|
|
||||||
import XRenoteButton from "@/components/MkRenoteButton.vue";
|
import XRenoteButton from "@/components/MkRenoteButton.vue";
|
||||||
import XQuoteButton from "@/components/MkQuoteButton.vue";
|
|
||||||
import MkUrlPreview from "@/components/MkUrlPreview.vue";
|
|
||||||
import MkInstanceTicker from "@/components/MkInstanceTicker.vue";
|
|
||||||
import MkVisibility from "@/components/MkVisibility.vue";
|
|
||||||
import { pleaseLogin } from "@/scripts/please-login";
|
import { pleaseLogin } from "@/scripts/please-login";
|
||||||
import { getWordSoftMute } from "@/scripts/check-word-mute";
|
import { getWordSoftMute } from "@/scripts/check-word-mute";
|
||||||
import { userPage } from "@/filters/user";
|
import { userPage } from "@/filters/user";
|
||||||
import { notePage } from "@/filters/note";
|
|
||||||
import { useRouter } from "@/router";
|
import { useRouter } from "@/router";
|
||||||
import * as os from "@/os";
|
import * as os from "@/os";
|
||||||
import { defaultStore, noteViewInterruptors } from "@/store";
|
import { defaultStore, noteViewInterruptors } from "@/store";
|
||||||
import { reactionPicker } from "@/scripts/reaction-picker";
|
import { reactionPicker } from "@/scripts/reaction-picker";
|
||||||
import { extractUrlFromMfm } from "@/scripts/extract-url-from-mfm";
|
|
||||||
import { $i } from "@/account";
|
import { $i } from "@/account";
|
||||||
import { i18n } from "@/i18n";
|
import { i18n } from "@/i18n";
|
||||||
import { getNoteMenu } from "@/scripts/get-note-menu";
|
import { getNoteMenu } from "@/scripts/get-note-menu";
|
||||||
|
@ -99,15 +90,11 @@ import { deepClone } from "@/scripts/clone";
|
||||||
import { stream } from "@/stream";
|
import { stream } from "@/stream";
|
||||||
import { NoteUpdatedEvent } from "calckey-js/built/streaming.types";
|
import { NoteUpdatedEvent } from "calckey-js/built/streaming.types";
|
||||||
|
|
||||||
const router = useRouter();
|
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
note: misskey.entities.Note;
|
note: misskey.entities.Note;
|
||||||
pinned?: boolean;
|
pinned?: boolean;
|
||||||
}>();
|
}>();
|
||||||
|
|
||||||
const inChannel = inject("inChannel", null);
|
|
||||||
|
|
||||||
let note = $ref(deepClone(props.note));
|
let note = $ref(deepClone(props.note));
|
||||||
|
|
||||||
const softMuteReasonI18nSrc = (what?: string) => {
|
const softMuteReasonI18nSrc = (what?: string) => {
|
||||||
|
@ -120,8 +107,6 @@ const softMuteReasonI18nSrc = (what?: string) => {
|
||||||
return i18n.ts.userSaysSomething;
|
return i18n.ts.userSaysSomething;
|
||||||
};
|
};
|
||||||
|
|
||||||
const enableEmojiReactions = defaultStore.state.enableEmojiReactions;
|
|
||||||
|
|
||||||
// plugin
|
// plugin
|
||||||
if (noteViewInterruptors.length > 0) {
|
if (noteViewInterruptors.length > 0) {
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
|
@ -155,16 +140,9 @@ const isDeleted = ref(false);
|
||||||
const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
|
const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
|
||||||
const translation = ref(null);
|
const translation = ref(null);
|
||||||
const translating = ref(false);
|
const translating = ref(false);
|
||||||
const urls = appearNote.text
|
let conversation = $ref<null | misskey.entities.Note[]>([]);
|
||||||
? extractUrlFromMfm(mfm.parse(appearNote.text)).slice(0, 5)
|
|
||||||
: null;
|
|
||||||
const showTicker =
|
|
||||||
defaultStore.state.instanceTicker === "always" ||
|
|
||||||
(defaultStore.state.instanceTicker === "remote" &&
|
|
||||||
appearNote.user.instance);
|
|
||||||
const conversation = ref<misskey.entities.Note[]>([]);
|
|
||||||
const replies = ref<misskey.entities.Note[]>([]);
|
const replies = ref<misskey.entities.Note[]>([]);
|
||||||
const directReplies = ref<misskey.entities.Note[]>([]);
|
let directReplies = $ref<null | misskey.entities.Note[]>([]);
|
||||||
let isScrolling;
|
let isScrolling;
|
||||||
|
|
||||||
const keymap = {
|
const keymap = {
|
||||||
|
@ -260,29 +238,6 @@ function menu(viaKeyboard = false): void {
|
||||||
).then(focus);
|
).then(focus);
|
||||||
}
|
}
|
||||||
|
|
||||||
function showRenoteMenu(viaKeyboard = false): void {
|
|
||||||
if (!isMyRenote) return;
|
|
||||||
os.popupMenu(
|
|
||||||
[
|
|
||||||
{
|
|
||||||
text: i18n.ts.unrenote,
|
|
||||||
icon: "ph-trash ph-bold ph-lg",
|
|
||||||
danger: true,
|
|
||||||
action: () => {
|
|
||||||
os.api("notes/delete", {
|
|
||||||
noteId: note.id,
|
|
||||||
});
|
|
||||||
isDeleted.value = true;
|
|
||||||
},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
renoteTime.value,
|
|
||||||
{
|
|
||||||
viaKeyboard: viaKeyboard,
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function focus() {
|
function focus() {
|
||||||
noteEl.focus();
|
noteEl.focus();
|
||||||
}
|
}
|
||||||
|
@ -291,13 +246,14 @@ function blur() {
|
||||||
noteEl.blur();
|
noteEl.blur();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
directReplies = null;
|
||||||
os.api("notes/children", {
|
os.api("notes/children", {
|
||||||
noteId: appearNote.id,
|
noteId: appearNote.id,
|
||||||
limit: 30,
|
limit: 30,
|
||||||
depth: 12,
|
depth: 12,
|
||||||
}).then((res) => {
|
}).then((res) => {
|
||||||
replies.value = res;
|
replies.value = res;
|
||||||
directReplies.value = res
|
directReplies = res
|
||||||
.filter(
|
.filter(
|
||||||
(note) =>
|
(note) =>
|
||||||
note.replyId === appearNote.id ||
|
note.replyId === appearNote.id ||
|
||||||
|
@ -306,12 +262,13 @@ os.api("notes/children", {
|
||||||
.reverse();
|
.reverse();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
conversation = null;
|
||||||
if (appearNote.replyId) {
|
if (appearNote.replyId) {
|
||||||
os.api("notes/conversation", {
|
os.api("notes/conversation", {
|
||||||
noteId: appearNote.replyId,
|
noteId: appearNote.replyId,
|
||||||
limit: 30,
|
limit: 30,
|
||||||
}).then((res) => {
|
}).then((res) => {
|
||||||
conversation.value = res.reverse();
|
conversation = res.reverse();
|
||||||
focus();
|
focus();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -345,7 +302,7 @@ async function onNoteUpdated(noteData: NoteUpdatedEvent): Promise<void> {
|
||||||
|
|
||||||
replies.value.splice(found, 0, replyNote);
|
replies.value.splice(found, 0, replyNote);
|
||||||
if (found === 0) {
|
if (found === 0) {
|
||||||
directReplies.value.push(replyNote);
|
directReplies.push(replyNote);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue