fix: cleaning, add missing functions and fixup 2025 (#927)

Author: ReuschelCGN

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",
@@ -299,6 +299,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)",
@@ -421,6 +422,14 @@
     "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 +452,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/lib/discord/commando/events/channelDelete.js

@@ -6,6 +6,12 @@ module.exports = async (client, channel) => {
 			await client.query.deleteQuery('monsters', { id: channel.id })
 			await client.query.deleteQuery('raid', { id: channel.id })
 			await client.query.deleteQuery('quest', { id: channel.id })
+			await client.query.deleteQuery('lures', { id: channel.id })
+			await client.query.deleteQuery('gym', { id: channel.id })
+			await client.query.deleteQuery('invasion', { id: channel.id })
+			await client.query.deleteQuery('nests', { id: channel.id })
+			await client.query.deleteQuery('forts', { id: channel.id })
+			await client.query.deleteQuery('weather', { id: channel.id })
 			await client.query.deleteQuery('humans', { id: channel.id })
 			client.logs.discord.log({
 				level: 'debug',
@@ -16,4 +22,4 @@ module.exports = async (client, channel) => {
 	} catch (e) {
 		client.logs.discord.error('Discord event channelDelete - Was unable to remove human', e)
 	}
-}
+}

src/lib/discord/discordReconciliation.js

@@ -131,6 +131,11 @@ class DiscordReconciliation {
 			await this.query.deleteQuery('raid', { id: user.id })
 			await this.query.deleteQuery('quest', { id: user.id })
 			await this.query.deleteQuery('lures', { id: user.id })
+			await this.query.deleteQuery('gym', { id: user.id })
+			await this.query.deleteQuery('invasion', { id: user.id })
+			await this.query.deleteQuery('nests', { id: user.id })
+			await this.query.deleteQuery('forts', { id: user.id })
+			await this.query.deleteQuery('weather', { id: user.id })
 			await this.query.deleteQuery('profiles', { id: user.id })
 			await this.query.deleteQuery('humans', { id: user.id })
 			this.log.info(`Reconciliation (Discord) Delete user ${user.id} ${user.name}`)

src/lib/poracleMessage/commands/backup.js

@@ -39,6 +39,7 @@ exports.run = async (client, msg, args, options) => {
 			weather: await client.query.selectAllQuery('weather', { id: target.id, profile_no: currentProfileNo }),
 			lures: await client.query.selectAllQuery('lures', { id: target.id, profile_no: currentProfileNo }),
 			gym: await client.query.selectAllQuery('gym', { id: target.id, profile_no: currentProfileNo }),
+			forts: await client.query.selectAllQuery('forts', { id: target.id, profile_no: currentProfileNo }),
 			nests: await client.query.selectAllQuery('nests', { id: target.id, profile_no: currentProfileNo }),
 		}
 		backup.monsters.map((x) => { x.id = 0; delete x.uid; x.profile_no = 0 })
@@ -49,6 +50,7 @@ exports.run = async (client, msg, args, options) => {
 		backup.weather.map((x) => { x.id = 0; delete x.uid; x.profile_no = 0 })
 		backup.lures.map((x) => { x.id = 0; delete x.uid; x.profile_no = 0 })
 		backup.gym.map((x) => { x.id = 0; delete x.uid; x.profile_no = 0 })
+		backup.forts.map((x) => { x.id = 0; delete x.uid; x.profile_no = 0 })
 		backup.nests.map((x) => { x.id = 0; delete x.uid; x.profile_no = 0 })
 
 		fs.writeFileSync(path.join(__dirname, '../../../../backups', `${args[0]}.json`), JSON.stringify(backup, null, '\t'))

src/lib/poracleMessage/commands/profile.js

@@ -116,6 +116,11 @@ exports.run = async (client, msg, args, options) => {
 					await client.query.deleteQuery('raid', { id: target.id, profile_no: profileNo })
 					await client.query.deleteQuery('quest', { id: target.id, profile_no: profileNo })
 					await client.query.deleteQuery('lures', { id: target.id, profile_no: profileNo })
+					await client.query.deleteQuery('forts', { id: target.id, profile_no: profileNo })
+					await client.query.deleteQuery('gym', { id: target.id, profile_no: profileNo })
+					await client.query.deleteQuery('invasion', { id: target.id, profile_no: profileNo })
+					await client.query.deleteQuery('nests', { id: target.id, profile_no: profileNo })
+					await client.query.deleteQuery('weather', { id: target.id, profile_no: profileNo })
 				}
 
 				if (human.current_profile_no === profileNo) {
@@ -236,7 +241,7 @@ exports.run = async (client, msg, args, options) => {
 			}
 			case 'copyto': {
 				const currentName = profiles.find((profile) => profile.profile_no === currentProfileNo).name
-				const categories = ['monsters', 'raid', 'egg', 'quest', 'invasion', 'weather', 'lures', 'gym', 'nests']
+				const categories = ['monsters', 'raid', 'egg', 'quest', 'invasion', 'weather', 'lures', 'gym', 'nests', 'forts']
 				const valid = []
 				const invalid = []
 

src/lib/poracleMessage/commands/script.js

@@ -28,7 +28,7 @@ exports.run = async (client, msg, args, options) => {
 
 		if (!args.length) {
 			await msg.reply(
-				translator.translateFormat('Valid commands are e.g. `{0}script everything`, `{0}script pokemon raids eggs quest lures invasion nests gym`, `{0}script everything allprofiles`, `{0}script everything link`', util.prefix),
+				translator.translateFormat('Valid commands are e.g. `{0}script everything`, `{0}script pokemon raids eggs quest lures invasion nests gym forts`, `{0}script everything allprofiles`, `{0}script everything link`', util.prefix),
 				{ style: 'markdown' },
 			)
 			return
@@ -60,6 +60,7 @@ exports.run = async (client, msg, args, options) => {
 			const lures = await client.query.selectAllQuery('lures', { id: target.id, profile_no: currentProfileNo })
 			const nests = await client.query.selectAllQuery('nests', { id: target.id, profile_no: currentProfileNo })
 			const gyms = await client.query.selectAllQuery('gym', { id: target.id, profile_no: currentProfileNo })
+			const forts = await client.query.selectAllQuery('forts', { id: target.id, profile_no: currentProfileNo })
 
 			const gender = ['', 'male', 'female', 'genderless']
 
@@ -136,6 +137,8 @@ exports.run = async (client, msg, args, options) => {
 					}
 					if (raid.team !== 4) message += ` team:${raidTeams[raid.team]}`
 					if (raid.exclusive) message += ' ex'
+					if (raid.rsvp_changes == 1) message += ' rsvp'
+					if (raid.rsvp_changes == 2) message += ' rsvp_only'
 					if (raid.clean) message += ' clean'
 
 					message += '\n'
@@ -157,6 +160,8 @@ exports.run = async (client, msg, args, options) => {
 					}
 					if (egg.team !== 4) message += ` team:${raidTeams[egg.team]}`
 					if (egg.exclusive) message += ' ex'
+					if (egg.rsvp_changes == 1) message += ' rsvp'
+					if (egg.rsvp_changes == 2) message += ' rsvp_only'
 					if (egg.clean) message += ' clean'
 
 					message += '\n'
@@ -254,6 +259,23 @@ exports.run = async (client, msg, args, options) => {
 				}
 			}
 
+			if (everything || args.includes('forts')) {
+				const fortParameters = {
+					template: ['template', client.config.general.defaultTemplateName.toString()],
+					d: ['distance', 0],
+				}
+				for (const fort of forts) {
+					message += `${prefix}fort ${fort.fort_type}`
+
+					if (fort.include_empty) message += ' include_empty'
+					for (const [param, [dbFieldName, defaultValue]] of Object.entries(fortParameters)) {
+						if (fort[dbFieldName] !== defaultValue) message += ` ${param}:${fort[dbFieldName]}`
+					}
+
+					message += '\n'
+				}
+			}
+
 			if (everything || args.includes('lures')) {
 				const lureParameters = {
 					template: ['template', client.config.general.defaultTemplateName.toString()],

src/lib/poracleMessage/commands/unregister.js

@@ -31,10 +31,17 @@ exports.run = async (client, msg, args, options) => {
 			await client.query.deleteQuery('monsters', { id: t })
 			await client.query.deleteQuery('raid', { id: t })
 			await client.query.deleteQuery('quest', { id: t })
+			await client.query.deleteQuery('lures', { id: t })
+			await client.query.deleteQuery('forts', { id: t })
+			await client.query.deleteQuery('gym', { id: t })
+			await client.query.deleteQuery('invasion', { id: t })
+			await client.query.deleteQuery('nests', { id: t })
+			await client.query.deleteQuery('weather', { id: t })
 			await client.query.deleteQuery('humans', { id: t })
+			await client.query.deleteQuery('profiles', { id: t })
 			client.log.info(`${msg.userId} unregistered ${t}`)
 		} catch (err) {
 			client.log.error('Unregister command failed with: ', err)
 		}
 	}
-}
+}

src/lib/telegram/telegramReconciliation.js

@@ -65,6 +65,11 @@ class TelegramReconciliation {
 			await this.query.deleteQuery('raid', { id: user.id })
 			await this.query.deleteQuery('quest', { id: user.id })
 			await this.query.deleteQuery('lures', { id: user.id })
+			await this.query.deleteQuery('gym', { id: user.id })
+			await this.query.deleteQuery('invasion', { id: user.id })
+			await this.query.deleteQuery('nests', { id: user.id })
+			await this.query.deleteQuery('forts', { id: user.id })
+			await this.query.deleteQuery('weather', { id: user.id })
 			await this.query.deleteQuery('profiles', { id: user.id })
 			await this.query.deleteQuery('humans', { id: user.id })
 			this.log.info(`Reconciliation (Telegram) Delete user ${user.id} ${user.name}`)