Campfire/Campfire-Sharkey
Campfire/Campfire-Sharkey
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge: Make pleaseLoginContext attempt to use stored remote url/uris first before falling back to local url (!942)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/942

Closes #993

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
This commit is contained in:
Marie 2025-03-10 11:00:22 +00:00
commit 835e6112ac
6 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/frontend/src/components/MkNote.vue
View file

@ -348,7 +348,7 @@ const allowAnim = ref(defaultStore.state.advancedMfm && defaultStore.state.anima
const pleaseLoginContext = computed<OpenOnRemoteOptions>(() => ({ const pleaseLoginContext = computed<OpenOnRemoteOptions>(() => ({
type: 'lookup', type: 'lookup',
url: `https://${host}/notes/${appearNote.value.id}`, url: appearNote.value.url ?? appearNote.value.uri ?? `https://${host}/notes/${appearNote.value.id}`,
})); }));
const mergedCW = computed(() => computeMergedCw(appearNote.value)); const mergedCW = computed(() => computeMergedCw(appearNote.value));

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

@ -371,7 +371,7 @@ let renoting = false;
const pleaseLoginContext = computed<OpenOnRemoteOptions>(() => ({ const pleaseLoginContext = computed<OpenOnRemoteOptions>(() => ({
type: 'lookup', type: 'lookup',
url: `https://${host}/notes/${appearNote.value.id}`, url: appearNote.value.url ?? appearNote.value.uri ?? `https://${host}/notes/${appearNote.value.id}`,
})); }));
const keymap = { const keymap = {

2
packages/frontend/src/components/MkNoteSub.vue
View file

@ -154,7 +154,7 @@ const isRenote = (
const pleaseLoginContext = computed<OpenOnRemoteOptions>(() => ({ const pleaseLoginContext = computed<OpenOnRemoteOptions>(() => ({
type: 'lookup', type: 'lookup',
url: `https://${host}/notes/${appearNote.value.id}`, url: appearNote.value.url ?? appearNote.value.uri ?? `https://${host}/notes/${appearNote.value.id}`,
})); }));
async function addReplyTo(replyNote: Misskey.entities.Note) { async function addReplyTo(replyNote: Misskey.entities.Note) {

2
packages/frontend/src/components/SkNote.vue
View file

@ -352,7 +352,7 @@ const renoteTooltip = computeRenoteTooltip(renoted);
const pleaseLoginContext = computed<OpenOnRemoteOptions>(() => ({ const pleaseLoginContext = computed<OpenOnRemoteOptions>(() => ({
type: 'lookup', type: 'lookup',
url: `https://${host}/notes/${appearNote.value.id}`, url: appearNote.value.url ?? appearNote.value.uri ?? `https://${host}/notes/${appearNote.value.id}`,
})); }));
/* Overload FunctionにLintが対応していないのでコメントアウト /* Overload FunctionにLintが対応していないのでコメントアウト

2
packages/frontend/src/components/SkNoteDetailed.vue
View file

@ -377,7 +377,7 @@ let renoting = false;
const pleaseLoginContext = computed<OpenOnRemoteOptions>(() => ({ const pleaseLoginContext = computed<OpenOnRemoteOptions>(() => ({
type: 'lookup', type: 'lookup',
url: `https://${host}/notes/${appearNote.value.id}`, url: appearNote.value.url ?? appearNote.value.uri ?? `https://${host}/notes/${appearNote.value.id}`,
})); }));
const keymap = { const keymap = {

2
packages/frontend/src/components/SkNoteSub.vue
View file

@ -168,7 +168,7 @@ const isRenote = (
const pleaseLoginContext = computed<OpenOnRemoteOptions>(() => ({ const pleaseLoginContext = computed<OpenOnRemoteOptions>(() => ({
type: 'lookup', type: 'lookup',
url: `https://${host}/notes/${appearNote.value.id}`, url: appearNote.value.url ?? appearNote.value.uri ?? `https://${host}/notes/${appearNote.value.id}`,
})); }));
async function addReplyTo(replyNote: Misskey.entities.Note) { async function addReplyTo(replyNote: Misskey.entities.Note) {