Merge pull request #920 from alromh87/master

Fix #903
ONEARMY · Mar 27, 2020 · 4f037b3 · 4f037b3
2 parents 80f1109 + e50e5e6
commit 4f037b3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/functions/src/Integrations/firebase-discord.ts b/functions/src/Integrations/firebase-discord.ts
@@ -11,7 +11,9 @@ export const notifyPinAccepted = functions.firestore
   .document('v3_mappins/{pinId}')
   .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.hasBeenAccepted : null;
+    if (info === null || info.moderation !== 'accepted' || beenAccepted) {
       return
     }
     const { _id, type } = info

diff --git a/src/models/common.models.tsx b/src/models/common.models.tsx
@@ -27,6 +27,7 @@ export type IModerationStatus =
 
 export interface IModerable {
   moderation: IModerationStatus
+  hasBeenAccepted?: boolean
   _createdBy?: string
   _id?: string
 }

diff --git a/src/stores/Maps/maps.store.ts b/src/stores/Maps/maps.store.ts
@@ -163,6 +163,9 @@ export class MapsStore extends ModuleStore {
     if (!hasAdminRights(this.activeUser)) {
       return false
     }
+    if (pin.moderation === 'accepted') {
+      pin.hasBeenAccepted = true
+    }
     this.setPin(pin)
   }
   public needsModeration(pin: IMapPin) {
@@ -177,7 +180,6 @@ export class MapsStore extends ModuleStore {
       _id: user.userName,
       location: user.location!.latlng,
       type: user.profileType ? user.profileType : 'member',
-      // TODO: keep moderation status ... ' Should we being duplicating info ¿?(user/pin)'
       moderation: 'awaiting-moderation',
     }
     if (user.workspaceType) {