From 65b2ec673d321bbbe4fc26b90720c4b2018048f8 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 12 May 2023 09:06:16 +0200
Subject: Fix SQL query

---
 server/models/actor/actor-follow.ts  | 4 ++--
 server/models/actor/actor.ts         | 4 ++--
 server/models/video/video-channel.ts | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/models/actor/actor-follow.ts b/server/models/actor/actor-follow.ts
index 0f199d208..71ce9fa6f 100644
--- a/server/models/actor/actor-follow.ts
+++ b/server/models/actor/actor-follow.ts
@@ -311,7 +311,7 @@ export class ActorFollowModel extends Model<Partial<AttributesOnly<ActorFollowMo
         if (t.host) {
           return {
             [Op.and]: [
-              ActorModel.wherePreferredUsername(t.name, '$preferredUsername$'),
+              ActorModel.wherePreferredUsername(t.name),
               { $host$: t.host }
             ]
           }
@@ -319,7 +319,7 @@ export class ActorFollowModel extends Model<Partial<AttributesOnly<ActorFollowMo
 
         return {
           [Op.and]: [
-            ActorModel.wherePreferredUsername(t.name, '$preferredUsername$'),
+            ActorModel.wherePreferredUsername(t.name),
             { $serverId$: null }
           ]
         }
diff --git a/server/models/actor/actor.ts b/server/models/actor/actor.ts
index 1524e0533..80a646c77 100644
--- a/server/models/actor/actor.ts
+++ b/server/models/actor/actor.ts
@@ -381,7 +381,7 @@ export class ActorModel extends Model<Partial<AttributesOnly<ActorModel>>> {
       const query = {
         where: {
           [Op.and]: [
-            this.wherePreferredUsername(preferredUsername),
+            this.wherePreferredUsername(preferredUsername, '"ActorModel"."preferredUsername"'),
             {
               serverId: null
             }
@@ -431,7 +431,7 @@ export class ActorModel extends Model<Partial<AttributesOnly<ActorModel>>> {
 
   static loadByNameAndHost (preferredUsername: string, host: string): Promise<MActorFull> {
     const query = {
-      where: this.wherePreferredUsername(preferredUsername),
+      where: this.wherePreferredUsername(preferredUsername, '"ActorModel"."preferredUsername"'),
       include: [
         {
           model: ServerModel,
diff --git a/server/models/video/video-channel.ts b/server/models/video/video-channel.ts
index 306bc6ade..0fb52827e 100644
--- a/server/models/video/video-channel.ts
+++ b/server/models/video/video-channel.ts
@@ -702,7 +702,7 @@ export class VideoChannelModel extends Model<Partial<AttributesOnly<VideoChannel
           required: true,
           where: {
             [Op.and]: [
-              ActorModel.wherePreferredUsername(name),
+              ActorModel.wherePreferredUsername(name, 'Actor.preferredUsername'),
               { serverId: null }
             ]
           },
@@ -728,7 +728,7 @@ export class VideoChannelModel extends Model<Partial<AttributesOnly<VideoChannel
         {
           model: ActorModel,
           required: true,
-          where: ActorModel.wherePreferredUsername(name),
+          where: ActorModel.wherePreferredUsername(name, 'Actor.preferredUsername'),
           include: [
             {
               model: ServerModel,
-- 
cgit v1.2.3