@@ -23,10 +25,10 @@
v-tooltip.noDelay="
i18n.t('edited', {
date: new Date(
- note.updated_at,
+ note.updated_at
).toLocaleDateString(),
time: new Date(
- note.updated_at,
+ note.updated_at
).toLocaleTimeString(),
})
"
@@ -48,7 +50,7 @@
diff --git a/fe_calckey/frontend/client/src/components/MkPostForm.vue b/fe_calckey/frontend/client/src/components/MkPostForm.vue
index b9144f3..308897c 100644
--- a/fe_calckey/frontend/client/src/components/MkPostForm.vue
+++ b/fe_calckey/frontend/client/src/components/MkPostForm.vue
@@ -89,8 +89,8 @@
reply
? 'ph-arrow-u-up-left ph-bold ph-lg'
: renote
- ? 'ph-quotes ph-bold ph-lg'
- : 'ph-paper-plane-tilt ph-bold ph-lg'
+ ? 'ph-quotes ph-bold ph-lg'
+ : 'ph-paper-plane-tilt ph-bold ph-lg'
"
>
@@ -101,8 +101,8 @@
- {{ i18n.ts.quoteAttached
- }}
@@ -127,8 +127,8 @@
>{{ i18n.ts.notSpecifiedMentionWarning }} -
+
+
import {
+ computed,
defineAsyncComponent,
inject,
nextTick,
+ onBeforeUnmount,
onMounted,
- watch,
ref,
- computed,
+ watch,
} from "vue";
import * as mfm from "mfm-js";
import * as misskey from "calckey-js";
@@ -285,7 +286,7 @@ const props = withDefaults(
mention?: misskey.entities.User;
specified?: misskey.entities.User;
initialText?: string;
- initialVisibility?: typeof misskey.noteVisibilities;
+ initialVisibility?: (typeof misskey.noteVisibilities)[number];
initialFiles?: (
| packed.PackDriveFileBase
| misskey.entities.DriveFile
@@ -303,7 +304,7 @@ const props = withDefaults(
initialVisibleUsers: () => [],
autofocus: true,
showMfmCheatSheet: true,
- },
+ }
);
const emit = defineEmits<{
@@ -332,20 +333,20 @@ let cw = ref
(null);
let localOnly = ref(
props.initialLocalOnly ?? defaultStore.state.rememberNoteVisibility
? defaultStore.state.localOnly
- : defaultStore.state.defaultNoteLocalOnly,
+ : defaultStore.state.defaultNoteLocalOnly
);
let visibility = ref(
props.initialVisibility ??
((defaultStore.state.rememberNoteVisibility
? defaultStore.state.visibility
: defaultStore.state
- .defaultNoteVisibility) as (typeof misskey.noteVisibilities)[number]),
+ .defaultNoteVisibility) as (typeof misskey.noteVisibilities)[number])
);
let visibleUsers = ref([]);
if (props.initialVisibleUsers) {
props.initialVisibleUsers.forEach(pushVisibleUser);
}
-let autocomplete = ref(null);
+let autocomplete = ref(null);
let draghover = ref(false);
let quoteId = ref(null);
let hasNotSpecifiedMentions = ref(false);
@@ -392,10 +393,10 @@ const submitText = computed((): string => {
return props.editId
? i18n.ts.edit
: props.renote
- ? i18n.ts.quote
- : props.reply
- ? i18n.ts.reply
- : i18n.ts.note;
+ ? i18n.ts.quote
+ : props.reply
+ ? i18n.ts.reply
+ : i18n.ts.note;
});
const textLength = computed((): number => {
@@ -419,9 +420,11 @@ const canPost = computed((): boolean => {
});
const withHashtags = computed(
- defaultStore.makeGetterSetter("postFormWithHashtags"),
+ defaultStore.makeGetterSetter("postFormWithHashtags")
+);
+const hashtags = computed(
+ defaultStore.makeGetterSetter("postFormHashtags")
);
-const hashtags = computed(defaultStore.makeGetterSetter("postFormHashtags"));
watch(text, () => {
checkMissingMention();
@@ -434,7 +437,7 @@ watch(
},
{
deep: true,
- },
+ }
);
if (props.mention) {
@@ -464,8 +467,8 @@ if (props.reply && props.reply.text != null) {
const mention = x.host
? `@${x.username}@${toASCII(x.host)}`
: otherHost == null || otherHost === host
- ? `@${x.username}`
- : `@${x.username}@${toASCII(otherHost)}`;
+ ? `@${x.username}`
+ : `@${x.username}@${toASCII(otherHost)}`;
// 自分は除外
if ($i.username === x.username && (x.host == null || x.host === host))
@@ -482,7 +485,7 @@ if (props.reply && props.reply.text != null) {
if (
props.reply &&
["home", "followers", "specified"].includes(
- magLegacyVisibility(props.reply.visibility),
+ magLegacyVisibility(props.reply.visibility)
)
) {
if (
@@ -492,7 +495,7 @@ if (
visibility.value = "followers";
} else if (
["home", "followers"].includes(
- magLegacyVisibility(props.reply.visibility),
+ magLegacyVisibility(props.reply.visibility)
) &&
visibility.value === "specified"
) {
@@ -505,7 +508,7 @@ if (
if (ids) {
os.api("users/show", {
userIds: ids.filter(
- (uid) => uid !== $i.id && uid !== props.reply!.user.id,
+ (uid) => uid !== $i.id && uid !== props.reply!.user.id
),
}).then((users) => {
users.forEach(pushVisibleUser);
@@ -516,7 +519,7 @@ if (
os.api("users/show", { userId: props.reply.user.id }).then(
(user) => {
pushVisibleUser(user);
- },
+ }
);
}
}
@@ -550,7 +553,7 @@ function checkMissingMention() {
for (const x of extractMentions(ast)) {
if (
!visibleUsers.value.some(
- (u) => u.username === x.username && u.host === x.host,
+ (u) => u.username === x.username && u.host === x.host
)
) {
hasNotSpecifiedMentions.value = true;
@@ -567,13 +570,13 @@ function addMissingMention() {
for (const x of extractMentions(ast)) {
if (
!visibleUsers.value.some(
- (u) => u.username === x.username && u.host === x.host,
+ (u) => u.username === x.username && u.host === x.host
)
) {
os.api("users/show", { username: x.username, host: x.host }).then(
(user) => {
visibleUsers.value.push(user);
- },
+ }
);
}
}
@@ -601,7 +604,7 @@ function focus() {
textareaEl.value.focus();
textareaEl.value.setSelectionRange(
textareaEl.value.value.length,
- textareaEl.value.value.length,
+ textareaEl.value.value.length
);
}
}
@@ -612,7 +615,7 @@ function chooseFileFrom(ev) {
for (const file of files_) {
files.value.push(file);
}
- },
+ }
);
}
@@ -644,7 +647,7 @@ function upload(file: File, name?: string) {
function setVisibility() {
os.popup(
defineAsyncComponent(
- () => import("@/components/MkVisibilityPicker.vue"),
+ () => import("@/components/MkVisibilityPicker.vue")
),
{
currentVisibility: visibility.value,
@@ -665,14 +668,14 @@ function setVisibility() {
}
},
},
- "closed",
+ "closed"
);
}
function pushVisibleUser(user) {
if (
!visibleUsers.value.some(
- (u) => u.username === user.username && u.host === user.host,
+ (u) => u.username === user.username && u.host === user.host
)
) {
visibleUsers.value.push(user);
@@ -697,13 +700,9 @@ function clear() {
}
function onKeydown(ev: KeyboardEvent) {
- if (
- (ev.which === 10 || ev.which === 13) &&
- (ev.ctrlKey || ev.metaKey) &&
- canPost.value
- )
+ if (ev.key === "Enter" && (ev.ctrlKey || ev.metaKey) && canPost.value)
post();
- if (ev.which === 27) emit("esc");
+ if (ev.key === "Escape") emit("esc");
}
function onCompositionUpdate(ev: CompositionEvent) {
@@ -715,16 +714,24 @@ function onCompositionEnd(ev: CompositionEvent) {
}
async function onPaste(ev: ClipboardEvent) {
+ if (!ev.clipboardData) {
+ return;
+ }
+
for (const { item, i } of Array.from(ev.clipboardData.items).map(
- (item, i) => ({ item, i }),
+ (item, i) => ({ item, i })
)) {
if (item.kind === "file") {
const file = item.getAsFile();
+ if (!file) {
+ continue;
+ }
+
const lio = file.name.lastIndexOf(".");
const ext = lio >= 0 ? file.name.slice(lio) : "";
const formatted = `${formatTimeString(
new Date(file.lastModified),
- defaultStore.state.pastedFileName,
+ defaultStore.state.pastedFileName
).replace(/{{number}}/g, `${i + 1}`)}${ext}`;
upload(file, formatted);
}
@@ -744,9 +751,9 @@ async function onPaste(ev: ClipboardEvent) {
return;
}
- quoteId.value = paste
- .substring(url.length)
- .match(/^\/notes\/(.+?)\/?$/)[1];
+ quoteId.value =
+ paste.substring(url.length).match(/^\/notes\/(.+?)\/?$/)?.[1] ??
+ null;
});
}
}
@@ -844,8 +851,8 @@ async function post() {
renoteId: props.renote
? props.renote.id
: quoteId.value
- ? quoteId.value
- : undefined,
+ ? quoteId.value
+ : undefined,
poll: poll.value,
cw: useCw.value ? cw.value || "" : undefined,
localOnly: localOnly.value,
@@ -872,7 +879,7 @@ async function post() {
if (postAccount.value) {
const storedAccounts = await getAccounts();
token = storedAccounts.find(
- (x) => x.id === postAccount.value.id,
+ (x) => x.id === postAccount.value.id
)?.token;
}
@@ -889,11 +896,11 @@ async function post() {
.filter((x) => x.type === "hashtag")
.map((x) => x.props.hashtag);
const history = JSON.parse(
- localStorage.getItem("hashtags") || "[]",
+ localStorage.getItem("hashtags") || "[]"
) as string[];
localStorage.setItem(
"hashtags",
- JSON.stringify(unique(hashtags_.concat(history))),
+ JSON.stringify(unique(hashtags_.concat(history)))
);
}
posting.value = false;
@@ -943,7 +950,7 @@ function openAccountMenu(ev: MouseEvent) {
}
},
},
- ev,
+ ev
);
}
@@ -957,9 +964,11 @@ onMounted(() => {
}
// TODO: detach when unmount
- new Autocomplete(textareaEl.value, text);
- new Autocomplete(cwInputEl.value, cw);
- new Autocomplete(hashtagsInputEl.value, hashtags);
+ autocomplete.value = [
+ new Autocomplete(textareaEl.value!, text),
+ new Autocomplete(cwInputEl.value!, cw),
+ new Autocomplete(hashtagsInputEl.value!, hashtags),
+ ];
nextTick(() => {
// 書きかけの投稿を復元
@@ -974,7 +983,7 @@ onMounted(() => {
visibility.value = draft.data.visibility;
localOnly.value = draft.data.localOnly;
files.value = (draft.data.files || []).filter(
- (draftFile) => draftFile,
+ (draftFile) => draftFile
);
if (draft.data.poll) {
poll.value = draft.data.poll;
@@ -1007,6 +1016,10 @@ onMounted(() => {
nextTick(() => watchForDraft());
});
});
+
+onBeforeUnmount(() => {
+ autocomplete.value?.forEach((a) => a.detach());
+});