3 files changed, 6 insertions, 2 deletions

diff --git a/server/models/migrations/index.ts b/server/models/migrations/index.ts
index c2b31b05e..24badb166 100644
--- a/server/models/migrations/index.ts
+++ b/server/models/migrations/index.ts
@@ -16,6 +16,10 @@ declare namespace Migration {
   interface BigInteger extends Sequelize.DefineAttributeColumnOptions {
     defaultValue: Sequelize.DataTypeBigInt | number | null
   }
+
+  interface UUID extends Sequelize.DefineAttributeColumnOptions {
+    defaultValue: Sequelize.DataTypeUUIDv4 | null
+  }
 }
 
 export {
diff --git a/server/models/utils.ts b/server/models/utils.ts
index 393f8f036..99e146583 100644
--- a/server/models/utils.ts
+++ b/server/models/utils.ts
@@ -76,7 +76,7 @@ export {
 // ---------------------------------------------------------------------------
 
 function searchTrigramNormalizeValue (value: string) {
-  return Sequelize.fn('lower', Sequelize.fn('unaccent', value))
+  return Sequelize.fn('lower', Sequelize.fn('immutable_unaccent', value))
 }
 
 function searchTrigramNormalizeCol (col: string) {
diff --git a/server/models/video/video-comment.ts b/server/models/video/video-comment.ts
index 03122dc03..f84c1880c 100644
--- a/server/models/video/video-comment.ts
+++ b/server/models/video/video-comment.ts
@@ -417,7 +417,7 @@ export class VideoCommentModel extends Model<VideoCommentModel> {
   toActivityPubObject (threadParentComments: VideoCommentModel[]): VideoCommentObject {
     let inReplyTo: string
     // New thread, so in AS we reply to the video
-    if ((this.inReplyToCommentId !== null) || (this.InReplyToVideoComment !== null)) {
+    if (this.inReplyToCommentId === null) {
       inReplyTo = this.Video.url
     } else {
       inReplyTo = this.InReplyToVideoComment.url