Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(frontend): follow-up of #13089 (#14206)

Browse source 
* fix(frontend): #13089 を修正

* fix

* 正規表現を強化

* fix
This commit is contained in:
かっこかり 2024-07-14 17:28:34 +09:00 • committed by GitHub
parent 09d30fef5b
commit 722acf5986
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 56 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

16
packages/frontend/src/components/MkNoteDetailed.vue
View file

@ -209,7 +209,7 @@ import MkPoll from '@/components/MkPoll.vue';
import MkUsersTooltip from '@/components/MkUsersTooltip.vue';
import MkUrlPreview from '@/components/MkUrlPreview.vue';
import MkInstanceTicker from '@/components/MkInstanceTicker.vue';
import { pleaseLogin } from '@/scripts/please-login.js';
import { pleaseLogin, type OpenOnRemoteOptions } from '@/scripts/please-login.js';
import { checkWordMute } from '@/scripts/check-word-mute.js';
import { userPage } from '@/filters/user.js';
import { notePage } from '@/filters/note.js';
@ -297,10 +297,10 @@ const conversation = ref<Misskey.entities.Note[]>([]);
const replies = ref<Misskey.entities.Note[]>([]);
const canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || appearNote.value.userId === $i?.id);
const pleaseLoginContext = {
const pleaseLoginContext = computed<OpenOnRemoteOptions>(() => ({
type: 'lookup',
path: `https://${host}/notes/${appearNote.value.id}`,
} as const;
url: `https://${host}/notes/${appearNote.value.id}`,
}));
const keymap = {
'r': () => reply(),
@ -402,7 +402,7 @@ if (appearNote.value.reactionAcceptance === 'likeOnly') {
}
function renote() {
pleaseLogin(undefined, pleaseLoginContext);
pleaseLogin(undefined, pleaseLoginContext.value);
showMovedDialog();
const { menu } = getRenoteMenu({ note: note.value, renoteButton });
@ -410,7 +410,7 @@ function renote() {
}
function reply(): void {
pleaseLogin(undefined, pleaseLoginContext);
pleaseLogin(undefined, pleaseLoginContext.value);
showMovedDialog();
os.post({
reply: appearNote.value,
@ -421,7 +421,7 @@ function reply(): void {
}
function react(): void {
pleaseLogin(undefined, pleaseLoginContext);
pleaseLogin(undefined, pleaseLoginContext.value);
showMovedDialog();
if (appearNote.value.reactionAcceptance === 'likeOnly') {
sound.playMisskeySfx('reaction');
@ -505,7 +505,7 @@ async function clip(): Promise<void> {
function showRenoteMenu(): void {
if (!isMyRenote) return;
pleaseLogin(undefined, pleaseLoginContext);
pleaseLogin(undefined, pleaseLoginContext.value);
os.popupMenu([{
text: i18n.ts.unrenote,
icon: 'ti ti-trash',