From c24822a8fdbc0647aa983fe7d784864ec3b9b854 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 12 Apr 2021 13:44:58 +0200
Subject: Don't save other attributes when set as refreshed

---
 server/lib/activitypub/process/process-delete.ts | 13 +++++++++++--
 server/models/video/video.ts                     |  6 ++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'server')

diff --git a/server/lib/activitypub/process/process-delete.ts b/server/lib/activitypub/process/process-delete.ts
index 070ee0f1d..88a968318 100644
--- a/server/lib/activitypub/process/process-delete.ts
+++ b/server/lib/activitypub/process/process-delete.ts
@@ -7,7 +7,15 @@ import { VideoModel } from '../../../models/video/video'
 import { VideoCommentModel } from '../../../models/video/video-comment'
 import { VideoPlaylistModel } from '../../../models/video/video-playlist'
 import { APProcessorOptions } from '../../../types/activitypub-processor.model'
-import { MAccountActor, MActor, MActorSignature, MChannelActor, MCommentOwnerVideo } from '../../../types/models'
+import {
+  MAccountActor,
+  MActor,
+  MActorFull,
+  MActorSignature,
+  MChannelAccountActor,
+  MChannelActor,
+  MCommentOwnerVideo
+} from '../../../types/models'
 import { markCommentAsDeleted } from '../../video-comment'
 import { forwardVideoRelatedActivity } from '../send/utils'
 
@@ -30,7 +38,8 @@ async function processDeleteActivity (options: APProcessorOptions<ActivityDelete
     } else if (byActorFull.type === 'Group') {
       if (!byActorFull.VideoChannel) throw new Error('Actor ' + byActorFull.url + ' is a group but we cannot find it in database.')
 
-      const channelToDelete = Object.assign({}, byActorFull.VideoChannel, { Actor: byActorFull })
+      const channelToDelete = byActorFull.VideoChannel as MChannelAccountActor & { Actor: MActorFull }
+      channelToDelete.Actor = byActorFull
       return retryTransactionWrapper(processDeleteVideoChannel, channelToDelete)
     }
   }
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index e9afb2c18..422bf6deb 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -2027,9 +2027,11 @@ export class VideoModel extends Model {
   }
 
   setAsRefreshed () {
-    this.changed('updatedAt', true)
+    const options = {
+      where: { id: this.id }
+    }
 
-    return this.save()
+    return VideoModel.update({ updatedAt: new Date() }, options)
   }
 
   requiresAuth () {
-- 
cgit v1.2.3