From 7d07e892078be1aea9941ebb3870d76a9c828001 Mon Sep 17 00:00:00 2001
From: zutto <zutto@localhost>
Date: Sun, 18 Aug 2024 09:02:15 +0300
Subject: [PATCH] fix opencollective tracking

---
 src/js/plugins/opencollective.js | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/js/plugins/opencollective.js b/src/js/plugins/opencollective.js
index 9e8155c..702b588 100644
--- a/src/js/plugins/opencollective.js
+++ b/src/js/plugins/opencollective.js
@@ -17,16 +17,14 @@ export class OpenCollective extends shield {
 		this.transactions().then((data) => {
 			try {
 				this.json = JSON.parse(data);
-				this.json.nodes.forEach((item) => {
-					if (item.kind === "CONTRIBUTION" && item.order.frequency === "MONTHLY") {
-						if (this.total[item.amount.currency] !== undefined) {
-							this.total[item.amount.currency] += (item.amount.value * -1);
-						} else {
-							this.total[item.amount.currency] = (item.amount.value * -1);
-						}
+				this.monthlyContributions(this.json.nodes).forEach((item) => {
+					if (this.total[item.amount.currency] !== undefined) {
+						this.total[item.amount.currency] += (item.amount.value * -1);
+					} else {
+						this.total[item.amount.currency] = (item.amount.value * -1);
 					}
-				});
 
+				});
 				this.render(element);
 				this.loadingEnd(element);
 			} catch (e) {
@@ -37,6 +35,21 @@ export class OpenCollective extends shield {
 	})
     }
 
+
+    monthlyContributions(nodes) {
+	    let monthly = new Map();
+	    nodes.forEach(node => {
+		    if (node.kind === "CONTRIBUTION" && node.order.frequency === "MONTHLY" && node.order.status === "ACTIVE") {
+			    var id = `${node.oppositeAccount.id}${node.order.createdAt}`;
+			    if (!monthly.has(id)) {
+				    monthly.set(id, node);
+			    }
+		    }
+	    }
+	);
+	return Array.from(monthly.values());
+    }
+
     async transactions() {
 	try { 
 		const fetch = new fetcher();