Fix SQL query

diff --git a/server/models/actor/actor-follow.ts b/server/models/actor/actor-follow.ts
index 0f199d20878440222c8e088eb8d6bc17723041f9..71ce9fa6fb2887d298cecd999ac6e2bfb6e9c692 100644 (file)
--- 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 1524e053385397c71fc0d07eeccaba4fcdb510e3..80a646c77f59e669119c61a8337a50d1534353a4 100644 (file)
--- 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 306bc6ade8074d73a26bc13b5bbe4bf0db2c0112..0fb52827e9a15b5192a89877d2318cc455628dc5 100644 (file)
--- 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,