KartulUdus · jfberry · Jul 28, 2023 · Jan 3, 2023 · Jan 11, 2023 · Jan 11, 2023
diff --git a/locale/de.json b/locale/de.json
@@ -11,10 +11,11 @@
     "add":"hinzufügen",
     "Added areas:":"Hinzugefügte Gebiete:",
     "Adventure Hat 2020":"Forscher",
-    "all items":"alle items",
-    "all pokemon":"alle pokemon",
-    "All team's":"alle teams",
-    "allprofiles":"alleprofile",
+    "all items":"alle Items",
+    "all level":"alle Level",
+    "all pokemon":"alle Pokemon",
+    "All team's":"alle Teams",
+    "allprofiles":"alle Profile",
     "Alola":"Alola",
     "Altered":"Wandel",
     "and":"und",
@@ -31,7 +32,7 @@
     "Aria":"Gesang",
     "Arlo":"Arlo",
     "Armored":"Rüstung",
-    "at gym ":"an der Arena ",
+    "at gym ":"an der Arena",
     "atk":"Atk",
     "Attack":"Angriff",
     "Autumn":"Herbst",
@@ -303,6 +304,7 @@
     "Ice":"Eis",
     "Incarnate":"Inkarnatiosform",
     "Incense":"Rauch",
+    "incident":"ereignis",
     "including battle changes":"inklusive Teamänderungen",
     "including slot changes":"inklusive Platzänderungen",
     "individually":"individuell",
@@ -321,7 +323,11 @@
     "Land 3 throws":"Lande 3 Würfe",
     "language":"Sprache",
     "Legendary":"Legendär",
-    "level":"level",
+    "level":"Level",
+    "Level 1 Shadow":"Crypto Level 1",
+    "Level 2 Shadow":"Crypto Level 2",
+    "Level 3 Shadow":"Crypto Level 3",
+    "Level 4 Shadow":"Crypto Level 4",
     "Level {0} CP {1}": "Level {0} WP {1}",
     "list":"auflisten",
     "little":"little",
@@ -444,7 +450,6 @@
     "Poffin":"Knursp",
     "Poison":"Gift",
     "Poké Ball":"Pokéball",
-    "Pokemon-Contest":"Pokemon-Wettbewerb",
     "polish":"Polnisch",
     "poracle":"poracle",
     "Possible weather change at":"Möglicher Wetterwechsel um",
@@ -500,11 +505,13 @@
     "Send 3 gifts":"Verschicke 3 Geschenke",
     "Send 5 gifts":"Verschicke 5 Geschenke",
     "Shadow":"Crypto",
+    "Shadow Legendary":"Crypto Legendär",
     "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)",
     "Shock":"Blitzmodul",
     "show":"zeigen",
+    "Showcase":"Showcase",
     "Sierra":"Sierra",
     "Silver Pinap Berry":"Silberne Sananabeere",
     "Sinnoh Stone":"Sinnoh-Stein",
@@ -610,7 +617,7 @@
     "Valid commands are `{0}role list`, `{0}role add <areaname>`, `{0}role remove <areaname>`":"Gültige Befehle sind `{0}rolle auflisten`, `{0}rolle hinzufügen <rollenname>`, `{0}rolle entfernen <rollenname>`, `{0}rolle mitglied`",
     "Valid commands are e.g. `{0}egg level5`, `{0}egg remove everything`":"Gültige Befehle sind z.B. `{0}ei level5`, `{0}ei entfernen alle`",
     "Valid commands are e.g. `{0}gym everything`, `{0}gym mystic slot_changes`":"Gültige Befehle sind z.B. `{0}arena alle`, `{0}arena weisheit platzänderung`",
-    "Valid commands are e.g. `{0}invasion giovanni`, `{0}invasion dragon`, `{0}invasion remove everything`":"Gültige Befehle sind z.B. `{0}invasion giovanni`, `{0}invasion drache`, `{0}invasion entfernen alle`",
+    "Valid commands are e.g. `{0}incident giovanni`, `{0}incident dragon`, `{0}incident remove everything`":"Gültige Befehle sind z.B. `{0}ereignis giovanni`, `{0}ereignis drache`, `{0}ereignis entfernen alle` (oder z.B. `{0}invasion drache`)",
     "Valid commands are e.g. `{0}location <lat>,<lon>`, `{0}location <your address>`":"Gültige Befehle sind z.B. `{0}standort <lat>,<lon>`, `{0}standort <adresse>`",
     "Valid commands are e.g. `{0}lure mossy`, `{0}lure remove everything`":"Gültige Befehle sind z.B. `{0}lockmodul moos`, `{0}lockmodul entfernen alle`",
     "Valid commands are e.g. `{0}quest spinda`, `{0}quest energycharizard`, `{0}quest remove everything`":"Gültige Befehle sind z.B. `{0}quest pandir`, `{0}quest energieglurak`, `{0}quest entfernen alle`",
@@ -628,11 +635,11 @@
     "Warning: Admin command detected without distance set - using default distance":"Warnung: Befehl ohne Distanz erkannt - standard Distanz wird stattdessen verwendet",
     "Wash":"Wasch",
     "Water":"Wasser",
-    "weather":"wetter",
+    "weather":"Wetter",
     "Weather information is not yet available - wait a few minutes and try again":"Wetterinformationen sind noch nicht verfügbar - warte ein paar Minuten und versuchen es erneut",
     "Webhook added":"Webhook hinzugefügt",
-    "webhook":"webhook",
-    "weight":"gewicht",
+    "webhook":"Webhook",
+    "weight":"Gewicht",
     "West Sea":"Westliches Meer",
     "White":"Weiß",
     "Will start cleaning up to {0} messages back - do not re-run until finished":"Eine Säuberung mit bis zu {0} Nachrichten wird gestartet - bitte nicht erneut laufen lassen, bis beendet!",

diff --git a/src/controllers/pokestop.js b/src/controllers/pokestop.js
@@ -118,8 +118,6 @@ class Invasion extends Controller {
 				data.displayTypeId = 8
 			}
 
-			data.gruntTypeColor = 'BABABA'
-
 			data.gender = 0
 			data.gruntName = ''
 			data.gruntTypeColor = 'BABABA'
@@ -144,9 +142,10 @@ class Invasion extends Controller {
 			// Event invasions
 			if (((data.grunt_type === 0) || !data.grunt_type) && (data.displayTypeId >= 7)) {
 				data.gender = 0
-				data.gruntName = data.displayTypeId && this.GameData.utilData.pokestopEvent[data.displayTypeId] ? this.GameData.utilData.pokestopEvent[data.displayTypeId] : ''
-				data.gruntType = data.displayTypeId && this.GameData.utilData.pokestopEvent[data.displayTypeId] ? this.GameData.utilData.pokestopEvent[data.displayTypeId].toLowerCase() : ''
+				data.gruntName = data.displayTypeId && this.GameData.utilData.pokestopEvent[data.displayTypeId].name ? this.GameData.utilData.pokestopEvent[data.displayTypeId].name : ''
+				data.gruntType = data.displayTypeId && this.GameData.utilData.pokestopEvent[data.displayTypeId].name ? this.GameData.utilData.pokestopEvent[data.displayTypeId].name.toLowerCase() : ''
 				data.gruntRewards = ''
+				data.gruntTypeColor = data.displayTypeId && this.GameData.utilData.pokestopEvent[data.displayTypeId].color ? this.GameData.utilData.pokestopEvent[data.displayTypeId].color : 'BABABA'
 			}
 
 			const whoCares = data.poracleTest ? [{
@@ -220,7 +219,8 @@ class Invasion extends Controller {
 						require('./common/weather').setGameWeather(data, translator, this.GameData, this.emojiLookup, platform, currentCellWeather)
 
 						if (((data.grunt_type === 0) || !data.grunt_type) && (data.displayTypeId >= 7)) {
-							data.gruntName = translator.translate(data.displayTypeId && this.GameData.utilData.pokestopEvent[data.displayTypeId] ? this.GameData.utilData.pokestopEvent[data.displayTypeId] : '')
+							data.gruntName = translator.translate(data.displayTypeId && this.GameData.utilData.pokestopEvent[data.displayTypeId].name ? this.GameData.utilData.pokestopEvent[data.displayTypeId].name : '')
+							data.gruntTypeEmoji = translator.translate(this.emojiLookup.lookup(this.GameData.utilData.pokestopEvent[data.displayTypeId].emoji, platform))
 						}
 
 						// full build
@@ -325,6 +325,7 @@ class Invasion extends Controller {
 							...geoResult,
 							...data,
 							time: data.distime,
+							tthd: data.tth.days,
 							tthh: data.tth.hours,
 							tthm: data.tth.minutes,
 							tths: data.tth.seconds,

diff --git a/src/lib/discord/commando/commands/incident.js b/src/lib/discord/commando/commands/incident.js
@@ -0,0 +1,11 @@
+const PoracleDiscordMessage = require('../../poracleDiscordMessage')
+const PoracleDiscordState = require('../../poracleDiscordState')
+
+const commandLogic = require('../../../poracleMessage/commands/incident')
+
+exports.run = async (client, msg, command) => {
+	const pdm = new PoracleDiscordMessage(client, msg)
+	const pds = new PoracleDiscordState(client)
+
+	await commandLogic.run(pds, pdm, command[0])
+}
diff --git a/src/lib/discord/commando/commands/invasion.js b/src/lib/discord/commando/commands/invasion.js
@@ -1,7 +1,7 @@
 const PoracleDiscordMessage = require('../../poracleDiscordMessage')
 const PoracleDiscordState = require('../../poracleDiscordState')
 
-const commandLogic = require('../../../poracleMessage/commands/invasion')
+const commandLogic = require('../../../poracleMessage/commands/incident')
 
 exports.run = async (client, msg, command) => {
 	const pdm = new PoracleDiscordMessage(client, msg)

diff --git a/src/lib/discord/discordWorker.js b/src/lib/discord/discordWorker.js
@@ -135,7 +135,7 @@ class Worker {
 
 	async userAlert(data) {
 		let user = this.client.users.cache.get(data.target)
-		const msgDeletionMs = ((data.tth.hours * 3600) + (data.tth.minutes * 60) + data.tth.seconds) * 1000
+		const msgDeletionMs = ((data.tth.days * 86400) + (data.tth.hours * 3600) + (data.tth.minutes * 60) + data.tth.seconds) * 1000
 
 		try {
 			const logReference = data.logReference ? data.logReference : 'Unknown'
@@ -189,7 +189,7 @@ class Worker {
 
 			this.logs.discord.info(`${logReference}: #${this.id} -> ${data.name} ${data.target} CHANNEL Sending discord message${data.clean ? ' (clean)' : ''}`)
 			const channel = await this.client.channels.fetch(data.target)
-			const msgDeletionMs = ((data.tth.hours * 3600) + (data.tth.minutes * 60) + data.tth.seconds) * 1000 + this.config.discord.messageDeleteDelay
+			const msgDeletionMs = ((data.tth.days * 86400) + (data.tth.hours * 3600) + (data.tth.minutes * 60) + data.tth.seconds) * 1000 + this.config.discord.messageDeleteDelay
 			if (!channel) return this.logs.discord.warn(`${logReference}: #${this.id} -> ${data.name} ${data.target} CHANNEL not found`)
 			this.logs.discord.debug(`${logReference}: #${this.id} -> ${data.name} ${data.target} CHANNEL Sending discord message`, data.message)
 

diff --git a/src/lib/poracleMessage/commands/invasion.js → src/lib/poracleMessage/commands/incident.js b/src/lib/poracleMessage/commands/invasion.js → src/lib/poracleMessage/commands/incident.js
@@ -29,15 +29,15 @@ exports.run = async (client, msg, args, options) => {
 
 		if (args.length === 0) {
 			await msg.reply(
-				translator.translateFormat('Valid commands are e.g. `{0}invasion giovanni`, `{0}invasion dragon`, `{0}invasion remove everything`', util.prefix),
+				translator.translateFormat('Valid commands are e.g. `{0}incident giovanni`, `{0}incident dragon`, `{0}incident remove everything`', util.prefix),
 				{ style: 'markdown' },
 			)
 			await helpCommand.provideSingleLineHelp(client, msg, util, language, target, commandName)
 			return
 		}
 
 		const typeArray = Object.values(client.GameData.grunts).map((grunt) => grunt.type.toLowerCase())
-		const eventArray = Object.values(client.GameData.utilData.pokestopEvent).map((x) => x.toLowerCase())
+		const eventArray = Object.values(client.GameData.utilData.pokestopEvent).map((x) => x.name.toLowerCase())
 
 		let reaction = '👌'
 		const remove = !!args.find((arg) => arg === 'remove')

diff --git a/src/lib/telegram/Telegram.js b/src/lib/telegram/Telegram.js
@@ -203,7 +203,7 @@ class Telegram extends EventEmitter {
 
 	async sendFormattedMessage(data, dataType) {
 		try {
-			const msgDeletionMs = ((data.tth.hours * 3600) + (data.tth.minutes * 60) + data.tth.seconds) * 1000
+			const msgDeletionMs = ((data.tth.days * 86400) + (data.tth.hours * 3600) + (data.tth.minutes * 60) + data.tth.seconds) * 1000
 			const messageIds = []
 			const logReference = data.logReference ? data.logReference : 'Unknown'
 

diff --git a/src/lib/telegram/commands/incident.js b/src/lib/telegram/commands/incident.js
@@ -0,0 +1,20 @@
+const PoracleTelegramMessage = require('../poracleTelegramMessage')
+const PoracleTelegramState = require('../poracleTelegramState')
+
+const commandLogic = require('../../poracleMessage/commands/incident')
+
+module.exports = async (ctx) => {
+	const { controller, command } = ctx.state
+
+	// channel message authors aren't identifiable, ignore all commands sent in channels
+	if (Object.keys(ctx.update).includes('channel_post')) return
+
+	try {
+		const ptm = new PoracleTelegramMessage(ctx)
+		const pts = new PoracleTelegramState(ctx)
+
+		await commandLogic.run(pts, ptm, command.splitArgsArray[0])
+	} catch (err) {
+		controller.logs.telegram.error('Incident command unhappy:', err)
+	}
+}
diff --git a/src/lib/telegram/commands/invasion.js b/src/lib/telegram/commands/invasion.js
@@ -1,7 +1,7 @@
 const PoracleTelegramMessage = require('../poracleTelegramMessage')
 const PoracleTelegramState = require('../poracleTelegramState')
 
-const commandLogic = require('../../poracleMessage/commands/invasion')
+const commandLogic = require('../../poracleMessage/commands/incident')
 
 module.exports = async (ctx) => {
 	const { controller, command } = ctx.state
@@ -17,4 +17,4 @@ module.exports = async (ctx) => {
 	} catch (err) {
 		controller.logs.telegram.error('Invasion command unhappy:', err)
 	}
-}
+}
diff --git a/src/util/util.json b/src/util/util.json
@@ -931,11 +931,26 @@
 		"south":"\u2b07\ufe0f",
 		"southeast": "\u2199\ufe0f",
 		"east": "\u2b05\ufe0f",
-		"northeast": "\u2196\ufe0f"
+		"northeast": "\u2196\ufe0f",
+		"incident-goldstop": "🪙",
+		"incident-kecleon": "🦎",
+		"incident-showcase": "🏆"
 	},
 	"pokestopEvent": {
-		"7": "Gold-Stop",
-		"8": "Kecleon",
-		"9": "Pokemon-Contest"
+		"7": {
+			"name": "Gold-Stop",
+			"color": "F9E418",
+			"emoji": "incident-goldstop"
+		},
+		"8": {
+			"name": "Kecleon",
+			"color": "B3CA78",
+			"emoji": "incident-kecleon"
+		},
+		"9": {
+			"name": "Showcase",
+			"color": "03AEB6",
+			"emoji": "incident-showcase"
+		}
 	}
 }