Skip to content

High performance self-hosted photo and video management solution.

fix: don't show comments or likes for trashed assets (#19113)

Zack Pollard5dd3a6e13fd9
diff --git a/server/src/queries/activity.repository.sql b/server/src/queries/activity.repository.sql
index 04fd582ae6..59eaeb835a 100644
--- a/server/src/queries/activity.repository.sql
+++ b/server/src/queries/activity.repository.sql
@@ -23,9 +23,9 @@ from
) as "dummy"
) as "user" on true
left join "assets" on "assets"."id" = "activity"."assetId"
- and "assets"."deletedAt" is null
where
"activity"."albumId" = $1
+ and "assets"."deletedAt" is null
order by
"activity"."createdAt" asc
diff --git a/server/src/repositories/activity.repository.ts b/server/src/repositories/activity.repository.ts
index ea3c560806..925a74ff2a 100644
--- a/server/src/repositories/activity.repository.ts
+++ b/server/src/repositories/activity.repository.ts
@@ -36,12 +36,13 @@ export class ActivityRepository {
(join) => join.onTrue(),
)
.select((eb) => eb.fn.toJson('user').as('user'))
- .leftJoin('assets', (join) => join.onRef('assets.id', '=', 'activity.assetId').on('assets.deletedAt', 'is', null))
+ .leftJoin('assets', 'assets.id', 'activity.assetId')
.$if(!!userId, (qb) => qb.where('activity.userId', '=', userId!))
.$if(assetId === null, (qb) => qb.where('assetId', 'is', null))
.$if(!!assetId, (qb) => qb.where('activity.assetId', '=', assetId!))
.$if(!!albumId, (qb) => qb.where('activity.albumId', '=', albumId!))
.$if(isLiked !== undefined, (qb) => qb.where('activity.isLiked', '=', isLiked!))
+ .where('assets.deletedAt', 'is', null)
.orderBy('activity.createdAt', 'asc')
.execute();
}