From 443c82fcd9ca5e161ff40d58e14cfedfd347adac Mon Sep 17 00:00:00 2001
From: ChrisChrome <chris@chrischro.me>
Date: Wed, 2 Oct 2024 12:22:07 -0600
Subject: [PATCH] Test1

---
 data/events.json |  5 ++++-
 funcs.js         |  1 -
 index.js         | 19 +++++++++++++------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/data/events.json b/data/events.json
index 5001fec..2d82ce4 100644
--- a/data/events.json
+++ b/data/events.json
@@ -1522,6 +1522,9 @@
 	"REP": {
 		"text": "RECCO Observations (tropical cyclone)",
 		"priority": 3
+	},
+	"PIR": {
+		"priority": 0,
+		"_comment": "This is an unknown event type, ignore it for now until we know more info"
 	}
-
 }
diff --git a/funcs.js b/funcs.js
index 88f0579..5faaf82 100644
--- a/funcs.js
+++ b/funcs.js
@@ -1,4 +1,3 @@
-const geolib = require("geolib");
 // Use OSM API to get coordinates https://nominatim.openstreetmap.org/search?q=search+query&format=json&limit=1
 const getCoordinates = async (location) => {
 	return new Promise((resolve, reject) => {
diff --git a/index.js b/index.js
index 096b028..e92009f 100644
--- a/index.js
+++ b/index.js
@@ -356,6 +356,8 @@ xmpp.on("stanza", (stanza) => {
 		// get product id from "x" tag
 		var evt = events[product_id.pil.substring(0, 3)];
 
+		if (evt.priority === 0) return; // This is an event that we don't care about
+
 		if (!evt) {
 			evt = { name: "Unknown", priority: 3 }
 			console.log(`${colors.red("[ERROR]")} Unknown event type: ${product_id.pil.substring(0, 3)}. Fix me`);
@@ -453,10 +455,12 @@ xmpp.on("stanza", (stanza) => {
 				if (!row.filter) row.filter = "";
 				let filterEvt = row.filterEvt.toLowerCase().split(",");
 				let filters = row.filter.toLowerCase().split(",");
+				filterEvt = filterEvt.filter(filter => !filter.startsWith('!'));
+				filters = filters.filter(filter => !filter.startsWith('!'));
 				if (evt.priority < row.minPriority) return;
 				// If the event type is not in th filter, ignore it. Make sure filterEvt isnt null
 				if (!filterEvt[0]) filterEvt = [];
-				if (!filterEvt.includes(evt.code.toLowerCase()) && !filterEvt.length == 0) return;
+				if (filterEvt.some(filter => filter.startsWith('!') ? evt.code.toLowerCase() === filter.substring(1) : !filter.includes(evt.code.toLowerCase())) && filterEvt.length > 0) return;
 
 				let channel = discord.channels.cache.get(row.channelid);
 				if (!channel) return console.log(`${colors.red("[ERROR]")} Channel ${row.channelid} not found`);
@@ -499,12 +503,15 @@ xmpp.on("stanza", (stanza) => {
 				if (!row.filter) row.filter = "";
 				let filterEvt = row.filterEvt.toLowerCase().split(",");
 				let filters = row.filter.toLowerCase().split(",");
+				filterEvt = filterEvt.filter(filter => !filter.startsWith('!'));
+				filters = filters.filter(filter => !filter.startsWith('!'));
+
 
 				// If priority is less than the min priority, ignore it
 				if (evt.priority < row.minPriority) return;
 				// If the event type is not in th filter, ignore it. Make sure filterEvt isnt null
 				if (!filterEvt[0]) filterEvt = [];
-				if (!filterEvt.includes(evt.code.toLowerCase()) && !filterEvt.length == 0) return;
+				if (filterEvt.some(filter => filter.startsWith('!') ? evt.code.toLowerCase() === filter.substring(1) : !filter.includes(evt.code.toLowerCase())) && filterEvt.length > 0) return;
 				let user = discord.users.cache.get(row.userid);
 				if (!user) return console.log(`${colors.red("[ERROR]")} User ${row.userid} not found`);
 
@@ -789,9 +796,9 @@ discord.on("interactionCreate", async (interaction) => {
 							if (err) {
 								console.error(err.message);
 								interaction.reply({ content: "Failed to subscribe to room", ephemeral: true });
-							} else if (row) {
+							} /*else if (row) {
 								return interaction.reply({ content: `Already subscribed to \`${getWFOByRoom(room).location}\`\nIf you want to update a subscribtion, please unsubscribe and resubscribe. This will be made a command eventually.`, ephemeral: true });
-							}
+							}*/
 							db.run(`INSERT INTO channels (channelid, iemchannel, custommessage, filter, filterEvt, minPriority) VALUES (?, ?, ?, ? ,? ,?)`, [interaction.channel.id, room, message, filter, filterEvt, minPriority], (err) => {
 								if (err) {
 									console.error(err.message);
@@ -806,9 +813,9 @@ discord.on("interactionCreate", async (interaction) => {
 							if (err) {
 								console.error(err.message);
 								interaction.reply({ content: "Failed to subscribe to room", ephemeral: true });
-							} else if (row) {
+							} /*else if (row) {
 								return interaction.reply({ content: `Already subscribed to \`${getWFOByRoom(room).location}\`\nIf you want to update a subscribtion, please unsubscribe and resubscribe. This will be made a command eventually.`, ephemeral: true });
-							}
+							}*/
 							db.run(`INSERT INTO userAlerts (userid, iemchannel, custommessage, filter, filterEvt, minPriority) VALUES (?, ?, ?, ? ,?, ?)`, [interaction.user.id, room, message, filter, filterEvt, minPriority], (err) => {
 								if (err) {
 									console.error(err.message);