From 862ead21a3d268677977a25bdb6853003299cf71 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 23 Oct 2019 12:06:26 +0200 Subject: [PATCH] Fix and cleanup actor follow inbox sql query --- server/models/activitypub/actor-follow.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/models/activitypub/actor-follow.ts b/server/models/activitypub/actor-follow.ts index fb3c4ef9d..24272a40e 100644 --- a/server/models/activitypub/actor-follow.ts +++ b/server/models/activitypub/actor-follow.ts @@ -574,8 +574,8 @@ export class ActorFollowModel extends Model { } const selections: string[] = [] - if (distinct === true) selections.push('DISTINCT("Follows"."' + columnUrl + '") AS "selectionUrl"') - else selections.push('"Follows"."' + columnUrl + '" AS "selectionUrl"') + if (distinct === true) selections.push(`DISTINCT("Follows"."${columnUrl}") AS "selectionUrl"`) + else selections.push(`"Follows"."${columnUrl}" AS "selectionUrl"`) selections.push('COUNT(*) AS "total"') @@ -585,7 +585,7 @@ export class ActorFollowModel extends Model { let query = 'SELECT ' + selection + ' FROM "actor" ' + 'INNER JOIN "actorFollow" ON "actorFollow"."' + firstJoin + '" = "actor"."id" ' + 'INNER JOIN "actor" AS "Follows" ON "actorFollow"."' + secondJoin + '" = "Follows"."id" ' + - 'WHERE "actor"."id" = ANY ($actorIds) AND "actorFollow"."state" = \'accepted\' AND "selectionUrl" IS NOT NULL ' + `WHERE "actor"."id" = ANY ($actorIds) AND "actorFollow"."state" = 'accepted' AND "Follows"."${columnUrl}" IS NOT NULL ` if (count !== undefined) query += 'LIMIT ' + count if (start !== undefined) query += ' OFFSET ' + start