mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-04-28 09:36:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

support Peertube preview thumbnails

Browse source
This commit is contained in:
Hazelnoot 2025-02-16 02:32:50 -05:00
parent 2d7918a9b7
commit 447534d094
3 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/core/activitypub/models/ApImageService.ts
View file

@ -18,7 +18,7 @@ import type { Config } from '@/config.js';
import { IdentifiableError } from '@/misc/identifiable-error.js';
import { ApResolverService } from '../ApResolverService.js';
import { ApLoggerService } from '../ApLoggerService.js';
import { isDocument, type IObject } from '../type.js';
import { isDocument, type IObject, isApObject } from '../type.js';
@Injectable()
export class ApImageService {

36
packages/backend/src/core/activitypub/models/ApNoteService.ts
View file

@ -25,7 +25,7 @@ import { UtilityService } from '@/core/UtilityService.js';
import { bindThis } from '@/decorators.js';
import { checkHttps } from '@/misc/check-https.js';
import { IdentifiableError } from '@/misc/identifiable-error.js';
import { getOneApId, getApId, getOneApHrefNullable, validPost, isEmoji, getApType } from '../type.js';
import { getOneApId, getApId, getOneApHrefNullable, validPost, isEmoji, getApType, isApObject, isDocument, IApDocument } from '../type.js';
import { ApLoggerService } from '../ApLoggerService.js';
import { ApMfmService } from '../ApMfmService.js';
import { ApDbResolverService } from '../ApDbResolverService.js';
@ -270,6 +270,14 @@ export class ApNoteService {
if (file) files.push(file);
}
// Some software (Peertube) attaches a thumbnail under "icon" instead of "attachment"
const icon = getBestIcon(note);
if (icon) {
icon.sensitive ??= note.sensitive;
const file = await this.apImageService.resolveImage(actor, icon);
if (file) files.push(file);
}
// リプライ
const reply: MiNote | null = note.inReplyTo
? await this.resolveNote(note.inReplyTo, { resolver })
@ -504,6 +512,14 @@ export class ApNoteService {
if (file) files.push(file);
}
// Some software (Peertube) attaches a thumbnail under "icon" instead of "attachment"
const icon = getBestIcon(note);
if (icon) {
icon.sensitive ??= note.sensitive;
const file = await this.apImageService.resolveImage(actor, icon);
if (file) files.push(file);
}
// リプライ
const reply: MiNote | null = note.inReplyTo
? await this.resolveNote(note.inReplyTo, { resolver })
@ -719,3 +735,21 @@ export class ApNoteService {
}));
}
}
function getBestIcon(note: IObject): IObject | null {
const icons: IObject[] = toArray(note.icon);
if (icons.length < 2) {
return icons[0] ?? null;
}
return icons.reduce((best, i) => {
if (!isApObject(i)) return best;
if (!isDocument(i)) return best;
if (!best) return i;
if (!best.width || !best.height) return i;
if (!i.width || !i.height) return best;
if (i.width > best.width) return i;
if (i.height > best.height) return i;
return best;
}, null as IApDocument | null) ?? null;
}

2
packages/backend/src/core/activitypub/type.ts
View file

@ -297,6 +297,8 @@ export const validDocumentTypes = ['Audio', 'Document', 'Image', 'Page', 'Video'
export interface IApDocument extends IObject {
type: 'Audio' | 'Document' | 'Image' | 'Page' | 'Video';
width?: number;
height?: number;
}
export const isDocument = (object: IObject): object is IApDocument => {