sup39/firefish
1
0
Fork 0
Code Issues Pull requests Activity

fix: post translate button not showing

Browse source
This commit is contained in:
naskya 2023-08-31 00:17:05 +09:00
parent 8abed1108a
commit dfcd869666
Signed by: naskya
GPG key ID: 164DFF24E2D40139
2 changed files with 38 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
packages/client/src/components/MkNote.vue
View file

@ -267,7 +267,7 @@ import { computed, inject, onMounted, ref } from "vue";
import * as mfm from "mfm-js"; import * as mfm from "mfm-js";
import type { Ref } from "vue"; import type { Ref } from "vue";
import type * as misskey from "firefish-js"; import type * as misskey from "firefish-js";
import { detect as detectLanguage } from "tinyld"; import { detect as detectLanguage_ } from "tinyld";
import MkNoteSub from "@/components/MkNoteSub.vue"; import MkNoteSub from "@/components/MkNoteSub.vue";
import MkSubNoteContent from "./MkSubNoteContent.vue"; import MkSubNoteContent from "./MkSubNoteContent.vue";
import XNoteHeader from "@/components/MkNoteHeader.vue"; import XNoteHeader from "@/components/MkNoteHeader.vue";
@ -356,30 +356,32 @@ const translating = ref(false);
const enableEmojiReactions = defaultStore.state.enableEmojiReactions; const enableEmojiReactions = defaultStore.state.enableEmojiReactions;
const expandOnNoteClick = defaultStore.state.expandOnNoteClick; const expandOnNoteClick = defaultStore.state.expandOnNoteClick;
const purifyMFM = (src) => { const detectLanguage = (src: string): string => {
const nodes = mfm.parse(src); const nodes = mfm.parse(src);
const filtered = mfm.extract(nodes, (node) => { const filtered = mfm.extract(nodes, (node) => {
node.type === "text" || node.type === "quote"; return node.type === "text" || node.type === "quote";
}); });
return mfm.toString(filtered); const purified = mfm.toString(filtered).trim();
return detectLanguage_(purified);
}; };
const isForeignLanguage = (() => {
if (!defaultStore.state.detectPostLanguage || !appearNote.text) const isForeignLanguage: boolean =
return false; defaultStore.state.detectPostLanguage &&
const text = purifyMFM(appearNote.text).trim(); (() => {
if (!text) return false; const targetLanguage = (
const uiLanguage = (
localStorage.getItem("translateLang") || localStorage.getItem("translateLang") ||
localStorage.getItem("lang") || localStorage.getItem("lang") ||
navigator.language navigator.language
).slice(0, 2); )?.slice(0, 2);
return detectLanguage(text) !== uiLanguage; const postLanguage = detectLanguage(appearNote.value.text);
return postLanguage !== "" && postLanguage !== targetLanguage;
})(); })();
const translate = async () => { const translate = async () => {
if (translation.value != null) return; if (translation.value != null) return;
translating.value = true; translating.value = true;
translation.value = await os.api("notes/translate", { translation.value = await os.api("notes/translate", {
noteId: appearNote.id, noteId: appearNote.value.id,
targetLang: targetLang:
localStorage.getItem("translateLang") || localStorage.getItem("translateLang") ||
localStorage.getItem("lang") || localStorage.getItem("lang") ||

28
packages/client/src/components/MkNoteSub.vue
View file

@ -189,7 +189,7 @@ import { inject, ref, computed } from "vue";
import type { Ref } from "vue"; import type { Ref } from "vue";
import * as misskey from "firefish-js"; import * as misskey from "firefish-js";
import * as mfm from "mfm-js"; import * as mfm from "mfm-js";
import { detect as detectLanguage } from "tinyld"; import { detect as detectLanguage_ } from "tinyld";
import XNoteHeader from "@/components/MkNoteHeader.vue"; import XNoteHeader from "@/components/MkNoteHeader.vue";
import MkSubNoteContent from "@/components/MkSubNoteContent.vue"; import MkSubNoteContent from "@/components/MkSubNoteContent.vue";
import XReactionsViewer from "@/components/MkReactionsViewer.vue"; import XReactionsViewer from "@/components/MkReactionsViewer.vue";
@ -277,30 +277,32 @@ const replies: misskey.entities.Note[] =
const enableEmojiReactions = defaultStore.state.enableEmojiReactions; const enableEmojiReactions = defaultStore.state.enableEmojiReactions;
const expandOnNoteClick = defaultStore.state.expandOnNoteClick; const expandOnNoteClick = defaultStore.state.expandOnNoteClick;
const purifyMFM = (src) => { const detectLanguage = (src: string): string => {
const nodes = mfm.parse(src); const nodes = mfm.parse(src);
const filtered = mfm.extract(nodes, (node) => { const filtered = mfm.extract(nodes, (node) => {
node.type === "text" || node.type === "quote"; return node.type === "text" || node.type === "quote";
}); });
return mfm.toString(filtered); const purified = mfm.toString(filtered).trim();
return detectLanguage_(purified);
}; };
const isForeignLanguage = (() => {
if (!defaultStore.state.detectPostLanguage || !appearNote.text) const isForeignLanguage: boolean =
return false; defaultStore.state.detectPostLanguage &&
const text = purifyMFM(appearNote.text).trim(); (() => {
if (!text) return false; const targetLanguage = (
const uiLanguage = (
localStorage.getItem("translateLang") || localStorage.getItem("translateLang") ||
localStorage.getItem("lang") || localStorage.getItem("lang") ||
navigator.language navigator.language
).slice(0, 2); )?.slice(0, 2);
return detectLanguage(text) !== uiLanguage; const postLanguage = detectLanguage(appearNote.value.text);
return postLanguage !== "" && postLanguage !== targetLanguage;
})(); })();
const translate = async () => { const translate = async () => {
if (translation.value != null) return; if (translation.value != null) return;
translating.value = true; translating.value = true;
translation.value = await os.api("notes/translate", { translation.value = await os.api("notes/translate", {
noteId: appearNote.id, noteId: appearNote.value.id,
targetLang: targetLang:
localStorage.getItem("translateLang") || localStorage.getItem("translateLang") ||
localStorage.getItem("lang") || localStorage.getItem("lang") ||