Set actor preferred name case insensitive

1 files changed, 11 insertions, 8 deletions

diff --git a/server/models/video/video-channel.ts b/server/models/video/video-channel.ts
index 67fccab68..306bc6ade 100644
--- a/server/models/video/video-channel.ts
+++ b/server/models/video/video-channel.ts
@@ -130,13 +130,16 @@ export type SummaryOptions = {
       for (const handle of options.handles || []) {
         const [ preferredUsername, host ] = handle.split('@')
 
+        const sanitizedPreferredUsername = VideoChannelModel.sequelize.escape(preferredUsername.toLowerCase())
+        const sanitizedHost = VideoChannelModel.sequelize.escape(host)
+
         if (!host || host === WEBSERVER.HOST) {
-          or.push(`("preferredUsername" = ${VideoChannelModel.sequelize.escape(preferredUsername)} AND "serverId" IS NULL)`)
+          or.push(`(LOWER("preferredUsername") = ${sanitizedPreferredUsername} AND "serverId" IS NULL)`)
         } else {
           or.push(
             `(` +
-              `"preferredUsername" = ${VideoChannelModel.sequelize.escape(preferredUsername)} ` +
-              `AND "host" = ${VideoChannelModel.sequelize.escape(host)}` +
+              `LOWER("preferredUsername") = ${sanitizedPreferredUsername} ` +
+              `AND "host" = ${sanitizedHost}` +
             `)`
           )
         }
@@ -698,8 +701,10 @@ export class VideoChannelModel extends Model<Partial<AttributesOnly<VideoChannel
           model: ActorModel,
           required: true,
           where: {
-            preferredUsername: name,
-            serverId: null
+            [Op.and]: [
+              ActorModel.wherePreferredUsername(name),
+              { serverId: null }
+            ]
           },
           include: [
             {
@@ -723,9 +728,7 @@ export class VideoChannelModel extends Model<Partial<AttributesOnly<VideoChannel
         {
           model: ActorModel,
           required: true,
-          where: {
-            preferredUsername: name
-          },
+          where: ActorModel.wherePreferredUsername(name),
           include: [
             {
               model: ServerModel,