From 395d7b0644b55b1dc3ee7ce367ca08b9df74de7d Mon Sep 17 00:00:00 2001
From: Pixelic <69585766+Pixelicc@users.noreply.github.com>
Date: Fri, 28 Jul 2023 17:09:22 +0200
Subject: [PATCH] v1.1.2

---
 package-lock.json                   |   4 +-
 package.json                        |   2 +-
 src/App.vue                         |  49 +++++++------
 src/data/dataStore.js               |  19 ++++-
 src/misc/blacklistParser.js         |  54 ++++++++-------
 src/misc/discordRPC.js              |  12 ++--
 src/views/Settings/Basic.vue        |   2 +-
 src/views/Settings/Blacklist.vue    | 104 +++++++++++++++++++++++++---
 src/views/Settings/Notification.vue |   2 +-
 9 files changed, 180 insertions(+), 68 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6aa45df..0410e48 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "pixelic-overlay",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "pixelic-overlay",
-      "version": "1.1.1",
+      "version": "1.1.2",
       "dependencies": {
         "@vueuse/electron": "^10.2.1",
         "axios": "^1.4.0",
diff --git a/package.json b/package.json
index c22985f..fdf76aa 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "pixelic-overlay",
   "description": "",
   "author": "Pixelic",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "main.js",
   "scripts": {
     "start": "vite build && electron .",
diff --git a/src/App.vue b/src/App.vue
index a37831a..26a9f85 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,7 +3,8 @@
     <v-toolbar density="compact" style="-webkit-app-region: drag; background-color: rgba(var(--v-theme-background), var(--opacity)) !important">
       <v-app-bar-nav-icon variant="text" @click.stop="sidebar = !sidebar" style="-webkit-app-region: no-drag"></v-app-bar-nav-icon>
 
-      <v-toolbar-title class="grow"> Pixelic Overlay </v-toolbar-title>
+      <v-toolbar-title v-if="!sidebar" class="grow"> Pixelic Overlay </v-toolbar-title>
+      <v-toolbar-title v-if="sidebar" class="grow" style="-webkit-app-region: no-drag"> Pixelic Overlay </v-toolbar-title>
 
       <v-btn v-if="table" icon @click="refreshPlayers" style="-webkit-app-region: no-drag">
         <v-icon color="secondary">mdi-refresh</v-icon>
@@ -46,7 +47,7 @@
       </v-list>
     </v-navigation-drawer>
     <router-view></router-view>
-    <v-data-table v-if="table" :headers="headers" :items="players" :items-per-page="-1" class="datatable elevation-1" density="compact" no-data-text="No Players found" sort-asc-icon="mdi-chevron-up" sort-desc-icon="mdi-chevron-down">
+    <v-data-table v-if="table" :headers="headers" :items="players" :items-per-page="-1" class="datatable elevation-0" density="compact" no-data-text="No Players found" sort-asc-icon="mdi-chevron-up" sort-desc-icon="mdi-chevron-down">
       <template v-slot:item="{ item }">
         <tr>
           <td class="align-center justify-center">
@@ -86,23 +87,28 @@
           <td v-if="headers.some((h) => h.title === 'FKDR')"><span v-html="item.columns.FKDRFormatted"></span></td>
           <td v-if="headers.some((h) => h.title === 'BBLR')"><span v-html="item.columns.BBLRFormatted"></span></td>
           <td>
-            <v-menu :close-on-content-click="false" v-if="item.columns.UUID !== undefined && item.columns.username.toLowerCase() !== dataStore.get('player').toLowerCase() && item.columns.UUID.toLowerCase() !== dataStore.get('player').replace(/-/g, '').toLowerCase()">
+            <v-menu>
               <template v-slot:activator="{ props }">
-                <v-btn size="small" variant="text" :ripple="false" icon="mdi-dots-horizontal" v-bind="props"> </v-btn>
+                <v-btn size="small" variant="text" icon="mdi-dots-horizontal" v-bind="props" style="height: calc(var(--v-btn-height)) !important"> </v-btn>
               </template>
               <v-list>
-                <v-list-item v-if="item.columns.blacklisted === false">
-                  <v-btn prepend-icon="mdi-flag-variant-plus" :loading="sendingCheatingReport" @click="reportPlayer(item.columns.UUID, 'cheater')">
+                <v-list-item>
+                  <v-btn variant="flat" prepend-icon="mdi-chart-timeline-variant-shimmer" router-link to="/statistics" @click="viewStatistics(item.columns.UUID)">
+                    <v-list-item-title>View Statistics</v-list-item-title>
+                  </v-btn>
+                </v-list-item>
+                <v-list-item v-if="!item.columns.blacklisted && !item.columns.isYou">
+                  <v-btn variant="flat" prepend-icon="mdi-flag-variant-plus" @click="reportPlayer(item.columns.UUID, 'cheater')">
                     <v-list-item-title>Report for Cheating</v-list-item-title>
                   </v-btn>
                 </v-list-item>
-                <v-list-item v-if="item.columns.blacklisted === false">
-                  <v-btn prepend-icon="mdi-flag-variant-plus" :loading="sendingSnipingReport" @click="reportPlayer(item.columns.UUID, 'sniper')">
+                <v-list-item v-if="!item.columns.blacklisted && !item.columns.isYou">
+                  <v-btn variant="flat" prepend-icon="mdi-flag-variant-plus" @click="reportPlayer(item.columns.UUID, 'sniper')">
                     <v-list-item-title>Report for Sniping</v-list-item-title>
                   </v-btn>
                 </v-list-item>
-                <v-list-item v-if="item.columns.blacklisted === true">
-                  <v-btn prepend-icon="mdi-flag-variant-minus" :loading="revokeReport" @click="revokePlayerReport(item.columns.UUID)">
+                <v-list-item v-if="item.columns.blacklisted && !item.columns.isYou">
+                  <v-btn variant="flat" prepend-icon="mdi-flag-variant-minus" @click="revokePlayerReport(item.columns.UUID)">
                     <v-list-item-title>Remove from Blacklist</v-list-item-title>
                   </v-btn>
                 </v-list-item>
@@ -234,12 +240,7 @@ const forceAddPlayer = (player) => {
   }
 };
 
-var sendingCheatingReport = false;
-var sendingSnipingReport = false;
-
 const reportPlayer = (UUID, reason) => {
-  if (reason === "cheating") sendingCheatingReport = true;
-  if (reason === "sniping") sendingSnipingReport = true;
   axios
     .post(
       "https://api.pixelic.de/hypixel/v1/overlay/reportsystem/report",
@@ -247,7 +248,7 @@ const reportPlayer = (UUID, reason) => {
       {
         params: {
           UUID: UUID,
-          expire: dataStore.get("blacklistExpiry"),
+          expire: reason === "cheater" ? dataStore.get("blacklistCheaterExpiry") : dataStore.get("blacklistSniperExpiry"),
           reason: reason,
         },
         headers: {
@@ -257,9 +258,6 @@ const reportPlayer = (UUID, reason) => {
       }
     )
     .then(() => {
-      if (reason === "cheater") sendingCheatingReport = false;
-      if (reason === "sniper") sendingSnipingReport = false;
-
       blacklistParser.add(UUID, reason);
 
       sendNotification({
@@ -270,9 +268,6 @@ const reportPlayer = (UUID, reason) => {
       });
     })
     .catch((error) => {
-      if (reason === "cheater") sendingCheatingReport = false;
-      if (reason === "sniper") sendingSnipingReport = false;
-
       sendNotification({
         timeout: 5000,
         color: "error",
@@ -312,6 +307,13 @@ const revokePlayerReport = (UUID) => {
     });
 };
 
+const viewStatistics = (UUID) => {
+  turnOffTable();
+  setTimeout(() => {
+    ipcRenderer.send("viewStatistics", UUID);
+  }, 1000);
+};
+
 setInterval(() => {
   const Players = [];
   for (var Player of getPlayers()) {
@@ -368,6 +370,7 @@ setInterval(() => {
       }
 
       Players.push({
+        isYou: Player.username.toLowerCase() === dataStore.get("player").toLowerCase() || Player.UUID.toLowerCase() === dataStore.get("player").replace(/-/g, "").toLowerCase(),
         blacklisted: blacklisted,
         UUID: Player.UUID,
         username: Player.username,
@@ -412,7 +415,7 @@ const updateHeaders = () => {
     { title: "Name", align: "center", key: "formattedUsername", sortable: false, width: "25%" },
     { key: "fullUsername", align: " d-none" },
     { key: "UUID", align: " d-none" },
-    { key: "username", align: " d-none" },
+    { key: "isYou", align: " d-none" },
     { key: "blacklisted", align: " d-none" },
   ];
 
diff --git a/src/data/dataStore.js b/src/data/dataStore.js
index 0067f89..c5acbbb 100644
--- a/src/data/dataStore.js
+++ b/src/data/dataStore.js
@@ -69,10 +69,27 @@ const store = new Store({
       type: "boolean",
       default: false,
     },
-    blacklistExpiry: {
+    blacklistCheaterExpiry: {
       type: "string",
       default: "1y",
     },
+    blacklistSniperExpiry: {
+      type: "string",
+      default: "30d",
+    },
+    blacklists: {
+      type: "array",
+      default: [
+        {
+          name: "Global",
+          enabled: false,
+        },
+        {
+          name: "Personal",
+          enabled: true,
+        },
+      ],
+    },
     colums: {
       type: "array",
       default: ["WS", "Wins", "WLR", "Finals", "FKDR", "BBLR"],
diff --git a/src/misc/blacklistParser.js b/src/misc/blacklistParser.js
index 0080be4..a34586b 100644
--- a/src/misc/blacklistParser.js
+++ b/src/misc/blacklistParser.js
@@ -1,49 +1,53 @@
 import dataStore from "../data/dataStore";
 import axios from "axios";
 
-var parsedBlacklist = [];
+var personalBlacklist = [];
 
-const updateLists = async () => {
-  var lists = [];
+const updatePersonalBlacklist = async () => {
+  var updatedList = [];
   await axios
     .get("https://api.pixelic.de/hypixel/v1/overlay/reportsystem/list/personal", { headers: { "X-API-Key": dataStore.get("pixelicKey"), "cache-control": "no-cache" } })
-    .then((res) => lists.push(res.data.reports))
+    .then((res) => {
+      updatedList = res.data.reports;
+    })
     .catch(() => {});
+  personalBlacklist = updatedList;
+};
 
-  // TODO: Add other extra custom blacklist from other people
+var globalBlacklist = [];
 
-  var updatedLists = [];
-  for (const list of lists) {
-    for (const entry of list) {
-      const checkForDuplicate = updatedLists.some((e) => e.suspect === entry.suspect);
-      if (checkForDuplicate) {
-        if (checkForDuplicate.reason === "sniper" && entry.reason === "cheater") {
-          updatedLists[updatedLists.findIndex((e) => e.suspect === entry.suspect)].reason = "cheater";
-        }
-      } else {
-        updatedLists.push(entry);
-      }
-    }
-  }
-  parsedBlacklist = updatedLists;
+const updateGlobalBlacklist = async () => {
+  var updatedList = [];
+  await axios
+    .get("https://api.pixelic.de/hypixel/v1/overlay/reportsystem/list/global", { headers: { "X-API-Key": dataStore.get("pixelicKey"), "cache-control": "no-cache" } })
+    .then((res) => {
+      updatedList = res.data.reports;
+    })
+    .catch(() => {});
+  globalBlacklist = updatedList;
 };
 
-updateLists().then(() => {});
+const updateLists = () => {
+  if (dataStore.get("blacklists").some((l) => l.name === "Personal" && l.enabled === true)) updatePersonalBlacklist();
+  if (dataStore.get("blacklists").some((l) => l.name === "Global" && l.enabled === true)) updateGlobalBlacklist();
+};
 
-setInterval(async () => {
-  await updateLists();
+updateLists();
+setInterval(() => {
+  updateLists();
 }, 60 * 1000);
 
 export default {
   add: (UUID, reason) => {
-    parsedBlacklist.push({ suspect: UUID, reason: reason });
+    personalBlacklist.push({ suspect: UUID, reason: reason });
   },
   remove: (UUID) => {
-    parsedBlacklist = parsedBlacklist.filter((p) => p.suspect !== UUID);
+    personalBlacklist = personalBlacklist.filter((p) => p.suspect !== UUID);
   },
   check: (UUID) => {
     if (UUID === undefined) return null;
-    if (parsedBlacklist.some((p) => p.suspect === UUID)) return parsedBlacklist.find((p) => p.suspect === UUID).reason;
+    if (dataStore.get("blacklists").some((l) => l.name === "Personal" && l.enabled === true) && personalBlacklist.some((p) => p.suspect === UUID)) return personalBlacklist.find((p) => p.suspect === UUID).reason;
+    if (dataStore.get("blacklists").some((l) => l.name === "Global" && l.enabled === true) && globalBlacklist.some((p) => p.suspect === UUID)) return globalBlacklist.find((p) => p.suspect === UUID).reason;
     return null;
   },
 };
diff --git a/src/misc/discordRPC.js b/src/misc/discordRPC.js
index e9b8843..61a8631 100644
--- a/src/misc/discordRPC.js
+++ b/src/misc/discordRPC.js
@@ -39,8 +39,8 @@ module.exports = {
 
             client.setActivity({
               instance: false,
-              details: `[${level}${star}] ${res.username}`,
-              state: `Lifetime » Wins: ${res.Bedwars.overall.wins.toLocaleString("en-US")} | Finals: ${res.Bedwars.overall.finalKills.toLocaleString("en-US")} | Beds: ${res.Bedwars.overall.bedsBroken.toLocaleString("en-US")}`,
+              details: `Lifetime » [${level}${star}] ${res.username}`,
+              state: `Wins: ${res.Bedwars.overall.wins.toLocaleString("en-US")} | Finals: ${res.Bedwars.overall.finalKills.toLocaleString("en-US")} | Beds: ${res.Bedwars.overall.bedsBroken.toLocaleString("en-US")}`,
               startTimestamp,
               largeImageKey: "pixelic",
               largeImageText: `Pixelic-Overlay v${PackageJSON.version}`,
@@ -131,11 +131,11 @@ module.exports = {
                     };
 
                     if (Object.keys(modeData).length === 0) {
-                      activity.details = `[0.00✫] ${res.username}`;
-                      activity.state = `${mode} » Wins: 0 | Finals: 0 | Beds: 0`;
+                      activity.details = `${mode} » [0.00✫] ${res.username}`;
+                      activity.state = `Wins: 0 | Finals: 0 | Beds: 0`;
                     } else {
-                      activity.details = `[${(res.Bedwars.level - modeData.Bedwars.level).toFixed(2)}✫] ${res.username}`;
-                      activity.state = `${mode} » Wins: ${(res.Bedwars.overall.wins - modeData.Bedwars.overall.wins).toLocaleString("en-US")} | Finals: ${(res.Bedwars.overall.finalKills - modeData.Bedwars.overall.finalKills).toLocaleString("en-US")} | Beds: ${(res.Bedwars.overall.bedsBroken - modeData.Bedwars.overall.bedsBroken).toLocaleString("en-US")}`;
+                      activity.details = `${mode} » [${(res.Bedwars.level - modeData.Bedwars.level).toFixed(2)}✫] ${res.username}`;
+                      activity.state = `Wins: ${(res.Bedwars.overall.wins - modeData.Bedwars.overall.wins).toLocaleString("en-US")} | Finals: ${(res.Bedwars.overall.finalKills - modeData.Bedwars.overall.finalKills).toLocaleString("en-US")} | Beds: ${(res.Bedwars.overall.bedsBroken - modeData.Bedwars.overall.bedsBroken).toLocaleString("en-US")}`;
                     }
 
                     client.setActivity(activity);
diff --git a/src/views/Settings/Basic.vue b/src/views/Settings/Basic.vue
index 9c2b418..9300561 100644
--- a/src/views/Settings/Basic.vue
+++ b/src/views/Settings/Basic.vue
@@ -55,7 +55,7 @@
                     <v-switch color="secondary" v-model="developerMode" @change="toggleDeveloperMode" style="display: flex"></v-switch>
                   </template>
                   <v-list-item-title>Developer Mode</v-list-item-title>
-                  <v-list-item-subtitle>Do not enable this if you do not know what you are doing</v-list-item-subtitle>
+                  <v-list-item-subtitle>Do not enable this if you do not know what you are doing!</v-list-item-subtitle>
                 </v-list-item>
               </v-list>
             </div>
diff --git a/src/views/Settings/Blacklist.vue b/src/views/Settings/Blacklist.vue
index f5a70ec..ebea608 100644
--- a/src/views/Settings/Blacklist.vue
+++ b/src/views/Settings/Blacklist.vue
@@ -8,9 +8,48 @@
       </v-row>
       <v-row>
         <v-col>
-          <v-card>
+          <v-card title="Manage Lists">
             <div class="ml-4 mr-4 mt-4">
-              <v-select label="Report Entry Expiry" variant="outlined" :items="expireOptions" prepend-inner-icon="mdi-timer-sand" v-model="getExpiry" return-object @update:modelValue="setExpiry"></v-select>
+              <v-list>
+                <v-list-item v-for="blacklist in blacklists">
+                  <template v-slot:prepend>
+                    <v-icon v-if="blacklist.name === 'Global'">mdi-earth</v-icon>
+                    <v-icon v-if="blacklist.name === 'Personal'">mdi-account</v-icon>
+                  </template>
+                  <template v-slot:append>
+                    <v-dialog v-model="clearPersonalBlacklistDialog">
+                      <template v-slot:activator="{ props1 }">
+                        <v-tooltip text="Clear Personal Blacklist" v-if="blacklist.name === 'Personal'">
+                          <template v-slot:activator="{ props2 }">
+                            <v-btn variant="flat" icon="mdi-close-box-outline" v-bind="(props1, props2)" @click="clearPersonalBlacklistDialog = true"></v-btn>
+                          </template>
+                        </v-tooltip>
+                      </template>
+                      <v-card>
+                        <v-card-text>You are about to clear your entire personal blacklist. This can take up to a minute to take affect. Please confirm below.</v-card-text>
+                        <v-card-actions class="justify-center">
+                          <v-btn color="success" variant="outlined" @click="clearPersonalBlacklist">Confirm</v-btn>
+                          <v-btn color="error" variant="outlined" @click="clearPersonalBlacklistDialog = false">Cancel</v-btn>
+                        </v-card-actions>
+                      </v-card>
+                    </v-dialog>
+                    <v-checkbox v-model="blacklist.enabled" @update:model-value="toggleList(blacklist.name)" style="display: flex"></v-checkbox>
+                  </template>
+                  <v-list-item-title>{{ blacklist.name }}</v-list-item-title>
+                  <v-list-item-subtitle v-if="blacklist.name === 'Global'">Enabling this might result in false-positives.</v-list-item-subtitle>
+                  <v-list-item-subtitle v-if="blacklist.name === 'Personal'">Disabling this list will prevent you from directly seing players you reported!</v-list-item-subtitle>
+                </v-list-item>
+              </v-list>
+            </div>
+          </v-card>
+        </v-col>
+      </v-row>
+      <v-row>
+        <v-col>
+          <v-card title="Options">
+            <div class="ml-4 mr-4 mt-4">
+              <v-select label="Cheater Report Expiry" variant="outlined" :items="cheaterExpireOptions" prepend-inner-icon="mdi-timer-sand" v-model="getCheaterExpiry" return-object @update:modelValue="setCheaterExpiry"></v-select>
+              <v-select label="Sniper Report Expiry" variant="outlined" :items="sniperExpireOptions" prepend-inner-icon="mdi-timer-sand" v-model="getSniperExpiry" return-object @update:modelValue="setSniperExpiry"></v-select>
             </div>
           </v-card>
         </v-col>
@@ -22,14 +61,63 @@
 <script setup>
 import dataStore from "../../data/dataStore";
 import { ref } from "vue";
+import axios from "axios";
+import { sendNotification } from "../../misc/snackbarNotification";
+
+const blacklists = ref(0);
+blacklists.value = dataStore.get("blacklists");
+
+const toggleList = (name) => {
+  dataStore.set("blacklists", blacklists.value);
+};
+
+const clearPersonalBlacklistDialog = ref(0);
+clearPersonalBlacklistDialog.value = false;
+
+const clearPersonalBlacklist = () => {
+  clearPersonalBlacklistDialog.value = false;
+  axios
+    .delete("https://api.pixelic.de/hypixel/v1/overlay/reportsystem/list/personal", {
+      headers: {
+        "x-api-key": dataStore.get("pixelicKey"),
+      },
+      timeout: 10000,
+    })
+    .then(() =>
+      sendNotification({
+        timeout: 5000,
+        color: "success",
+        icon: "mdi-database-sync-outline",
+        text: "Your personal blacklist was cleared successfully.",
+      })
+    )
+    .catch(() =>
+      sendNotification({
+        timeout: 5000,
+        color: "error",
+        icon: "mdi-database-sync-outline",
+        text: "An error occured whilst trying to clear your personal blacklist.",
+      })
+    );
+};
+
+const cheaterExpireOptions = ["7d", "30d", "90d", "180d", "1y", "3y", "5y", "10y"];
+
+const getCheaterExpiry = ref(0);
+getCheaterExpiry.value = dataStore.get("blacklistCheaterExpiry");
+
+const setCheaterExpiry = (selectedExpiry) => {
+  dataStore.set("blacklistCheaterExpiry", selectedExpiry);
+  getCheaterExpiry.value = selectedExpiry;
+};
 
-const expireOptions = ["180d", "1y", "3y", "5y", "10y"];
+const sniperExpireOptions = ["7d", "30d", "90d", "180d", "1y", "3y", "5y", "10y"];
 
-const getExpiry = ref(0);
-getExpiry.value = dataStore.get("blacklistExpiry");
+const getSniperExpiry = ref(0);
+getSniperExpiry.value = dataStore.get("blacklistSniperExpiry");
 
-const setExpiry = (selectedExpiry) => {
-  dataStore.set("blacklistExpiry", selectedExpiry);
-  getCogetExpirylums = selectedExpiry;
+const setSniperExpiry = (selectedExpiry) => {
+  dataStore.set("blacklistSniperExpiry", selectedExpiry);
+  getSniperExpiry.value = selectedExpiry;
 };
 </script>
diff --git a/src/views/Settings/Notification.vue b/src/views/Settings/Notification.vue
index 09ec0e0..cd9219f 100644
--- a/src/views/Settings/Notification.vue
+++ b/src/views/Settings/Notification.vue
@@ -38,7 +38,7 @@
                     <v-switch color="secondary" v-model="blacklistNotification" @change="toggleBlacklistNotification" style="display: flex"></v-switch>
                   </template>
                   <v-list-item-title>Cheater/Sniper</v-list-item-title>
-                  <v-list-item-subtitle>Triggered once a blacklisted player enters your queue</v-list-item-subtitle>
+                  <v-list-item-subtitle>Triggered once a blacklisted player enters your queue.</v-list-item-subtitle>
                 </v-list-item>
               </v-list>
             </div>