misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

fetch linked notes manually, unless we have them in DB - fixes 1006

Browse source
This commit is contained in:
dakkar 2025-03-15 19:05:28 +00:00
parent 8e62aa9814
commit d0a074ac89
4 changed files with 40 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

29
packages/frontend/src/components/MkUrlPreview.vue
View file

@ -71,6 +71,11 @@ SPDX-License-Identifier: AGPL-3.0-only
<i class="ti ti-brand-x"></i> {{ i18n.ts.expandTweet }}
</MkButton>
</div>
<div v-if="showAsQuote && activityPub && !theNote && !fetchingTheNote" :class="$style.action">
<MkButton :small="true" inline @click="fetchNote()">
<i class="ti ti-note"></i> {{ i18n.ts.fetchLinkedNote }}
</MkButton>
</div>
<div v-if="!playerEnabled && player.url" :class="$style.action">
<MkButton :small="true" inline @click="playerEnabled = true">
<i class="ti ti-player-play"></i> {{ i18n.ts.enablePlayer }}
@ -150,16 +155,21 @@ const embedId = `embed${Math.random().toString().replace(/\D/, '')}`;
const tweetHeight = ref(150);
const unknownUrl = ref(false);
const theNote = ref<Misskey.entities.Note | null>(null);
const fetchingTheNote = ref(false);
onDeactivated(() => {
playerEnabled.value = false;
});
watch(activityPub, async (uri) => {
async function fetchNote() {
if (!props.showAsQuote) return;
if (!uri) return;
if (!activityPub.value) return;
if (theNote.value) return;
if (fetchingTheNote.value) return;
fetchingTheNote.value = true;
try {
const response = await misskeyApi('ap/show', { uri });
const response = await misskeyApi('ap/show', { uri: activityPub.value });
if (response.type !== 'Note') return;
const theNoteId = response['object'].id;
if (theNoteId && props.skipNoteIds && props.skipNoteIds.includes(theNoteId)) {
@ -167,12 +177,16 @@ watch(activityPub, async (uri) => {
return;
}
theNote.value = response['object'];
fetchingTheNote.value = false;
} catch (err) {
if (_DEV_) {
console.error(`failed to extract note for preview of ${uri}`, err);
console.error(`failed to extract note for preview of ${activityPub.value}`, err);
}
activityPub.value = null;
fetchingTheNote.value = false;
theNote.value = null;
}
});
}
const requestUrl = new URL(props.url);
if (!['http:', 'https:'].includes(requestUrl.protocol)) throw new Error('invalid url');
@ -199,7 +213,7 @@ window.fetch(`/url?url=${encodeURIComponent(requestUrl.href)}&lang=${versatileLa
return res.json();
})
.then((info: SummalyResult | null) => {
.then((info: SummalyResult & { haveNoteLocally?: boolean } | null) => {
if (!info || info.url == null) {
fetching.value = false;
unknownUrl.value = true;
@ -217,6 +231,9 @@ window.fetch(`/url?url=${encodeURIComponent(requestUrl.href)}&lang=${versatileLa
player.value = info.player;
sensitive.value = info.sensitive ?? false;
activityPub.value = info.activityPub;
if (info.haveNoteLocally) {
fetchNote();
}
});
function adjustTweetHeight(message: MessageEvent) {