From a220b84b0e29c7ce1b32166aec07870696a28ef9 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 25 May 2022 09:10:20 +0200 Subject: Fix avatars in notifications --- server/models/actor/actor-image.ts | 3 +++ server/models/user/sql/user-notitication-list-query-builder.ts | 5 +++++ 2 files changed, 8 insertions(+) (limited to 'server/models') diff --git a/server/models/actor/actor-image.ts b/server/models/actor/actor-image.ts index f74ab735e..9d44ef4d1 100644 --- a/server/models/actor/actor-image.ts +++ b/server/models/actor/actor-image.ts @@ -138,6 +138,9 @@ export class ActorImageModel extends ModelVideoChannel->Actor"."preferredUsername" AS "Video.VideoChannel.Actor.preferredUsername", "Video->VideoChannel->Actor->Avatars"."id" AS "Video.VideoChannel.Actor.Avatars.id", "Video->VideoChannel->Actor->Avatars"."width" AS "Video.VideoChannel.Actor.Avatars.width", + "Video->VideoChannel->Actor->Avatars"."type" AS "Video.VideoChannel.Actor.Avatars.type", "Video->VideoChannel->Actor->Avatars"."filename" AS "Video.VideoChannel.Actor.Avatars.filename", "Video->VideoChannel->Actor->Server"."id" AS "Video.VideoChannel.Actor.Server.id", "Video->VideoChannel->Actor->Server"."host" AS "Video.VideoChannel.Actor.Server.host", @@ -97,6 +98,7 @@ export class UserNotificationListQueryBuilder extends AbstractRunQuery { "VideoComment->Account->Actor"."preferredUsername" AS "VideoComment.Account.Actor.preferredUsername", "VideoComment->Account->Actor->Avatars"."id" AS "VideoComment.Account.Actor.Avatars.id", "VideoComment->Account->Actor->Avatars"."width" AS "VideoComment.Account.Actor.Avatars.width", + "VideoComment->Account->Actor->Avatars"."type" AS "VideoComment.Account.Actor.Avatars.type", "VideoComment->Account->Actor->Avatars"."filename" AS "VideoComment.Account.Actor.Avatars.filename", "VideoComment->Account->Actor->Server"."id" AS "VideoComment.Account.Actor.Server.id", "VideoComment->Account->Actor->Server"."host" AS "VideoComment.Account.Actor.Server.host", @@ -127,6 +129,7 @@ export class UserNotificationListQueryBuilder extends AbstractRunQuery { "Abuse->FlaggedAccount->Actor"."preferredUsername" AS "Abuse.FlaggedAccount.Actor.preferredUsername", "Abuse->FlaggedAccount->Actor->Avatars"."id" AS "Abuse.FlaggedAccount.Actor.Avatars.id", "Abuse->FlaggedAccount->Actor->Avatars"."width" AS "Abuse.FlaggedAccount.Actor.Avatars.width", + "Abuse->FlaggedAccount->Actor->Avatars"."type" AS "Abuse.FlaggedAccount.Actor.Avatars.type", "Abuse->FlaggedAccount->Actor->Avatars"."filename" AS "Abuse.FlaggedAccount.Actor.Avatars.filename", "Abuse->FlaggedAccount->Actor->Server"."id" AS "Abuse.FlaggedAccount.Actor.Server.id", "Abuse->FlaggedAccount->Actor->Server"."host" AS "Abuse.FlaggedAccount.Actor.Server.host", @@ -155,6 +158,7 @@ export class UserNotificationListQueryBuilder extends AbstractRunQuery { "ActorFollow->ActorFollower->Account"."name" AS "ActorFollow.ActorFollower.Account.name", "ActorFollow->ActorFollower->Avatars"."id" AS "ActorFollow.ActorFollower.Avatars.id", "ActorFollow->ActorFollower->Avatars"."width" AS "ActorFollow.ActorFollower.Avatars.width", + "ActorFollow->ActorFollower->Avatars"."type" AS "ActorFollow.ActorFollower.Avatars.type", "ActorFollow->ActorFollower->Avatars"."filename" AS "ActorFollow.ActorFollower.Avatars.filename", "ActorFollow->ActorFollower->Server"."id" AS "ActorFollow.ActorFollower.Server.id", "ActorFollow->ActorFollower->Server"."host" AS "ActorFollow.ActorFollower.Server.host", @@ -173,6 +177,7 @@ export class UserNotificationListQueryBuilder extends AbstractRunQuery { "Account->Actor"."preferredUsername" AS "Account.Actor.preferredUsername", "Account->Actor->Avatars"."id" AS "Account.Actor.Avatars.id", "Account->Actor->Avatars"."width" AS "Account.Actor.Avatars.width", + "Account->Actor->Avatars"."type" AS "Account.Actor.Avatars.type", "Account->Actor->Avatars"."filename" AS "Account.Actor.Avatars.filename", "Account->Actor->Server"."id" AS "Account.Actor.Server.id", "Account->Actor->Server"."host" AS "Account.Actor.Server.host"` -- cgit v1.2.3