server: improve OpenGraph data for note attachments

With this change, not all files will be proclaimed to be image files. Only
images, videos and audio files will be represented with OpenGraph data.

More properties for these files will also be represented, e.g. image alt text.

However, if the note has a CW or any of the files are marked sensitive, none
of the files will be used.

The users profile picture will not be used any more.

Changelog: Changed
This commit is contained in:
Johann150 2023-02-01 11:34:09 +01:00
parent 75b14124f2
commit 39fb7e5946
Signed by untrusted user: Johann150
GPG key ID: 9EE6577A2A06F8F1
2 changed files with 64 additions and 3 deletions

View file

@ -18,7 +18,7 @@ import { KoaAdapter } from '@bull-board/koa';
import { In, IsNull } from 'typeorm';
import { fetchMeta } from '@/misc/fetch-meta.js';
import config from '@/config/index.js';
import { Users, Notes, UserProfiles, Pages, Channels, Clips } from '@/models/index.js';
import { Users, Notes, UserProfiles, Pages, Channels, Clips, DriveFiles } from '@/models/index.js';
import * as Acct from '@/misc/acct.js';
import { getNoteSummary } from '@/misc/get-note-summary.js';
import { queues } from '@/queue/queues.js';
@ -327,10 +327,70 @@ router.get('/notes/:note', async (ctx, next) => {
const packedNote = await Notes.pack(note);
const profile = await UserProfiles.findOneByOrFail({ userId: note.userId });
const meta = await fetchMeta();
// If the note has a CW (is sensitive as a whole) or any of the files is sensitive or there are no
// files, they are not used for a preview.
let filesOpengraph = [];
if (!packedNote.cw || packedNote.files.length > 0 || packedNote.files.all(file => !file.isSensitive)) {
let limit = 4;
for (const file of packedNote.files) {
if (file.type.startsWith('image/')) {
filesOpengraph.push([
"og:image",
DriveFiles.getPublicUrl(file, true),
]);
filesOpengraph.push([
"og:image:type",
file.type,
]);
if (file.properties != null) {
filesOpengraph.push([
"og:image:width",
file.properties?.width,
]);
filesOpengraph.push([
"og:image:height",
file.properties?.height,
]);
}
if (file.comment) {
filesOpengraph.push([
"og:image:alt",
file.comment,
]);
}
} else if (file.type.startsWith('audio/')) {
filesOpengraph.push([
"og:audio",
DriveFiles.getPublicUrl(file),
]);
filesOpengraph.push([
"og:audio:type",
file.type,
]);
} else if (file.type.startsWith('video/')) {
filesOpengraph.push([
"og:video",
DriveFiles.getPublicUrl(file),
]);
filesOpengraph.push([
"og:video:type",
file.type,
]);
} else {
// doesn't count towards the limit
continue;
}
// limit the number of presented attachments
if (--limit < 0) break;
}
}
await ctx.render('note', {
note: packedNote,
profile,
avatarUrl: await Users.getAvatarUrl(await Users.findOneByOrFail({ id: note.userId })),
filesOpengraph,
// TODO: Let locale changeable by instance setting
summary: getNoteSummary(packedNote),
instanceName: meta.name || 'FoundKey',

View file

@ -17,7 +17,8 @@ block og
meta(property='og:title' content= title)
meta(property='og:description' content= summary)
meta(property='og:url' content= url)
meta(property='og:image' content= avatarUrl)
for opengraphTag in filesOpengraph
meta(property=opengraphTag[0] content=opengraphTag[1])
block meta
if user.host || isRenote || profile.noCrawle