Merge pull request #1020 from ONEARMY/alrhomh87-1008

avoid-notif-on-user-edit-1008
ONEARMY · Aug 25, 2020 · 953ece8 · 953ece8
2 parents 4d75866 + aa5529a
commit 953ece8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/functions/src/Integrations/firebase-discord.ts b/functions/src/Integrations/firebase-discord.ts
@@ -30,7 +30,10 @@ export const notifyHowToAccepted = functions.firestore
   .document('v3_howtos/{id}')
   .onWrite(async (change, context) => {
     const info = change.after.exists ? change.after.data() : null
-    if (info === null || info.moderation !== 'accepted') {
+    const prevInfo = change.before.exists ? change.before.data() : null
+    const beenAccepted =
+      prevInfo !== null ? prevInfo.moderation === 'accepted' : null
+    if (info === null || info.moderation !== 'accepted' || beenAccepted) {
       return
     }
     const { _createdBy, title, slug } = info

diff --git a/functions/src/Integrations/firebase-slack.ts b/functions/src/Integrations/firebase-slack.ts
@@ -16,6 +16,9 @@ export const notifyNewPin = functions.firestore
     if (info === null || info.moderation !== 'awaiting-moderation' || prevModeration === 'awaiting-moderation') {
       return
     }
+    if (prevModeration === 'accepted' && info.moderation !== 'awaiting-moderation'){ // If edited after being accepted keep it accepted and avoid message #1008
+      return change.after.ref.parent.child('moderation').set('accepted');
+    }
 
     const id = info._id
     const type = info.type
@@ -42,9 +45,14 @@ export const notifyNewHowTo = functions.firestore
   .document('v3_howtos/{id}')
   .onWrite((change, context) => {
     const info = change.after.exists ? change.after.data() : null
+    const prevInfo = change.before.exists ? change.before.data() : null
+    const prevModeration = (prevInfo !== null) ? prevInfo.moderation : null;
     if (info === null || info.moderation !== 'awaiting-moderation') {
       return
     }
+    if (prevModeration === 'accepted' && info.moderation !== 'awaiting-moderation'){ // If edited after being accepted keep it accepted and avoid message #1008
+      return change.after.ref.parent.child('moderation').set('accepted');
+    }
 
     const user = info._createdBy
     const title = info.title