Merge pull request #933 from KartulUdus/develop

Sync to master

Author: jfberry

config/default.json

@@ -512,6 +512,8 @@
   // webhook queue is kept under control; if this clears nicely in between drops from your scanner you are keeping up.  For outbound, a lower number of
   // concurrent senders will reduce chance of hitting the global rate limit (probably) which is why we haven't defaulted too high here
   //
+  // fastMonsters - Eliminate SQL lookups for monster matching by activating in memory pokemon matching
+  // disablePokemonCache - The impact of this will be that poracle uses a lot less memory
   // maxDatabaseConnections - This is the max number of database connections Poracle can have (per worker)
   // webhookProcessingWorkers - Number of threads to run inbound webhook workers.  Five is enough for very big systems, going too high is probably
   //     counter productive so talk to me before playing with this one
@@ -524,7 +526,8 @@
   // concurrentDiscordWebhookConnections - How many concurrent discord webhook destinations to send to at once
   //
   "tuning": {
-    "fastMonsters": false,
+    "fastMonsters": true,
+    "disablePokemonCache": true,
     "maxDatabaseConnections": 15,
     "webhookProcessingWorkers": 5,
     "concurrentWebhookProcessorsPerWorker": 4,

locale/de.json

@@ -46,7 +46,7 @@
     "channel":"Kanal",
     "Charged TM":"Lade-TM",
     "Chill":"Gefriermodul",
-    "clean":"aufräumen",
+    "clean":"bereinigen",
     "Cleaning finished":"Säuberung beendet!",
     "clear":"leeren",
     "Cliff":"Cliff",
@@ -147,6 +147,7 @@
     "incident":"ereignis",
     "include_empty":"auch_leer",
     "including battle changes":"inklusive Teamänderungen",
+    "including rsvp updates":"mit rsvp updates",
     "including slot changes":"inklusive Platzänderungen",
     "individually":"individuell",
     "instinct":"Intuition",
@@ -290,6 +291,7 @@
     "Rock":"Gestein",
     "role":"Rolle",
     "Roles available":"Aktuell sind folgende Rollen verfügbar",
+    "rsvp only":"nur rsvp",
     "russian":"Russisch",
     "s location to : ":"“ wurde gesetzt auf: ",
     "'s location to the following coordinates in":"“ wurde wie folgt gesetzt:",
@@ -299,6 +301,7 @@
     "settime":"Zeit",
     "Shadow":"Crypto",
     "Shadow Legendary":"Crypto Legendär",
+    "Shiny":"schillernd",
     "Shiny information not yet calculated - wait a few minutes and try again":"Shinyinfos noch nicht berechnet - warte ein paar Minuten und versuche es erneut",
     "Shiny Rate":"Shinyrate",
     "Shiny Stats (Last few hours)":"Shiny Statistik (der letzen Stunden)",
@@ -416,11 +419,20 @@
     "Winter":"Winter",
     "with":"mit",
     "with move":"mit Attacke",
+    "without rsvp updates":"ohne rsvp updates",
     "yellow":"gelb",
     "You are currently set to receive alarms in":"Folgende Gebiete sind gesetzt:",
     "You can start receiving alerts again using {0}{1}":"Du kannst mit {0}{1} wieder Benachrichtigungen erhalten",
     "You do not have any profiles":"Kein Profil vorhanden",
     "You do not have permission to execute this command":"keine Berechtigung dieses Komando zu benutzen",
+    "You do not have permission to track monsters":"keine Berechtigung Pokémon zu tracken",
+    "You do not have permission to track raids":"keine Berechtigung Raids zu tracken",
+    "You do not have permission to track quests":"keine Berechtigung Quests zu tracken",
+    "You do not have permission to track invasions":"keine Berechtigung Team-GO-Rocket-Invasionen zu tracken",
+    "You do not have permission to track lures":"keine Berechtigung Lockmodule zu tracken",
+    "You do not have permission to track nests":"keine Berechtigung Nester zu tracken",
+    "You do not have permission to track gyms":"keine Berechtigung Arenen zu tracken",
+    "You do not have permission to track fort changes":"keine Berechtigung Gym und Stop Änderungen zu tracken",
     "You don't have a profile set":"Kein Profil gewählt",
     "You have been granted the role {0}":"Folgende Rolle wurde hinzugefügt: {0}",
     "You have breached the rate limit too many times in the last 24 hours. Your messages are now stopped, use {0}start to resume":"24 Std. Nachrichtenlimit wurde überschritten. Benachrichtigungen sind nun deaktiviert, nutze {0}start um diese wieder zu aktivieren",
@@ -443,12 +455,14 @@
     "You're not tracking any nests":"Es werden keine Nester beobachtet.",
     "You're not tracking any quests":"Es werden keine Quests beobachtet.",
     "You're not tracking any raids":"Es werden keine Raids beobachtet.",
+    "You're not tracking any fort changes":"Es werden keine Gym und Stop Änderungen beobachtet.",
     "You're tracking the following gyms:":"Folgende Arenen werden beobachtet:",
     "You're tracking the following invasions:":"Folgende Team-GO-Rocket-Invasionen werden beobachtet:",
     "You're tracking the following lures:":"Folgende Lockmodule werden beobachtet:",
     "You're tracking the following monsters:":"Folgende Pokémon werden beobachtet:",
     "You're tracking the following nests:":"Folgende Nester werden beobachtet:",
     "You're tracking the following quests:":"Folgende Quests werden beobachtet:",
     "You're tracking the following raids:":"Folgende Raids werden beobachtet:",
+    "You're tracking the following fort changes:":"Folgende Gym und Stop Änderungen werden beobachtet:",
     "Zen":"Trance-Modus"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "poracle",
-  "version": "4.8.3",
+  "version": "4.8.4",
   "description": "Webhook processing and personalised discord|telegram alarms",
   "keywords": [
     "poracle",
@@ -42,7 +42,7 @@
     "discord.js": "^13.16.0",
     "fast-json-stable-stringify": "^2.1.0",
     "fastify": "^4.25.2",
-    "flat-cache": "^4.0.0",
+    "flat-cache": "^5.0.0",
     "form-data": "^4.0.0",
     "geo-tz": "^8.0.0",
     "handlebars": "^4.7.7",

src/app.js

@@ -589,12 +589,50 @@ async function processOne(hook) {
 					fastify.webhooks.info(`raid ${JSON.stringify(hook.message)}`)
 					const cacheKey = `${hook.message.gym_id}${hook.message.end}${hook.message.pokemon_id}`
 
-					if (fastify.cache.get(cacheKey)) {
+					const raidDetails = fastify.cache.get(cacheKey)
+					let rsvpDifference = false
+					const oldRsvpsLen = raidDetails?.rsvps?.length ?? 0
+					const newRsvpsLen = hook.message.rsvps?.length ?? 0
+					if (newRsvpsLen > oldRsvpsLen) {
+						rsvpDifference = true
+					} else if (raidDetails && raidDetails.rsvps && hook.message.rsvps) {
+						// Allow for old timeslots to have disappeared, so only compare the
+						// new ones present
+						for (let x = 0; x < newRsvpsLen; x++) {
+							const newRsvp = hook.message.rsvps[x]
+
+							let found = false
+							for (const oldRsvp of raidDetails.rsvps) {
+								if (newRsvp.timeslot === oldRsvp.timeslot) {
+									found = true
+									if (newRsvp.going_count !== oldRsvp.going_count
+											|| newRsvp.maybe_count !== oldRsvp.maybe_count) {
+										rsvpDifference = true
+									}
+									break
+								}
+							}
+
+							if (found) {
+								if (rsvpDifference) break
+							} else {
+								// timeslot was not in old rsvps
+								rsvpDifference = true
+								break
+							}
+						}
+					}
+
+					if (raidDetails && !rsvpDifference) {
 						fastify.controllerLog.debug(`${hook.message.gym_id}: Raid was sent again too soon, ignoring`)
 						break
 					}
 
-					fastify.cache.set(cacheKey, 'x')
+					hook.message.firstNotification = !raidDetails
+
+					fastify.cache.set(cacheKey, {
+						rsvps: hook.message.rsvps,
+					})
 				}
 
 				await processHook(hook)

src/controllers/fortupdate.js

@@ -83,7 +83,7 @@ class FortUpdate extends Controller {
 			data.fortType = data.new?.type || data.old?.type || 'unknown'
 			Object.assign(data, this.config.general.dtsDictionary)
 			data.googleMapUrl = `https://maps.google.com/maps?q=${data.latitude},${data.longitude}`
-			data.appleMapUrl = `https://maps.apple.com/maps?daddr=${data.latitude},${data.longitude}`
+			data.appleMapUrl = `https://maps.apple.com/place?coordinate=${data.latitude},${data.longitude}`
 			data.wazeMapUrl = `https://www.waze.com/ul?ll=${data.latitude},${data.longitude}&navigate=yes&zoom=17`
 			if (this.config.general.rdmURL) {
 				data.rdmUrl = `${this.config.general.rdmURL}${!this.config.general.rdmURL.endsWith('/') ? '/' : ''}@${data.latitude}/@${data.longitude}/18`

src/controllers/gym.js

@@ -89,7 +89,7 @@ class Gym extends Controller {
 			Object.assign(data, this.config.general.dtsDictionary)
 			data.gymId = data.id || data.gym_id
 			data.googleMapUrl = `https://maps.google.com/maps?q=${data.latitude},${data.longitude}`
-			data.appleMapUrl = `https://maps.apple.com/maps?daddr=${data.latitude},${data.longitude}`
+			data.appleMapUrl = `https://maps.apple.com/place?coordinate=${data.latitude},${data.longitude}`
 			data.wazeMapUrl = `https://www.waze.com/ul?ll=${data.latitude},${data.longitude}&navigate=yes&zoom=17`
 			if (this.config.general.rdmURL) {
 				data.rdmUrl = `${this.config.general.rdmURL}${!this.config.general.rdmURL.endsWith('/') ? '/' : ''}@gym/${data.gymId}`

src/controllers/monster.js

@@ -233,7 +233,7 @@ class Monster extends Controller {
 			if (data.boosted_weather) data.weather = data.boosted_weather
 			if (!data.weather) data.weather = 0
 			Object.assign(data, this.config.general.dtsDictionary)
-			data.appleMapUrl = `https://maps.apple.com/maps?daddr=${data.latitude},${data.longitude}`
+			data.appleMapUrl = `https://maps.apple.com/place?coordinate=${data.latitude},${data.longitude}`
 			data.googleMapUrl = `https://maps.google.com/maps?q=${data.latitude},${data.longitude}`
 			data.wazeMapUrl = `https://www.waze.com/ul?ll=${data.latitude},${data.longitude}&navigate=yes&zoom=17`
 			if (this.config.general.rdmURL) {

src/controllers/nest.js

@@ -76,7 +76,7 @@ class Nest extends Controller {
 
 			Object.assign(data, this.config.general.dtsDictionary)
 			data.googleMapUrl = `https://maps.google.com/maps?q=${data.latitude},${data.longitude}`
-			data.appleMapUrl = `https://maps.apple.com/maps?daddr=${data.latitude},${data.longitude}`
+			data.appleMapUrl = `https://maps.apple.com/place?coordinate=${data.latitude},${data.longitude}`
 			data.wazeMapUrl = `https://www.waze.com/ul?ll=${data.latitude},${data.longitude}&navigate=yes&zoom=17`
 			if (this.config.general.rdmURL) {
 				data.rdmUrl = `${this.config.general.rdmURL}${!this.config.general.rdmURL.endsWith('/') ? '/' : ''}@${data.latitude}/@${data.longitude}/18`

src/controllers/pokestop.js

@@ -73,7 +73,7 @@ class Invasion extends Controller {
 
 			Object.assign(data, this.config.general.dtsDictionary)
 			data.googleMapUrl = `https://maps.google.com/maps?q=${data.latitude},${data.longitude}`
-			data.appleMapUrl = `https://maps.apple.com/maps?daddr=${data.latitude},${data.longitude}`
+			data.appleMapUrl = `https://maps.apple.com/place?coordinate=${data.latitude},${data.longitude}`
 			data.wazeMapUrl = `https://www.waze.com/ul?ll=${data.latitude},${data.longitude}&navigate=yes&zoom=17`
 			if (this.config.general.rdmURL) {
 				data.rdmUrl = `${this.config.general.rdmURL}${!this.config.general.rdmURL.endsWith('/') ? '/' : ''}@pokestop/${data.pokestop_id}`

src/controllers/pokestop_lure.js

@@ -75,7 +75,7 @@ class Lure extends Controller {
 
 			Object.assign(data, this.config.general.dtsDictionary)
 			data.googleMapUrl = `https://maps.google.com/maps?q=${data.latitude},${data.longitude}`
-			data.appleMapUrl = `https://maps.apple.com/maps?daddr=${data.latitude},${data.longitude}`
+			data.appleMapUrl = `https://maps.apple.com/place?coordinate=${data.latitude},${data.longitude}`
 			data.wazeMapUrl = `https://www.waze.com/ul?ll=${data.latitude},${data.longitude}&navigate=yes&zoom=17`
 			if (this.config.general.rdmURL) {
 				data.rdmUrl = `${this.config.general.rdmURL}${!this.config.general.rdmURL.endsWith('/') ? '/' : ''}@pokestop/${data.pokestop_id}`