Merge pull request #11 from AlterTobi/dev

Dev
AlterTobi · Dec 9, 2021 · 61b7ed2 · 61b7ed2
2 parents d77392e + 7745084
commit 61b7ed2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/wfes-Base.user.js b/wfes-Base.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         WFES - Base
 // @namespace    https://github.com/AlterTobi/WFES/
-// @version      0.7.1
+// @version      0.8.0
 // @description  basic functionality for WFES
 // @author       AlterTobi
 // @match        https://wayfarer.nianticlabs.com/*
@@ -105,6 +105,8 @@
                 case PREFIX + 'manage':
                     // nomination list
                     window.wfes.nominations.list = json.result.nominations;
+                    window.wfes.nominations.canAppeal = json.result.canAppeal;
+                    window.wfes.nominations.wayspots = json.result.wayspots;
                     window.dispatchEvent(new Event("WFESNominationListLoaded"));
                     break;
                 case PREFIX + 'manage/detail':

diff --git a/wfes-NominationNotify.user.js b/wfes-NominationNotify.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         WFES - Nomination Notify
 // @namespace    https://github.com/AlterTobi/WFES/
-// @version      0.4.0
+// @version      0.5.0
 // @description  show nomination status updates
 // @author       AlterTobi
 // @match        https://wayfarer.nianticlabs.com/*
@@ -15,7 +15,7 @@
     'use strict';
 
     const lStoreList = 'wfesNomList';
-    const states = ['ACCEPTED','REJECTED','VOTING','DUPLICATE','WITHDRAWN','NOMINATED'];
+    const states = ['ACCEPTED','REJECTED','VOTING','DUPLICATE','WITHDRAWN','NOMINATED','APPEALED'];
 
     function localSave(name,content){
         let json = JSON.stringify(content);
@@ -52,6 +52,9 @@
                 .wfesBgOrange{
                 background-color: #FC9000D0;
                 }
+                .wfesBgBlue{
+                background-color: #0010DFD0;
+                }
                 .wfesNotifyCloseButton{
                 float: right;
                 }
@@ -78,6 +81,9 @@
             case 'orange':
                 notification.setAttribute("class", "wfesNotification wfesBgOrange");
                 break;
+            case 'blue':
+                notification.setAttribute("class", "wfesNotification wfesBgBlue");
+                break;
             default:
                 notification.setAttribute("class", "wfesNotification wfesBgGreen");
                 break;
@@ -123,7 +129,7 @@
 
     function detectChange(){
         // make a copy
-        let nomList = JSON.parse(JSON.stringify(wfes.nominations.list));
+        let nomList = JSON.parse(JSON.stringify(window.wfes.nominations.list));
         let historyDict = JSON.parse(localStorage.getItem(lStoreList)) || [];
         const missingDict = detectMissing();
 
@@ -147,6 +153,11 @@
                 historicalData = historyDict[nom.id];
                 myDates = {};
 
+                // detect unknown states
+                if (!states.includes(nom.status)) {
+                    createNotification(`${nom.title} has unknown state: ${nom.status}`,'blue');
+                }
+
                 if (historicalData === undefined) {
                     myDates[nom.status] = today; // save current date and
                                                  // state
@@ -170,7 +181,7 @@
                 // Niantic Review?
                 if (historicalData.isNianticControlled === false && nom.isNianticControlled === true){
                     myDates.NIANTICREVIEW = today;
-                    createNotification(`${nom.title} went into Niantic review!`, red);
+                    createNotification(`${nom.title} went into Niantic review!`, 'red');
                 }
 
                 // was missing?
@@ -188,7 +199,9 @@
                     }else if(nom.status === "DUPLICATE"){
                         createNotification(`${nom.title} was marked as a duplicate!`);
                     }
-                }
+                } else if ((historicalData.status !== "APPEALED") && (nom.status === "APPEALED")){
+                    createNotification(`${nom.title} was appealed!`);
+                } 
 
                 // save Dates of each state change
                 for (let j = 0; j < states.length; j++) {