diff options
Diffstat (limited to 'packages/backend/src/core')
4 files changed, 26 insertions, 3 deletions
diff --git a/packages/backend/src/core/DriveService.ts b/packages/backend/src/core/DriveService.ts index cecbec9638..4b4872a2d6 100644 --- a/packages/backend/src/core/DriveService.ts +++ b/packages/backend/src/core/DriveService.ts @@ -423,6 +423,10 @@ export class DriveService { q.andWhere('file.id != :bannerId', { bannerId: user.bannerId }); } + if (user.backgroundId) { + q.andWhere('file.id != :backgroundId', { backgroundId: user.backgroundId }); + } + //This selete is hard coded, be careful if change database schema q.addSelect('SUM("file"."size") OVER (ORDER BY "file"."id" DESC ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)', 'acc_usage'); q.orderBy('file.id', 'ASC'); diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts index 155aee39a9..c862bffce5 100644 --- a/packages/backend/src/core/activitypub/ApRendererService.ts +++ b/packages/backend/src/core/activitypub/ApRendererService.ts @@ -454,9 +454,10 @@ export class ApRendererService { const id = this.userEntityService.genLocalUserUri(user.id); const isSystem = user.username.includes('.'); - const [avatar, banner, profile] = await Promise.all([ + const [avatar, banner, background, profile] = await Promise.all([ user.avatarId ? this.driveFilesRepository.findOneBy({ id: user.avatarId }) : undefined, user.bannerId ? this.driveFilesRepository.findOneBy({ id: user.bannerId }) : undefined, + user.backgroundId ? this.driveFilesRepository.findOneBy({ id: user.backgroundId }) : undefined, this.userProfilesRepository.findOneByOrFail({ userId: user.id }), ]); @@ -496,6 +497,7 @@ export class ApRendererService { summary: profile.description ? this.mfmService.toHtml(mfm.parse(profile.description)) : null, icon: avatar ? this.renderImage(avatar) : null, image: banner ? this.renderImage(banner) : null, + backgroundUrl: background ? this.renderImage(background) : null, tag, manuallyApprovesFollowers: user.isLocked, discoverable: user.isExplorable, @@ -650,6 +652,9 @@ export class ApRendererService { // Firefish firefish: "https://joinfirefish.org/ns#", speakAsCat: "firefish:speakAsCat", + // Sharkey + sharkey: "https://joinsharkey.org/ns#", + backgroundUrl: "sharkey:backgroundUrl", // vcard vcard: 'http://www.w3.org/2006/vcard/ns#', }, diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts index bbb362646d..639d11add3 100644 --- a/packages/backend/src/core/activitypub/models/ApPersonService.ts +++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts @@ -225,8 +225,8 @@ export class ApPersonService implements OnModuleInit { return null; } - private async resolveAvatarAndBanner(user: MiRemoteUser, icon: any, image: any): Promise<Pick<MiRemoteUser, 'avatarId' | 'bannerId' | 'avatarUrl' | 'bannerUrl' | 'avatarBlurhash' | 'bannerBlurhash'>> { - const [avatar, banner] = await Promise.all([icon, image].map(img => { + private async resolveAvatarAndBanner(user: MiRemoteUser, icon: any, image: any): Promise<Pick<MiRemoteUser, 'avatarId' | 'bannerId' | 'backgroundId' | 'avatarUrl' | 'bannerUrl' | 'backgroundUrl' | 'avatarBlurhash' | 'bannerBlurhash' | 'backgroundBlurhash'>> { + const [avatar, banner, background] = await Promise.all([icon, image].map(img => { if (img == null) return null; if (user == null) throw new Error('failed to create user: user is null'); return this.apImageService.resolveImage(user, img).catch(() => null); @@ -235,10 +235,13 @@ export class ApPersonService implements OnModuleInit { return { avatarId: avatar?.id ?? null, bannerId: banner?.id ?? null, + backgroundId: background?.id ?? null, avatarUrl: avatar ? this.driveFileEntityService.getPublicUrl(avatar, 'avatar') : null, bannerUrl: banner ? this.driveFileEntityService.getPublicUrl(banner) : null, + backgroundUrl: background ? this.driveFileEntityService.getPublicUrl(background) : null, avatarBlurhash: avatar?.blurhash ?? null, bannerBlurhash: banner?.blurhash ?? null, + backgroundBlurhash: background?.blurhash ?? null }; } diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts index 714459d76b..dbad82b1fe 100644 --- a/packages/backend/src/core/entities/UserEntityService.ts +++ b/packages/backend/src/core/entities/UserEntityService.ts @@ -308,6 +308,14 @@ export class UserEntityService implements OnModuleInit { bannerBlurhash: banner.blurhash, }); } + if (user.backgroundId != null && user.backgroundUrl === null) { + const background = await this.driveFilesRepository.findOneByOrFail({ id: user.backgroundId }); + user.backgroundUrl = this.driveFileEntityService.getPublicUrl(background); + this.usersRepository.update(user.id, { + backgroundUrl: user.backgroundUrl, + backgroundBlurhash: background.blurhash, + }); + } const meId = me ? me.id : null; const isMe = meId === user.id; @@ -385,6 +393,8 @@ export class UserEntityService implements OnModuleInit { lastFetchedAt: user.lastFetchedAt ? user.lastFetchedAt.toISOString() : null, bannerUrl: user.bannerUrl, bannerBlurhash: user.bannerBlurhash, + backgroundUrl: user.backgroundUrl, + backgroundBlurhash: user.backgroundBlurhash, isLocked: user.isLocked, isSilenced: this.roleService.getUserPolicies(user.id).then(r => !r.canPublicNote), isSuspended: user.isSuspended ?? falsy, @@ -429,6 +439,7 @@ export class UserEntityService implements OnModuleInit { ...(opts.detail && isMe ? { avatarId: user.avatarId, bannerId: user.bannerId, + backgroundId: user.backgroundId, isModerator: isModerator, isAdmin: isAdmin, injectFeaturedNote: profile!.injectFeaturedNote, |