From 012ca39a8dc29517aef191e85325f3e5889daf37 Mon Sep 17 00:00:00 2001
From: Romulus Urakagi Tsai <urakagi@gmail.com>
Date: Fri, 8 May 2020 11:50:43 +0800
Subject: Attachment activities merging done

---
 models/activities.js  |  6 +-----
 models/attachments.js | 21 +++++----------------
 2 files changed, 6 insertions(+), 21 deletions(-)

(limited to 'models')

diff --git a/models/activities.js b/models/activities.js
index df207bca..2663dd29 100644
--- a/models/activities.js
+++ b/models/activities.js
@@ -217,11 +217,7 @@ if (Meteor.isServer) {
     }
     if (activity.attachmentId) {
       const attachment = activity.attachment();
-      if (attachment.original) {
-        params.attachment = attachment.original.name;
-      } else {
-        params.attachment = attachment.versions.original.name;
-      }
+      params.attachment = attachment.name;
       params.attachmentId = attachment._id;
     }
     if (activity.checklistId) {
diff --git a/models/attachments.js b/models/attachments.js
index cab3d9e3..d469f702 100644
--- a/models/attachments.js
+++ b/models/attachments.js
@@ -8,8 +8,7 @@ Attachments = new FilesCollection({
   allowClientCode: true,
   collectionName: 'attachments2',
   onAfterUpload: onAttachmentUploaded,
-  onBeforeRemove: onAttachmentRemoving,
-  onAfterRemove: onAttachmentRemoved
+  onBeforeRemove: onAttachmentRemoving
 });
 
 if (Meteor.isServer) {
@@ -41,9 +40,9 @@ function onAttachmentUploaded(fileRef) {
       type: 'card',
       activityType: 'addAttachment',
       attachmentId: fileRef._id,
-	  // this preserves the name so that notifications can be meaningful after
+      // this preserves the name so that notifications can be meaningful after
       // this file is removed 
-	  attachmentName: fileRef.versions.original.name,
+      attachmentName: fileRef.name,
       boardId: fileRef.meta.boardId,
       cardId: fileRef.meta.cardId,
       listId: fileRef.meta.listId,
@@ -73,9 +72,9 @@ function onAttachmentRemoving(cursor) {
     type: 'card',
     activityType: 'deleteAttachment',
     attachmentId: file._id,
-	// this preserves the name so that notifications can be meaningful after
+    // this preserves the name so that notifications can be meaningful after
     // this file is removed
-	attachmentName: file.versions.original.name,
+    attachmentName: file.name,
     boardId: meta.boardId,
     cardId: meta.cardId,
     listId: meta.listId,
@@ -84,14 +83,4 @@ function onAttachmentRemoving(cursor) {
   return true;
 }
 
-function onAttachmentRemoved(files) {
-  // Don't know why we need to remove the activity
-/*  for (let i in files) {
-    let doc = files[i];
-    Activities.remove({
-      attachmentId: doc._id,
-    });
-  }*/
-}
-
 export default Attachments;
-- 
cgit v1.2.3-1-g7c22