From 30baff46db3eddc1cbb3cc20fb7fde625f986feb Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Thu, 10 Mar 2022 14:48:18 +0200
Subject: [PATCH 001/367] Latest translations
---
core/lang/pokemon_moves.json | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/lang/pokemon_moves.json b/core/lang/pokemon_moves.json
index e9078e0a..8764d514 100644
--- a/core/lang/pokemon_moves.json
+++ b/core/lang/pokemon_moves.json
@@ -3848,16 +3848,16 @@
"ES": "Fuego Sagrado++"
},
"pokemon_move_364": {
- "PT-BR": "Acrobatics",
+ "PT-BR": "Acrobático",
"EN": "Acrobatics",
"FI": "Acrobatics",
"NL": "Acrobatics",
"NO": "Acrobatics",
"PL": "Acrobatics",
- "FR": "Acrobatics",
- "DE": "Acrobatics",
- "IT": "Acrobatics",
+ "FR": "Acrobatie",
+ "DE": "Akrobatik",
+ "IT": "Acrobazia",
"RU": "Акробатика",
- "ES": "Acrobatics"
+ "ES": "Acróbata"
}
}
\ No newline at end of file
From a9b16abc9a82cfcbd608654bfaa013cfd2fac780 Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Sat, 12 Mar 2022 22:31:41 +0200
Subject: [PATCH 002/367] Added WEBHOOK_CHATS_BY_POKEMON
---
commands/raid_from_webhook.php | 11 ++++++++++-
config/defaults-config.json | 1 +
docs/config.rst | 22 +++++++++++++++++++++-
3 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/commands/raid_from_webhook.php b/commands/raid_from_webhook.php
index e527d823..71a8c1b3 100644
--- a/commands/raid_from_webhook.php
+++ b/commands/raid_from_webhook.php
@@ -345,7 +345,16 @@ function isPointInsidePolygon($point, $vertices) {
if(!empty($config->WEBHOOK_CHATS_ALL_LEVELS)) {
$webhook_chats = explode(',', $config->WEBHOOK_CHATS_ALL_LEVELS);
}
- $chats = array_merge($chats_geofence, $chats_raidlevel, $webhook_chats);
+
+ $chats_by_pokemon = [];
+ foreach($config->WEBHOOK_CHATS_BY_POKEMON as $rule) {
+ info_log(print_r($rule,true));
+ if(isset($rule['pokemon_id']) && $rule['pokemon_id'] == $pokemon && (!isset($rule['form_id']) or (isset($rule['form_id']) && $rule['form_id'] == $form))) {
+ $chats_by_pokemon = $rule['chats'];
+ }
+ }
+
+ $chats = array_merge($chats_geofence, $chats_raidlevel, $webhook_chats, $chats_by_pokemon);
require_once(LOGIC_PATH .'/send_raid_poll.php');
if ($metrics){
diff --git a/config/defaults-config.json b/config/defaults-config.json
index 8c7f7b6d..51c72229 100644
--- a/config/defaults-config.json
+++ b/config/defaults-config.json
@@ -126,6 +126,7 @@
"WEBHOOK_CHATS_LEVEL_3_1":"",
"WEBHOOK_CHATS_LEVEL_2_1":"",
"WEBHOOK_CHATS_LEVEL_1_1":"",
+ "WEBHOOK_CHATS_BY_POKEMON" : [],
"WEBHOOK_EXCLUDE_UNKNOWN": false,
"WEBHOOK_EXCLUDE_RAID_LEVEL":"1,2,3",
"WEBHOOK_EXCLUDE_POKEMON":"",
diff --git a/docs/config.rst b/docs/config.rst
index 49476b55..c8abc0ab 100644
--- a/docs/config.rst
+++ b/docs/config.rst
@@ -47,7 +47,6 @@ it's already prepended to the right length.
.. code-block::
- {
*snip*
"chat": {
"id": -1002233445566,
@@ -395,6 +394,25 @@ For that you need to setup ``WEBHOOK_CREATOR``\ , and to automatically share rai
or by Raidlevel ``"WEBHOOK_CHATS_LEVEL_5":"-100444555666"``
All incoming raids will be published in these chats.
+If you only want to automatically share a specific Pokemon, you can do that by editing the ``WEBHOOK_CHATS_BY_POKEMON`` json array:
+
+
+.. code-block::
+
+ "WEBHOOK_CHATS_BY_POKEMON" : [
+ {
+ "pokemon_id": 744,
+ "chats":[chat_id_1, chat_id_2]
+ },
+ {
+ "pokemon_id": 25,
+ "form_id": 2678,
+ "chats":[chat_id_3]
+ }
+ ],
+
+``pokemon_id`` and ``chats`` are required objects, ``form_id`` is optional.
+
Filter Raids from Webhook / geoconfig.json
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1074,6 +1092,8 @@ Config reference
- List of Telegram chat IDs to autoshare raids of level 5
* - WEBHOOK_CHATS_ALL_LEVELS
- List of Telegram chat IDs to autoshare raids of any level
+ * - WEBHOOK_CHATS_BY_POKEMON
+ - Automatically share only specific Pokemon to set chats. See above for further details.
* - WEBHOOK_CREATE_ONLY
- Bool, only create raids, don't autoshare them to any chat
* - WEBHOOK_CREATOR
From eac926dab46413a15a67246291f697bec826e9aa Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Sun, 13 Mar 2022 09:17:09 +0200
Subject: [PATCH 003/367] Minor WEBHOOK_CHATS_BY_POKEMON documentation fix
---
docs/config.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/config.rst b/docs/config.rst
index c8abc0ab..4b7cd7e4 100644
--- a/docs/config.rst
+++ b/docs/config.rst
@@ -1093,7 +1093,7 @@ Config reference
* - WEBHOOK_CHATS_ALL_LEVELS
- List of Telegram chat IDs to autoshare raids of any level
* - WEBHOOK_CHATS_BY_POKEMON
- - Automatically share only specific Pokemon to set chats. See above for further details.
+ - Automatically share only specific Pokemon to set chats. See `Raids from Webhook`_ for further details.
* - WEBHOOK_CREATE_ONLY
- Bool, only create raids, don't autoshare them to any chat
* - WEBHOOK_CREATOR
From deeb91fa0dc5ca5e899240cdc0154f966c0d50b8 Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Sun, 13 Mar 2022 09:18:01 +0200
Subject: [PATCH 004/367] Reworked raid posting from webhooks to acommodate
WEBHOOK_CHATS_BY_POKEMON
---
commands/raid_from_webhook.php | 89 ++++++++++++++++++++++------------
1 file changed, 57 insertions(+), 32 deletions(-)
diff --git a/commands/raid_from_webhook.php b/commands/raid_from_webhook.php
index 71a8c1b3..c41a6e5d 100644
--- a/commands/raid_from_webhook.php
+++ b/commands/raid_from_webhook.php
@@ -33,6 +33,25 @@ function isPointInsidePolygon($point, $vertices) {
}
}
+$cleanup_data = [];
+if(!empty($config->WEBHOOK_CHATS_BY_POKEMON[0])) {
+ // Fetch cleanup info for later use
+ try {
+ $query_cleanup = 'SELECT raid_id, chat_id FROM cleanup';
+ $statement_cleanup = $dbh->prepare($query_cleanup);
+ $statement_cleanup->execute();
+ $cleanup_table = $statement_cleanup->fetchAll();
+ foreach($cleanup_table as $row) {
+ $cleanup_data[$row['raid_id']][] = $row['chat_id'];
+ }
+ }
+ catch (PDOException $exception) {
+ error_log($exception->getMessage());
+ $dbh = null;
+ exit;
+ }
+}
+
// Telegram JSON array.
$tg_json = [];
debug_log(count($update),"Received raids:");
@@ -315,51 +334,57 @@ function isPointInsidePolygon($point, $vertices) {
}
if($send_updates == true) {
require_once(LOGIC_PATH .'/update_raid_poll.php');
- $update = update_raid_poll($raid_id, $raid, false, $tg_json, false); // update_raid_poll() will return false if the raid isn't shared to any chat
- if($update != false) $tg_json = $update;
- }else {
- // Get chats to share to by raid level and geofence id
- $chats_geofence = [];
- if($geofences != false) {
- foreach ($inside_geofences as $geofence_id) {
- $const_geofence = 'WEBHOOK_CHATS_LEVEL_' . $level . '_' . $geofence_id;
- $const_geofence_chats = $config->{$const_geofence};
+ $tg_json = update_raid_poll($raid_id, $raid, false, $tg_json, false);
+ }
+ // Get chats to share to by raid level and geofence id
+ $chats_geofence = [];
+ if($geofences != false) {
+ foreach ($inside_geofences as $geofence_id) {
+ $const_geofence = 'WEBHOOK_CHATS_LEVEL_' . $level . '_' . $geofence_id;
+ $const_geofence_chats = $config->{$const_geofence};
- if(!empty($const_geofence_chats)) {
- $chats_geofence = explode(',', $const_geofence_chats);
- }
+ if(!empty($const_geofence_chats)) {
+ $chats_geofence = explode(',', $const_geofence_chats);
}
}
+ }
- // Get chats to share to by raid level
- $const = 'WEBHOOK_CHATS_LEVEL_' . $level;
- $const_chats = $config->{$const};
+ // Get chats to share to by raid level
+ $const = 'WEBHOOK_CHATS_LEVEL_' . $level;
+ $const_chats = $config->{$const};
- $chats_raidlevel =[];
- if(!empty($const_chats)) {
- $chats_raidlevel = explode(',', $const_chats);
- }
+ $chats_raidlevel =[];
+ if(!empty($const_chats)) {
+ $chats_raidlevel = explode(',', $const_chats);
+ }
- // Get chats
- $webhook_chats = [];
- if(!empty($config->WEBHOOK_CHATS_ALL_LEVELS)) {
- $webhook_chats = explode(',', $config->WEBHOOK_CHATS_ALL_LEVELS);
- }
+ // Get chats
+ $webhook_chats = [];
+ if(!empty($config->WEBHOOK_CHATS_ALL_LEVELS)) {
+ $webhook_chats = explode(',', $config->WEBHOOK_CHATS_ALL_LEVELS);
+ }
- $chats_by_pokemon = [];
+ $chats_by_pokemon = [];
+ if(!empty($config->WEBHOOK_CHATS_BY_POKEMON[0])) {
foreach($config->WEBHOOK_CHATS_BY_POKEMON as $rule) {
- info_log(print_r($rule,true));
if(isset($rule['pokemon_id']) && $rule['pokemon_id'] == $pokemon && (!isset($rule['form_id']) or (isset($rule['form_id']) && $rule['form_id'] == $form))) {
- $chats_by_pokemon = $rule['chats'];
+ foreach($rule['chats'] as $rule_chat) {
+ // If the raid isn't already posted to the chats specified in WEBHOOK_CHATS_BY_POKEMON, we add it to the array
+ if(!isset($cleanup_data[$raid_id]) or !in_array($rule_chat, $cleanup_data[$raid_id])) {
+ $chats_by_pokemon[] = $rule_chat;
+ }
+ }
}
}
+ }
- $chats = array_merge($chats_geofence, $chats_raidlevel, $webhook_chats, $chats_by_pokemon);
+ $chats = array_merge($chats_geofence, $chats_raidlevel, $webhook_chats, $chats_by_pokemon);
- require_once(LOGIC_PATH .'/send_raid_poll.php');
- if ($metrics){
- $webhook_raids_posted_total->inc();
- }
+ require_once(LOGIC_PATH .'/send_raid_poll.php');
+ if ($metrics){
+ $webhook_raids_posted_total->inc();
+ }
+ if(count($chats) > 0) {
$tg_json = send_raid_poll($raid_id, $chats, $raid, $tg_json);
}
}
From 208e5ce2071808867440e886c6b638b8e474bf9b Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Wed, 16 Mar 2022 10:33:12 +0200
Subject: [PATCH 005/367] Fixed webhook posting not respecting
WEBHOOK_CREATE_ONLY
---
commands/raid_from_webhook.php | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/commands/raid_from_webhook.php b/commands/raid_from_webhook.php
index c41a6e5d..a4a5a465 100644
--- a/commands/raid_from_webhook.php
+++ b/commands/raid_from_webhook.php
@@ -52,6 +52,9 @@ function isPointInsidePolygon($point, $vertices) {
}
}
+// Skip posting if create only -mode is set or raid time is greater than value set in config
+$no_auto_posting = ($config->WEBHOOK_CREATE_ONLY or ($raid['message']['end']-$raid['message']['start']) > ($config->WEBHOOK_EXCLUDE_AUTOSHARE_DURATION * 60));
+
// Telegram JSON array.
$tg_json = [];
debug_log(count($update),"Received raids:");
@@ -269,8 +272,7 @@ function isPointInsidePolygon($point, $vertices) {
$webhook_raids_accepted_total->inc();
}
- // Skip posting if create only -mode is set or raid time is greater than value set in config
- if ($config->WEBHOOK_CREATE_ONLY or ($raid['message']['end']-$raid['message']['start']) > ($config->WEBHOOK_EXCLUDE_AUTOSHARE_DURATION * 60) ) {
+ if ($no_auto_posting) {
debug_log($gym_name,'Not autoposting raid, WEBHOOK_CREATE_ONLY is set to true or raids duration is over the WEBHOOK_EXCLUDE_AUTOSHARE_DURATION threshold:');
continue;
}
@@ -336,6 +338,9 @@ function isPointInsidePolygon($point, $vertices) {
require_once(LOGIC_PATH .'/update_raid_poll.php');
$tg_json = update_raid_poll($raid_id, $raid, false, $tg_json, false);
}
+
+ if($no_auto_posting) continue;
+
// Get chats to share to by raid level and geofence id
$chats_geofence = [];
if($geofences != false) {
From c97272386e14f7107f3e8af16ad969cd753a2b4e Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Wed, 16 Mar 2022 10:34:50 +0200
Subject: [PATCH 006/367] Tried fixing timezone mess with import upcoming
bosses Might work, might not. We'll see in a year Also edited the date
display of scheduled bosses under pokedex
---
logic/read_upcoming_bosses.php | 22 +++++++++-------------
mods/import_future_bosses.php | 5 +++--
mods/pokedex_list_raids.php | 4 ++--
3 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/logic/read_upcoming_bosses.php b/logic/read_upcoming_bosses.php
index 09c0670c..17714d08 100644
--- a/logic/read_upcoming_bosses.php
+++ b/logic/read_upcoming_bosses.php
@@ -6,13 +6,10 @@
* @return string
*/
function read_upcoming_bosses($return_sql = false) {
- global $config;
$link = curl_get_contents('https://fight.pokebattler.com/raids');
$pb = json_decode($link,true);
- $now = new dateTimeZone($config->TIMEZONE);
- $transitions = ( $now->getTransitions()[0]['isdst'] ? 0 : 1 );
- $tz_offset = (-7 - $transitions)*60*60;
+ $pb_timezone = new dateTimeZone('America/Phoenix');
$count = 0;
$sql = $list = $prev_start = $prev_rl = '';
foreach($pb['breakingNews'] as $news) {
@@ -20,8 +17,11 @@ function read_upcoming_bosses($return_sql = false) {
$rl = str_replace('RAID_LEVEL_','', $news['tier']);
if($rl == "MEGA") $raid_level_id = 6; else $raid_level_id = $rl;
if($raid_level_id != '5' and $raid_level_id != '6') break; // Limit scheduling to tier 5 and mega only
- $starttime = new DateTime("@".(substr($news['startDate'],0,10) + $tz_offset), new dateTimeZone('UTC'));
- $endtime = new DateTime("@".(substr($news['endDate'],0,10) + $tz_offset), new dateTimeZone('UTC'));
+ $starttime = new DateTime("@".(substr($news['startDate'],0,10)), new dateTimeZone('UTC'));
+ $endtime = new DateTime("@".(substr($news['endDate'],0,10)), new dateTimeZone('UTC'));
+
+ $starttime->setTimezone($pb_timezone);
+ $endtime->setTimezone($pb_timezone);
// If the boss only appears for an hour, the eggs most likely start to spawn 20 minutes prior to the time.
$diff = $starttime->diff($endtime);
@@ -30,16 +30,12 @@ function read_upcoming_bosses($return_sql = false) {
}
$date_start = $starttime->format('Y-m-d H:i:s');
- if($endtime->format('H') == '11') {
- // Usually the switch happens at 10. Pokebattler sets the end time to 11, so we must manually set it to 10
- $date_end = $endtime->format('Y-m-d').' 10:00:00';
- }else {
- $date_end = $endtime->format('Y-m-d H:i:s');
- }
+ $date_end = $endtime->format('Y-m-d H:i:s');
$dex_id_form = explode('-',resolve_boss_name_to_ids($news['pokemon']),2);
if($prev_start != $date_start) {
- $list.= CR . '' . $date_start . ' - ' . $date_end . ':' . CR;
+ $list.= CR . EMOJI_CLOCK . ' ' . $starttime->format('j.n. ') . getTranslation('raid_egg_opens_at') . $starttime->format(' H:i') . ' — ' . $endtime->format('j.n. ') . getTranslation('raid_egg_opens_at') . $endtime->format(' H:i') . ':' . CR;
+ $prev_rl = '';
}
if($prev_rl != $raid_level_id) {
$list.= '' . getTranslation($raid_level_id . 'stars') .':' . CR;
diff --git a/mods/import_future_bosses.php b/mods/import_future_bosses.php
index ac2b1e9a..beac26a4 100644
--- a/mods/import_future_bosses.php
+++ b/mods/import_future_bosses.php
@@ -32,7 +32,7 @@
if(!empty($list)) {
$now = new DateTime('now', new DateTimeZone($config->TIMEZONE));
$query = my_query("
- SELECT * FROM raid_bosses
+ SELECT id, pokedex_id, pokemon_form_id, raid_level, scheduled, DATE_FORMAT(date_start, '%e.%c. ".getTranslation('raid_egg_opens_at')." %H:%i') as date_start, DATE_FORMAT(date_end, '%e.%c. ".getTranslation('raid_egg_opens_at')." %H:%i') as date_end FROM raid_bosses
WHERE date_end > '" . $now->format('Y-m-d H:i:s') . "'
AND scheduled = 1
ORDER BY date_start, raid_level, pokedex_id, pokemon_form_id
@@ -41,7 +41,8 @@
$msg = '' . getTranslation('current_scheduled_bosses') . ':';
foreach($query->fetchAll() as $result) {
if($prev_start != $result['date_start']) {
- $msg.= CR . '' . $result['date_start'] . ' - ' . $result['date_end'] . ':' . CR;
+ $msg.= CR . EMOJI_CLOCK . ' ' . $result['date_start'] . ' — ' . $result['date_end'] . ':' . CR;
+ $prev_rl = '';
}
if($prev_rl != $result['raid_level']) {
$msg.= '' . getTranslation($result['raid_level'] . 'stars') .':' . CR;
diff --git a/mods/pokedex_list_raids.php b/mods/pokedex_list_raids.php
index cad3b361..45f12c7b 100644
--- a/mods/pokedex_list_raids.php
+++ b/mods/pokedex_list_raids.php
@@ -12,7 +12,7 @@
// Get all pokemon with raid levels from database.
$rs = my_query(
"
- SELECT raid_bosses.id, raid_bosses.pokedex_id, raid_bosses.pokemon_form_id, raid_bosses.raid_level, raid_bosses.date_start, raid_bosses.date_end, raid_bosses.scheduled
+ SELECT raid_bosses.id, raid_bosses.pokedex_id, raid_bosses.pokemon_form_id, raid_bosses.raid_level, DATE_FORMAT(date_start, '%e.%c. ".getTranslation('raid_egg_opens_at')." %H:%i') as date_start, DATE_FORMAT(date_end, '%e.%c. ".getTranslation('raid_egg_opens_at')." %H:%i') as date_end, raid_bosses.scheduled
FROM raid_bosses
LEFT JOIN pokemon
ON raid_bosses.pokedex_id = pokemon.pokedex_id
@@ -44,7 +44,7 @@
if($pokemon['scheduled'] == 0) {
$msg .= '' . getTranslation('unscheduled_bosses') . ':' . CR;
}else {
- $msg .= EMOJI_CLOCK . ' ' . $pokemon['date_start'] . ' - ' . $pokemon['date_end'] . ':' . CR ;
+ $msg .= EMOJI_CLOCK . ' ' . $pokemon['date_start'] . ' — ' . $pokemon['date_end'] . ':' . CR ;
}
$previous_level = 'FIRST_RUN';
}
From d4975d13f98a4b5f23798f2400e86179d5bdd9fa Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Wed, 16 Mar 2022 20:41:59 +0200
Subject: [PATCH 007/367] Fix
---
mods/vote_time.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mods/vote_time.php b/mods/vote_time.php
index 07dbec89..69fafdf4 100644
--- a/mods/vote_time.php
+++ b/mods/vote_time.php
@@ -64,7 +64,7 @@
}
// Vote time in the future or Raid anytime?
-if($now <= $attend_time_compare || $vote_time == 0) {
+if($vote_time == 0 || $now <= $attend_time_compare) {
// If user is attending remotely, get the number of remote users already attending
if (!is_array($answer) or !in_array('remote', $answer) or $answer['remote'] == 0){
$remote_users = 0;
From cbce7d0bd5d6bd4dd88f3a8d1101bfbe3b293596 Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Wed, 16 Mar 2022 20:48:55 +0200
Subject: [PATCH 008/367] Changed user_id column in user_input table to bigint
This is overflowing with newer Telegram users
---
VERSION | 2 +-
sql/pokemon-raid-bot.sql | 2 +-
sql/upgrade/5.sql | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
create mode 100644 sql/upgrade/5.sql
diff --git a/VERSION b/VERSION
index b8626c4c..7ed6ff82 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4
+5
diff --git a/sql/pokemon-raid-bot.sql b/sql/pokemon-raid-bot.sql
index 6d3ec13f..76773f30 100644
--- a/sql/pokemon-raid-bot.sql
+++ b/sql/pokemon-raid-bot.sql
@@ -120,7 +120,7 @@ CREATE TABLE `trainerinfo` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE TABLE `user_input` (
`id` int(11) NOT NULL AUTO_INCREMENT,
- `user_id` int(11) DEFAULT NULL,
+ `user_id` bigint(20) DEFAULT NULL,
`handler` varchar(45) DEFAULT NULL,
`modifiers` text DEFAULT NULL,
PRIMARY KEY (`id`)
diff --git a/sql/upgrade/5.sql b/sql/upgrade/5.sql
new file mode 100644
index 00000000..c8fd9c68
--- /dev/null
+++ b/sql/upgrade/5.sql
@@ -0,0 +1 @@
+ALTER TABLE user_input CHANGE COLUMN IF EXISTS `user_id` `user_id` BIGINT(20) DEFAULT NULL AFTER `id`;
From 53b44f475f64333df09d32f7dd27414b4ae98a29 Mon Sep 17 00:00:00 2001
From: Artanicus
Date: Sat, 19 Mar 2022 16:42:42 +0200
Subject: [PATCH 009/367] Collect metrics on Telegram responses to API calls
Example metrics after a while of normal running:
```
pokemonraidbot_tg_response_count{code="200",method="answerCallbackQuery",description=""} 16
pokemonraidbot_tg_response_count{code="200",method="deleteMessage",description=""} 38
pokemonraidbot_tg_response_count{code="200",method="editMessageCaption",description=""} 30
pokemonraidbot_tg_response_count{code="200",method="editMessageMedia",description=""} 20
pokemonraidbot_tg_response_count{code="200",method="editMessageText",description=""} 209
pokemonraidbot_tg_response_count{code="200",method="sendPhoto",description=""} 40
pokemonraidbot_tg_response_count{code="400",method="deleteMessage",description="Bad Request: message to delete not found"} 1
```
---
logic/curl_json_response.php | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/logic/curl_json_response.php b/logic/curl_json_response.php
index 7c0855e8..67592461 100644
--- a/logic/curl_json_response.php
+++ b/logic/curl_json_response.php
@@ -1,4 +1,9 @@
registerCounter($namespace, 'tg_response_count', 'Counters of response codes from Telegram', ['code', 'method', 'description']);
+}
+
/**
* Process response from telegram api.
* @param string $json_response Json response from Telegram
@@ -8,12 +13,24 @@
*/
function curl_json_response($json_response, $json, $identifier = false)
{
- global $config;
+ global $config, $metrics, $tg_response_code;
// Write to log.
debug_log_incoming($json_response, '<-');
- // Decode json response.
+ // Decode json objects
+ $request = json_decode($json, true);
$response = json_decode($json_response, true);
+ if ($metrics){
+ $code = 200;
+ $method = $request['method'];
+ $description = null;
+ if (isset($response['error_code'])) {
+ $code = $response['error_code'];
+ # We have to also include the description because TG overloads error codes
+ $description = $response['description'];
+ }
+ $tg_response_code->inc([$code, $method, $description]);
+ }
// Validate response.
if ((isset($response['ok']) && $response['ok'] != true) || isset($response['update_id'])) {
info_log("{$json} -> {$json_response}", 'ERROR:');
From 98d261f7f113245f0a65c09940d82810f5f988fe Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Sun, 20 Mar 2022 10:19:45 +0200
Subject: [PATCH 010/367] Another webhook autopost fix
---
commands/raid_from_webhook.php | 71 ++++++++++++++++------------------
1 file changed, 33 insertions(+), 38 deletions(-)
diff --git a/commands/raid_from_webhook.php b/commands/raid_from_webhook.php
index a4a5a465..e7e819f1 100644
--- a/commands/raid_from_webhook.php
+++ b/commands/raid_from_webhook.php
@@ -334,52 +334,47 @@ function isPointInsidePolygon($point, $vertices) {
$dbh = null;
exit;
}
+ $chats_geofence = $chats_raidlevel = $webhook_chats = $chats_by_pokemon = [];
if($send_updates == true) {
require_once(LOGIC_PATH .'/update_raid_poll.php');
$tg_json = update_raid_poll($raid_id, $raid, false, $tg_json, false);
- }
-
- if($no_auto_posting) continue;
-
- // Get chats to share to by raid level and geofence id
- $chats_geofence = [];
- if($geofences != false) {
- foreach ($inside_geofences as $geofence_id) {
- $const_geofence = 'WEBHOOK_CHATS_LEVEL_' . $level . '_' . $geofence_id;
- $const_geofence_chats = $config->{$const_geofence};
-
- if(!empty($const_geofence_chats)) {
- $chats_geofence = explode(',', $const_geofence_chats);
+ if(!empty($config->WEBHOOK_CHATS_BY_POKEMON[0]) && !$no_auto_posting) {
+ foreach($config->WEBHOOK_CHATS_BY_POKEMON as $rule) {
+ if(isset($rule['pokemon_id']) && $rule['pokemon_id'] == $pokemon && (!isset($rule['form_id']) or (isset($rule['form_id']) && $rule['form_id'] == $form))) {
+ foreach($rule['chats'] as $rule_chat) {
+ // If the raid isn't already posted to the chats specified in WEBHOOK_CHATS_BY_POKEMON, we add it to the array
+ if(!isset($cleanup_data[$raid_id]) or !in_array($rule_chat, $cleanup_data[$raid_id])) {
+ $chats_by_pokemon[] = $rule_chat;
+ }
+ }
+ }
+ }
+ }
+ if(empty($chats_by_pokemon)) continue;
+ }else {
+ // Get chats to share to by raid level and geofence id
+ if($geofences != false) {
+ foreach ($inside_geofences as $geofence_id) {
+ $const_geofence = 'WEBHOOK_CHATS_LEVEL_' . $level . '_' . $geofence_id;
+ $const_geofence_chats = $config->{$const_geofence};
+
+ if(!empty($const_geofence_chats)) {
+ $chats_geofence = explode(',', $const_geofence_chats);
+ }
}
}
- }
-
- // Get chats to share to by raid level
- $const = 'WEBHOOK_CHATS_LEVEL_' . $level;
- $const_chats = $config->{$const};
- $chats_raidlevel =[];
- if(!empty($const_chats)) {
- $chats_raidlevel = explode(',', $const_chats);
- }
+ // Get chats to share to by raid level
+ $const = 'WEBHOOK_CHATS_LEVEL_' . $level;
+ $const_chats = $config->{$const};
- // Get chats
- $webhook_chats = [];
- if(!empty($config->WEBHOOK_CHATS_ALL_LEVELS)) {
- $webhook_chats = explode(',', $config->WEBHOOK_CHATS_ALL_LEVELS);
- }
+ if(!empty($const_chats)) {
+ $chats_raidlevel = explode(',', $const_chats);
+ }
- $chats_by_pokemon = [];
- if(!empty($config->WEBHOOK_CHATS_BY_POKEMON[0])) {
- foreach($config->WEBHOOK_CHATS_BY_POKEMON as $rule) {
- if(isset($rule['pokemon_id']) && $rule['pokemon_id'] == $pokemon && (!isset($rule['form_id']) or (isset($rule['form_id']) && $rule['form_id'] == $form))) {
- foreach($rule['chats'] as $rule_chat) {
- // If the raid isn't already posted to the chats specified in WEBHOOK_CHATS_BY_POKEMON, we add it to the array
- if(!isset($cleanup_data[$raid_id]) or !in_array($rule_chat, $cleanup_data[$raid_id])) {
- $chats_by_pokemon[] = $rule_chat;
- }
- }
- }
+ // Get chats
+ if(!empty($config->WEBHOOK_CHATS_ALL_LEVELS)) {
+ $webhook_chats = explode(',', $config->WEBHOOK_CHATS_ALL_LEVELS);
}
}
From 894cc6fa602d64386769838dc0a1e08e8a6d73a0 Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Wed, 23 Mar 2022 19:22:39 +0200
Subject: [PATCH 011/367] Added new RAID_PICTURE_SEND_METHOD If this config
value is set to something else than `url`, bot pushes raidpicture instead of
have TG fetch it from an url Hopefully this mitigates some issues related to
TG fetching the raidpicture from an url. Requires PHP version 8+. TODO:
Handle errors if TG rejects file_unique_id we're sending them. Might happen
since we have no idea how long TG stores the images. We'll do this when it
actually happens and we know what the specific error message for this is.
---
commands/help.php | 2 +-
commands/raid_from_webhook.php | 1 +
commands/start.php | 2 +-
commands/tutorial.php | 2 +-
config/defaults-config.json | 1 +
core/bot/cleanup_run.php | 2 +
core/bot/logic/sql_utils.php | 4 +-
core/telegram/functions.php | 125 +++----
logic/curl_json_response.php | 34 +-
logic/get_raid.php | 3 +-
logic/insert_cleanup.php | 24 +-
logic/keys_vote.php | 14 +-
logic/raid_level.php | 2 +-
logic/raid_picture.php | 653 ++++++++++++++++++++++++++++++++-
logic/send_raid_poll.php | 13 +-
logic/show_raid_poll.php | 4 +-
logic/update_raid_poll.php | 72 ++--
mods/end_remote_raid.php | 2 +-
mods/raid_set_poke.php | 2 +-
mods/refresh_polls.php | 10 +-
mods/tutorial.php | 2 +-
mods/vote_refresh.php | 2 +-
raidpicture.php | 640 +++-----------------------------
sql/pokemon-raid-bot.sql | 15 +-
sql/upgrade/5.sql | 4 +
25 files changed, 884 insertions(+), 751 deletions(-)
diff --git a/commands/help.php b/commands/help.php
index 66f08396..77d37835 100644
--- a/commands/help.php
+++ b/commands/help.php
@@ -69,7 +69,7 @@
]
];
$photo = $tutorial[0]['photo'];
- send_photo($update['message']['from']['id'],$photo, $msg, $keys, ['disable_web_page_preview' => 'true']);
+ send_photo($update['message']['from']['id'],$photo, false, $msg, $keys, ['disable_web_page_preview' => 'true']);
exit();
// No help for the user.
diff --git a/commands/raid_from_webhook.php b/commands/raid_from_webhook.php
index e7e819f1..96008fb5 100644
--- a/commands/raid_from_webhook.php
+++ b/commands/raid_from_webhook.php
@@ -327,6 +327,7 @@ function isPointInsidePolygon($point, $vertices) {
'event_raid_duration' => NULL,
'event_hide_raid_picture' => NULL,
'event_poll_template' => NULL,
+ 'raid_ended' => 0,
]);
}
catch (PDOException $exception) {
diff --git a/commands/start.php b/commands/start.php
index 23816ba8..d2463f0c 100644
--- a/commands/start.php
+++ b/commands/start.php
@@ -28,7 +28,7 @@
]
];
$photo = $tutorial[0]['photo'];
- send_photo($update['message']['from']['id'], $photo, $msg, $keys, ['disable_web_page_preview' => 'true'],false);
+ send_photo($update['message']['from']['id'], $photo, false, $msg, $keys, ['disable_web_page_preview' => 'true'],false);
}else {
// Trim away everything before "/start "
$searchterm = $update['message']['text'];
diff --git a/commands/tutorial.php b/commands/tutorial.php
index 3b8b7695..207a002c 100644
--- a/commands/tutorial.php
+++ b/commands/tutorial.php
@@ -28,5 +28,5 @@
]
];
$photo = $tutorial[0]['photo'];
-send_photo($update['message']['from']['id'], $photo, $msg, $keys, ['disable_web_page_preview' => 'true'],false);
+send_photo($update['message']['from']['id'], $photo, false, $msg, $keys, ['disable_web_page_preview' => 'true'],false);
?>
\ No newline at end of file
diff --git a/config/defaults-config.json b/config/defaults-config.json
index 51c72229..233d00dc 100644
--- a/config/defaults-config.json
+++ b/config/defaults-config.json
@@ -58,6 +58,7 @@
"RAID_PICTURE": false,
"RAID_PICTURE_AUTOEXTEND": false,
"RAID_AUTOMATIC_ALARM": false,
+ "RAID_PICTURE_SEND_METHOD": "url",
"RAID_PICTURE_HIDE_LEVEL":"",
"RAID_PICTURE_HIDE_POKEMON":"",
"RAID_PICTURE_BG_COLOR":"0,0,0",
diff --git a/core/bot/cleanup_run.php b/core/bot/cleanup_run.php
index fb9598b6..36d4af37 100644
--- a/core/bot/cleanup_run.php
+++ b/core/bot/cleanup_run.php
@@ -91,8 +91,10 @@ function perform_cleanup(){
}
$q_a = my_query('DELETE FROM attendance WHERE raid_id IN (SELECT id FROM raids WHERE raids.end_time < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$config->CLEANUP_TIME_DB.' MINUTE))');
$q_r = my_query('DELETE FROM raids WHERE end_time < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$config->CLEANUP_TIME_DB.' MINUTE)');
+ $q_p = my_query('DELETE photo_cache FROM photo_cache LEFT JOIN raids ON photo_cache.raid_id = raids.id WHERE photo_cache.ended = 0 AND raids.id IS NULL');
cleanup_log('Cleaned ' . $q_a->rowCount() . ' rows from attendance table');
cleanup_log('Cleaned ' . $q_r->rowCount() . ' rows from raids table');
+ cleanup_log('Cleaned ' . $q_p->rowCount() . ' rows from photo_cache table');
if ($metrics){
$cleanup_total->incBy($q_a->rowCount(), ['db_attendance']);
$cleanup_total->incBy($q_r->rowCount(), ['db_raids']);
diff --git a/core/bot/logic/sql_utils.php b/core/bot/logic/sql_utils.php
index c95c1218..327e17eb 100644
--- a/core/bot/logic/sql_utils.php
+++ b/core/bot/logic/sql_utils.php
@@ -42,12 +42,12 @@ function my_query($query, $binds=null)
} catch (PDOException $exception) {
// The message will be output in the global handler, we just need to extract the failing query
error_log('The following query failed:');
- log_query($stmt, $binds, 'error_log');
+ log_query($stmt, print_r($binds, true), 'error_log');
throw $exception;
} finally {
debug_log_sql('Query success', '$');
if($config->DEBUG_SQL) {
- log_query($stmt, $binds, 'debug_log_sql');
+ log_query($stmt, print_r($binds, true), 'debug_log_sql');
}
}
return $stmt;
diff --git a/core/telegram/functions.php b/core/telegram/functions.php
index 6a10d0a0..8cdfddbe 100644
--- a/core/telegram/functions.php
+++ b/core/telegram/functions.php
@@ -591,147 +591,139 @@ function get_chatmember($chat_id, $user_id, $multicurl = false)
/**
* Send photo.
* @param $chat_id
- * @param $photo_url
+ * @param string $media_content content of the media file.
+ * @param bool $content_type true = photo file, false = file_id
* @param array $text
* @param mixed $inline_keyboard
* @param array $merge_args
* @param array $multicurl
* @param int $identifier
*/
-function send_photo($chat_id, $photo_url, $text = array(), $inline_keyboard = false, $merge_args = [], $multicurl = false, $identifier = false)
+function send_photo($chat_id, $media_content, $content_type, $text = '', $inline_keyboard = false, $merge_args = [], $multicurl = false, $identifier = false)
{
// Create response content array.
- $reply_content = [
- 'method' => 'sendPhoto',
- 'chat_id' => $chat_id,
- 'photo' => $photo_url,
- 'parse_mode' => 'HTML',
- 'caption' => $text
+ $post_contents = [
+ 'method' => 'sendPhoto',
+ 'chat_id' => $chat_id,
+ 'reply_markup' => json_encode(['inline_keyboard' => $inline_keyboard]),
];
+ if($text != '') {
+ $post_contents['caption'] = $text;
+ $post_contents['parse_mode'] = 'HTML';
+ }
if(!is_valid_target($chat_id, null, false, true)){
info_log($chat_id, 'ERROR: Cannot send to invalid chat id:');
- info_log($reply_content, 'ERROR: data would have been:');
+ info_log(print_r($post_contents, true), 'ERROR: data would have been:');
exit();
}
- debug_log($inline_keyboard, 'KEYS:');
+ $post_contents['photo'] = ($content_type) ? new CURLStringFile($media_content, 'photo') : $media_content;
- if (isset($inline_keyboard)) {
- $reply_content['reply_markup'] = ['inline_keyboard' => $inline_keyboard];
- }
+ debug_log($inline_keyboard, 'KEYS:');
if (is_array($merge_args) && count($merge_args)) {
- $reply_content = array_merge_recursive($reply_content, $merge_args);
+ $post_contents = array_merge_recursive($post_contents, $merge_args);
}
- // Encode data to json.
- $reply_json = json_encode($reply_content);
- header('Content-Type: application/json');
-
- debug_log($reply_json, '>');
+ debug_log(print_r($post_contents, true), '>');
// Send request to telegram api.
- return curl_request($reply_json, $multicurl, $identifier);
+ return curl_request($post_contents, $multicurl, $identifier);
}
/**
* Edit message media and text.
* @param $id_val
* @param $text_val
- * @param $url
+ * @param string $media_content content of the media file.
+ * @param bool $content_type true = photo file, false = file_id/url
* @param $markup_val
* @param null $chat_id
* @param mixed $merge_args
* @param $multicurl
*/
-function editMessageMedia($id_val, $text_val, $url, $markup_val, $chat_id = NULL, $merge_args = false, $multicurl = false)
+function editMessageMedia($id_val, $text_val, $media_content, $content_type, $inline_keyboard = false, $chat_id = NULL, $merge_args = false, $multicurl = false, $identifier = false)
{
// Create response array.
- $response = [
+ $post_contents = [
'method' => 'editMessageMedia',
'media' => [
'type' => 'photo',
- 'media' => $url,
'caption' => $text_val,
'parse_mode'=> 'HTML'
- ],
- 'reply_markup' => [
- 'inline_keyboard' => $markup_val
]
];
- if ($markup_val == false) {
- unset($response['reply_markup']);
- $response['remove_keyboard'] = true;
+ if ($inline_keyboard !== false) {
+ $post_contents['reply_markup'] = json_encode(['inline_keyboard' => $inline_keyboard]);
+ }else {
+ $post_contents['remove_keyboard'] = true;
}
if ($chat_id != null) {
- $response['chat_id'] = $chat_id;
- $response['message_id'] = $id_val;
+ $post_contents['chat_id'] = $chat_id;
+ $post_contents['message_id'] = $id_val;
} else {
- $response['inline_message_id'] = $id_val;
+ $post_contents['inline_message_id'] = $id_val;
}
if (is_array($merge_args) && count($merge_args)) {
- $response = array_merge_recursive($response, $merge_args);
+ $post_contents = array_merge_recursive($post_contents, $merge_args);
}
if(!is_valid_target($chat_id, $id_val, true, false)){
info_log("{$chat_id}/{$id_val}", 'ERROR: Cannot edit media of invalid chat/message id:');
- info_log($response, 'ERROR: data would have been:');
+ info_log(print_r($post_contents, true), 'ERROR: data would have been:');
exit();
}
// Encode response to json format.
- $json_response = json_encode($response);
- debug_log($response, '<-');
+ if($content_type) {
+ $post_contents['photo'] = new CURLStringFile($media_content, 'photo');
+ $post_contents['media']['media'] = 'attach://photo';
+ } else {
+ $post_contents['media']['media'] = $media_content;
+ }
+ $post_contents['media'] = json_encode($post_contents['media']);
+ debug_log(print_r($post_contents, true), '->');
// Send request to telegram api.
- return curl_request($json_response, $multicurl);
+ return curl_request($post_contents, $multicurl, $identifier);
}
/**
* Send request to telegram api - single or multi?.
- * @param $json
+ * @param $post_contents
* @param $multicurl
* @param $identifier
* @return mixed
*/
-function curl_request($json, $multicurl = false, $identifier = false)
+function curl_request($post_contents, $multicurl = false, $identifier = false)
{
// Send request to telegram api.
if($multicurl == true) {
- return ['json' => $json, 'identifier' => $identifier];
+ return ['post_contents' => $post_contents, 'identifier' => $identifier];
} else {
- return curl_json_request($json, $identifier);
+ return curl_json_request($post_contents, $identifier);
}
}
/**
* Send request to telegram api.
- * @param $json
+ * @param $post_contents
* @param $identifier
* @return mixed
*/
-function curl_json_request($json, $identifier)
+function curl_json_request($post_contents, $identifier)
{
global $config;
- // Bridge mode?
- if($config->BRIDGE_MODE) {
- // Add bot folder name to callback data
- debug_log('Adding bot folder name "' . basename(ROOT_PATH) . '" to callback data');
- $search = '"callback_data":"';
- $replace = $search . basename(ROOT_PATH) . ':';
- $json = str_replace($search,$replace,$json);
- }
// Telegram
$URL = 'https://api.telegram.org/bot' . API_KEY . '/';
$curl = curl_init($URL);
- curl_setopt($curl, CURLOPT_HEADER, false);
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
- curl_setopt($curl, CURLOPT_HTTPHEADER, array("Content-type: application/json"));
+ if(!is_array($post_contents)) curl_setopt($curl, CURLOPT_HTTPHEADER, array("Content-type: application/json"));
curl_setopt($curl, CURLOPT_POST, true);
- curl_setopt($curl, CURLOPT_POSTFIELDS, $json);
+ curl_setopt($curl, CURLOPT_POSTFIELDS, $post_contents);
curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 5);
curl_setopt($curl, CURLOPT_TIMEOUT, 10);
@@ -741,7 +733,8 @@ function curl_json_request($json, $identifier)
}
// Write to log.
- debug_log($json, '->');
+ if(is_array($post_contents)) debug_log(print_r($post_contents,true), '->');
+ else debug_log($post_contents, '->');
// Execute curl request.
$json_response = curl_exec($curl);
@@ -754,7 +747,7 @@ function curl_json_request($json, $identifier)
curl_close($curl);
// Process response from telegram api.
- $response = curl_json_response($json_response, $json, $identifier);
+ $response = curl_json_response($json_response, $post_contents, $identifier);
// Return response.
return $response;
@@ -788,7 +781,7 @@ function curl_json_multi_request($json)
// Curl options.
curl_setopt($curly[$id], CURLOPT_URL, $URL);
curl_setopt($curly[$id], CURLOPT_HEADER, false);
- curl_setopt($curly[$id], CURLOPT_HTTPHEADER, array("Content-type: application/json"));
+ if(!is_array($data['post_contents'])) curl_setopt($curly[$id], CURLOPT_HTTPHEADER, array("Content-type: application/json"));
curl_setopt($curly[$id], CURLOPT_RETURNTRANSFER, true);
curl_setopt($curly[$id], CURLOPT_CONNECTTIMEOUT, 5);
curl_setopt($curly[$id], CURLOPT_TIMEOUT, 10);
@@ -798,24 +791,16 @@ function curl_json_multi_request($json)
curl_setopt($curly[$id], CURLOPT_PROXY, $config->CURL_PROXYSERVER);
}
- // Bridge mode?
- if($config->BRIDGE_MODE) {
- // Add bot folder name to callback data
- debug_log('Adding bot folder name "' . basename(ROOT_PATH) . '" to callback data');
- $search = '"callback_data":"';
- $replace = $search . basename(ROOT_PATH) . ':';
- array_push($data['json'], str_replace($search,$replace,$data['json']));
- }
-
// Curl post.
curl_setopt($curly[$id], CURLOPT_POST, true);
- curl_setopt($curly[$id], CURLOPT_POSTFIELDS, $data['json']);
+ curl_setopt($curly[$id], CURLOPT_POSTFIELDS, $data['post_contents']);
// Add multi handle.
curl_multi_add_handle($mh, $curly[$id]);
// Write to log.
- debug_log($data['json'], '->');
+ if(is_array($data['post_contents'])) debug_log(print_r($data['post_contents'],true), '->');
+ else debug_log($data['post_contents'], '->');
}
// Execute the handles.
@@ -837,7 +822,7 @@ function curl_json_multi_request($json)
// Process response from telegram api.
foreach($response as $id => $json_response) {
- $response[$id] = curl_json_response($response[$id], $json[$id]['json'], $json[$id]['identifier']);
+ $response[$id] = curl_json_response($response[$id], $json[$id]['post_contents'], $json[$id]['identifier']);
debug_log_incoming($json_response, '<-');
}
diff --git a/logic/curl_json_response.php b/logic/curl_json_response.php
index 67592461..28c4bf26 100644
--- a/logic/curl_json_response.php
+++ b/logic/curl_json_response.php
@@ -8,7 +8,7 @@
* Process response from telegram api.
* @param string $json_response Json response from Telegram
* @param string $json Json sent to Telegram
- * @param int|string $identifier
+ * @param array|int|string $identifier raid array from get_raid, raid id or [overview/trainer]
* @return mixed
*/
function curl_json_response($json_response, $json, $identifier = false)
@@ -33,6 +33,7 @@ function curl_json_response($json_response, $json, $identifier = false)
}
// Validate response.
if ((isset($response['ok']) && $response['ok'] != true) || isset($response['update_id'])) {
+ if(is_array($json)) $json = json_encode($json);
info_log("{$json} -> {$json_response}", 'ERROR:');
} else {
if($identifier != false) {
@@ -40,7 +41,7 @@ function curl_json_response($json_response, $json, $identifier = false)
// Set chat and message_id
$chat_id = $response['result']['chat']['id'];
$message_id = $response['result']['message_id'];
- debug_log('Return data: Chat id: '.$chat_id.', message_id: '.$message_id.', type: '.$identifier);
+ debug_log('Return data: Chat id: '.$chat_id.', message_id: '.$message_id.', type: '.(is_array($identifier) ? print_r($identifier,true) : $identifier));
if($identifier == 'trainer') {
debug_log('Adding trainermessage info to database now!');
insert_trainerinfo($chat_id, $message_id);
@@ -60,7 +61,34 @@ function curl_json_response($json_response, $json, $identifier = false)
}else if(isset($response['result']['photo']) && !isset($response['result']['caption'])) {
$type = 'photo';
}
- insert_cleanup($chat_id, $message_id, $identifier, $type);
+ $save_id = $unique_id = false;
+ if(isset($response['result']['photo'])) {
+ $largest_size = 0;
+ foreach($response['result']['photo'] as $photo) {
+ if($photo['file_size'] > $largest_size) {
+ $largest_size = $photo['file_size'];
+ $save_id = $photo['file_id'];
+ $unique_id = $photo['file_unique_id'];
+ }
+ }
+ $standalone_photo = (array_key_exists('standalone_photo', $identifier) && $identifier['standalone_photo'] === true) ? true : false;
+ my_query("
+ REPLACE INTO photo_cache
+ VALUES (:id, :unique_id, :pokedex_id, :form_id, :raid_id, :ended, :gym_id, :standalone)
+ ",[
+ ':id' => $save_id,
+ ':unique_id' => $unique_id,
+ ':pokedex_id' => $identifier['pokemon'],
+ ':form_id' => $identifier['pokemon_form'],
+ ':raid_id' => ($identifier['raid_ended'] ? 0 : $identifier['id']), // No need to save raid id if raid has ended
+ ':ended' => $identifier['raid_ended'],
+ ':gym_id' => $identifier['gym_id'],
+ ':standalone' => $standalone_photo,
+ ]
+ );
+ }
+ $raid_id = is_array($identifier) ? $identifier['id'] : $identifier;
+ insert_cleanup($chat_id, $message_id, $raid_id, $type, $unique_id);
}
}
}
diff --git a/logic/get_raid.php b/logic/get_raid.php
index d4f3e352..2c76107e 100644
--- a/logic/get_raid.php
+++ b/logic/get_raid.php
@@ -18,7 +18,8 @@ function get_raid($raid_id)
gyms.lat, gyms.lon, gyms.address, gyms.gym_name, gyms.ex_gym, gyms.gym_note,
users.name, users.trainername, users.nick,
events.name as event_name, events.description as event_description, events.vote_key_mode as event_vote_key_mode, events.time_slots as event_time_slots, events.raid_duration as event_raid_duration, events.hide_raid_picture as event_hide_raid_picture, events.poll_template as event_poll_template,
- TIME_FORMAT(TIMEDIFF(end_time, UTC_TIMESTAMP()) + INTERVAL 1 MINUTE, \'%k:%i\') AS t_left
+ TIME_FORMAT(TIMEDIFF(end_time, UTC_TIMESTAMP()) + INTERVAL 1 MINUTE, \'%k:%i\') AS t_left,
+ IF(UTC_TIMESTAMP() > end_time, 1, 0) as raid_ended
FROM raids
LEFT JOIN gyms
ON raids.gym_id = gyms.id
diff --git a/logic/insert_cleanup.php b/logic/insert_cleanup.php
index b77b6fdc..827fffac 100644
--- a/logic/insert_cleanup.php
+++ b/logic/insert_cleanup.php
@@ -5,8 +5,9 @@
* @param $message_id
* @param $raid_id
* @param $type
+ * @param $photo_id
*/
-function insert_cleanup($chat_id, $message_id, $raid_id, $type)
+function insert_cleanup($chat_id, $message_id, $raid_id, $type, $photo_id = NULL)
{
// Log ID's of raid, chat and message
debug_log('Raid_ID: ' . $raid_id);
@@ -17,14 +18,21 @@ function insert_cleanup($chat_id, $message_id, $raid_id, $type)
if ((is_numeric($chat_id)) && (is_numeric($message_id)) && (is_numeric($raid_id)) && ($raid_id > 0)) {
// Build query for cleanup table to add cleanup info to database
debug_log('Adding cleanup info to database:');
- $rs = my_query(
- "
- INSERT INTO cleanup
- SET raid_id = '{$raid_id}',
- chat_id = '{$chat_id}',
- message_id = '{$message_id}',
- type = '{$type}'
+ my_query(
"
+ REPLACE INTO cleanup
+ SET raid_id = :raid_id,
+ chat_id = :chat_id,
+ message_id = :message_id,
+ type = :type,
+ media_unique_id = :media_unique_id
+ ", [
+ ':raid_id' => $raid_id,
+ ':chat_id' => $chat_id,
+ ':message_id' => $message_id,
+ ':type' => $type,
+ ':media_unique_id' => $photo_id,
+ ]
);
} else {
debug_log('Invalid input for cleanup preparation!');
diff --git a/logic/keys_vote.php b/logic/keys_vote.php
index 6d9baf1b..219fe6d9 100644
--- a/logic/keys_vote.php
+++ b/logic/keys_vote.php
@@ -21,11 +21,11 @@ function keys_vote($raid)
debug_log($start_time, 'UTC START:');
// Raid ended already.
- if ($end_time < $now) {
+ if ($raid['raid_ended']) {
if($config->RAID_ENDED_HIDE_KEYS) {
- $keys = [];
+ return [];
}else {
- $keys = [
+ return [
[
[
'text' => getPublicTranslation('raid_done'),
@@ -50,7 +50,7 @@ function keys_vote($raid)
// Show buttons to users?
if(in_array($raid_level, $hide_buttons_raid_level) || in_array(($raid_pokemon_id . "-" . get_pokemon_form_name($raid_pokemon_id,$raid_pokemon_form_id)), $hide_buttons_pokemon) || in_array($raid_pokemon_id, $hide_buttons_pokemon)) {
- $keys = [];
+ return [];
} else {
// Extra Keys
$buttons_alone = [
@@ -566,11 +566,11 @@ function keys_vote($raid)
if(!empty($keys[$r][0])) $r++;
}
}
+
+ // Return the keys.
+ return $keys;
}
}
-
- // Return the keys.
- return $keys;
}
?>
diff --git a/logic/raid_level.php b/logic/raid_level.php
index a46d0f9a..bfb73652 100644
--- a/logic/raid_level.php
+++ b/logic/raid_level.php
@@ -37,7 +37,7 @@ function get_raid_level($pokedex_id, $pokemon_form_id)
* Get active raid bosses at a certain time.
* @param $time - string, datetime, local time
* @param $raid_level - ENUM('1', '2', '3', '4', '5', '6', 'X')
- * @return string
+ * @return array
*/
function get_raid_bosses($time, $raid_level)
{
diff --git a/logic/raid_picture.php b/logic/raid_picture.php
index bee70152..9424ec64 100644
--- a/logic/raid_picture.php
+++ b/logic/raid_picture.php
@@ -22,15 +22,666 @@ function raid_picture_url($raid, $standalone = false)
// We'll set raid start and end times to 0 to get a new image for when the raid has ended.
// Setting thetimes to 0 also makes it so TG can cache the raid ended -images and reuse them
$start_time = $end_time = 0;
+ $raid_id = '';
}else {
$start_time = strtotime($raid['start_time']);
$end_time = strtotime($raid['end_time']);
+ $raid_id = 'raid='.$raid['id'].'&';
}
if($raid['event'] == EVENT_ID_EX) $ex_raid = '1'; else $ex_raid = '0';
- $picture_url = "{$config->RAID_PICTURE_URL}?pokemon={$raid['pokemon']}&pokemon_form={$raid['pokemon_form']}&gym_id={$raid['gym_id']}&start_time={$start_time}&end_time={$end_time}&ex_raid={$ex_raid}";
+ $picture_url = "{$config->RAID_PICTURE_URL}?{$raid_id}pokemon={$raid['pokemon']}&pokemon_form={$raid['pokemon_form']}&gym_id={$raid['gym_id']}&start_time={$start_time}&end_time={$end_time}&ex_raid={$ex_raid}";
if($standalone) $picture_url .= '&sa=1';
if($raid['costume'] != 0) $picture_url .= '&costume='.$raid['costume'];
debug_log('raid_picture_url: ' . $picture_url);
return $picture_url;
}
+
+/**
+ * Returns photo contents to post to Telegram. File_id, url or photo file contents
+ * @param array $raid Raid array from get_raid()
+ * @param bool $standalone_photo Clear the bottom right corner of the photo from text
+ * @param bool $debug Add debug features to the photo
+ * @return array [true/false if returned content is photo file, content, cached unique_id for editMessageMedia]
+ */
+function get_raid_picture($raid, $standalone_photo = false) {
+ global $config;
+ // Has raid ended?
+ $binds = [
+ ':raid_id' => $raid['id'],
+ ':gym_id' => $raid['gym_id'],
+ ':pokedex_id' => $raid['pokemon'],
+ ':pokemon_form' => $raid['pokemon_form'],
+ ':standalone' => $standalone_photo,
+ ':ended' => $raid['raid_ended'],
+ ];
+ if($config->RAID_PICTURE_SEND_METHOD == 'url') return [false, raid_picture_url($raid, $standalone_photo)];
+ $query_cache = my_query("
+ SELECT id, unique_id
+ FROM photo_cache
+ WHERE raid_id = :raid_id
+ AND gym_id = :gym_id
+ AND pokedex_id = :pokedex_id
+ AND form_id = :pokemon_form
+ AND ended = :ended
+ AND standalone = :standalone
+ LIMIT 1", $binds
+ );
+
+ if($query_cache->rowCount() > 0) {
+ $result = $query_cache->fetch();
+ return [false, $result['id'], $result['unique_id']];
+ }else {
+ return [true, create_raid_picture($raid, $standalone_photo)];
+ }
+}
+
+/**
+ * Create a raid picture and return it as a string
+ * @param array $raid Raid array from get_raid()
+ * @param bool $standalone_photo Clear the bottom right corner of the photo from text
+ * @param bool $debug Add debug features to the photo
+ * @return string
+ */
+function create_raid_picture($raid, $standalone_photo = false, $debug = false) {
+ global $config;
+ if ($GLOBALS['metrics']){
+ $GLOBALS['requests_total']->inc(['raidpicture']);
+ }
+
+ if(utcnow() > $raid['end_time']) $raid_ongoing = false;
+ else $raid_ongoing = true;
+
+ // Query missing raid info
+ $q_pokemon_info = my_query("
+ SELECT
+ pokemon_form_name, min_cp, max_cp, min_weather_cp, max_weather_cp, weather, shiny, asset_suffix, type, type2,
+ (SELECT img_url FROM gyms WHERE id='".$raid['gym_id']."' LIMIT 1) as img_url
+ FROM pokemon
+ WHERE pokedex_id = '".$raid['pokemon']."'
+ AND pokemon_form_id = '".$raid['pokemon_form']."' LIMIT 1");
+ if($q_pokemon_info->rowCount() == 0) {
+ info_log("Something wrong with the raid data provided!");
+ info_log(print_r($raid,true));
+ exit();
+ }
+ $raid = array_merge($raid, $q_pokemon_info->fetch());
+
+ // Fonts
+ $font_gym = FONTS_PATH . '/' . $config->RAID_PICTURE_FONT_GYM;
+ $font_text = FONTS_PATH . '/' . $config->RAID_PICTURE_FONT_TEXT;
+ $font_ex_gym = FONTS_PATH . '/' . $config->RAID_PICTURE_FONT_EX_GYM;
+
+ // Canvas size
+ $canvas_width = 700;
+ $canvas_height = 356;
+
+ // Creating an empty canvas
+ $canvas = imagecreatetruecolor($canvas_width,$canvas_height);
+ imagesavealpha($canvas,true);
+
+ // Background color
+ // Default: White
+ $bg_rgb = [255,255,255];
+ $config_bg_color = explode(',',$config->RAID_PICTURE_BG_COLOR);
+ if(count($config_bg_color) == 3) {
+ $bg_rgb = $config_bg_color;
+ } else {
+ info_log($config->RAID_PICTURE_BG_COLOR, 'Invalid value RAID_PICTURE_BG_COLOR:');
+ }
+ $bg_color = imagecolorallocate($canvas,$bg_rgb[0],$bg_rgb[1], $bg_rgb[2]);
+ imagefill($canvas, 0, 0, $bg_color);
+
+ // Text / Font color
+ // Default: Black
+ $font_rgb = [0,0,0];
+ $config_font_color = explode(',',$config->RAID_PICTURE_TEXT_COLOR);
+ if(count($config_font_color) == 3) {
+ $font_rgb = $config_font_color;
+ } else {
+ info_log($config->RAID_PICTURE_TEXT_COLOR, 'Invalid value RAID_PICTURE_TEXT_COLOR:');
+ }
+ $font_color = imagecolorallocate($canvas,$font_rgb[0],$font_rgb[1],$font_rgb[2]);
+
+ // Defining RBG values that are used to create transparent color
+ // Should be different from RAID_PICTURE_BG_COLOR and RAID_PICTURE_TEXT_COLOR
+ $transparent_rgb = [0,255,0];
+
+ // Gym image
+ $gym_url = $raid['img_url'];
+ if($config->RAID_PICTURE_STORE_GYM_IMAGES_LOCALLY && !empty($gym_url)) {
+ if(substr($gym_url, 0, 7) == 'file://') {
+ $gym_image_path = $gym_url;
+ debug_log($gym_image_path, 'Found an image imported via a portal bot: ');
+ }else {
+ $file_name = explode('/', $gym_url)[3];
+ $gym_image_path = PORTAL_IMAGES_PATH .'/'. $file_name.'.png';
+ debug_log($gym_image_path, 'Attempting to use locally stored gym image');
+ if(!file_exists($gym_image_path)) {
+ debug_log($gym_url, 'Gym image not found, attempting to downloading it from: ');
+ if(is_writable(PORTAL_IMAGES_PATH)) {
+ download_Portal_Image($gym_url, PORTAL_IMAGES_PATH, $file_name . '.png');
+ }else {
+ $gym_image_path = $gym_url;
+ info_log(PORTAL_IMAGES_PATH, 'Failed to write new gym image, incorrect permissions in directory ');
+ }
+ }
+ }
+ }else {
+ $img_gym = false;
+ if (!empty($gym_url)) {
+ $gym_image_path = $gym_url;
+ }
+ }
+ $img_gym = grab_img($gym_image_path);
+ if($img_gym == false) {
+ info_log($gym_image_path, 'Loading the gym image failed, using default gym image');
+ if(is_file($config->RAID_DEFAULT_PICTURE)) {
+ $img_gym = grab_img($config->RAID_DEFAULT_PICTURE);
+ } else {
+ info_log($config->RAID_DEFAULT_PICTURE, 'Cannot read default gym image:');
+ $img_gym = grab_img(IMAGES_PATH . "/gym_default.png");
+ }
+ }
+
+ // Get the width and height of the gym picture
+ $gym_w = imagesx($img_gym);
+ $gym_h = imagesy($img_gym);
+
+ // Crop gym image
+ if($gym_w > $gym_h) {
+ $size = $gym_h;
+ $crop_x = floor((($gym_w/2)-($gym_h/2)));
+ $crop_y = 0;
+ } else {
+ $size = $gym_w;
+ $crop_x = 0;
+ $crop_y = floor((($gym_h/2)-($gym_w/2)));
+ }
+
+ // Create mask
+ $new_w = 300;
+ $new_h = 300;
+ $mask = imagecreatetruecolor($new_w,$new_h);
+
+ // Fill the mask with background color
+ $bg = imagecolorallocate($mask,$bg_rgb[0],$bg_rgb[1], $bg_rgb[1]);
+ imagefill($mask,0,0,$bg);
+
+ // Define transparent color for the mask
+ $transparent = imagecolorallocate($mask,$transparent_rgb[0],$transparent_rgb[1],$transparent_rgb[2]);
+ imagecolortransparent($mask,$transparent);
+
+ // Creating the orange circle around the gym photo
+ $color_ellipse = imagecolorallocate($mask,254,193,161);
+ imagefilledellipse($mask,$new_w/2,$new_h/2,$new_w-9,$new_h-9,$color_ellipse);
+ imagefilledellipse($mask,$new_w/2,$new_h/2,$new_w-16,$new_h-16,$bg);
+
+ // Creating a circle that is filled with transparent color
+ imagefilledellipse($mask,$new_w/2,$new_h/2,$new_w-30,$new_h-30,$transparent);
+
+ // Merging the desired part of the gym picture with canvas
+ imagecopyresampled($canvas,$img_gym,0,0,$crop_x,$crop_y,$new_w,$new_h, $size,$size);
+
+ // Merging the mask with a circular cutout to the canvas
+ imagecopymerge($canvas, $mask, 0, 0, 0, 0, $new_w, $new_h, 100);
+
+
+
+ // Is ex gym?
+ if($raid['ex_gym'] == 1) {
+ $ex_text_size = 20;
+ $ex_text_angle = 0;
+ $corner = 16; // Roundness of the corners
+ $extra = $ex_text_size/5+1; // Some extra height
+
+ $ex_mark_bg_color = [94,169,190];
+ $ex_mark_text_color = [255,255,255];
+
+ // Get the text with local translation for EX Raid gym
+ $ex_raid_gym_text = strtoupper(getPublicTranslation('ex_gym'));
+ // Finding out the size of text
+ $ex_text_box = imagettfbbox($ex_text_size,$ex_text_angle,$font_ex_gym,$ex_raid_gym_text);
+
+ $ex_logo_width = $ex_text_box[2]+($corner);
+ $ex_logo_height = $ex_text_size+$extra;
+
+
+ // Create the canvas for EX RAID indicator
+ $ex_logo = imagecreatetruecolor($ex_logo_width,$ex_logo_height);
+ // Defining the transparent color
+ $ex_transparent = imagecolorallocate($ex_logo,$transparent_rgb[0],$transparent_rgb[1],$transparent_rgb[2]);
+ imagecolortransparent($ex_logo,$ex_transparent);
+ // Defining background color
+ $ex_logo_bg = imagecolorallocate($mask,$ex_mark_bg_color[0],$ex_mark_bg_color[1], $ex_mark_bg_color[2]);
+ $ex_text_color = imagecolorallocate($ex_logo,$ex_mark_text_color[0],$ex_mark_text_color[1],$ex_mark_text_color[2]);
+
+ //Filling the canvas with transparent color
+ imagefill($ex_logo,0,0,$ex_transparent);
+
+ // Creating 4 balls, one in each corner
+ imagefilledellipse($ex_logo,$corner/2,$corner/2,$corner,$corner,$ex_logo_bg);
+ imagefilledellipse($ex_logo,$corner/2,$ex_logo_height-$corner/2,$corner,$corner,$ex_logo_bg);
+ imagefilledellipse($ex_logo,$ex_logo_width-$corner/2,$corner/2,$corner,$corner,$ex_logo_bg);
+ imagefilledellipse($ex_logo,$ex_logo_width-$corner/2,$ex_logo_height-$corner/2,$corner,$corner,$ex_logo_bg);
+ // And two rectangles to fill the rest
+ imagefilledrectangle($ex_logo,$corner/2,0,$ex_logo_width-($corner/2),$ex_logo_height,$ex_logo_bg);
+ imagefilledrectangle($ex_logo,0,$corner/2,$ex_logo_width,$ex_logo_height-($corner/2),$ex_logo_bg);
+
+ // Draw the text
+ imagettftext($ex_logo,$ex_text_size,$ex_text_angle,$corner/2,$ex_text_size+1,$ex_text_color,$font_ex_gym,$ex_raid_gym_text);
+
+ // Copy icon into canvas
+ imagecopy($canvas,$ex_logo,20,20,0,0,$ex_logo_width,$ex_logo_height);
+ }
+
+
+ $show_boss_pokemon_types = false;
+ // Raid running
+ if($raid_ongoing) {
+ if(strlen($raid['asset_suffix']) > 2) {
+ $icon_suffix = $raid['asset_suffix'];
+ }else {
+ $pad_zeroes = '';
+ for ($o=3-strlen($raid['pokemon']);$o>0;$o--) {
+ $pad_zeroes .= 0;
+ }
+ $icon_suffix = $pad_zeroes.$raid['pokemon'] . "_" . $raid['asset_suffix'];
+ }
+
+ // Raid Egg
+ if($raid['pokemon'] > 9990) {
+ // Getting the actual icon
+ $img_pokemon = grab_img(IMAGES_PATH . "/raid_eggs/pokemon_icon_" . $raid['pokemon'] . "_00.png");
+
+ // Position and size of the picture
+ $dst_x = $dst_y = 150;
+ $dst_w = $dst_h = 200;
+ $src_w = $src_h = 128;
+
+ //Pokemon
+ } else {
+ // Check pokemon icon source and create image
+ $img_file = null;
+ $p_sources = explode(',', $config->RAID_PICTURE_POKEMON_ICONS);
+
+ $addressable_icon = 'pm'.$raid['pokemon'];
+ if($raid['pokemon_form_name'] != 'normal') $addressable_icon .= '.f'.strtoupper($raid['pokemon_form_name']);
+
+ // Getting the actual icon filename
+ $p_icon = "pokemon_icon_" . $icon_suffix;
+ if($raid['costume'] != 0) {
+ $p_icon .= '_' . str_pad($raid['costume'], 2, '0', STR_PAD_LEFT);
+
+ $costume = json_decode(file_get_contents(ROOT_PATH . '/protos/costume.json'), true);
+ $addressable_icon .= '.c' . array_search($raid['costume'],$costume);
+ }
+ if($raid['shiny'] == 1 && $config->RAID_PICTURE_SHOW_SHINY) {
+ $p_icon = $p_icon . "_shiny";
+ $addressable_icon .= '.s';
+ $shiny_icon = grab_img(IMAGES_PATH . "/shinystars.png");
+ }
+ $addressable_icon .= '.icon.png';
+ $p_icon = $p_icon . ".png";
+
+ foreach($p_sources as $p_dir) {
+ // Set pokemon icon dir
+ $p_img = IMAGES_PATH . "/pokemon_" . $p_dir . "/" . $p_icon;
+ $p_add_img = IMAGES_PATH . "/pokemon_" . $p_dir . "/Addressable_Assets/" . $addressable_icon;
+
+ // Icon dir named 'pokemon'? Then change path to not add '_repo-owner' to icon folder name
+ if($p_dir == 'pokemon') {
+ $p_img = IMAGES_PATH . "/pokemon/" . $p_icon;
+ $p_add_img = IMAGES_PATH . "/pokemon/Addressable_Assets" . $addressable_icon;
+ }
+ // Check if file exists in this collection
+ // Prioritize addressable asset file
+ if(file_exists($p_add_img) && filesize($p_add_img) > 0) {
+ $img_file = $p_add_img;
+ break;
+ }else if(file_exists($p_img) && filesize($p_img) > 0) {
+ $img_file = $p_img;
+ break;
+ }
+ }
+
+ // If no image was found, substitute with a fallback
+ if($img_file === null) {
+ info_log($p_icon, 'Failed to find an image in any pokemon image collection for:');
+ $img_fallback_file = null;
+ // If we know the raid level, fallback to egg image
+ if(array_key_exists('level', $raid) && $raid['level'] !== null && $raid['level'] != 0) {
+ $img_fallback_file = IMAGES_PATH . "/raid_eggs/pokemon_icon_999" . $raid['level'] . "_00.png";
+ } else {
+ info_log('Unknown raid level, using fallback icon.');
+ $img_fallback_file = $config->RAID_PICTURE_POKEMON_FALLBACK;
+ }
+ $img_file = $img_fallback_file;
+ }
+
+ $img_pokemon = grab_img($img_file);
+
+ // Position and size of the picture
+ $dst_x = $dst_y = 100;
+ $dst_w = $dst_h = $src_w = $src_h = 256;
+
+ if($raid['type'] != '') $show_boss_pokemon_types = true;
+ }
+
+ // Raid ended
+ } else {
+ // Raid won image
+ $img_pokemon = grab_img(IMAGES_PATH . "/raidwon.png");
+
+ // Position and size of the picture
+ $dst_x = $dst_y = 172;
+ $src_w = 444;
+ $src_h = 512;
+ $dst_w = 160;
+ $dst_h = floor($dst_w/$src_w*$src_h);
+ }
+
+ // Create pokemon image.
+ imagesavealpha($img_pokemon,true);
+
+ // Debug - Add border around pokemon image
+ if($debug) {
+ $im = imagecreate($src_w,$src_h);
+ $black = imagecolorallocate($im,0,0,0);
+ imagerectangle($img_pokemon,0,0,$src_w-1,$src_h-1,$black);
+ }
+
+ // Add pokemon to image
+ imagecopyresampled($canvas,$img_pokemon,$dst_x,$dst_y,0,0,$dst_w,$dst_h,$src_w,$src_h);
+
+ // Add pokemon types
+ if($config->RAID_PICTURE_POKEMON_TYPES && $show_boss_pokemon_types) {
+ $img_type = grab_img(IMAGES_PATH . "/types/".$raid['type'].".png");
+ $type1_x = 300;
+ imagesavealpha($img_type, true);
+ if($raid['type2'] != '') {
+ $img_type2 = grab_img(IMAGES_PATH . "/types/".$raid['type2'].".png");
+ imagesavealpha($img_type2, true);
+ imagecopyresampled($canvas,$img_type2,300,300,0,0,40,40,64,64);
+ $type1_x -= 50;
+ }
+ imagecopyresampled($canvas,$img_type,$type1_x,300,0,0,40,40,64,64);
+ }
+ if(isset($shiny_icon)) {
+ imagesavealpha($shiny_icon,true);
+ $light_white = imagecolorallocatealpha($canvas, 255,255,255,50);
+ imagefilledellipse($canvas, $type1_x-35 ,320,40,40,$light_white);
+ imagecopyresampled($canvas,$shiny_icon,$type1_x-52,301,0,0,35,35,100,100);
+ }
+
+ // Ex-Raid?
+ if($raid['event'] == EVENT_ID_EX) {
+ $img_expass = grab_img(IMAGES_PATH . "/expass.png");
+ imagesavealpha($img_expass,true);
+
+ // Debug - Add border around expass image
+ if($debug) {
+ $im = imagecreate(256,256);
+ $black = imagecolorallocate($im,0,0,0);
+ imagerectangle($img_expass,0,0,255,255,$black);
+ }
+ imagecopyresampled($canvas,$img_expass,0,225,0,0,100,100,256,256);
+ }
+
+
+
+ // Adding the gym name to the image
+ $text_size = 23; // Font size of additional text
+ $text_size_cp_weather = 20;// Font size of weather cp text
+ $left_after_poke = 356; // First left position behind the pokemon icon.
+ $angle = 0; // Angle of the text
+ $spacing = 10; // Spacing between lines
+ $spacing_right = 10; // Empty space on the right for weather icons and CP text
+
+
+
+ // Gym name
+ // Largest gym name we found so far for testing:
+ //$gym_name = 'Zentrum für Junge Erwachsene der Kirche Jesu Christi der Heiligen der Letzten Tage Pfahl Düsseldorf';
+ $gym_name = $raid['gym_name'];
+
+ // Get length, the shortest and largest word of the gym name
+ $gym_name_words = explode(SP, $gym_name);
+ $gym_name_word_lengths = array_map('strlen', array_map('utf8_decode', $gym_name_words));
+ $gym_name_word_largest = max($gym_name_word_lengths);
+ $gym_name_total_chars = strlen(utf8_decode($gym_name));
+
+ // Number of rows based on number of words or total chars
+ $gym_name_rows = 1;
+ if(count($gym_name_words) > 1 && $gym_name_total_chars >= 18 && $gym_name_total_chars <= 50) {
+ $gym_name_rows = 2;
+ } else if($gym_name_total_chars > 50) {
+ $gym_name_rows = 3;
+ }
+
+ // Wrap gym name to multiple lines if too long
+ $gym_name_lines = explode(PHP_EOL,wordwrap(trim($gym_name),floor(($gym_name_total_chars+$gym_name_word_largest)/$gym_name_rows),PHP_EOL));
+
+ debug_log($gym_name_total_chars, 'Gym name length:');
+ debug_log($gym_name_lines, 'Gym name lines:');
+
+ // Target width and height
+ $targetWidth = imagesx($canvas) - imagesx($mask) - $spacing_right;
+ $targetHeight = 95;
+ $rowHeight = $targetHeight/$gym_name_rows;
+
+ // Get largest possible fontsize for each gym name line
+ $fontsize_gym = 0;
+ for($l=0; $l= $targetWidth || $height >= $rowHeight){
+ break;
+ }
+ }
+
+ // Gym name font size and spacing
+ if($l == 0 || $targetsize < $fontsize_gym) {
+ $fontsize_gym = $targetsize;
+ $spacing_gym = $height * 0.30;
+ }
+ }
+
+ // Add gym name to image
+ for($y=0;$y 20) {
+ $pokemon_text_lines = explode(SP,$pokemon_name);
+ if(count($pokemon_text_lines) == 1) {
+ // Wrapping the time text if too long (to 20 letters)
+ $pokemon_text_lines = explode(PHP_EOL,wordwrap(trim($pokemon_name),20,PHP_EOL));
+ }
+ }
+ $num_pokemon_lines = count($pokemon_text_lines);
+
+ // Target width and height
+ $targetWidth = imagesx($canvas) - $left_after_poke - (strlen($raid['weather']) * 42) - $spacing_right;
+ $targetHeight = 80;
+
+ // Get largest possible fontsize for each pokemon name and form line
+ $fontsize_poke = 0;
+ for($p=0; $p<($num_pokemon_lines); $p++) {
+ for($s=1; $s<40; $s=$s+0.5){
+ $box = imagettfbbox($s, 0, $font_text, $pokemon_text_lines[$p]);
+ $min_x = min(array($box[0], $box[2], $box[4], $box[6]));
+ $max_x = max(array($box[0], $box[2], $box[4], $box[6]));
+ $min_y = min(array($box[1], $box[3], $box[5], $box[7]));
+ $max_y = max(array($box[1], $box[3], $box[5], $box[7]));
+ $width = ($max_x - $min_x);
+ $height = ($max_y - $min_y);
+ $targetsize = $s;
+ // Exit once we exceed width or height
+ if($width >= $targetWidth || $height >= $targetHeight){
+ break;
+ }
+ }
+
+ // Gym name font size and spacing
+ if($p == 0 || $targetsize < $fontsize_poke) {
+ $fontsize_poke = $targetsize;
+ }
+ }
+
+ // Pokemon name (and form) in 1 row
+ $poke_text_top = 310;
+
+ // Pokemon name and form in one or two lines?
+ if($num_pokemon_lines > 1) {
+ $poke_text_top = 272;
+ }
+
+ // If the photo is sent without caption, we want to keep the bottom right corcer clear of text because Telegram covers it with a timestamp
+ if($standalone_photo) $poke_text_top -= 50;
+
+ // Add pokemon name to image
+ for($pa=0;$pa<$num_pokemon_lines;$pa++){
+ // Get text width and height
+ $textwidth = ($max_x - $min_x);
+ $textheight = ($max_y - $min_y);
+ // Position from top
+ $poke_text_top = ($poke_text_top+($pa*($fontsize_poke+$spacing)));
+ imagettftext($canvas,$fontsize_poke,$angle,$left_after_poke,$poke_text_top,$font_color,$font_text,$pokemon_text_lines[$pa]);
+ }
+
+ // Pokemon CP
+ if($raid['pokemon'] < 9990) {
+ $cp_text_top = $poke_text_top+$text_size+$spacing;
+ $cp_text = $raid['min_cp']." - ".$raid['max_cp'];
+ $cp_text2 = "(".$raid['min_weather_cp']."-".$raid['max_weather_cp'].")";
+
+ imagettftext($canvas,$text_size,$angle,$left_after_poke,$cp_text_top,$font_color,$font_text,$cp_text);
+ $cp_weather_text_box = imagettfbbox($text_size_cp_weather,$angle,$font_text,$cp_text2);
+ imagettftext($canvas,$text_size_cp_weather,$angle,($canvas_width-$cp_weather_text_box[2]-$spacing_right),$cp_text_top,$font_color,$font_text,$cp_text2);
+
+ $count_weather = strlen($raid['weather']);
+ for($i=0;$i<$count_weather;$i++) {
+ $we = substr($raid['weather'],$i,1);
+ $weather_icon_path = IMAGES_PATH . "/weather/";
+ // Use white icons?
+ if($config->RAID_PICTURE_ICONS_WHITE) {
+ $weather_icon_path = IMAGES_PATH . "/weather_white/";
+ }
+ $weather_icon = grab_img($weather_icon_path . $we . ".png"); // 64x64
+ imagecopyresampled($canvas,$weather_icon,$canvas_width-$spacing_right-($count_weather-$i)*40,$poke_text_top-30,0,0,38,38,64,64);
+ }
+ }
+
+ ob_start();
+ // Define and print picture
+ // PNG
+ if($config->RAID_PICTURE_FILE_FORMAT == 'png') {
+ imagepng($canvas);
+
+ // JPEG
+ } else if($config->RAID_PICTURE_FILE_FORMAT == 'jpeg' || $config->RAID_PICTURE_FILE_FORMAT == 'jpg') {
+ imagejpeg($canvas, NULL, 90);
+
+ // Use GIF as default - smallest file size without compression
+ } else {
+ imagegif($canvas);
+ }
+ return ob_get_clean();
+
+}
+
+/**
+ * Create GD image object from given URI regardless of file type
+ * @param string $uri Image uri
+ * @return object
+ */
+function grab_img($uri) {
+ $img = imagecreatefromstring(file_get_contents($uri));
+ if ($img === false) {
+ info_log($uri, 'Failed to get image:');
+ return false;
+ }
+ return $img;
+}
+
?>
diff --git a/logic/send_raid_poll.php b/logic/send_raid_poll.php
index c6dd53fb..6607be1f 100644
--- a/logic/send_raid_poll.php
+++ b/logic/send_raid_poll.php
@@ -35,12 +35,6 @@ function send_raid_poll($raid_id, $chats, $raid = false, $tg_json = false) {
// Telegram JSON array.
if($tg_json == false) $tg_json = [];
- // Raid picture
- if($config->RAID_PICTURE) {
- require_once(LOGIC_PATH . '/raid_picture.php');
- $picture_url = raid_picture_url($raid, $config->RAID_PICTURE_AUTOEXTEND);
- }
-
// Send the message.
$raid_picture_hide_level = explode(",",$config->RAID_PICTURE_HIDE_LEVEL);
$raid_picture_hide_pokemon = explode(",",$config->RAID_PICTURE_HIDE_POKEMON);
@@ -62,11 +56,14 @@ function send_raid_poll($raid_id, $chats, $raid = false, $tg_json = false) {
send_message($chat_id, $text['full'], $keys, ['disable_web_page_preview' => 'true'], false, $raid_id);
}else {
if($config->RAID_PICTURE && $raid['event_hide_raid_picture'] == 0 && !in_array($raid_level, $raid_picture_hide_level) && !in_array($raid_pokemon, $raid_picture_hide_pokemon) && !in_array($raid_pokemon_id, $raid_picture_hide_pokemon)) {
+ require_once(LOGIC_PATH . '/raid_picture.php');
+ $media_content = get_raid_picture($raid, $config->RAID_PICTURE_AUTOEXTEND);
if(($config->RAID_PICTURE_AUTOEXTEND && !in_array($raid['level'], $raid_poll_hide_buttons_levels)) or $post_text) {
- send_photo($chat_id, $picture_url, '', [], [], false, $raid_id);
+ $raid['standalone_photo'] = true; // Inject this into raid array so we can pass it all the way to photo cache
+ send_photo($chat_id, $media_content[1], $media_content[0], '', [], [], false, $raid);
send_message($chat_id, $text['short'], $keys, ['disable_web_page_preview' => 'true'], false, $raid_id);
} else {
- $tg_json[] = send_photo($chat_id, $picture_url, $text['short'], $keys, ['disable_web_page_preview' => 'true'], true, $raid_id);
+ $tg_json[] = send_photo($chat_id, $media_content[1], $media_content[0], $text['short'], $keys, ['disable_web_page_preview' => 'true'], true, $raid);
}
} else {
$tg_json[] = send_message($chat_id, $text['full'], $keys, ['disable_web_page_preview' => 'true'], true, $raid_id);
diff --git a/logic/show_raid_poll.php b/logic/show_raid_poll.php
index f8c15cae..e1cbebcf 100644
--- a/logic/show_raid_poll.php
+++ b/logic/show_raid_poll.php
@@ -270,7 +270,7 @@ function show_raid_poll($raid, $inline = false)
// Raid has started and has participants
if($time_now > $raid['start_time']) {
// Add raid is done message.
- if($time_now > $raid['end_time']) {
+ if($raid['raid_ended']) {
$msg = raid_poll_message($msg, '' . getPublicTranslation('raid_done') . '' . CR);
// Add time left message.
} else {
@@ -469,7 +469,7 @@ function show_raid_poll($raid, $inline = false)
// Add update time and raid id to message.
$msg = raid_poll_message($msg, CR . '' . getPublicTranslation('updated') . ': ' . dt2time('now', 'H:i:s') . '');
- if($inline && ($buttons_hidden or ($raid['end_time'] < $time_now && $config->RAID_ENDED_HIDE_KEYS))) {
+ if($inline && ($buttons_hidden or ($raid['raid_ended'] && $config->RAID_ENDED_HIDE_KEYS))) {
// Only case this is needed anymore is a poll shared via inline that has no vote keys
$msg = raid_poll_message($msg, SP . SP . substr(strtoupper($config->BOT_ID), 0, 1) . '-ID = ' . $raid['id']);
}
diff --git a/logic/update_raid_poll.php b/logic/update_raid_poll.php
index b1420f64..8a9d1cc7 100644
--- a/logic/update_raid_poll.php
+++ b/logic/update_raid_poll.php
@@ -6,11 +6,10 @@
* @param array|false $raid Array received from get_raid() (optional).
* @param array|false $update
* @param array|false $tg_json Multicurl array.
- * @param bool $skip_picture_update Bool, Skip updating raid picture on refresh after raid has ended
* @return array|false tg_json multicurl array
*/
-function update_raid_poll($raid_id, $raid = false, $update = false, $tg_json = false, $skip_picture_update = true)
+function update_raid_poll($raid_id, $raid = false, $update = false, $tg_json = false)
{
global $config;
$chat_and_message = [];
@@ -23,22 +22,18 @@ function update_raid_poll($raid_id, $raid = false, $update = false, $tg_json = f
];
// For updating a poll
}else if(isset($update['push'])) {
- $chat_and_message[] = [
- 'chat_id' => $update['push']['chat_id'],
- 'message_id' => $update['push']['message_id'],
- 'type' => $update['push']['type'],
- ];
+ $chat_and_message[] = $update['push'];
}
// If neither of the methods above yielded results, or update came from a inline poll, check cleanup table for chat messages to update
if(empty($chat_and_message) or isset($update['callback_query']['inline_message_id'])) {
$rs_chann = my_query('
- SELECT chat_id, message_id, type
+ SELECT chat_id, message_id, type, media_unique_id
FROM cleanup
WHERE raid_id = ' . $raid_id
);
if ($rs_chann->rowCount() > 0) {
while($chat = $rs_chann->fetch()) {
- $chat_and_message[] = ['chat_id' => $chat['chat_id'], 'message_id' => $chat['message_id'], 'type' => $chat['type']];
+ $chat_and_message[] = $chat;
}
}else {
if(is_array($tg_json)) return $tg_json;
@@ -67,35 +62,12 @@ function update_raid_poll($raid_id, $raid = false, $update = false, $tg_json = f
// Telegram JSON array.
if($tg_json == false) $tg_json = [];
- if($config->RAID_PICTURE) {
- require_once(LOGIC_PATH . '/raid_picture.php');
- }
foreach($chat_and_message as $chat_id_msg_id) {
$chat = $chat_id_msg_id['chat_id'];
$message = $chat_id_msg_id['message_id'];
$type = $chat_id_msg_id['type'];
- if($type == 'poll_photo') {
- $picture_url = raid_picture_url($raid);
- // If the poll message gets too long, we'll replace it with regular text based poll
- if($post_text == true) {
- // Delete raid picture and caption.
- $tg_json[] = delete_message($chat, $message, true);
- my_query("DELETE FROM cleanup WHERE chat_id = '{$chat}' AND message_id = '{$message}'");
-
- // Resend raid poll as text message.
- send_photo($chat, $picture_url, '', [], [], false, $raid_id);
- send_message($chat, $text['full'], $keys, ['disable_web_page_preview' => 'true'], false, $raid_id);
- } else {
- // Edit the picture and caption
- if(!$skip_picture_update) {
- $tg_json[] = editMessageMedia($message, $text['short'], $picture_url, $keys, $chat, ['disable_web_page_preview' => 'true'], true);
- }else {
- // Edit the caption.
- $tg_json[] = editMessageCaption($message, $text['short'], $keys, $chat, ['disable_web_page_preview' => 'true'], true);
- }
- }
- }else if ($type == 'poll_text') {
+ if ($type == 'poll_text') {
$raid_picture_hide_level = explode(",",$config->RAID_PICTURE_HIDE_LEVEL);
$raid_picture_hide_pokemon = explode(",",$config->RAID_PICTURE_HIDE_POKEMON);
@@ -106,9 +78,37 @@ function update_raid_poll($raid_id, $raid = false, $update = false, $tg_json = f
}else {
$tg_json[] = editMessageText($message, $text['full'], $keys, $chat, ['disable_web_page_preview' => 'true'], true);
}
- }else if ($type == 'photo' && !$skip_picture_update) {
- $picture_url = raid_picture_url($raid, 1);
- $tg_json[] = editMessageMedia($message, '', $picture_url, '', $chat, [], true);
+ }else {
+ require_once(LOGIC_PATH . '/raid_picture.php');
+ if($type == 'poll_photo') {
+ // If the poll message gets too long, we'll replace it with regular text based poll
+ if($post_text == true) {
+ // Delete raid picture and caption.
+ $tg_json[] = delete_message($chat, $message, true);
+ my_query("DELETE FROM cleanup WHERE chat_id = '{$chat}' AND message_id = '{$message}'");
+
+ $media_content = get_raid_picture($raid, true);
+ $raid['standalone_photo'] = true; // Inject this into raid array so we can pass it all the way to photo cache
+ // Resend raid poll as text message.
+ send_photo($chat, $media_content[1], $media_content[0], '', [], [], false, $raid);
+ send_message($chat, $text['full'], $keys, ['disable_web_page_preview' => 'true'], false, $raid_id);
+ } else {
+ $media_content = get_raid_picture($raid);
+ // Edit the picture and caption
+ if(!isset($media_content[2]) or $media_content[2] != $chat_id_msg_id['media_unique_id']) {
+ $tg_json[] = editMessageMedia($message, $text['short'], $media_content[1], $media_content[0], $keys, $chat, ['disable_web_page_preview' => 'true'], true, $raid);
+ }else {
+ // Edit the caption.
+ $tg_json[] = editMessageCaption($message, $text['short'], $keys, $chat, ['disable_web_page_preview' => 'true'], true);
+ }
+ }
+ }else if ($type == 'photo') {
+ $media_content = get_raid_picture($raid, 1);
+ $raid['standalone_photo'] = true; // Inject this into raid array so we can pass it all the way to photo cache
+ if(!isset($media_content[2]) or $media_content[2] != $chat_id_msg_id['media_unique_id']) {
+ $tg_json[] = editMessageMedia($message, '', $media_content[1], $media_content[0], false, $chat, false, true, $raid);
+ }
+ }
}
}
return $tg_json;
diff --git a/mods/end_remote_raid.php b/mods/end_remote_raid.php
index 31c78416..428f5485 100644
--- a/mods/end_remote_raid.php
+++ b/mods/end_remote_raid.php
@@ -5,7 +5,7 @@
my_query('UPDATE raids SET end_time = date_sub(UTC_TIMESTAMP(),interval 1 minute) WHERE id = \'' . $raid_id . '\'');
require_once(LOGIC_PATH . '/update_raid_poll.php');
-$tg_json = update_raid_poll($raid_id, false, $update, false, false);
+$tg_json = update_raid_poll($raid_id, false, $update, false);
$tg_json[] = edit_message($update, getTranslation('raid_done'), [], false, true);
$tg_json[] = answerCallbackQuery($update['callback_query']['id'], getTranslation("remote_raid_marked_ended"), true);
diff --git a/mods/raid_set_poke.php b/mods/raid_set_poke.php
index 0bd7f9ee..d8f05a32 100644
--- a/mods/raid_set_poke.php
+++ b/mods/raid_set_poke.php
@@ -48,7 +48,7 @@
// Update the shared raid polls.
require_once(LOGIC_PATH .'/update_raid_poll.php');
-$tg_json = update_raid_poll($id, $raid, false, $tg_json, false);
+$tg_json = update_raid_poll($id, $raid, false, $tg_json);
// Alert users.
$tg_json = alarm($raid, $update['callback_query']['from']['id'], 'new_boss', '', $tg_json);
diff --git a/mods/refresh_polls.php b/mods/refresh_polls.php
index d3d58f73..5da202cf 100644
--- a/mods/refresh_polls.php
+++ b/mods/refresh_polls.php
@@ -5,12 +5,12 @@
if(strlen($data['id']) > 5) $where_chat = 'chat_id = '.$data['id']; else $where_chat = 'chat_id != 0';
if(!empty($config->RAID_POLL_HIDE_BUTTONS_RAID_LEVEL)) $level_exclude = 'AND raids.level NOT IN ('.$config->RAID_POLL_HIDE_BUTTONS_RAID_LEVEL.')'; else $level_exclude = '';
$query_messages = my_query("
- SELECT cleanup.*
+ SELECT cleanup.raid_id, cleanup.chat_id, cleanup.message_id, cleanup.type, cleanup.media_unique_id
FROM cleanup
LEFT JOIN raids
ON cleanup.raid_id = raids.id
WHERE {$where_chat}
- AND cleanup.type IN ('poll_text', 'poll_photo')
+ AND cleanup.type IN ('poll_text', 'poll_photo', 'photo')
AND raids.start_time <= UTC_TIMESTAMP()
AND raids.end_time > DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 MINUTE)
AND message_id != 0
@@ -25,12 +25,10 @@
debug_log("chat id: ".$res_messages['chat_id']);
debug_log("raid id: ".$res_messages['raid_id']);
- $data_poll['push']['message_id']=$res_messages['message_id'];
- $data_poll['push']['chat_id']=$res_messages['chat_id'];
- $data_poll['push']['type']=$res_messages['type'];
+ $data_poll['push'] = $res_messages;
require_once(LOGIC_PATH . '/update_raid_poll.php');
- $tg_json = update_raid_poll($res_messages['raid_id'], false, $data_poll, $tg_json, false);
+ $tg_json = update_raid_poll($res_messages['raid_id'], get_raid($res_messages['raid_id']), $data_poll, $tg_json);
}
curl_json_multi_request($tg_json);
}else {
diff --git a/mods/tutorial.php b/mods/tutorial.php
index 088f9db2..94a1e48b 100644
--- a/mods/tutorial.php
+++ b/mods/tutorial.php
@@ -112,5 +112,5 @@
}
}
answerCallbackQuery($update['callback_query']['id'], "OK!");
-editMessageMedia($update['callback_query']['message']['message_id'], $msg, $photo, $keys, $update['callback_query']['message']['chat']['id'], ['disable_web_page_preview' => 'true']);
+editMessageMedia($update['callback_query']['message']['message_id'], $msg, $photo, false, $keys, $update['callback_query']['message']['chat']['id'], ['disable_web_page_preview' => 'true']);
?>
\ No newline at end of file
diff --git a/mods/vote_refresh.php b/mods/vote_refresh.php
index 315cbdce..22ebad3d 100644
--- a/mods/vote_refresh.php
+++ b/mods/vote_refresh.php
@@ -1,7 +1,7 @@
inc(['raidpicture']);
-}
-// Create GD image object from given URI regardless of file type
-function grab_img($uri){
- try {
- $img = imagecreatefromstring(file_get_contents($uri));
- } catch (Exception $e) {
- info_log($uri, 'Failed to get image:');
- info_log($e->getMessage(), 'Reason: ');
- return false;
- }
- return $img;
+ $requests_total->inc(['raidpicture']);
}
+
if(isset($_GET['sa']) && $_GET['sa'] == 1) $standalone_photo = true; else $standalone_photo = false;
// Debug switch
$debug = false;
if(isset($_GET['debug']) && $_GET['debug'] == 1) {
$debug = true;
-}
-$required_parameters = ['pokemon', 'pokemon_form', 'start_time', 'end_time', 'gym_id', 'ex_raid'];
-$failed = [];
-// Raid info
-foreach($required_parameters as $required) {
- if(!array_key_exists($required, $_GET)) {
- $failed[] = $required;
- }
-}
-if(count($failed) > 0) {
- info_log('Raidpicture called without '.join(', ',$failed).', ending execution');
- exit();
-}
-$raid = [];
-$raid['pokemon'] = preg_replace("/\D/","",$_GET['pokemon']);
-$raid['gym_id'] = preg_replace("/\D/","",$_GET['gym_id']);
-$raid['raid_costume'] = false;
-if($_GET['start_time'] == 0) {
- $raid_ongoing = false;
-}else {
- $raid_ongoing = true;
- $raid['start_time'] = date("Y-M-d H:i:s",preg_replace("/\D/","",$_GET['start_time']));
- $raid['end_time'] = date("Y-M-d H:i:s",preg_replace("/\D/","",$_GET['end_time']));
-}
-if(in_array($_GET['pokemon_form'], ['-1','-2','-3'])) {
- $raid['pokemon_form'] = $_GET['pokemon_form'];
-}else {
- $raid['pokemon_form'] = preg_replace("/\D/","",$_GET['pokemon_form']);
-}
-$raid['costume'] = 0;
-if(array_key_exists('costume', $_GET) && $_GET['costume'] != '') {
- $raid['costume'] = preg_replace("/\D/","",$_GET['costume']);
-}
-$q_pokemon_info = my_query("
- SELECT
- pokemon_form_name, min_cp, max_cp, min_weather_cp, max_weather_cp, weather, shiny, asset_suffix, type, type2
- FROM pokemon
- WHERE pokedex_id = '".$raid['pokemon']."'
- AND pokemon_form_id = '".$raid['pokemon_form']."' LIMIT 1")->fetch();
-$q_gym_info = my_query("SELECT img_url, gym_name, ex_gym FROM gyms WHERE id='".$raid['gym_id']."'")->fetch();
-$raid = array_merge($raid, $q_pokemon_info, $q_gym_info);
-
-// Fonts
-$font_gym = FONTS_PATH . '/' . $config->RAID_PICTURE_FONT_GYM;
-$font_text = FONTS_PATH . '/' . $config->RAID_PICTURE_FONT_TEXT;
-$font_ex_gym = FONTS_PATH . '/' . $config->RAID_PICTURE_FONT_EX_GYM;
-
-
-// Canvas size
-$canvas_width = 700;
-$canvas_height = 356;
-
-// Creating an empty canvas
-$canvas = imagecreatetruecolor($canvas_width,$canvas_height);
-imagesavealpha($canvas,true);
-
-// Background color
-// Default: White
-$bg_rgb = [255,255,255];
-$config_bg_color = explode(',',$config->RAID_PICTURE_BG_COLOR);
-if(count($config_bg_color) == 3) {
- $bg_rgb = $config_bg_color;
+ $raid_id = preg_replace("/\D/","",$_GET['raid']);
+ if(preg_match("^[0-9]+$^",$raid_id)) $raid = get_raid($raid_id);
+ else die("Invalid raid id!");
} else {
- info_log($config->RAID_PICTURE_BG_COLOR, 'Invalid value RAID_PICTURE_BG_COLOR:');
-}
-$bg_color = imagecolorallocate($canvas,$bg_rgb[0],$bg_rgb[1], $bg_rgb[2]);
-imagefill($canvas, 0, 0, $bg_color);
-
-// Text / Font color
-// Default: Black
-$font_rgb = [0,0,0];
-$config_font_color = explode(',',$config->RAID_PICTURE_TEXT_COLOR);
-if(count($config_font_color) == 3) {
- $font_rgb = $config_font_color;
-} else {
- info_log($config->RAID_PICTURE_TEXT_COLOR, 'Invalid value RAID_PICTURE_TEXT_COLOR:');
-}
-$font_color = imagecolorallocate($canvas,$font_rgb[0],$font_rgb[1],$font_rgb[2]);
-
-// Defining RBG values that are used to create transparent color
-// Should be different from RAID_PICTURE_BG_COLOR and RAID_PICTURE_TEXT_COLOR
-$transparent_rgb = [0,255,0];
-
-// Gym image
-$gym_url = $raid['img_url'];
-if($config->RAID_PICTURE_STORE_GYM_IMAGES_LOCALLY && !empty($gym_url)) {
- if(substr($gym_url, 0, 7) == 'file://') {
- $gym_image_path = $gym_url;
- debug_log($gym_image_path, 'Found an image imported via a portal bot: ');
- }else {
- $file_name = explode('/', $gym_url)[3];
- $gym_image_path = PORTAL_IMAGES_PATH .'/'. $file_name.'.png';
- debug_log($gym_image_path, 'Attempting to use locally stored gym image');
- if(!file_exists($gym_image_path)) {
- debug_log($gym_url, 'Gym image not found, attempting to downloading it from: ');
- if(is_writable(PORTAL_IMAGES_PATH)) {
- download_Portal_Image($gym_url, PORTAL_IMAGES_PATH, $file_name . '.png');
- }else {
- $gym_image_path = $gym_url;
- info_log(PORTAL_IMAGES_PATH, 'Failed to write new gym image, incorrect permissions in directory ');
- }
+ $required_parameters = ['pokemon', 'pokemon_form', 'start_time', 'end_time', 'gym_id', 'ex_raid'];
+ $failed = [];
+ // Raid info
+ foreach($required_parameters as $required) {
+ if(!array_key_exists($required, $_GET)) {
+ $failed[] = $required;
}
}
-}else {
- $img_gym = false;
- if (!empty($gym_url)) {
- $gym_image_path = $gym_url;
- }
-}
-$img_gym = grab_img($gym_image_path);
-if($img_gym == false) {
- info_log($gym_image_path, 'Loading the gym image failed, using default gym image');
- if(is_file($config->RAID_DEFAULT_PICTURE)) {
- $img_gym = grab_img($config->RAID_DEFAULT_PICTURE);
- } else {
- info_log($config->RAID_DEFAULT_PICTURE, 'Cannot read default gym image:');
- $img_gym = grab_img(IMAGES_PATH . "/gym_default.png");
+ if(count($failed) > 0) {
+ info_log('Raidpicture called without '.join(', ',$failed).', ending execution');
+ exit();
}
-}
-
-// Get the width and height of the gym picture
-$gym_w = imagesx($img_gym);
-$gym_h = imagesy($img_gym);
-
-// Crop gym image
-if($gym_w > $gym_h) {
- $size = $gym_h;
- $crop_x = floor((($gym_w/2)-($gym_h/2)));
- $crop_y = 0;
-} else {
- $size = $gym_w;
- $crop_x = 0;
- $crop_y = floor((($gym_h/2)-($gym_w/2)));
-}
-
-// Create mask
-$new_w = 300;
-$new_h = 300;
-$mask = imagecreatetruecolor($new_w,$new_h);
-
-// Fill the mask with background color
-$bg = imagecolorallocate($mask,$bg_rgb[0],$bg_rgb[1], $bg_rgb[1]);
-imagefill($mask,0,0,$bg);
-
-// Define transparent color for the mask
-$transparent = imagecolorallocate($mask,$transparent_rgb[0],$transparent_rgb[1],$transparent_rgb[2]);
-imagecolortransparent($mask,$transparent);
-
-// Creating the orange circle around the gym photo
-$color_ellipse = imagecolorallocate($mask,254,193,161);
-imagefilledellipse($mask,$new_w/2,$new_h/2,$new_w-9,$new_h-9,$color_ellipse);
-imagefilledellipse($mask,$new_w/2,$new_h/2,$new_w-16,$new_h-16,$bg);
-
-// Creating a circle that is filled with transparent color
-imagefilledellipse($mask,$new_w/2,$new_h/2,$new_w-30,$new_h-30,$transparent);
-
-// Merging the desired part of the gym picture with canvas
-imagecopyresampled($canvas,$img_gym,0,0,$crop_x,$crop_y,$new_w,$new_h, $size,$size);
-
-// Merging the mask with a circular cutout to the canvas
-imagecopymerge($canvas, $mask, 0, 0, 0, 0, $new_w, $new_h, 100);
-
-
-
-// Is ex gym?
-if($raid['ex_gym'] == 1) {
- $ex_text_size = 20;
- $ex_text_angle = 0;
- $corner = 16; // Roundness of the corners
- $extra = $ex_text_size/5+1; // Some extra height
-
- $ex_mark_bg_color = [94,169,190];
- $ex_mark_text_color = [255,255,255];
-
- // Get the text with local translation for EX Raid gym
- $ex_raid_gym_text = strtoupper(getPublicTranslation('ex_gym'));
- // Finding out the size of text
- $ex_text_box = imagettfbbox($ex_text_size,$ex_text_angle,$font_ex_gym,$ex_raid_gym_text);
-
- $ex_logo_width = $ex_text_box[2]+($corner);
- $ex_logo_height = $ex_text_size+$extra;
-
-
- // Create the canvas for EX RAID indicator
- $ex_logo = imagecreatetruecolor($ex_logo_width,$ex_logo_height);
- // Defining the transparent color
- $ex_transparent = imagecolorallocate($ex_logo,$transparent_rgb[0],$transparent_rgb[1],$transparent_rgb[2]);
- imagecolortransparent($ex_logo,$ex_transparent);
- // Defining background color
- $ex_logo_bg = imagecolorallocate($mask,$ex_mark_bg_color[0],$ex_mark_bg_color[1], $ex_mark_bg_color[2]);
- $ex_text_color = imagecolorallocate($ex_logo,$ex_mark_text_color[0],$ex_mark_text_color[1],$ex_mark_text_color[2]);
-
- //Filling the canvas with transparent color
- imagefill($ex_logo,0,0,$ex_transparent);
-
- // Creating 4 balls, one in each corner
- imagefilledellipse($ex_logo,$corner/2,$corner/2,$corner,$corner,$ex_logo_bg);
- imagefilledellipse($ex_logo,$corner/2,$ex_logo_height-$corner/2,$corner,$corner,$ex_logo_bg);
- imagefilledellipse($ex_logo,$ex_logo_width-$corner/2,$corner/2,$corner,$corner,$ex_logo_bg);
- imagefilledellipse($ex_logo,$ex_logo_width-$corner/2,$ex_logo_height-$corner/2,$corner,$corner,$ex_logo_bg);
- // And two rectangles to fill the rest
- imagefilledrectangle($ex_logo,$corner/2,0,$ex_logo_width-($corner/2),$ex_logo_height,$ex_logo_bg);
- imagefilledrectangle($ex_logo,0,$corner/2,$ex_logo_width,$ex_logo_height-($corner/2),$ex_logo_bg);
-
- // Draw the text
- imagettftext($ex_logo,$ex_text_size,$ex_text_angle,$corner/2,$ex_text_size+1,$ex_text_color,$font_ex_gym,$ex_raid_gym_text);
-
- // Copy icon into canvas
- imagecopy($canvas,$ex_logo,20,20,0,0,$ex_logo_width,$ex_logo_height);
-}
-
-
-$show_boss_pokemon_types = false;
-// Raid running
-if($raid_ongoing) {
- if(strlen($raid['asset_suffix']) > 2) {
- $icon_suffix = $raid['asset_suffix'];
+ $raid = [];
+ $raid['pokemon'] = preg_replace("/\D/","",$_GET['pokemon']);
+ $raid['gym_id'] = preg_replace("/\D/","",$_GET['gym_id']);
+ $raid['raid_costume'] = false;
+ $raid['event'] = ($_GET['ex_raid'] == 1) ? EVENT_ID_EX : 0;
+ if($_GET['start_time'] == 0) {
+ $raid_ongoing = false;
}else {
- $pad_zeroes = '';
- for ($o=3-strlen($raid['pokemon']);$o>0;$o--) {
- $pad_zeroes .= 0;
- }
- $icon_suffix = $pad_zeroes.$raid['pokemon'] . "_" . $raid['asset_suffix'];
+ $raid_ongoing = true;
+ $raid['start_time'] = date("Y-M-d H:i:s",preg_replace("/\D/","",$_GET['start_time']));
+ $raid['end_time'] = date("Y-M-d H:i:s",preg_replace("/\D/","",$_GET['end_time']));
}
-
- // Raid Egg
- if($raid['pokemon'] > 9990) {
- // Getting the actual icon
- $img_pokemon = grab_img(IMAGES_PATH . "/raid_eggs/pokemon_icon_" . $raid['pokemon'] . "_00.png");
-
- // Position and size of the picture
- $dst_x = $dst_y = 150;
- $dst_w = $dst_h = 200;
- $src_w = $src_h = 128;
-
- //Pokemon
- } else {
- // Formatting the id from 1 digit to 3 digit (1 -> 001)
- $pokemon_id = str_pad($raid['pokemon'], 3, '0', STR_PAD_LEFT);
-
- // Check pokemon icon source and create image
- $img_file = null;
- $p_sources = explode(',', $config->RAID_PICTURE_POKEMON_ICONS);
-
- $addressable_icon = 'pm'.$raid['pokemon'];
- if($raid['pokemon_form_name'] != 'normal') $addressable_icon .= '.f'.strtoupper($raid['pokemon_form_name']);
-
- // Getting the actual icon filename
- $p_icon = "pokemon_icon_" . $icon_suffix;
- if($raid['costume'] != 0) {
- $p_icon .= '_' . str_pad($raid['costume'], 2, '0', STR_PAD_LEFT);
-
- $costume = json_decode(file_get_contents(ROOT_PATH . '/protos/costume.json'), true);
- $addressable_icon .= '.c' . array_search($raid['costume'],$costume);
- }
- if($raid['shiny'] == 1 && $config->RAID_PICTURE_SHOW_SHINY) {
- $p_icon = $p_icon . "_shiny";
- $addressable_icon .= '.s';
- $shiny_icon = grab_img(IMAGES_PATH . "/shinystars.png");
- }
- $addressable_icon .= '.icon.png';
- $p_icon = $p_icon . ".png";
-
- foreach($p_sources as $p_dir) {
- // Set pokemon icon dir
- $p_img = IMAGES_PATH . "/pokemon_" . $p_dir . "/" . $p_icon;
- $p_add_img = IMAGES_PATH . "/pokemon_" . $p_dir . "/Addressable_Assets/" . $addressable_icon;
-
- // Icon dir named 'pokemon'? Then change path to not add '_repo-owner' to icon folder name
- if($p_dir == 'pokemon') {
- $p_img = IMAGES_PATH . "/pokemon/" . $p_icon;
- $p_add_img = IMAGES_PATH . "/pokemon/Addressable_Assets" . $addressable_icon;
- }
- // Check if file exists in this collection
- // Prioritize addressable asset file
- if(file_exists($p_add_img) && filesize($p_add_img) > 0) {
- $img_file = $p_add_img;
- break;
- }else if(file_exists($p_img) && filesize($p_img) > 0) {
- $img_file = $p_img;
- break;
- }
- }
-
- // If no image was found, substitute with a fallback
- if($img_file === null) {
- info_log($p_icon, 'Failed to find an image in any pokemon image collection for:');
- $img_fallback_file = null;
- // If we know the raid level, fallback to egg image
- if(array_key_exists('level', $raid) && $raid['level'] !== null && $raid['level'] != 0) {
- $img_fallback_file = IMAGES_PATH . "/raid_eggs/pokemon_icon_999" . $raid['level'] . "_00.png";
- } else {
- info_log('Unknown raid level, using fallback icon.');
- $img_fallback_file = $config->RAID_PICTURE_POKEMON_FALLBACK;
- }
- $img_file = $img_fallback_file;
- }
-
- $img_pokemon = grab_img($img_file);
-
- // Position and size of the picture
- $dst_x = $dst_y = 100;
- $dst_w = $dst_h = $src_w = $src_h = 256;
-
- if($raid['type'] != '') $show_boss_pokemon_types = true;
- }
-
-// Raid ended
-} else {
- // Raid won image
- $img_pokemon = grab_img(IMAGES_PATH . "/raidwon.png");
-
- // Position and size of the picture
- $dst_x = $dst_y = 172;
- $src_w = 444;
- $src_h = 512;
- $dst_w = 160;
- $dst_h = floor($dst_w/$src_w*$src_h);
-}
-
-// Create pokemon image.
-imagesavealpha($img_pokemon,true);
-
-// Debug - Add border around pokemon image
-if($debug) {
- $im = imagecreate($src_w,$src_h);
- $black = imagecolorallocate($im,0,0,0);
- imagerectangle($img_pokemon,0,0,$src_w-1,$src_h-1,$black);
-}
-
-// Add pokemon to image
-imagecopyresampled($canvas,$img_pokemon,$dst_x,$dst_y,0,0,$dst_w,$dst_h,$src_w,$src_h);
-
-// Add pokemon types
-if($config->RAID_PICTURE_POKEMON_TYPES && $show_boss_pokemon_types) {
- $img_type = grab_img(IMAGES_PATH . "/types/".$raid['type'].".png");
- $type1_x = 300;
- imagesavealpha($img_type, true);
- if($raid['type2'] != '') {
- $img_type2 = grab_img(IMAGES_PATH . "/types/".$raid['type2'].".png");
- imagesavealpha($img_type2, true);
- imagecopyresampled($canvas,$img_type2,300,300,0,0,40,40,64,64);
- $type1_x -= 50;
- }
- imagecopyresampled($canvas,$img_type,$type1_x,300,0,0,40,40,64,64);
-}
-if(isset($shiny_icon)) {
- imagesavealpha($shiny_icon,true);
- $light_white = imagecolorallocatealpha($canvas, 255,255,255,50);
- imagefilledellipse($canvas, $type1_x-35 ,320,40,40,$light_white);
- imagecopyresampled($canvas,$shiny_icon,$type1_x-52,301,0,0,35,35,100,100);
-}
-
-// Ex-Raid?
-if($_GET['ex_raid'] == '1') {
- $img_expass = grab_img(IMAGES_PATH . "/expass.png");
- imagesavealpha($img_expass,true);
-
- // Debug - Add border around expass image
- if($debug) {
- $im = imagecreate(256,256);
- $black = imagecolorallocate($im,0,0,0);
- imagerectangle($img_expass,0,0,255,255,$black);
- }
- imagecopyresampled($canvas,$img_expass,0,225,0,0,100,100,256,256);
-}
-
-
-
-// Adding the gym name to the image
-$text_size = 23; // Font size of additional text
-$text_size_cp_weather = 20;// Font size of weather cp text
-$left_after_poke = 356; // First left position behind the pokemon icon.
-$angle = 0; // Angle of the text
-$spacing = 10; // Spacing between lines
-$spacing_right = 10; // Empty space on the right for weather icons and CP text
-
-
-
-// Gym name
-// Largest gym name we found so far for testing:
-//$gym_name = 'Zentrum für Junge Erwachsene der Kirche Jesu Christi der Heiligen der Letzten Tage Pfahl Düsseldorf';
-$gym_name = $raid['gym_name'];
-
-// Get length, the shortest and largest word of the gym name
-$gym_name_words = explode(SP, $gym_name);
-$gym_name_word_lengths = array_map('strlen', array_map('utf8_decode', $gym_name_words));
-$gym_name_word_largest = max($gym_name_word_lengths);
-$gym_name_word_shortest = min($gym_name_word_lengths);
-$gym_name_total_chars = strlen(utf8_decode($gym_name));
-
-// Number of rows based on number of words or total chars
-$gym_name_rows = 1;
-if(count($gym_name_words) > 1 && $gym_name_total_chars >= 18 && $gym_name_total_chars <= 50) {
- $gym_name_rows = 2;
-} else if($gym_name_total_chars > 50) {
- $gym_name_rows = 3;
-}
-
-// Wrap gym name to multiple lines if too long
-$gym_name_lines = explode(PHP_EOL,wordwrap(trim($gym_name),floor(($gym_name_total_chars+$gym_name_word_largest)/$gym_name_rows),PHP_EOL));
-
-debug_log($gym_name_total_chars, 'Gym name length:');
-debug_log($gym_name_lines, 'Gym name lines:');
-
-// Target width and height
-$targetWidth = imagesx($canvas) - imagesx($mask) - $spacing_right;
-$targetHeight = 95;
-$targetHeight = $targetHeight/$gym_name_rows;
-
-// Get largest possible fontsize for each gym name line
-for($l=0; $l= $targetWidth || $height >= $targetHeight){
- break;
- }
- }
-
- // Gym name font size and spacing
- if($l == 0 || $targetsize < $fontsize_gym) {
- $fontsize_gym = $targetsize;
- $spacing_gym = $height * 0.30;
- }
-}
-
-// Add gym name to image
-for($y=0;$y 20) {
- $pokemon_text_lines = explode(SP,$pokemon_name);
- if(count($pokemon_text_lines) == 1) {
- // Wrapping the time text if too long (to 20 letters)
- $pokemon_text_lines = explode(PHP_EOL,wordwrap(trim($pokemon_name),20,PHP_EOL));
- }
-}
-$num_pokemon_lines = count($pokemon_text_lines);
-
-// Target width and height
-$targetWidth = imagesx($canvas) - $left_after_poke - (strlen($raid['weather']) * 42) - $spacing_right;
-$targetHeight = 80;
-
-// Get largest possible fontsize for each pokemon name and form line
-for($p=0; $p<($num_pokemon_lines); $p++) {
- for($s=1; $s<40; $s=$s+0.5){
- $box = imagettfbbox($s, 0, $font_text, $pokemon_text_lines[$p]);
- $min_x = min(array($box[0], $box[2], $box[4], $box[6]));
- $max_x = max(array($box[0], $box[2], $box[4], $box[6]));
- $min_y = min(array($box[1], $box[3], $box[5], $box[7]));
- $max_y = max(array($box[1], $box[3], $box[5], $box[7]));
- $width = ($max_x - $min_x);
- $height = ($max_y - $min_y);
- $targetsize = $s;
- // Exit once we exceed width or height
- if($width >= $targetWidth || $height >= $targetHeight){
- break;
- }
+ if(in_array($_GET['pokemon_form'], ['-1','-2','-3'])) {
+ $raid['pokemon_form'] = $_GET['pokemon_form'];
+ }else {
+ $raid['pokemon_form'] = preg_replace("/\D/","",$_GET['pokemon_form']);
}
-
- // Gym name font size and spacing
- if($p == 0 || $targetsize < $fontsize_poke) {
- $fontsize_poke = $targetsize;
+ $raid['costume'] = 0;
+ if(array_key_exists('costume', $_GET) && $_GET['costume'] != '') {
+ $raid['costume'] = preg_replace("/\D/","",$_GET['costume']);
}
+ $q_pokemon_info = my_query("
+ SELECT
+ pokemon_form_name, min_cp, max_cp, min_weather_cp, max_weather_cp, weather, shiny, asset_suffix, type, type2
+ FROM pokemon
+ WHERE pokedex_id = '".$raid['pokemon']."'
+ AND pokemon_form_id = '".$raid['pokemon_form']."' LIMIT 1")->fetch();
+ $q_gym_info = my_query("SELECT img_url, gym_name, ex_gym FROM gyms WHERE id='".$raid['gym_id']."'")->fetch();
+ $raid = array_merge($raid, $q_pokemon_info, $q_gym_info);
}
-// Pokemon name (and form) in 1 row
-$poke_text_top = 310;
-
-// Pokemon name and form in one or two lines?
-if($num_pokemon_lines > 1) {
- $poke_text_top = 272;
-}
-
-// If the photo is sent without caption, we want to keep the bottom right corcer clear of text because Telegram covers it with a timestamp
-if($standalone_photo) $poke_text_top -= 50;
-
-// Add pokemon name to image
-for($pa=0;$pa<$num_pokemon_lines;$pa++){
- // Get text width and height
- $textwidth = ($max_x - $min_x);
- $textheight = ($max_y - $min_y);
- // Position from top
- $poke_text_top = ($poke_text_top+($pa*($fontsize_poke+$spacing)));
- imagettftext($canvas,$fontsize_poke,$angle,$left_after_poke,$poke_text_top,$font_color,$font_text,$pokemon_text_lines[$pa]);
-}
-
-// Pokemon CP
-if($raid['pokemon'] < 9990) {
- $cp_text_top = $poke_text_top+$text_size+$spacing;
- $cp_text = $raid['min_cp']." - ".$raid['max_cp'];
- $cp_text2 = "(".$raid['min_weather_cp']."-".$raid['max_weather_cp'].")";
-
- imagettftext($canvas,$text_size,$angle,$left_after_poke,$cp_text_top,$font_color,$font_text,$cp_text);
- $cp_weather_text_box = imagettfbbox($text_size_cp_weather,$angle,$font_text,$cp_text2);
- imagettftext($canvas,$text_size_cp_weather,$angle,($canvas_width-$cp_weather_text_box[2]-$spacing_right),$cp_text_top,$font_color,$font_text,$cp_text2);
-
- $count_weather = strlen($raid['weather']);
- for($i=0;$i<$count_weather;$i++) {
- $we = substr($raid['weather'],$i,1);
- $weather_icon_path = IMAGES_PATH . "/weather/";
- // Use white icons?
- if($config->RAID_PICTURE_ICONS_WHITE) {
- $weather_icon_path = IMAGES_PATH . "/weather_white/";
- }
- $weather_icon = grab_img($weather_icon_path . $we . ".png"); // 64x64
- imagecopyresampled($canvas,$weather_icon,$canvas_width-$spacing_right-($count_weather-$i)*40,$poke_text_top-30,0,0,38,38,64,64);
- }
-}
-
-
-
// Define and print picture
// PNG
if($config->RAID_PICTURE_FILE_FORMAT == 'png') {
header("Content-type: image/png");
- imagepng($canvas);
// JPEG
} else if($config->RAID_PICTURE_FILE_FORMAT == 'jpeg' || $config->RAID_PICTURE_FILE_FORMAT == 'jpg') {
header("Content-type: image/jpeg");
- imagejpeg($canvas, NULL, 90);
// Use GIF as default - smallest file size without compression
} else {
header("Content-type: image/gif");
- imagegif($canvas);
}
+echo create_raid_picture($raid, $standalone_photo, $debug);
+
?>
diff --git a/sql/pokemon-raid-bot.sql b/sql/pokemon-raid-bot.sql
index 76773f30..74b8d20e 100644
--- a/sql/pokemon-raid-bot.sql
+++ b/sql/pokemon-raid-bot.sql
@@ -25,7 +25,9 @@ CREATE TABLE `cleanup` (
`message_id` bigint(20) unsigned NOT NULL,
`type` VARCHAR(20) NULL,
`date_of_posting` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
- PRIMARY KEY (`id`)
+ `media_unique_id` varchar(45) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unique_chat_msg` (`chat_id`,`message_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE TABLE `events` (
`id` int(3) unsigned NOT NULL AUTO_INCREMENT,
@@ -63,6 +65,17 @@ CREATE TABLE `overview` (
`updated` date DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `photo_cache` (
+ `id` varchar(100) NOT NULL,
+ `unique_id` varchar(45) NOT NULL,
+ `pokedex_id` int(10) DEFAULT NULL,
+ `form_id` int(4) DEFAULT NULL,
+ `raid_id` int(10) unsigned DEFAULT NULL,
+ `ended` tinyint(1) DEFAULT NULL,
+ `gym_id` int(10) unsigned DEFAULT NULL,
+ `standalone` tinyint(1) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`unique_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE TABLE `pokemon` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`pokedex_id` int(10) unsigned NOT NULL,
diff --git a/sql/upgrade/5.sql b/sql/upgrade/5.sql
index c8fd9c68..4ff94df7 100644
--- a/sql/upgrade/5.sql
+++ b/sql/upgrade/5.sql
@@ -1 +1,5 @@
ALTER TABLE user_input CHANGE COLUMN IF EXISTS `user_id` `user_id` BIGINT(20) DEFAULT NULL AFTER `id`;
+
+CREATE TABLE `photo_cache` (`id` varchar(100) NOT NULL, `unique_id` varchar(45) NOT NULL, `pokedex_id` int(10) DEFAULT NULL, `form_id` int(4) DEFAULT NULL, `raid_id` int(10) unsigned DEFAULT NULL, `ended` tinyint(1) DEFAULT NULL, `gym_id` int(10) unsigned DEFAULT NULL, `standalone` tinyint(1) NOT NULL DEFAULT '0', PRIMARY KEY (`unique_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+ALTER TABLE `cleanup` ADD COLUMN IF NOT EXISTS `media_unique_id` varchar(45) DEFAULT NULL AFTER `date_of_posting`;
+CREATE UNIQUE INDEX IF NOT EXISTS `unique_chat_msg` ON `cleanup` (chat_id, message_id);
From af90b2dfeb89fbafb1880b0c8b17a0233fc2b919 Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Wed, 23 Mar 2022 19:36:21 +0200
Subject: [PATCH 012/367] Cleaned up curl request mess
---
logic/curl_json_response.php | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/logic/curl_json_response.php b/logic/curl_json_response.php
index 28c4bf26..8e898f2d 100644
--- a/logic/curl_json_response.php
+++ b/logic/curl_json_response.php
@@ -7,22 +7,22 @@
/**
* Process response from telegram api.
* @param string $json_response Json response from Telegram
- * @param string $json Json sent to Telegram
+ * @param string $request Request sent to Telegram
* @param array|int|string $identifier raid array from get_raid, raid id or [overview/trainer]
* @return mixed
*/
-function curl_json_response($json_response, $json, $identifier = false)
+function curl_json_response($json_response, $request, $identifier = false)
{
- global $config, $metrics, $tg_response_code;
+ global $metrics, $tg_response_code;
// Write to log.
debug_log_incoming($json_response, '<-');
// Decode json objects
- $request = json_decode($json, true);
+ $request_array = is_array($request) ? $request : json_decode($request, true);
$response = json_decode($json_response, true);
if ($metrics){
$code = 200;
- $method = $request['method'];
+ $method = $request_array['method'];
$description = null;
if (isset($response['error_code'])) {
$code = $response['error_code'];
@@ -33,7 +33,7 @@ function curl_json_response($json_response, $json, $identifier = false)
}
// Validate response.
if ((isset($response['ok']) && $response['ok'] != true) || isset($response['update_id'])) {
- if(is_array($json)) $json = json_encode($json);
+ if(is_array($request)) $json = json_encode($request); else $json = $request;
info_log("{$json} -> {$json_response}", 'ERROR:');
} else {
if($identifier != false) {
From ae8ee4999ceaf877fb0e683cd51248a3980d3570 Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Thu, 24 Mar 2022 18:06:58 +0200
Subject: [PATCH 013/367] Importal fixes - Fixed portalmapbot message parsing -
Fixed a couple of php errors
---
core/bot/importal.php | 25 +++++++++++++++----------
mods/importal.php | 5 +++--
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/core/bot/importal.php b/core/bot/importal.php
index 996d316c..456c4e63 100644
--- a/core/bot/importal.php
+++ b/core/bot/importal.php
@@ -8,13 +8,24 @@
$msg_to_rows = explode(PHP_EOL, $update['message']['text']);
+ $supported_bots = ['Ingressportalbot', 'PortalMapBot'];
+ if(isset($update['message']['via_bot']) && in_array($update['message']['via_bot']['username'], $supported_bots)) {
+ $parse_bot = $update['message']['via_bot']['username'];
+ }else {
+ // Invalid input or unknown bot - send message and end.
+ $msg = '' . getTranslation('invalid_input') . '';
+ $msg .= CR . CR . getTranslation('not_supported') . SP . getTranslation('or') . SP . getTranslation('internal_error');
+ send_message($update['message']['from']['id'], $msg);
+ exit();
+ }
+
// Ingressportalbot
- if(strpos($update['message']['text'], $icon . 'Portal:') === 0) {
+ if($parse_bot == 'Ingressportalbot') {
// Set portal bot name.
$botname = '@Ingressportalbot';
// Get portal name.
- $portal = trim(str_replace($icon . 'Portal:', '', strtok($update['message']['text'], PHP_EOL)));
+ $portal = trim(str_replace($icon . 'Portal:', '', $msg_to_rows[0]));
// Get portal address.
$address = trim(explode(':', $msg_to_rows[1], 2)[1]);
@@ -40,12 +51,12 @@
$portal_image = $update['message']['entities']['0']['url'];
// PortalMapBot
- } else if(substr_compare(strtok($update['message']['text'], PHP_EOL), '(Intel)', -strlen('(Intel)')) === 0) {
+ } else if($parse_bot == 'PortalMapBot') {
// Set portal bot name.
$botname = '@PortalMapBot';
// Get portal name.
- $portal = trim(substr(strtok($update['message']['text'], PHP_EOL), 0, -strlen('(Intel)')));
+ $portal = trim(str_replace('(Intel)','', str_replace('(Scanner)','',$msg_to_rows[0])));
// Check for strange characters at the beginn of the portal name: â<81>£
// â = 0x00E2
@@ -70,12 +81,6 @@
// Portal image
$portal_image = $update['message']['entities']['0']['url'];
- } else {
- // Invalid input or unknown bot - send message and end.
- $msg = '' . getTranslation('invalid_input') . '';
- $msg .= CR . CR . getTranslation('not_supported') . SP . getTranslation('or') . SP . getTranslation('internal_error');
- send_message($update['message']['from']['id'], $msg);
- exit();
}
// Empty address? Try lookup.
diff --git a/mods/importal.php b/mods/importal.php
index fa589151..80d7ecaa 100644
--- a/mods/importal.php
+++ b/mods/importal.php
@@ -82,6 +82,7 @@ function escape($value){
UPDATE gyms
SET lat = :lat,
lon = :lon,
+ gym_name = :gym_name,
address = :address,
' . $update_values . '
img_url = :gym_image
@@ -94,7 +95,7 @@ function escape($value){
// Insert / Update.
$statement = $dbh->prepare($query);
$statement->execute([
- 'gym_name' => $gym_name,
+ 'gym_name' => $gym_name_no_spec,
'lat' => $lat,
'lon' => $lon,
'address' => $address,
@@ -119,7 +120,7 @@ function escape($value){
}
// Gym photo.
- if($gym_image) {
+ if($config->RAID_PICTURE_STORE_GYM_IMAGES_LOCALLY && $gym_image) {
$msg .= EMOJI_CAMERA . SP . $no_spaces_gym_name;
}
From 15696403f6cbd5885f6b0ecd43ba067b3913f52d Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Sat, 26 Mar 2022 10:44:01 +0200
Subject: [PATCH 014/367] fix to /list with gymareas enabled
---
logic/raid_edit_gyms_first_letter_keys.php | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/logic/raid_edit_gyms_first_letter_keys.php b/logic/raid_edit_gyms_first_letter_keys.php
index c5c02206..573397fa 100644
--- a/logic/raid_edit_gyms_first_letter_keys.php
+++ b/logic/raid_edit_gyms_first_letter_keys.php
@@ -143,10 +143,17 @@ function raid_edit_gyms_first_letter_keys($action = 'raid_by_gym', $hidden = fal
if ($active_raid > 0) {
$gym_name = EMOJI_WARN . SP . $gym_name;
}
- $keys[] = array(
- 'text' => $gym_name,
- 'callback_data' => 'gl' . $gymarea_id . ':' . $gym_name_action . ':' . $gym['id']
- );
+ if($gym_name_action == 'list_raid') {
+ $keys[] = array(
+ 'text' => $gym_name,
+ 'callback_data' => '0:' . $gym_name_action . ':' . $gym['id']
+ );
+ }else {
+ $keys[] = array(
+ 'text' => $gym_name,
+ 'callback_data' => 'gl' . $gymarea_id . ':' . $gym_name_action . ':' . $gym['id']
+ );
+ }
}
}
From 1eae7c24c516ed3b9d13846290ce2f3255a21e5d Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:07:10 +0300
Subject: [PATCH 015/367] Raid picture fixes If you're using
`RAID_PICTURE_AUTOEXTEND true`, `RAID_PICTURE_SEND_METHOD url` and scheduled
bosses together with webhook posted/updated raids, you'll probably still get
spammed with TG errors when the egg hatches. I'm not fixing that, it'll go
away when we get rid of url method for passing raid pictures
---
commands/raid_from_webhook.php | 2 +-
logic/raid_picture.php | 7 ++-----
logic/update_raid_poll.php | 9 ++++++---
mods/raid_set_poke.php | 2 +-
raidpicture.php | 4 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/commands/raid_from_webhook.php b/commands/raid_from_webhook.php
index 96008fb5..a086cb27 100644
--- a/commands/raid_from_webhook.php
+++ b/commands/raid_from_webhook.php
@@ -338,7 +338,7 @@ function isPointInsidePolygon($point, $vertices) {
$chats_geofence = $chats_raidlevel = $webhook_chats = $chats_by_pokemon = [];
if($send_updates == true) {
require_once(LOGIC_PATH .'/update_raid_poll.php');
- $tg_json = update_raid_poll($raid_id, $raid, false, $tg_json, false);
+ $tg_json = update_raid_poll($raid_id, $raid, false, $tg_json, true);
if(!empty($config->WEBHOOK_CHATS_BY_POKEMON[0]) && !$no_auto_posting) {
foreach($config->WEBHOOK_CHATS_BY_POKEMON as $rule) {
if(isset($rule['pokemon_id']) && $rule['pokemon_id'] == $pokemon && (!isset($rule['form_id']) or (isset($rule['form_id']) && $rule['form_id'] == $form))) {
diff --git a/logic/raid_picture.php b/logic/raid_picture.php
index 9424ec64..f16f4e6f 100644
--- a/logic/raid_picture.php
+++ b/logic/raid_picture.php
@@ -88,9 +88,6 @@ function create_raid_picture($raid, $standalone_photo = false, $debug = false) {
$GLOBALS['requests_total']->inc(['raidpicture']);
}
- if(utcnow() > $raid['end_time']) $raid_ongoing = false;
- else $raid_ongoing = true;
-
// Query missing raid info
$q_pokemon_info = my_query("
SELECT
@@ -277,7 +274,7 @@ function create_raid_picture($raid, $standalone_photo = false, $debug = false) {
$show_boss_pokemon_types = false;
// Raid running
- if($raid_ongoing) {
+ if(!$raid['raid_ended']) {
if(strlen($raid['asset_suffix']) > 2) {
$icon_suffix = $raid['asset_suffix'];
}else {
@@ -515,7 +512,7 @@ function create_raid_picture($raid, $standalone_photo = false, $debug = false) {
// Raid times
- if($raid_ongoing) {
+ if(!$raid['raid_ended']) {
$time_text = get_raid_times($raid, true, true);
} else {
$time_text = getPublicTranslation('raid_done');
diff --git a/logic/update_raid_poll.php b/logic/update_raid_poll.php
index 8a9d1cc7..45a74575 100644
--- a/logic/update_raid_poll.php
+++ b/logic/update_raid_poll.php
@@ -6,10 +6,11 @@
* @param array|false $raid Array received from get_raid() (optional).
* @param array|false $update
* @param array|false $tg_json Multicurl array.
+ * @param bool $update_photo Update the raid photo.
* @return array|false tg_json multicurl array
*/
-function update_raid_poll($raid_id, $raid = false, $update = false, $tg_json = false)
+function update_raid_poll($raid_id, $raid = false, $update = false, $tg_json = false, $update_photo = false)
{
global $config;
$chat_and_message = [];
@@ -26,10 +27,12 @@ function update_raid_poll($raid_id, $raid = false, $update = false, $tg_json = f
}
// If neither of the methods above yielded results, or update came from a inline poll, check cleanup table for chat messages to update
if(empty($chat_and_message) or isset($update['callback_query']['inline_message_id'])) {
+ if($update_photo) $photo_query = 'AND type = \'photo\''; else $photo_query = '';
$rs_chann = my_query('
SELECT chat_id, message_id, type, media_unique_id
FROM cleanup
- WHERE raid_id = ' . $raid_id
+ WHERE raid_id = ' . $raid_id . '
+ ' . $photo_query
);
if ($rs_chann->rowCount() > 0) {
while($chat = $rs_chann->fetch()) {
@@ -102,7 +105,7 @@ function update_raid_poll($raid_id, $raid = false, $update = false, $tg_json = f
$tg_json[] = editMessageCaption($message, $text['short'], $keys, $chat, ['disable_web_page_preview' => 'true'], true);
}
}
- }else if ($type == 'photo') {
+ }else if ($type == 'photo' && $update_photo) {
$media_content = get_raid_picture($raid, 1);
$raid['standalone_photo'] = true; // Inject this into raid array so we can pass it all the way to photo cache
if(!isset($media_content[2]) or $media_content[2] != $chat_id_msg_id['media_unique_id']) {
diff --git a/mods/raid_set_poke.php b/mods/raid_set_poke.php
index d8f05a32..f936b614 100644
--- a/mods/raid_set_poke.php
+++ b/mods/raid_set_poke.php
@@ -48,7 +48,7 @@
// Update the shared raid polls.
require_once(LOGIC_PATH .'/update_raid_poll.php');
-$tg_json = update_raid_poll($id, $raid, false, $tg_json);
+$tg_json = update_raid_poll($id, $raid, false, $tg_json, true);
// Alert users.
$tg_json = alarm($raid, $update['callback_query']['from']['id'], 'new_boss', '', $tg_json);
diff --git a/raidpicture.php b/raidpicture.php
index 124cd9cf..fa415594 100644
--- a/raidpicture.php
+++ b/raidpicture.php
@@ -36,9 +36,9 @@
$raid['raid_costume'] = false;
$raid['event'] = ($_GET['ex_raid'] == 1) ? EVENT_ID_EX : 0;
if($_GET['start_time'] == 0) {
- $raid_ongoing = false;
+ $raid['raid_ended'] = true;
}else {
- $raid_ongoing = true;
+ $raid['raid_ended'] = false;
$raid['start_time'] = date("Y-M-d H:i:s",preg_replace("/\D/","",$_GET['start_time']));
$raid['end_time'] = date("Y-M-d H:i:s",preg_replace("/\D/","",$_GET['end_time']));
}
From 2a61a573889a097f4352678057c53081e4679a95 Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Sat, 2 Apr 2022 15:45:23 +0300
Subject: [PATCH 016/367] Proper format
---
logic/curl_json_response.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/logic/curl_json_response.php b/logic/curl_json_response.php
index 8e898f2d..1b2038e1 100644
--- a/logic/curl_json_response.php
+++ b/logic/curl_json_response.php
@@ -71,7 +71,7 @@ function curl_json_response($json_response, $request, $identifier = false)
$unique_id = $photo['file_unique_id'];
}
}
- $standalone_photo = (array_key_exists('standalone_photo', $identifier) && $identifier['standalone_photo'] === true) ? true : false;
+ $standalone_photo = (array_key_exists('standalone_photo', $identifier) && $identifier['standalone_photo'] === true) ? 1 : 0;
my_query("
REPLACE INTO photo_cache
VALUES (:id, :unique_id, :pokedex_id, :form_id, :raid_id, :ended, :gym_id, :standalone)
From 4ca3a79417e4d64254d60dd80aa40af5df7e2ce7 Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Wed, 27 Apr 2022 20:47:23 +0300
Subject: [PATCH 017/367] getdb fix
---
mods/getdb.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mods/getdb.php b/mods/getdb.php
index f2d80b19..1cf7f41c 100644
--- a/mods/getdb.php
+++ b/mods/getdb.php
@@ -44,7 +44,7 @@
$pokemon_id = $id;
foreach($forms as $form=>$data) {
// Check that data is set, if not the mon is probably not in the game yet and there's no point in having them in a broken state
- if(isset($data['weather']) && isset($data['min_cp']) && isset($data['max_cp']) && isset($data['min_weather_cp']) && isset($data['max_weather_cp'])) {
+ if(isset($data['weather']) && isset($data['min_cp']) && isset($data['max_cp']) && isset($data['min_weather_cp']) && isset($data['max_weather_cp']) && isset($data['pokemon_name'])) {
$poke_form = $form;
$poke_name = $data['pokemon_name'];
From cc70b742c57cfdfc5d8b0d7bd51c7ae779b0177f Mon Sep 17 00:00:00 2001
From: Artanicus
Date: Fri, 29 Apr 2022 16:30:34 +0300
Subject: [PATCH 018/367] Fail pokemon form name resolutions with a useful
error
---
logic/get_pokemon_form_name.php | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/logic/get_pokemon_form_name.php b/logic/get_pokemon_form_name.php
index 64e81bd7..075e742b 100644
--- a/logic/get_pokemon_form_name.php
+++ b/logic/get_pokemon_form_name.php
@@ -24,8 +24,12 @@ function get_pokemon_form_name($pokedex_id, $pokemon_form_id)
);
$level = $rs->fetch();
- $pokemon_form_name = $level['pokemon_form_name'];
-
+ if($level) {
+ $pokemon_form_name = $level['pokemon_form_name'];
+ } else {
+ $error = "pokemon_form_name unknown for pokedex_id: {$pokedex_id}, pokemon_form_id: {$pokemon_form_id}";
+ throw new Exception($error);
+ }
debug_log($pokemon_form_name, 'Per db, level is:');
} else {
debug_log('Faulty dex_id or form_id, defaulting to normal.');
From b7fdc62646b4653eeb223510b4dbd26b4f87e603 Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Fri, 29 Apr 2022 17:10:37 +0300
Subject: [PATCH 019/367] Fixed getdb to support the new mega system in game
master
---
mods/getdb.php | 50 ++++++++++++++------------------------------------
1 file changed, 14 insertions(+), 36 deletions(-)
diff --git a/mods/getdb.php b/mods/getdb.php
index 1cf7f41c..900de408 100644
--- a/mods/getdb.php
+++ b/mods/getdb.php
@@ -176,6 +176,7 @@ function parse_master_into_pokemon_table($form_ids, $game_master_url) {
// Using negative to prevent mixup with actual form ID's
// Collected from pogoprotos (hoping they won't change, so hard coding them here)
$mega_ids = array('MEGA'=>-1,'MEGA_X'=>-2,'MEGA_Y'=>-3);
+ $mega_asset_suffixes = array('MEGA'=>51,'MEGA_X'=>51,'MEGA_Y'=>52);
$weatherboost_table = array(
'POKEMON_TYPE_BUG' => '3',
@@ -245,34 +246,6 @@ function parse_master_into_pokemon_table($form_ids, $game_master_url) {
}
}
- }else if($part[0] == 'TEMPORARY' && $part[1] == 'EVOLUTION') {
- // Found Mega pokemon data
- // Get pokemon ID
- $pokemon_id = ltrim(str_replace('V','',$part[2]),'0');
- unset($part[0]);
- unset($part[1]);
- unset($part[2]);
- unset($part[3]);
-
- // Pokemon name
- $pokemon_name = implode("_",$part);
- $form_data = $row['data']['temporaryEvolutionSettings']['temporaryEvolutions'];
- foreach($form_data as $form) {
- // Nidoran
- $poke_name = ucfirst(strtolower(str_replace(["_FEMALE","_MALE"],["♀","♂"],$pokemon_name)));
- // Ho-oh
- $poke_name = str_replace("_","-",$poke_name);
-
- $form_name = str_replace("TEMP_EVOLUTION_","",$form['temporaryEvolutionId']);
- $form_asset_suffix = $form['assetBundleValue'];
- $form_id = $mega_ids[$form_name];
-
- $pokemon_array[$pokemon_id][$form_name] = [ "pokemon_name"=>$poke_name,
- "pokemon_form_name"=>$form_name,
- "pokemon_form_id"=>$form_id,
- "asset_suffix"=>$form_asset_suffix
- ];
- }
}else if ($part[1] == "POKEMON" && $part[0][0] == "V" && isset($row['data']['pokemonSettings'])) {
// Found Pokemon data
$pokemon_id = (int)str_replace("V","",$part[0]);
@@ -328,7 +301,7 @@ function parse_master_into_pokemon_table($form_ids, $game_master_url) {
if(isset($row['data']['pokemonSettings']['tempEvoOverrides'])) {
foreach($row['data']['pokemonSettings']['tempEvoOverrides'] as $temp_evolution) {
if(isset($temp_evolution['tempEvoId'])) {
- $form_name = str_replace('TEMP_EVOLUTION_','',$temp_evolution['tempEvoId']);
+ $mega_evolution_name = str_replace('TEMP_EVOLUTION_','',$temp_evolution['tempEvoId']);
// We only override the types for megas
// weather info is used to display boosts for caught mons, which often are different from mega's typing
$typeOverride = strtolower(str_replace('POKEMON_TYPE_','', $temp_evolution['typeOverride1']));
@@ -337,13 +310,18 @@ function parse_master_into_pokemon_table($form_ids, $game_master_url) {
if(isset($temp_evolution['typeOverride2'])) {
$typeOverride2 = strtolower(str_replace('POKEMON_TYPE_','', $temp_evolution['typeOverride2']));
}
- $pokemon_array[$pokemon_id][$form_name]['min_cp'] = $min_cp;
- $pokemon_array[$pokemon_id][$form_name]['max_cp'] = $max_cp;
- $pokemon_array[$pokemon_id][$form_name]['min_weather_cp'] = $min_weather_cp;
- $pokemon_array[$pokemon_id][$form_name]['max_weather_cp'] = $max_weather_cp;
- $pokemon_array[$pokemon_id][$form_name]['weather'] = $weather;
- $pokemon_array[$pokemon_id][$form_name]['type'] = $typeOverride;
- $pokemon_array[$pokemon_id][$form_name]['type2'] = $typeOverride2;
+ $pokemon_array[$pokemon_id][$mega_evolution_name] = [ 'pokemon_name' => $pokemon_array[$pokemon_id][$form_name]['pokemon_name'],
+ 'pokemon_form_name' => $mega_evolution_name,
+ 'pokemon_form_id' => $mega_ids[$mega_evolution_name],
+ 'asset_suffix' => $mega_asset_suffixes[$mega_evolution_name],
+ 'min_cp' => $min_cp,
+ 'max_cp' => $max_cp,
+ 'min_weather_cp' => $min_weather_cp,
+ 'max_weather_cp' => $max_weather_cp,
+ 'weather' => $weather,
+ 'type' => $typeOverride,
+ 'type2' => $typeOverride2,
+ ];
}
}
}
From 2745bf3e384e4ecbba48e8ab2e45363b6f602437 Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Fri, 29 Apr 2022 17:11:19 +0300
Subject: [PATCH 020/367] New translations
---
core/lang/pokemon.json | 1 -
core/lang/pokemon_moves.json | 26 ++++++++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/core/lang/pokemon.json b/core/lang/pokemon.json
index b1470fd8..913d424c 100644
--- a/core/lang/pokemon.json
+++ b/core/lang/pokemon.json
@@ -4139,7 +4139,6 @@
"RU": "Крабаминабл"
},
"pokemon_id_741": {
- "PT-BR": "Oricório",
"EN": "Oricorio",
"FR": "Plumeline",
"DE": "Choreogel",
diff --git a/core/lang/pokemon_moves.json b/core/lang/pokemon_moves.json
index 8764d514..d12c7d79 100644
--- a/core/lang/pokemon_moves.json
+++ b/core/lang/pokemon_moves.json
@@ -3859,5 +3859,31 @@
"IT": "Acrobazia",
"RU": "Акробатика",
"ES": "Acróbata"
+ },
+ "pokemon_move_365": {
+ "PT-BR": "Purga de Esplendor",
+ "EN": "Luster Purge",
+ "FI": "Luster Purge",
+ "NL": "Luster Purge",
+ "NO": "Luster Purge",
+ "PL": "Luster Purge",
+ "FR": "Lumi-Éclat",
+ "DE": "Scheinwerfer",
+ "IT": "Abbagliante",
+ "RU": "Генеральная Чистка",
+ "ES": "Resplandor"
+ },
+ "pokemon_move_366": {
+ "PT-BR": "Bola de Névoa",
+ "EN": "Mist Ball",
+ "FI": "Mist Ball",
+ "NL": "Mist Ball",
+ "NO": "Mist Ball",
+ "PL": "Mist Ball",
+ "FR": "Ball’Brume",
+ "DE": "Nebelball",
+ "IT": "Foschisfera",
+ "RU": "Шар Тумана",
+ "ES": "Bola Neblina"
}
}
\ No newline at end of file
From 7a4e802e7433cccc1c7786bfaecbb2c1e5fce688 Mon Sep 17 00:00:00 2001
From: Artanicus
Date: Tue, 3 May 2022 14:20:34 +0300
Subject: [PATCH 021/367] Add default config values for level 7 raids, i.e.
legendary megas
Lack of these causes crashes but this does not add full support for
them, just avoids some of the crashes.
---
config/defaults-config.json | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/config/defaults-config.json b/config/defaults-config.json
index 233d00dc..890f002e 100644
--- a/config/defaults-config.json
+++ b/config/defaults-config.json
@@ -100,6 +100,7 @@
"TRAINER_CHATS":"",
"SHARE_CHATS":"",
"SHARE_CHATS_LEVEL_X":"",
+ "SHARE_CHATS_LEVEL_7":"",
"SHARE_CHATS_LEVEL_6":"",
"SHARE_CHATS_LEVEL_5":"",
"SHARE_CHATS_LEVEL_4":"",
@@ -109,18 +110,21 @@
"WEBHOOK_CREATOR":"bot_or_user_id",
"WEBHOOK_CREATE_ONLY": false,
"WEBHOOK_CHATS_ALL_LEVELS":"",
+ "WEBHOOK_CHATS_LEVEL_7":"",
"WEBHOOK_CHATS_LEVEL_6":"",
"WEBHOOK_CHATS_LEVEL_5":"",
"WEBHOOK_CHATS_LEVEL_4":"",
"WEBHOOK_CHATS_LEVEL_3":"",
"WEBHOOK_CHATS_LEVEL_2":"",
"WEBHOOK_CHATS_LEVEL_1":"",
+ "WEBHOOK_CHATS_LEVEL_7_0":"",
"WEBHOOK_CHATS_LEVEL_6_0":"",
"WEBHOOK_CHATS_LEVEL_5_0":"",
"WEBHOOK_CHATS_LEVEL_4_0":"",
"WEBHOOK_CHATS_LEVEL_3_0":"",
"WEBHOOK_CHATS_LEVEL_2_0":"",
"WEBHOOK_CHATS_LEVEL_1_0":"",
+ "WEBHOOK_CHATS_LEVEL_7_1":"",
"WEBHOOK_CHATS_LEVEL_6_1":"",
"WEBHOOK_CHATS_LEVEL_5_1":"",
"WEBHOOK_CHATS_LEVEL_4_1":"",
From 156667c0dac8e946dd7cf65e8f1ead183c5070f9 Mon Sep 17 00:00:00 2001
From: ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Tue, 3 May 2022 17:39:26 +0300
Subject: [PATCH 022/367] Legendary mega support I might have missed something,
let's see
---
constants.php | 1 +
images/raid_eggs/pokemon_icon_9997_00.png | Bin 0 -> 21087 bytes
lang/language.json | 26 ++++++++++++++++++++++
logic/raid_picture.php | 2 +-
logic/read_upcoming_bosses.php | 4 ++--
mods/getdb.php | 2 +-
mods/pokebattler.php | 13 ++++++-----
mods/pokedex_set_raid_level.php | 2 +-
sql/pokemon-raid-bot.sql | 4 ++--
sql/upgrade/5.sql | 3 +++
10 files changed, 45 insertions(+), 12 deletions(-)
create mode 100644 images/raid_eggs/pokemon_icon_9997_00.png
diff --git a/constants.php b/constants.php
index eedf0507..ceb64dac 100644
--- a/constants.php
+++ b/constants.php
@@ -72,6 +72,7 @@
// Raid eggs.
$eggs = array(
+ '9997', // Level 7 / Legendary Mega
'9996', // Level 6 / Mega
'9995', // Level 5
'9994', // Level 4
diff --git a/images/raid_eggs/pokemon_icon_9997_00.png b/images/raid_eggs/pokemon_icon_9997_00.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdd08eedd319d0a1df34db81b88ea808be7b829d
GIT binary patch
literal 21087
zcmW)n1ymc&*T!2)Tim5sDH1fedmB7h2^Jgz6nFQx6bgZ20fIx3AVq@}r$B(>E=7yG
zQ?$^J|98%A_RKjs*`3MG+~?lsH}LnG%7l2dcu$@@AyidSfIMD(9?$=9UOav-J7rTo
zUY>eFltE7_N9cDS8`!q*G~PXVf{w@kYx(@Kjq9dj==tOcQTPAOr+uy^)=!>jU#Kd)
z)AchuZ1YVpHb55tlA^1X68I4K;b9jJk6ro|6*rf@l#@Pxn4YnBlzp`4VcNc_n5%v)
zGx3I8<;^PDZrjyzpliZ%;9%iZp^7&1CPy@+G$e53`SSWR90(+3s^Z&>UeM|Cvme68
zfgPTs&lAQN|H{UmoK^liS)a6&(<{~W*4EaR!rbg&FGXf-OvQ8GDQVA({3jkfuzu25
zNGvEME3DXN_&bfuuVrG>4dXzKxf8$e(2t;-Pr
zz*@EqNjCqOt1rCPK?ivrG}LM|&TEx!)b%r#E^Gohu9oMHtdaZM{qN9RqP<6KeULse
zG4Wq>ef^(*uV`p)tm=*KmE|5zgemi5SMTD&2o5@!6N93@Ea7EQ1
zOupRmMC_&;n#2>wAUCs3D^Jjs|0pES(!Mlsr|UUCzVDI6Nf%(s_28?W
z%kw53d{}OeXk|sdRUo;k)PmqM>XEOMHZpU%9Wh7s;xd@8C^t
z*dSr8J~U7mrzr)u@ym5BTQHG-Hm*=db~q%t^t~}^0*<@!=c>TX4oBqt+|GwppZR;4
znPz2&(x>uEpPTL9_g}w$m3vS+pngS4O8V5_>nx2mlkmaD#xGqH=vmYFx;=#lRGDnl
zezU_-#Zu?AzC{QxC>hFEz!P><9xOvP_!=9UwR!k5`ApPqd81Ic<&STy29946V~)`O+uej
zKi#M(Cq$oXRLauQGIZmbvYlq)tN>U({tgYr{#{(`skL!P0hR;Hr`hSd8NQC7U
zS+BYd*+3Of!7_u^)sIq6yU$^uG&kK6C|o<l$20k~zB+eQQrAsgHb)n9DU*Bh_2@_$tQc$Eo9e
z_iOfjsS^iF)R3A)kHt7Jk$h0~{v)U28`dNRWdBv@s0Ep^X2t*i{No*les(sK7)wd~
zH&q0|PP0-i0jt>5NM*cN^mN}}3;VC9=#pU2!=KKo-V6^|9>~+ZnVXxvNveBi&M@8`UjSCl441d5<0@{
z{K6eFNeeq%WG%99@$!Em6KJ)w!Vr0QmOsZu^DE=+5;XIN4jm790uo2Aj8=9_+;6Yo
z{oG{K=O#mRd4
z>MD5O1XmNUsH*pdMn(1I_Oj!`fytW>;?vR8wL+%>Aw+STwk-MW1iSJ)B{|34C!G|c
zE)}qg0qFo$>%Pkb@kTl$ZDR>`DbV`fc$f5B!waxewh_cL4Jv{i^F9qVlbQ+<(Qr2
z92HkRz3Gzmy1y>O$mW~gXH4}W!T01S-69uDT0oK&M`p$k%&I8c=;41l((W!#t!%di
zyxwA|l!Pbjyg-V(x!|#+Zre$5DhL4+Z9KsK=3#^UG07O8O2T~qb~^h%5ja|E9*6-y
zIv94=Tse{}nXtaV*Y}-Da^YEnrQ3Uc@MfwF7;aNK)Z5#8+-{<}XAAdMzU#$q{?5L;
zG2Z_#3nqce(hqd74?&$t`-ebO^aMjj*f3yEr>iY~yq1B)@w9)*?{SfPi4^aayk4J`
zW=v`R8H52!@Q&ROips_?{W`ZMI(|S^9-tU?$q_Bm`P1onG)Uean4g0
zlpuuDhmsqm$EioQA2&Akp2^q3;y2b|q@?ETaqmwT=jnL!W^Bim#-X2EpND?TbIosU
zYs)D*cG}p!5Zgw(xjfTJo=N;8;KlPEp0%sEu1oB|CaEp*>j*i4cKALu;?wVBZcKXe
za1bHTdHwJPRZnnuULj6N{oFNn4;Mau!tA%AL&t=pHu?2y2URwma4xy?<6_MStqAMT
z)TCO-9fQQ)NboF#*!N>%X6RcH8S$x;o;GAgchI_d_xbkaZip$vSWE4>l8Ozvnfh=N
zE>D?)t{$Q8w0E_SPo9|ip^uB!YY@#SunnJzh>^OEX%r7KP*xKasz7V786NQQ&|EJh1DR&^4$zCR+jL2i
z*RPK@#e>aP#%t>8dT=$Ic6-JT$U2F=yhPY(PXG1npO_brV=fi+W!D_`wS^~GelqMR
zcsR=74tIXn;|gdsQn^ppjxkU3)~cSr$uZ;cW8$I7iLm$MREsqKV0TLH$o#+tc&EgP
zOhibvF0o@YbLkY%y@bGbTyDZ#1nou+2q*`B5f7sf0?O7_kKH3rSTh&v_!7t21rw_E
z^;jA9Z{ETUe84xf3p$D6`~|Xe(@O%*)|No%i}iK?8uxMjy(M(^{}dYm=ID9oO6EEj
zVo3qUJ`H_cOi7mV7iFXoFMtQpoe$DNYLNu?4^q~1r2{#U|3oS$Y81Yho3V4n-t>i4G`~^<
zIoLE)Et@
z+rYHvWPT~|f6-l+x!YC`Iv9nB_%R8o;-tKfPAT+&8B}V)d*PXEIp!h}GsPL~yqyotjm2OA
z77^{+c3vjruMTfbrw#@(=9rXg(maZNyciq$;`4n0JUY7KwfT7xLt}g`@Hb^M8Z#}_
zO*p21EM-4#Hp$z?e>!;wX`nL32TzT%$hWG&l{oD2lK_m!*t=g(ipyOL*IT-G=zUoI
z`$kDjN_)(VqajOO3H(hf-?ZEuQvO4&7=f#$L9uYb#U1_9@wxoA?Rec(OvHDeL>0Nw
ze>7B|j`s+!neOAjA)w8)o980Bd_|jU(_gSU;rWv90s`(w5?Pi*G2)uX20}Z6{}>ln
z8}EqE_V(A+GBQ`9T$~i_6rW3b47y3zKB+=kBgTZ8{!nts9~BA$Pi^=7g7_ro;Vi7D
zuiO_82x4SF^qxQOYpb994VQ#{htQDGnYnZZm*eNP%)Y<|Hn`N`9SRZhBTkrJso1$Xfbj*NqHCf{6YZr?=c7|$;trY7Ph0!5}>kp1QcYTAfVEiQaha+(pIU~&8
zFU_nb5$3eT{dfN6oEdBmZbl57tVon#meDbGh83(vmB-dvpsyi!5c3{ftlweiiq+k>V?17rXdul%I#-6fz7oC~;9cFB#0J%Ru
zU(L*nVX^mmZZz>6#DPKrI$VS$I$=q8>S>0IeLaI^e(RS+Bc>+3!>%|-=7*iqoo-F2&iTyq@2|N=la`c&Eh-dqn~AE
zQl{W@2i;&9EIjB^7g
zU(dbfnn_jFqDc^R8*j$mk*MmDffPt8K@x4}gU*d-7T_qEMu~98Fg0+v?iNMGikSve9yb1#zdl#r5k?T`ZXZZS
zcUSu=i|#*ErS1?KDEc`Hpo`5Yq|K_W`ik^z^-$xQH7k;qBqKNcCx}6|SAq%Ab4JfS
zT&q{X2?EAgqY=8Qj`-%V~aMh!TXPq(1UhHJu&X#JE--*UyjC2zx&C`2GayABO96lYgAa$c_(g#dw
z$y>~OIHCHN@M5l4PjN}3L=zR%fV!m)tQ$KCX{leXfjqDYG7{%lceQE&l&v133im9Fk5(3rv1t-BB>eMOMVL5a0qa-fWO%ZA*V6F1so#Y~Qp5zC1TPkIfV^K{qH
z?9Sv5A0)A46n0D+Ko3&cR*I_Z7
zrd)$^R&V#V9@T@*1s2fW6r>h7EtXL@u1~g)%1`cnFTs`$OnF`l9lch`@YJiTjHTx2
zxdrsB>%y?j3|=x#6_RQSL`o$J=_=`q)f8akq#V7$U-!+@P&;QiEsGe*al?|Ei
zPDcDTs8##HS7g%acdEru{7^=hHM2S$tO5^CpMe2&yRxTJ3185Q?M6VglwpQW)$-+1
zg%}5wZw)`98r5SPhqHB+5CejM(pDK?=l3dY0k#x$FPC1WS5kY(fVzH@t9sx_R1l$S
zOq2s8dJuCK1)pi97_csIYoLtIz}C{BKzqHDuLIrvJT&F<+U6p(Tg^62rkMpb(4qiK
ztlLVWr^P}=XolX(5Nm=j%)WkDHwB_hm&dI2fxdE2JTGT>hO#6S?$+=S8B$r8b}++n
zEe4Dd|F7`#gyi(&lchs>`_MFS=B8e(?6*nTQE!69vkxrZom;f)Kv4I_u39)~V0~aC
z-ub>Wf01#PH6F8ygE%e#jxb?Li%Wr_3c1L+`!_dgEO-Z(Z~2*!&uibSKF)Onx-B>z
ze*bKUKBs4~=^O-H7r!?jPM8>&^U2;dF{1>eD?U_wonQsEyAjNJT+w5WFR*i&e79Tm1M00Vnxr1|+a2++4=lhG3ui3)HN
zL5z2oz$h4IDv|vP+gv_8VL^O_Wy3?_ai*81Wu%m5o4#E*qYV&iutuBPI~Z~l>v1B<
z2UYrF_qjPT>8W9%;3dg(7z9BQIKh;vv%k;L*M4ew5=9hd;1p$-<=3tkz1ftK2u8Ce
zleeIMeZ2E6I^F5a*8!)T&<_fGr$m$eoe!PX+Ej4n98E(^#XqtgSOH!8;dM?WO
zq{i!;qk5a%jhfXh|4m3reu&f_oBcd>`Jxq!FjsxwPe0w;*$09T3%@BqzfCYojoBdM
zo-zzjNLzE09ARYFYZoWopBWwJ}U=m!_;EUEo9)?EE2F1_yFd07BO;vn>w}eJx$kxMlklV;Kk=bOlA64;>fe7NrC2p<=9ye5Q-K{AXc62WIne|~y{gzTMT
z;>zc(Z&TUF+QgY4Lu7pBxjnJQ_*l!^3q-_$S&d%s<~cDZzYDu@_|DQhu$+($RoH$OOK%Q(_Rv$AY#t4U(&OS~N5Qca`6
z(TIk(#UuofcZAWb)WRzrx_yWuDE_lHO#`0GPuL+s`mOhppc+SUnGy?|qwhD8B!X^t
z!#FxxgV&F6wvc=LZ?oO397)#@cCy5%!Y1;41ax!^NBgrPE?d*6h7$qYnzbpef>mGI
zb8}9Ph9Rtc25-Yhx4`9_flA6ojk*oz(aLh~#dMh#{7?TsSgytS5NUSK!>9>LaQ)@W
zoduI%7g#R9=X{8Rh<8rm@tve0Gij3yGyZO8zs7vIH~n<6N$B&!cV%nzkp-GDR5~*L
z^=S0XpR;<|FPi#a+gd2>CG?quI0W^#3}Gqol!5BTSOqXnDXRg!@?J_`9W&h&p8x$5HVI2g@|%TTc+MxYpB~@?J^`#tlF!Hg}bxxUbXsMuI9y
zU%%FTol8~5&C_$VDoQ1K&DXN65Jr<@ZY#zfF}0#_Fr2x*1_keIQ*w)FNzZy15s!M~
zqD5kFJirB0a6vPssT;E8Jm4%Zbf^W0D6CNjWFVo
zBg|04qxYxl8zLY@C
zzEZbn@OM`ye(*+}WSY0VEit6q}MrxbL*am%d9FN0me$?6f!h7Esod8BTRP}dwl!BGrn!quhMC13$VyQ4GGd^0gYHQ@2Y5#a
zlcTE$N^(>Pv5f%wz+A~I8c6?Q5~6cyb!^bUKYEUFBtgy9FCJ2y`SlEnr6__=No__r
zHfr`wp-)G{Jm^PxyBv4@{W=kx7_J+8gjwNr%Qz{{P(3rMlpvzb+b(w(Ngntxz)Ca{
z|0p7|13E8#vfoOYE!cG}f(Vt^zykab*2y^}Z=9;)
z0nGIuEl*j6pT4uKd-11Oa9U`3mQkdTJ!+SK!|-d(PEQO@Uw7AYF#0vxOCZ67tzMLRQ=Sk66l&@K
zOx#)pN3nVgg6>nVI2ZQ#pGS2dFLK#b!;S-ry)2Hf0j1`YD%tni8s^h&$SULFa!Mz
z1tW=ir2=i0i!;>5wRkrSz}nf?hAMIS*>~bcNR^t2Zkzo0=@YM$OTCqS#dCb_;WSf+
zaOZ~C>y!1b(#t#NK(#|BPAo5q?fpf}V$K>opwU94IpvffKod|Ogu^yLhi8qJ!JkZ%
z`L4A&7oK}=PArb`aF9T=dk(JZnGid>3rx_`wr{@w)ARZ8%+!tZ@+UWCE69LE?H>5J
z1i{IcRfTgC?UbDLn-o*YHmOt{9E!kEDFXs(Z2|QLh4occ1O)|pIC(cyx!|gJMiEI~
zn9O~*3YT{o#=e7OV{^B%Rc`^!Vu5So6P0h82hot+sE0U
z2Z~e+r!$e_CSlL)+IIgp8yZRWwf2oOE8emCxK@!f2J=53J5%ki3Y9rV_Cfn1b1PSu
z;*qDnyA{*9uV$)yLZ_9(%38`uY^M5QD8ZpSSUYNDiWLqRF#ziQvq}e85Fl
z6>s7;6`z%b&uyHY@jZ0?mkO@u%L!UuR&>%}F+)RC-=AP*i~F|Psdo()v9>yBb~$25
z)yU$C?N;CIi}8`|+QuorA$5SuTZ8FgHz)~aCcuk%3Q9!9I6qk_=Mg;qit0&VV~fE@
z;v*vb*X=T&9k&Ck8^)qm+dZ(gKe3)@{Z~cpU7aIbg{OORUi2dR65uhhE+7Jl-J17u
zau$a8$|#wKPNZwiMCrlOq0CfK{z2DnRE({1EPltPE+=fKm&T$FB>vAWiXFec_D4ya
z5Pan#Rg;VH3+tvCE#bGGM(Q{O@;5g{@ft~K&aQ!qt%M{zqp3sos5i)^YR(0C_iJ>ODBZCJ=_#vT4TB}&fzihCU7S9~AyVDj?CZE6v$+aSoq0@h^(r{Fg
zZ-%5fhzzJo$l9-N-%hmtY_lT~YS1+FsN9)@buXz;gV(KW&`hch6b&$izksqe
zuwYj8pqNn|58bj~QNqz5z=b}-)Qml89!+(*lB9`ij;8SPrLeH7f7-I3Auer)x@m}n
zh%0RR<1mJbgVo1c2R)C!klgk6;rsnfG_7`o6;rj0%QNuB#A>Qk#}F3eelq7JD9-&9
z&eii8_aXw#@e;+L0dg2^CFC}!eAC!K$!AZX1-I#{;i@3A$(4DS{N5o`NpV+>c}SSC
z{{jKB>w&prY)XqMVNC>)2~Zo(2WA*CQNT%*=4-X!J5Z7ij1Tg15H?x<;d*l7^J7dV?Z9mET8vk
z?0#_LdGD)!#@>{{XN_)^#I{7u=-Q=^G!9v`^IR6gnu?n44GCN^dY~`>`gI}`Y!Fs<
zC&k|?8=v^cdni}tP90rY>doOL7jiMctv0F#WaMMuwe<3*=)=Ry!gxSXH-Eg>I8xTg
zv*x#l(B=x|x?#r*GXs$HyYG?J=&A6{UoT4XIZ<^O%T{S-1~`hGgUm6Nr%)2{ZDVfm
zX;{<`J3~PoZR@w*aNPP$PP=ca@@l4R^K_nL6Up%bMjiTkAM(n>X}@A|d(`rPILHge
ze?n;Z9A>cp($|Cd@onNFv47~QJFaaRUGQq=`+HF&wY0o4GVO7fyy{4Sx@6^~Kvjif
zWX^kOK0cbX8~%D>JzU#!D{Sa&XU-ZZO84{N2|&A&X`>86SGm^%1(R`D?3Mx%yvU^Fha|4>G08OCLf*{ND?&;R8?MA2K_;!3lmyz+
zkdSFxJC#D@cQAV9)SC%8cxoFRe6yL_G06CzfUGR9?6Zzg7or|hQ*j&g8+19rLS*Dx
zW6)P)w?88Q*5uT+#(q}6r9x7AKwKu7d)K>05zVdS0fQfRe~G%qL789(oV6=~Hny(r
z75mzHu=^=9k8`Cr&T?oOwVyCY12wTRzYvtEnpWtyzciL?u^kahSSuO!)8bP4B%CTM
zuN7Qy<+GMI0p&sJv9WX83mlt$yBKm=cKd!W>5K;%RdHI}c$U?$NoAJb-pmNzoLAR(
zV;MKX2G|bsVe2IHIZxz5n_~w$;>CuG+b=}0O28z`9~H*PgY5bNtE$xCuy^r@W(O}F
z*!K7DJ(nk28h-^r^1OH?NS)}@d$lM|=a$i+qB$1jIBXTzO;Wodup4H`5wp3znqv4-
z>ajuupDe;=M{{cUW2rh3*JUg$QTKal%gKi(7fgU>wEPYh-U&I(aekg(S}Nvoq+;a=zO>S-f>V3I
z9&$Pdr8>pYh6g`?;>^s<|Y^MWVi%5;tHrG&)CS9s{5P9K(l=IG5jE>!f!1pIsP
zltemW?!QTQ(6^44fEX7~syl3|M;}O2w*R820#c4Wy7}&%!&Ce}uwRQ2wYq%skjFZn
z*#q{VH_jzqLpSU&te`Y0PFd5QbNOx5iXhRfDw@_*nk~&cNV^9;1rY
zMqgJdF_$kf$sxCHZ>a|DZA{eokJVs@UCaz)xUAz4GSuC{ng0sqT`*9;D-%^?B3l&N
z?KgR4jeZ*9&Wr|5sR7X(!*zVv+&x^YXY}eTeNWXWOHucJZLd>?he2F}n-`UnL4&ZA
z&BnUA3q~QLSS@1YfUv0O01PFeAJ%hZDobJmmynIR|R7gq#G3Xhp9{%u3io&B9eJ;6kaFQWkWbgBqc-iAFHEZhOUQ&%v_
zQgQZlt>Wkd`fUDwk}<$$=(If{s*B
z5)=d>>lim0&EFWrd)}Tb{aR2tc#|m{{OE@+O1pR0wVCl@s3@d4J8Ryn3TAJxd)R5H
zp=M=^&rJHma&S^HXX~$a!+!U@2w=l$0$v!xH+xmPk|b?WP~7h@T$DO4Z~r2YW^&TL
zy~5L>5L&{D{GMy<(SkZ_3APjyDFlBgF_qdd!Eo)92{tf9lG5*tvFu?@S@PG;#;TOI?Ao9cgpnQc_q@564`?hbIXmaH{c%4nD
zQI|>@!y|$rAP|z4W=8?z%iZ?_ACQP>B*{-l;S_#*y9+_SH$Yc%*aWylA^q0?GEWkU@xhVavgK~vsH|~lv0{JqA@nF-(FNT6VARknDljIUJOaZCx}xwYMT~hd=U(v$;NVNemKkiHMy
z!X!=#zKJtz~(FhWp
zLI)Vdv$HURV}4lFCk%weXBYZU$3Cj-z%F)dd;gviC#TMzL%?}s}nTcYPZOP?UHV=6*|Mrt)sF4-U|ZQGDh2Tzkmy~afKLpUIPYtR}~I7XQcBLRsh
zAU;`lIgO7Y05d#@_q7qtmWT|esJ95-FU_lVMryNbpYF&(2Nm3Her~?ljIAFi2uY6GcX%h@Efe*%*NY&Q!{6=J%OoxY!$Px?<
z2Zx}6DZBYL#Q2-N@b5q&q;+qtdKk)~{6!%`fxHvsKM0YFhkoM3b3c7h(TI_^^%b}+
z73f-jE>PvMj*$*}%l>yfUxjBB4Mct)?}R^A`@uZ_OQ1_!v2>Zd#uYOXNo+_L=J>mX
zdSn5*Af_4I)8=xz*Ht(ne^zULuM<-}k7q1jA760vJ07V?kdj&EeN^?c!MteFQ%NS|
zwtTDaUV5E`@~b>Z0q+a0M77;{>BR?m
z>ddDab+iw{-$e{iRu0uqT+N*GkAG>9?FP22lOwN%bEONhL&amwLxts;ZEZsCAFx9H
z97)TD*b>Dbk0OR>q+7*e1HW&djI=4X{<{=(G0*H>b7D859kl0J{-}}>*k)&>&D>T7
zQMI?BG_p69l9h{}z7IY~ochFVU?<^s%16(Y`^Df>*uxEaXU9d=$g9D?$r`Ow5gJg2S!t$kAR0sgH
z92@^(=i$7kL0F7gT$j+*{FdQ**msoFvD*48GFQH6**0;e-gtWyzsaR1phWlImYwxR
z4r@c~!>Z^#3srMn9V>oLRu%R%)YZSwx|?4bhAYC
zy%!(tSEVUk)U<@prVH%P|aqodrblMQp%%RR3{q$B@gH*mFY5u
zwV}HDRmg*`iz=6EF8hp}IFXIF_p9n({A#Pla-J`wsQK{Fb)sGmI*)-9L<~SLEiKhR
zKP1j*0#gC!r*#!Cx39L{)+e}-TQ3Eq=eQt?lZJ5(Tg<{Iba`r%iMh5^o9UBH^%LrA
zy&S>k*BkdD;N@hM?ZYw|zq`vPxUV~^
zMY7a>ePY_(on~fAx#_olU})0pwY#7N--M{cvmtCqHS{BX`03D|DcQ0q%VKLuY_>FO
z;&d25CaN{~Z12ga)+5AsK2qzf1uLU
z1iE1o^(N8I&!#~fF$Ch2EMURzO^Gh8n8x=;Y7hx3NcS+P;SnB|;3fSvMKY68^feMY
z{&Ir$mww#RpMbp&Eq1t5?*?D*Wvnpt7C+|Fo>7}#A%7oOU$;rUlbaQMqOH-oHZ&o~xyj|k_d4VY0^(7e9-Z(_kD%4Ah<^)tll}>F
zKB`VSI!Sgp&~LiYrajH;LnGBgzm~L3q=lF;HR_+q2SK^~oEA;KRaa}Vjxw4siPA+C
z)#~>E=}`}s6w9H4i*cjJavaNWecm!|)P)wvDN6g1F3x-$IR4Qmuhw*b3OK&caa53R
zqRfspe6>5$wP;7GUo?m)Y}}d=hf>7B7rh9s2Nc#Km{*uV(6hS2qnb
z#&pe6-?ZQ9vGIsdezS}9D~^0z2z+7b|5fvkzdfyep9SUZF{m`T@znw#l~q(!YKi4~
z6gRd+7XZ8?ctk#8*b}F}7&47{kBEN{7#^9}JNw$xf9KP}S#FozLcVnU(z4km)B`7iw8Z)_M`s?D_qVuk#@%7TZOX2if`%0mfpv?
zg@yon4V`dQt<$lzM7mnZ>@(kb`1hX|dI`1nvDiS%!~4oePl9B~Wc%_<7L{2RXL*e&
z3w_l1O$nan{3T=T;CQ?1>9(O4@*qypXGYv(kKi(UE=jqozkHs685shuE;f}xq0qMN
zvFnQ{IQ)iN)yctOQwQGW=40@|x&2CvD)4UY$%ylJ+{%O5md(pe(Z!CX^W-_@tC!ZV
z#}GSR`a=57)2|9|91^#9P`YgYZJEhQ<}IqLRy%Q`2kPc~lsb>Yg?z?+@;X_$qs%i{
zI)Qg{F?r%Q;8%x{-FMJJKlLav@9m3MuD52dm6_e6d2zHt;PLIfrR%HAD1@#n@$K!J
zqCc6sUm!vpBpE_$i}v*7o?DduaeaM}C%-<)A}M(r>dSt4&`FhHoRN^78Tq;Qh5N!G
zH#exV?Dsajt!|dn+DvBhldp@`6Gq@O#$&0|G+Ll0FvjM{2SDT0}KVml`ej8oSs~vZxR5nv$v6l&qz>IkvR)xr0w&?!B)xSIXW?#2f~rZg?A`W08)>WLEXSOg
zeS!Cu_;S05+WriHDOqQJMqlM0Z^T1e)mw)Bb>!lrotHOC+ty425m_?6K#@z)z1!-Y
z_v~0Z+P^Y5QgSdZc}4biO=9=&L@wWOQpoF|j(geVD_Nzhrq0~g
z>qNV;u9aDAoJYT}beiM?v_EZoJv}@(c}<=aJ~P9VVddM?(AX%l_}Duf;#oK-u&W5J0p25$>gX
z#3~*SvpXAp>5~3OT*|!t$IjY152G6F>e403+0gKAlmTyvnDJklHfnBqQ)FmlND4kp
z15{B{E9iS=(DeUGDxY};SB$kldc%21n@*059Q0KkV-75G*
zX1A2Jf#jFFt5N%g(>nTH@dZ1xXxQV(5ftpUg^3c3kYmtqsYdTP{N
z&akfQZE_%X=IL{4sYg0JPRgpP`=MTsb?2aGRy8TG*;!Em8IikWs0}Pdh1v85h&G8%
zA0^AoaoJ8%o?Nr<4U80dWLf9#W+SWH#(<9nI!XjbDvXM54ONt6rS-UR@3wDY|INeMl&oAbJ($})2bt$Ry
z+Vd&0HKunQ%lh2J{=BH*3Clo$nJzKht03T@?!ab+AR5?EQsUiIS9hE%Nzu$0(upPo
zqciu7t2NZ6;2L02e7JrY<%e3sA9uL`>Q1KWn1e)gzl|`A@iU$daYDp{z~>ks8|6jBnqW_npH+I*uOcY21{E1
z1G4k=WODkn3C$`mQbH?!uy3Ym$TMQ{FRvoi>E=nxwdfJp$HQuH)!=#8#dW1&_X#?R4k6y-}1!
zU|gJ?tb&FvP0$ddT=vH->~oLcfP_9-W^S3Hb~{n}?*Bk~1hlAJ-I1>w8$ZPYtsZQc
zlkjRQDGEof&l7`(2I?Yq`rs!~R1o$b1U}-I&nspxVYCKTL@A^ns_A4gj%q@ks6(Aj8+s}LbiP8}0c{Shq
zdt_STBWpuTDXyj2=_n=LZqk3v%|uKM<>h$`d55);Rjvo21i0|di3!6jIp3#J3lvuq
zV8e2N2%Z1U&Cj1h6fjeA$BD;I=;X^(R6be<-H)s1rk&l-{O1j3$N}r5IpIj%r-!yD
zjP{%uL48m0q0evjaQ~v4etizS+6uR(k`~h8!MKbxpS_S9nQ^jaeo$kj|hcCvUx22r#(Huu8+g3-{)j&%Lic!V*g;rGD
z8xE?K^1!6Zf*S;s{(u5RgKVjrf`9rXkR|8Zoh?-c5*&Tp8-VXYuC1T-C0dXLjOQIk
z(L$Y>%c$X5FQ%k?gZo7$alWF$r`6j=p;}NC_w~2FMU_t^gJh_)I}>zqKFN+V^`I_g
zF?W5QfB}O5&=N%1Ma;9*@%Ncv8&NXDUGx+WJ6>t!a1t5SpqoQ#DtGvz
z@!unY2q^C$8Svsl+lc#Y{=_Q_s6SK{S12gUI&*wMj#l@=(RkXgnlCM;_aVQQiTd6-
zg0+O8)@r)$ptO6BfafCxP)o$hGGANez`hja?IHoT)5y$5sBZT$Lk5^l-6=CGM^TkQ
z3Q@zuJhM_>!Dve~RJPq~m#jk-{9}*~x1b-akraW+Fnu$wi-={NRqz;QodspPgCRK0
zdy^mU_QhK!n9jFi{j*l+ipc7Ljeh)G8}WZ;nR~tl;FU#$NbDs~mR|nkzvac%$&VbvDY&)Mj2k~;yR7KEIm
zqb`2jpU|^Q^c~hD)KFz#kj*ioMpA8J1$l#*YG3mt{pii4ix@PfY7zexR$1h+F?Rd+
zf|N`NqrCGqZbBz4m+C-O?M(<<^f5lM%G)Td*2dUern5H!tw(yYO`Uw$CrOuP%FGes
z#|4Sl-ivj7tKQ)*#eFBV)4VC>u{COhOr@jbnW@V`?2=!1#K`GLNi8>1kB%0bK4prz
z$^vHEOj_owBcU$&P@pO6TFM(_X>wroFFt67eeWvKzn!yb@pm}6P9IUkSnoqXgsK3P_DWMt%Hrr<@E
z2{Mqf5-gU4+k`_SO?dl&$kX%lq)kC!;>}LBbK;bgL8+=5K@ldRnQ{9<*KmiU;GF3OZv%Et$i^uDhI0SYmKf2j|G{u;snQ2q`ZwkY0LpL5r&S1V!9
zC;@4fO<*+TE+uFWbljCJKk6zgC@A>1(yT3dY01=xdIYBw004m2&M^ZXrWkPlW>q)J
zKcHN{C}pM=nBvYZGEBj~rITYIG`U`q7fpTsXn#WZQ?~{NSU)D4sGc-s%XW@{sYU)T
zjuCP0G<5V3
zO?u>5k_FjjJ@Qfvuo&ZE;#Y(WOuRT2@Jo9xl$BY~TAPOI5(6rW^mGAek((AL;F2w&
zNeDnh=qa(kz1@vRkGAmO!3r(0CTK0)Pr_%#5^Q<48Kbmx>FX#!M^m==JY(r~Rae|e
zV)#COVS)dYleg02{rJU)V-fJBtv?aqKoaRn;Hg05oANQ)K8Z0B>rnFLjp5;8HH+mx
z%IfUwL`V1F(^4g|gb>S8SuSCw)S9V@5>h3>4zX!Q9dc8W1?jZUuu!|$CsO$~rO?<|
zf3ZzVi$`I00tzU(`9vO-=i#6*su;{g7UxKA76Dy$<
z%OCf?v%~)yZd=lC6#%Z&J@#T)SwY3%&%YTLU%u;OTIoE6#OeNW1N)du(
zu_V)^b)=TcvpcaSI<^aSmHQ;I85s#QHSCg%%MRWU6z6D=YK)XiG0V)))gUiB5ygdi
zA(oFNv5a0HLUVo~Mn}u>=)tDoaJyfmmeb2AUZ3y8+<1!+%rsS%AX#lhe3*`!Axb7m
z__D>Osxz@UwkgCmHH}w0G<-FKI^;uM(_XxI(Y;(2%aBkZ){$P8Xr{SVF3AqDEYTfG
znIfq!rMR%rfLphgaPQs*-g#$-BwrBJ)#VGZdDK{OS+1!}!BBrGI$HV9I*rtL#o0@;
zLM&r2go*N8TVWBYWx4OZxgv`_PbuDA?V)C?15?9Ivf!GcQtAz|z<=3y{Ke2OO{^wJ
z4_n_P?(Ez_S7q0iKexJ$+1c5A7W>v)Z@HK2Ml55dk}RaU;7+Q*QHq^Qvhy4p73D1&
zr_Rn|jEpo3GBR|~>7s>HZlw65;3vmx(B6_`Pb!ybMJaYgmlz}{poH`MDkYf3D%oD{
z7Gisw8wAa?#!u6y%VK$cRW?nMSZPjW0v%G_i5+Si!G+!PLagJ|fAwR3e}D4YwQHY}
z++XvSnyJTGSy>;d)#?utG)8E379=Ip63AecNv3($9R^CVL^934dP*_x8+8eUnxJG8
z(y=KyL0~azpx4Gi6&WmujtoGoDp*_uRx>qaCR+9sq@u1S4OJCZS`z7zO1DdJ6)>4%
z?HK9eVQ4>D7bnmrst_3-fGoN|cDMR)=jtjxe(xOi)<>|m&`U{P!1n4OmS=_qL){(d
zXlz1NNhN$v@gIOCAn;@?{Ew@g2qMYu2sjlWQ=eat%gdJqIi>BdW*0aAJIAU2>IcdF
z)$QB2fBoj0Z~pqig$tivAk0ajehAU9KdPw^E8Fu|~apYc|kh^n6T6=@#W%EyVI|7TPx_^W*7u+Dgb$T}Uy}8k#U0
z>HE_6&?H17Dk2D05`VBYCInwSHz%Yrmk$?kW@{Q_{oNSoY{y7%C-nF2_0RYA_I`Ei)~#QkJ9q9=7QM5x^Q*0m4M?o7u3>h17GtC1V*Sf<
zT?Mm9PO2nVO0G%AO%-ohsy($rHc3^A<>aQA=tAHGI;2XlTu!f1A1^Q|u+QHv&;?==
z7r_$@x_Bf}dLu%;1l48fBDIem915|kbEDYbn8NnT1m;
zx|3i|tdv@oY~NCo#ZN^#1WR%`!F-}ws)Qt05^Euu0;3w~sY%o%sDWx2ho
z9Z|l?2=mf9m1I|;JkRo*)4mo`rP0>b_CIlQIjLNZFI~FyDNAITEOldTU8Ht-aaoAH
za^;HH4i68@f>Tq>0+T^6C-;e1C3eXM#XPGdg_0@eRtLP#Vlz{@U*rN0z
zS*Sa)ES2$lJ^bqk210Q5{c>3MG+b
zvfL+PlN>k;W{E79=T%86rTg^zRa4R7i}Cfi^xC`b0I7HPk#MkyI^x
zjras4M#mu`itdl0IWty`q{swl!sDS1i9uYDN+#Mj95MdK}REGPM$pJL|KEi#tN}kvk`eY87L{tMR`d9D$5FK{>ws9PCBh$tyD6NNHZr>
zcbbI!^fZ~GtPGUr=b*Z{0Oi?vsLn4$ZDA4Wic4g=>T1!~)PRxBR!sJHVRpC|i{pd1
zaIhwGW@|}EWmxL=qFpRYU7obbV)If85bYg@z$0OZ^o)H9WgZo}3RO%n?vSe+fh%H*(HIGw9>QLWF6VSB-b
zy_IPktj)>^l~|dzVT|OkNS3-}vtfaLzsZ4NG?q6b%aH3Nl+((`ztd8sQCmCqU$`u@
zSY2WUax+U&Q_+ZymM#qU4+*hbYfD(6QZ_R=j;V=J%uUk?BC$&glUSUapmp$=fcN<}
zPOLjvs5`co-E(%6Qs>}cbq1Sr<3cP;mBcc9JEN4UOzd!HAEpL}u`q6z+ELq%s{A^b
z;;gb%Cggae*h*4qsrdYl7Wlf4rlzrfTUS?yysR=>ZsZEV4Da)8C8Z^3ZE1pSd_+iP
z!Mx9*sx&1#$}k6Bg@q65bIPG
znB~a{ObrcTsIwdGbtEOL9J!W4WE%42ttBxNI+YcXKGe)9m>izOP#*nT{`U^LGrEx#
zorPmB9+OE)NWpUdGKx});Nju%Pn0-L&+qnVY8tMP#7bDLr9x~%LYhFQ%YxCEkD{U?
za2aoDX%YX|EQAMEmIw7ik*49bn=QqM+DiBBs4i8czGDHJaxDN5rMp~by
z!l2E9*+_GBRw1e@YtT#`cSl<*db&C>G14zHHq?jy?hbUdwFrqBmMr=jIz$Ak5gHID
zP)8UL=9?fs_hGE3kD8xxO!W0b7i~pixEbnDqZ2GPE=Vun{i=exr^NDJat6cbtOX??Guj$%%cI*d%o-$+SWfmx6>Cx-Bvp(P2r5jz~ge
zm=SXZGEiD5=)
zB1}k4%Aq;70z+NH80{OgmtrC+DhfaO$xjgL5i5>&CU&-_JEog;(YmkZ?JQsSQJ-3W
zl*=#6^-cdA^(Xxi-)3BpqBBd;srSdXnrEevmI=lK`I)2T6
zn4>S^v3LM3X7
z8$<)eLYb0;5>bk4YHE%;eywkYax^vdR5UmDe9+F4Q;Mk!o1Cy}3u%r^hbo8?O7K44
zrdC@J7iUCF43%suxlxo}COj~~E%DKmYB#9D)Pgi4mE7zqR2DX3yl)=s
z6HM_rLa2l!HkQ*IPt6Y57m6U@}*_n^IEoRYJI@wRoD?(PXed;18L
z!*IDVvW#+N;UJXGJ(MW+W?6AOw{G=*DSic?eb1(}(}C@E<`MMblK%dR`>
z%Ue;JSB?CPQj{0gp&+XaRzs#-iW3tPXXE4J>rb3G@y{5?xBh1QT@RY;z8w(};X{p#
zo>8e(setTimezone($ph);
@@ -144,7 +147,7 @@
debug_log('Processing received pokebattler raid bosses for each raid level');
foreach($pb_data['tiers'] as $tier) {
$rl = str_replace('RAID_LEVEL_','', $tier['tier']);
- if($rl == "MEGA") $raid_level_id = 6; else $raid_level_id = $rl;
+ if($rl == "MEGA") $raid_level_id = 6; elseif($rl == 'MEGA_5') $raid_level_id = 7; else $raid_level_id = $rl;
// Skip this raid level if the boss data was already collected from breaking news or raid level doesn't interest us
if(!in_array($tier['tier'], $raidlevels) or isset($levels_processed[$raid_level_id])) {
continue;
@@ -164,7 +167,7 @@
$count = count($get_levels)-1;
for($i=$count;$i>=0;$i--) {
$raid_level_id = $get_levels[$i];
- if($raid_level_id == 6) $rl = "MEGA"; else $rl = $raid_level_id;
+ if($raid_level_id == 6) $rl = "MEGA"; elseif($raid_level_id == 7) $rl = "Legendary MEGA"; else $rl = $raid_level_id;
$msg .= '' . getTranslation('pokedex_raid_level') . SP . $rl . ':' . CR;
foreach($bosses[$raid_level_id] as $dex_id_form) {
$dex_id = explode('-', $dex_id_form['id'], 2)[0];
diff --git a/mods/pokedex_set_raid_level.php b/mods/pokedex_set_raid_level.php
index 4812bc4c..6a0f473b 100644
--- a/mods/pokedex_set_raid_level.php
+++ b/mods/pokedex_set_raid_level.php
@@ -22,7 +22,7 @@
// Set raid level or show raid levels?
if($data['arg'] == "setlevel") {
- $raid_levels = [0,1,3,5,6,'X'];
+ $raid_levels = [0,1,3,5,6,7,'X'];
// Init empty keys array.
$keys = [];
diff --git a/sql/pokemon-raid-bot.sql b/sql/pokemon-raid-bot.sql
index 74b8d20e..3a6e8ab3 100644
--- a/sql/pokemon-raid-bot.sql
+++ b/sql/pokemon-raid-bot.sql
@@ -100,7 +100,7 @@ CREATE TABLE `raid_bosses` (
`pokemon_form_id` int(4) DEFAULT NULL,
`date_start` datetime NOT NULL DEFAULT '1970-01-01 00:00:01',
`date_end` datetime NOT NULL DEFAULT '2038-01-19 03:14:07',
- `raid_level` enum('1','2','3','4','5','6','X') DEFAULT NULL,
+ `raid_level` enum('1','2','3','4','5','6','7','X') DEFAULT NULL,
`scheduled` TINYINT(1) NULL DEFAULT 0,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
@@ -114,7 +114,7 @@ CREATE TABLE `raids` (
`end_time` datetime DEFAULT NULL,
`gym_team` enum('mystic','valor','instinct') DEFAULT NULL,
`gym_id` int(10) unsigned NOT NULL,
- `level` enum('1','2','3','4','5','6','X') DEFAULT NULL,
+ `level` enum('1','2','3','4','5','6','7','X') DEFAULT NULL,
`move1` varchar(255) DEFAULT NULL,
`move2` varchar(255) DEFAULT NULL,
`gender` varchar(255) DEFAULT NULL,
diff --git a/sql/upgrade/5.sql b/sql/upgrade/5.sql
index 4ff94df7..a20c253f 100644
--- a/sql/upgrade/5.sql
+++ b/sql/upgrade/5.sql
@@ -3,3 +3,6 @@ ALTER TABLE user_input CHANGE COLUMN IF EXISTS `user_id` `user_id` BIGINT(20) DE
CREATE TABLE `photo_cache` (`id` varchar(100) NOT NULL, `unique_id` varchar(45) NOT NULL, `pokedex_id` int(10) DEFAULT NULL, `form_id` int(4) DEFAULT NULL, `raid_id` int(10) unsigned DEFAULT NULL, `ended` tinyint(1) DEFAULT NULL, `gym_id` int(10) unsigned DEFAULT NULL, `standalone` tinyint(1) NOT NULL DEFAULT '0', PRIMARY KEY (`unique_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
ALTER TABLE `cleanup` ADD COLUMN IF NOT EXISTS `media_unique_id` varchar(45) DEFAULT NULL AFTER `date_of_posting`;
CREATE UNIQUE INDEX IF NOT EXISTS `unique_chat_msg` ON `cleanup` (chat_id, message_id);
+
+ALTER TABLE `raids` MODIFY `level` enum('1','2','3','4','5','6','7','X') DEFAULT NULL;
+ALTER TABLE `raid_bosses` MODIFY `raid_level` enum('1','2','3','4','5','6','7','X') DEFAULT NULL;
From d80ae9a619233ba2eec6ec29f340c8de03734d06 Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Wed, 4 May 2022 17:01:32 +0300
Subject: [PATCH 023/367] Raidpicture update fix
---
logic/update_raid_poll.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/logic/update_raid_poll.php b/logic/update_raid_poll.php
index 45a74575..3c0ccfd5 100644
--- a/logic/update_raid_poll.php
+++ b/logic/update_raid_poll.php
@@ -27,7 +27,7 @@ function update_raid_poll($raid_id, $raid = false, $update = false, $tg_json = f
}
// If neither of the methods above yielded results, or update came from a inline poll, check cleanup table for chat messages to update
if(empty($chat_and_message) or isset($update['callback_query']['inline_message_id'])) {
- if($update_photo) $photo_query = 'AND type = \'photo\''; else $photo_query = '';
+ if($update_photo) $photo_query = 'AND (type = \'photo\' OR type = \'poll_photo\')'; else $photo_query = '';
$rs_chann = my_query('
SELECT chat_id, message_id, type, media_unique_id
FROM cleanup
From d23fcd293c1544b9afa81d846705b4bdf4b6109d Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Wed, 4 May 2022 19:27:33 +0300
Subject: [PATCH 024/367] Autopost raid timelimit fix
---
commands/raid_from_webhook.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/commands/raid_from_webhook.php b/commands/raid_from_webhook.php
index a086cb27..18a64a1a 100644
--- a/commands/raid_from_webhook.php
+++ b/commands/raid_from_webhook.php
@@ -52,9 +52,6 @@ function isPointInsidePolygon($point, $vertices) {
}
}
-// Skip posting if create only -mode is set or raid time is greater than value set in config
-$no_auto_posting = ($config->WEBHOOK_CREATE_ONLY or ($raid['message']['end']-$raid['message']['start']) > ($config->WEBHOOK_EXCLUDE_AUTOSHARE_DURATION * 60));
-
// Telegram JSON array.
$tg_json = [];
debug_log(count($update),"Received raids:");
@@ -62,6 +59,9 @@ function isPointInsidePolygon($point, $vertices) {
$webhook_raids_received_total->incBy(count($update));
}
foreach ($update as $raid) {
+ // Skip posting if create only -mode is set or raid time is greater than value set in config
+ $no_auto_posting = ($config->WEBHOOK_CREATE_ONLY or ($raid['message']['end']-$raid['message']['start']) > ($config->WEBHOOK_EXCLUDE_AUTOSHARE_DURATION * 60));
+
$level = $raid['message']['level'];
$pokemon = $raid['message']['pokemon_id'];
$exclude_raid_levels = explode(',', $config->WEBHOOK_EXCLUDE_RAID_LEVEL);
From 8f5827d902caa904b27cc7dbf529d832f10d16d0 Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Wed, 4 May 2022 20:11:50 +0300
Subject: [PATCH 025/367] Raid level 7
---
constants.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/constants.php b/constants.php
index ceb64dac..0b96542f 100644
--- a/constants.php
+++ b/constants.php
@@ -3,7 +3,7 @@
define('PORTAL_IMAGES_PATH', IMAGES_PATH . '/gyms');
// raid level constants
-define('RAID_LEVEL_ALL', '654321');
+define('RAID_LEVEL_ALL', '7654321');
// Value used for denoting anytime attendance
define('ANYTIME', '1970-01-01 00:00:00');
From e70523d8656d3652cc66e1295b10d131992b8b9d Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Thu, 5 May 2022 19:55:13 +0300
Subject: [PATCH 026/367] Moved all stuff regarding raid level control to
constants.php Should make adding/removing raid levels easier. I also made the
webhook autoposting more failproof for unsupported raid levels/missing chat
config values
---
commands/raid_from_webhook.php | 4 +--
constants.php | 41 +++++++++++++++-------
lang/language.json | 26 ++++++++++++++
logic/read_upcoming_bosses.php | 5 +--
mods/getdb.php | 6 ++--
mods/pokebattler.php | 61 +++++++++++----------------------
mods/pokedex_disable_raids.php | 16 ++++-----
mods/pokedex_set_raid_level.php | 2 +-
8 files changed, 90 insertions(+), 71 deletions(-)
diff --git a/commands/raid_from_webhook.php b/commands/raid_from_webhook.php
index 18a64a1a..afdc3c8b 100644
--- a/commands/raid_from_webhook.php
+++ b/commands/raid_from_webhook.php
@@ -357,7 +357,7 @@ function isPointInsidePolygon($point, $vertices) {
if($geofences != false) {
foreach ($inside_geofences as $geofence_id) {
$const_geofence = 'WEBHOOK_CHATS_LEVEL_' . $level . '_' . $geofence_id;
- $const_geofence_chats = $config->{$const_geofence};
+ $const_geofence_chats = $config->{$const_geofence} ?? [];
if(!empty($const_geofence_chats)) {
$chats_geofence = explode(',', $const_geofence_chats);
@@ -367,7 +367,7 @@ function isPointInsidePolygon($point, $vertices) {
// Get chats to share to by raid level
$const = 'WEBHOOK_CHATS_LEVEL_' . $level;
- $const_chats = $config->{$const};
+ $const_chats = $config->{$const} ?? [];
if(!empty($const_chats)) {
$chats_raidlevel = explode(',', $const_chats);
diff --git a/constants.php b/constants.php
index 0b96542f..2ff8075f 100644
--- a/constants.php
+++ b/constants.php
@@ -2,8 +2,34 @@
// Paths.
define('PORTAL_IMAGES_PATH', IMAGES_PATH . '/gyms');
-// raid level constants
-define('RAID_LEVEL_ALL', '7654321');
+// raid levels constant
+define('RAID_LEVEL_ALL', 'X76531');
+
+// Raid eggs.
+$eggs = array(
+ '9997', // Level 7 / Legendary Mega
+ '9996', // Level 6 / Mega
+ '9995', // Level 5
+ '9994', // Level 4
+ '9993', // Level 3
+ '9992', // Level 2
+ '9991' // Level 1
+);
+
+// Levels available for import at PokeBattler
+$pokebattler_levels = array('7', '6', '5', '3', '1');
+
+// Map our raid levels to tier names PokeBattler uses
+$pokebattler_level_map = [
+ '1' => 1,
+ '3' => 3,
+ '5' => 5,
+ '6' => 'MEGA',
+ '7' => 'MEGA_5',
+];
+
+// Limit the tiers of upcoming raid bosses imported from PokeBattler to legendary and mega
+$pokebattler_import_future_tiers = [5, 6, 7];
// Value used for denoting anytime attendance
define('ANYTIME', '1970-01-01 00:00:00');
@@ -69,14 +95,3 @@
'unknown' => TEAM_UNKNOWN,
'cancel' => TEAM_CANCEL
);
-
-// Raid eggs.
-$eggs = array(
- '9997', // Level 7 / Legendary Mega
- '9996', // Level 6 / Mega
- '9995', // Level 5
- '9994', // Level 4
- '9993', // Level 3
- '9992', // Level 2
- '9991' // Level 1
-);
diff --git a/lang/language.json b/lang/language.json
index 8ccf3c51..a6110523 100644
--- a/lang/language.json
+++ b/lang/language.json
@@ -38,6 +38,19 @@
"FI": "Legendaarinen Mega-Raidi",
"ES": "TRANSLATE"
},
+ "7stars_short": {
+ "NL": "TRANSLATE",
+ "DE": "TRANSLATE",
+ "EN": "Lege Mega",
+ "IT": "TRANSLATE",
+ "PT-BR": "TRANSLATE",
+ "RU": "TRANSLATE",
+ "NO": "TRANSLATE",
+ "FR": "TRANSLATE",
+ "PL": "TRANSLATE",
+ "FI": "Lege Mega",
+ "ES": "TRANSLATE"
+ },
"6stars": {
"NL": "Mega-Raid",
"DE": "Mega-Raid",
@@ -51,6 +64,19 @@
"FI": "Mega-Raidi",
"ES": "Mega Incursión"
},
+ "6stars_short": {
+ "NL": "Mega",
+ "DE": "Mega",
+ "EN": "Mega",
+ "IT": "TRANSLATE",
+ "PT-BR": "TRANSLATE",
+ "RU": "TRANSLATE",
+ "NO": "TRANSLATE",
+ "FR": "TRANSLATE",
+ "PL": "TRANSLATE",
+ "FI": "Mega",
+ "ES": "Mega"
+ },
"5stars": {
"NL": "5 Sterren",
"DE": "5 Sterne",
diff --git a/logic/read_upcoming_bosses.php b/logic/read_upcoming_bosses.php
index 900e522a..4ff96a27 100644
--- a/logic/read_upcoming_bosses.php
+++ b/logic/read_upcoming_bosses.php
@@ -6,6 +6,7 @@
* @return string
*/
function read_upcoming_bosses($return_sql = false) {
+ global $pokebattler_import_future_tiers, $pokebattler_level_map;
$link = curl_get_contents('https://fight.pokebattler.com/raids');
$pb = json_decode($link,true);
@@ -15,8 +16,8 @@ function read_upcoming_bosses($return_sql = false) {
foreach($pb['breakingNews'] as $news) {
if($news['type'] == 'RAID_TYPE_RAID') {
$rl = str_replace('RAID_LEVEL_','', $news['tier']);
- if($rl == 'MEGA') $raid_level_id = 6; elseif($rl == 'MEGA_5') $raid_level_id = 7; else $raid_level_id = $rl;
- if($raid_level_id != '5' and $raid_level_id != '6' and $raid_level_id != '7') break; // Limit scheduling to tier 5 and mega only
+ $raid_level_id = array_search($rl, $pokebattler_level_map);
+ if(!in_array($raid_level_id,$pokebattler_import_future_tiers)) break; // Limit scheduling to tier 5 and mega only
$starttime = new DateTime("@".(substr($news['startDate'],0,10)), new dateTimeZone('UTC'));
$endtime = new DateTime("@".(substr($news['endDate'],0,10)), new dateTimeZone('UTC'));
diff --git a/mods/getdb.php b/mods/getdb.php
index 21677cd8..1b858885 100644
--- a/mods/getdb.php
+++ b/mods/getdb.php
@@ -19,10 +19,10 @@
} else {
$PRE = 'INSERT INTO `pokemon`' . PHP_EOL;
$PRE .= '(pokedex_id, pokemon_name, pokemon_form_name, pokemon_form_id, asset_suffix, min_cp, max_cp, min_weather_cp, max_weather_cp, type, type2, weather) VALUES';
- for($e = 1; $e <= 7; $e++) {
- $pokemon_id = '999'.$e;
+ foreach($eggs as $egg) {
+ $pokemon_id = $egg;
$form_name = 'normal';
- $pokemon_name = 'Level '. $e .' Egg';
+ $pokemon_name = 'Level '. $egg[3] .' Egg';
$pokemon_array[$pokemon_id][$form_name] = [ 'pokemon_name'=>$pokemon_name,
'pokemon_form_name'=>$form_name,
'pokemon_form_id'=>0,
diff --git a/mods/pokebattler.php b/mods/pokebattler.php
index 9a584d06..20f7112b 100644
--- a/mods/pokebattler.php
+++ b/mods/pokebattler.php
@@ -10,9 +10,6 @@
bot_access_check($update, 'pokedex');
include(LOGIC_PATH . '/resolve_boss_name_to_ids.php');
-// Levels available for import at PokeBattler
-$levels = array('7', '6', '5', '3', '1');
-
// Get raid levels
$id = $data['id'];
@@ -31,11 +28,11 @@
// All raid level keys.
$keys[][] = array(
'text' => getTranslation('pokedex_all_raid_level'),
- 'callback_data' => RAID_LEVEL_ALL . ':pokebattler:ex#0,0,0'
+ 'callback_data' => implode(",", $pokebattler_levels) . ':pokebattler:ex#0,0,0'
);
// Add key for each raid level
- foreach($levels as $l) {
+ foreach($pokebattler_levels as $l) {
$keys[][] = array(
'text' => getTranslation($l . 'stars'),
'callback_data' => $l . ':pokebattler:ex#0,0,0'
@@ -69,14 +66,8 @@
$pb_data = curl_get_contents($link);
$pb_data = json_decode($pb_data,true);
- // All raid levels?
- if($id == RAID_LEVEL_ALL) {
- $get_levels = $levels;
- $clear = "'7','6','5','3','1'";
- } else {
- $get_levels = explode(",", $id);
- $clear = $id;
- }
+ $get_levels = explode(",", $id);
+ $clear = $id;
// Prefix for exclusion.
$prefix = 'ex#';
@@ -112,13 +103,7 @@
debug_log('Processing the following raid levels:');
$raidlevels = array();
foreach($get_levels as $level) {
- if($level == 6) {
- $level = 'MEGA'; // PB uses RAID_LEVEL_MEGA instead of RAID_LEVEL_6
- }
- if($level == 7) {
- $level = 'MEGA_5'; // PB uses RAID_LEVEL_MEGA_5 instead of RAID_LEVEL_7
- }
- $raidlevels[] = 'RAID_LEVEL_' . $level;
+ $raidlevels[] = 'RAID_LEVEL_' . $pokebattler_level_map[$level];
}
debug_log($raidlevels);
$levels_processed = [];
@@ -129,7 +114,7 @@
foreach($pb_data['breakingNews'] as $news) {
if($news['type'] == 'RAID_TYPE_RAID') {
$rl = str_replace('RAID_LEVEL_','', $news['tier']);
- if($rl == "MEGA") $raid_level_id = 6; elseif($rl == 'MEGA_5') $raid_level_id = 7; else $raid_level_id = $rl;
+ $raid_level_id = array_search($rl, $pokebattler_level_map);
$starttime = new DateTime("@".substr($news['startDate'],0,10));
$endtime = new DateTime("@".substr($news['endDate'],0,10));
$starttime->setTimezone($ph);
@@ -142,12 +127,11 @@
}
}
}
-
// Process raid tier(s)
debug_log('Processing received pokebattler raid bosses for each raid level');
foreach($pb_data['tiers'] as $tier) {
$rl = str_replace('RAID_LEVEL_','', $tier['tier']);
- if($rl == "MEGA") $raid_level_id = 6; elseif($rl == 'MEGA_5') $raid_level_id = 7; else $raid_level_id = $rl;
+ $raid_level_id = array_search($rl, $pokebattler_level_map);
// Skip this raid level if the boss data was already collected from breaking news or raid level doesn't interest us
if(!in_array($tier['tier'], $raidlevels) or isset($levels_processed[$raid_level_id])) {
continue;
@@ -164,11 +148,10 @@
}
}
- $count = count($get_levels)-1;
- for($i=$count;$i>=0;$i--) {
- $raid_level_id = $get_levels[$i];
- if($raid_level_id == 6) $rl = "MEGA"; elseif($raid_level_id == 7) $rl = "Legendary MEGA"; else $rl = $raid_level_id;
- $msg .= '' . getTranslation('pokedex_raid_level') . SP . $rl . ':' . CR;
+ foreach($get_levels as $raid_level_id) {
+ if($raid_level_id > 5) $raid_level_text = getTranslation($raid_level_id . 'stars_short'); else $raid_level_text = $raid_level_id;
+ if(!isset($bosses[$raid_level_id])) continue;
+ $msg .= '' . getTranslation('pokedex_raid_level') . SP . $raid_level_text . ':' . CR;
foreach($bosses[$raid_level_id] as $dex_id_form) {
$dex_id = explode('-', $dex_id_form['id'], 2)[0];
$dex_form = explode('-', $dex_id_form['id'], 2)[1];
@@ -235,20 +218,16 @@
// Are 3 raid bosses already selected?
if($poke1 == '0' || $poke2 == '0' || $poke3 == '0') {
- // Add raid level to pokemon name
- if($id == RAID_LEVEL_ALL) {
- // Add key to exclude pokemon from import.
- $keys[] = array(
- 'text' => '[' . ($rl) . ']' . SP . $local_pokemon,
- 'callback_data' => $id . ':pokebattler:' . $new_arg
- );
- } else {
- // Add key to exclude pokemon from import.
- $keys[] = array(
- 'text' => $local_pokemon,
- 'callback_data' => $id . ':pokebattler:' . $new_arg
- );
+ // Add key to exclude pokemon from import.
+ $button_text_prefix = '';
+ if($id == implode(",", $pokebattler_levels)) {
+ // Add raid level to pokemon name
+ $button_text_prefix = '[' . ($raid_level_text) . ']';
}
+ $keys[] = array(
+ 'text' => $button_text_prefix . SP . $local_pokemon,
+ 'callback_data' => $id . ':pokebattler:' . $new_arg
+ );
}
}
}
diff --git a/mods/pokedex_disable_raids.php b/mods/pokedex_disable_raids.php
index 0e4db6a6..f5238b32 100644
--- a/mods/pokedex_disable_raids.php
+++ b/mods/pokedex_disable_raids.php
@@ -15,18 +15,16 @@
// Get argument.
$arg = $data['arg'];
+// Specify raid levels.
+$levels = str_split(RAID_LEVEL_ALL);
+
// All raid levels?
-if($id == 'X' . RAID_LEVEL_ALL) {
- // TODO(artanicus): get this from somewhere instead of hardcoded
- $clear = "'X','6','5','3','1'";
+if($id == RAID_LEVEL_ALL) {
+ $clear = "'" . implode("','", $levels) . "'";
} else {
$clear = "'" . $id . "'";
}
-// Specify raid levels.
-// TODO(artanicus): get this from somewhere instead of hardcoded
-$levels = array('X', '6', '5', '3', '1');
-
// Raid level selection
if($arg == 0) {
// Set message.
@@ -38,7 +36,7 @@
// All raid level keys.
$keys[] = array(
'text' => getTranslation('pokedex_all_raid_level'),
- 'callback_data' => 'X' . RAID_LEVEL_ALL . ':pokedex_disable_raids:1'
+ 'callback_data' => RAID_LEVEL_ALL . ':pokedex_disable_raids:1'
);
// Add key for each raid level
@@ -124,7 +122,7 @@
$msg = '' . getTranslation('disabled_raid_level') . ':' . CR;
// All levels
- if($id == 'X' . RAID_LEVEL_ALL) {
+ if($id == RAID_LEVEL_ALL) {
foreach($levels as $lv) {
$msg .= getTranslation($lv . 'stars') . CR;
}
diff --git a/mods/pokedex_set_raid_level.php b/mods/pokedex_set_raid_level.php
index 6a0f473b..473aa65e 100644
--- a/mods/pokedex_set_raid_level.php
+++ b/mods/pokedex_set_raid_level.php
@@ -22,7 +22,7 @@
// Set raid level or show raid levels?
if($data['arg'] == "setlevel") {
- $raid_levels = [0,1,3,5,6,7,'X'];
+ $raid_levels = str_split('0' . RAID_LEVEL_ALL);
// Init empty keys array.
$keys = [];
From 7a706e45403bc3a9d48fa97610a08cde20096147 Mon Sep 17 00:00:00 2001
From: klablabla <30940278+klablabla@users.noreply.github.com>
Date: Sat, 7 May 2022 15:26:42 +0200
Subject: [PATCH 027/367] Added dutch translation
---
lang/language.json | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/lang/language.json b/lang/language.json
index a6110523..f7077baa 100644
--- a/lang/language.json
+++ b/lang/language.json
@@ -26,7 +26,7 @@
"ES": "Incursión EX"
},
"7stars": {
- "NL": "TRANSLATE",
+ "NL": "Legendary Mega-Raid",
"DE": "TRANSLATE",
"EN": "Legendary Mega-Raid",
"IT": "TRANSLATE",
@@ -39,7 +39,7 @@
"ES": "TRANSLATE"
},
"7stars_short": {
- "NL": "TRANSLATE",
+ "NL": "Lege Mega",
"DE": "TRANSLATE",
"EN": "Lege Mega",
"IT": "TRANSLATE",
@@ -156,7 +156,7 @@
"ES": "Desactivado"
},
"egg_7": {
- "NL": "TRANSLATE",
+ "NL": "Legendary Mega-Raid Ei",
"DE": "TRANSLATE",
"EN": "Legendary Mega-Raid Egg",
"IT": "TRANSLATE",
@@ -260,7 +260,7 @@
"ES": "Huevo Incursión"
},
"upcoming": {
- "NL": "TRANSLATE",
+ "NL": "geplande",
"DE": "TRANSLATE",
"EN": "upcoming",
"IT": "TRANSLATE",
@@ -273,7 +273,7 @@
"ES": "próximo"
},
"upcoming_bosses_not_found": {
- "NL": "TRANSLATE",
+ "NL": "Geen informatie gevonden voor geplande raid bazen!",
"DE": "TRANSLATE",
"EN": "No info of upcoming bosses was found!",
"IT": "TRANSLATE",
@@ -286,7 +286,7 @@
"ES": "¡No se encontró información de los próximos jefes!"
},
"current_scheduled_bosses": {
- "NL": "TRANSLATE",
+ "NL": "Geplande raid bazen van de database",
"DE": "TRANSLATE",
"EN": "Scheduled raid bosses from database",
"IT": "TRANSLATE",
@@ -299,7 +299,7 @@
"ES": "Jefes de incursión programados de la base de datos"
},
"unscheduled_bosses": {
- "NL": "TRANSLATE",
+ "NL": "Ongeplande bazen",
"DE": "TRANSLATE",
"EN": "Unscheduled bosses",
"IT": "TRANSLATE",
@@ -312,7 +312,7 @@
"ES": "Jefes no programados"
},
"delete_scheduled_confirmation": {
- "NL": "TRANSLATE",
+ "NL": "Wil je de geplande baas verwijderen?",
"DE": "TRANSLATE",
"EN": "Do you want to delete this scheduled entry?",
"IT": "TRANSLATE",
@@ -325,7 +325,7 @@
"ES": "¿Quieres eliminar esta entrada programada?"
},
"found_upcoming_bosses": {
- "NL": "TRANSLATE",
+ "NL": "Volgende geplande raid bazen gevonden",
"DE": "TRANSLATE",
"EN": "Found following upcoming bosses",
"IT": "TRANSLATE",
@@ -338,7 +338,7 @@
"ES": "Próximos jefes encontrado"
},
"confirm_replace_upcoming": {
- "NL": "TRANSLATE",
+ "NL": "Wil je de data vervangen met wat we gevonden hebben?",
"DE": "TRANSLATE",
"EN": "Would you like to replace the current data with what we found?",
"IT": "TRANSLATE",
@@ -637,7 +637,7 @@
"ES": "Importar"
},
"update_pokemon_table": {
- "NL": "TRANSLATE",
+ "NL": "Update Pokemon tabel",
"DE": "TRANSLATE",
"EN": "Update Pokemon table",
"IT": "TRANSLATE",
@@ -819,7 +819,7 @@
"ES": "Incursión remota"
},
"remote_raids": {
- "NL": "TRANSLATE",
+ "NL": "Remote raids",
"DE": "TRANSLATE",
"EN": "Remote raids",
"IT": "TRANSLATE",
@@ -871,7 +871,7 @@
"ES": "Has participado en la incursión remota que creaste. ¿Quieres eliminar el anuncio de la incursión?"
},
"delete_remote_raid_cancel": {
- "NL": "TRANSLATE",
+ "NL": "Je hebt je aanwezigheid bij de remote raid afgezegd. Kunnen we het raid overzicht verwijderen?",
"DE": "TRANSLATE",
"EN": "You have canceled your attendance to the remote raid you created. Can we delete the raid poll?",
"IT": "TRANSLATE",
@@ -988,7 +988,7 @@
"ES": "Por favor, selecciona la primera letra del gimnasio:"
},
"select_gym_first_letter_or_gym_area": {
- "NL": "TRANSLATE",
+ "NL": "Selecteer de eerste letter van de gym of gym gebied:",
"DE": "TRANSLATE",
"EN": "Please select the first letter of the gym or gym area:",
"IT": "TRANSLATE",
@@ -1001,7 +1001,7 @@
"ES": "Seleccione la primera letra del gimnasio o la zona del gimnasio:"
},
"select_gym_name_or_gym_area": {
- "NL": "TRANSLATE",
+ "NL": "Selecteer gym of gym gebied:",
"DE": "TRANSLATE",
"EN": "Please select gym or gym area:",
"IT": "TRANSLATE",
@@ -1014,7 +1014,7 @@
"ES": "Seleccione gimnasio o zona de gimnasio:"
},
"select_gym_area": {
- "NL": "TRANSLATE",
+ "NL": "Selecteer gym gebied:",
"DE": "TRANSLATE",
"EN": "Please select the gymarea:",
"IT": "TRANSLATE",
@@ -3393,7 +3393,7 @@
"ES": "¡Alertas de incursión activadas!"
},
"switch_alarm_on": {
- "NL": "TRANSLATE",
+ "NL": "Zet automatische raid alarm aan",
"DE": "TRANSLATE",
"EN": "Enable automatic raid alerts",
"IT": "TRANSLATE",
@@ -3406,7 +3406,7 @@
"ES": "Activar alertas automáticas de incursiones"
},
"switch_alarm_off": {
- "NL": "TRANSLATE",
+ "NL": "Zet automatisch raid alarm uit",
"DE": "TRANSLATE",
"EN": "Disable automatic raid alerts",
"IT": "TRANSLATE",
@@ -3848,7 +3848,7 @@
"ES": "¡No se encontraron incursiones con los asistentes!"
},
"date": {
- "NL": "TRANSLATE",
+ "NL": "Datum",
"DE": "Datum",
"EN": "Date",
"IT": "TRANSLATE",
@@ -3861,7 +3861,7 @@
"ES": "Fecha"
},
"current_gymarea": {
- "NL": "TRANSLATE",
+ "NL": "Gym gebied",
"DE": "TRANSLATE",
"EN": "Current gymarea",
"IT": "TRANSLATE",
@@ -3873,4 +3873,4 @@
"FI": "Salit alueelta",
"ES": "Zona de gimnasio actual"
}
-}
\ No newline at end of file
+}
From 1450b9f7f8bb71942bcef0b7945d4053ca1c6999 Mon Sep 17 00:00:00 2001
From: Artanicus
Date: Sat, 7 May 2022 17:17:18 +0300
Subject: [PATCH 028/367] Fail gracefully on not finding weather
---
logic/get_pokemon_weather.php | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/logic/get_pokemon_weather.php b/logic/get_pokemon_weather.php
index fa4a95b5..1835b8dc 100644
--- a/logic/get_pokemon_weather.php
+++ b/logic/get_pokemon_weather.php
@@ -18,10 +18,13 @@ function get_pokemon_weather($pokemon_id, $pokemon_form_id)
"
);
- // Fetch the row.
$ww = $rs->fetch();
- return $ww['weather'];
+ if($ww) {
+ return $ww['weather'];
+ } else {
+ throw new Exception("Failed to find pokemon {$pokemon_id}_{$pokemon_form_id} weather.");
+ }
} else {
return 0;
}
From 8a5f2ca4561d90ff4a6aaa9a32eeeb3e6d5abd65 Mon Sep 17 00:00:00 2001
From: Artanicus
Date: Sat, 7 May 2022 17:23:19 +0300
Subject: [PATCH 029/367] Use new global eggs data
---
mods/getdb.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mods/getdb.php b/mods/getdb.php
index 1b858885..7a9dbfb3 100644
--- a/mods/getdb.php
+++ b/mods/getdb.php
@@ -6,7 +6,7 @@
// Read the form ids from protos
if($protos = get_protos($proto_url)) {
- global $dbh;
+ global $dbh, $eggs;
$form_ids = $protos[0];
$costume = $protos[1];
From d7fe915003a5e1205e3bbb8db95832872f9c71ff Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Sat, 21 May 2022 20:05:34 +0300
Subject: [PATCH 030/367] New move translations
---
core/lang/pokemon_moves.json | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/core/lang/pokemon_moves.json b/core/lang/pokemon_moves.json
index d12c7d79..55a1489b 100644
--- a/core/lang/pokemon_moves.json
+++ b/core/lang/pokemon_moves.json
@@ -3885,5 +3885,31 @@
"IT": "Foschisfera",
"RU": "Шар Тумана",
"ES": "Bola Neblina"
+ },
+ "pokemon_move_368": {
+ "PT-BR": "Rolagem",
+ "EN": "Rollout",
+ "FI": "Rollout",
+ "NL": "Rollout",
+ "NO": "Rollout",
+ "PL": "Rollout",
+ "FR": "Roulade",
+ "DE": "Walzer",
+ "IT": "Rotolamento",
+ "RU": "Перекат",
+ "ES": "Desenrollar"
+ },
+ "pokemon_move_369": {
+ "PT-BR": "Semente Ofuscante",
+ "EN": "Seed Flare",
+ "FI": "Seed Flare",
+ "NL": "Seed Flare",
+ "NO": "Seed Flare",
+ "PL": "Seed Flare",
+ "FR": "Fulmigraine",
+ "DE": "Schocksamen",
+ "IT": "Infuriaseme",
+ "RU": "Сияние Семени",
+ "ES": "Fogonazo"
}
}
\ No newline at end of file
From 5b5bc7860b37989b008e9192f58acc9710e5716e Mon Sep 17 00:00:00 2001
From: Ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Sat, 21 May 2022 22:06:51 +0300
Subject: [PATCH 031/367] Prepared raidpicture for the full transition to using
new asset naming format As announced, PokeMiners is about to move all the
pokemon icon files from Addressable Assets folder to the parent directory.
You can prepare your image folder for the transition by removing the
`pokemon_icon_*` files from `pokemon(_PokeMiners)` folder and moving every
file from `Addressable_Assets` folder to the parent directory and then
removing the `Addressable_Assets` folder.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Old file structure:
pokemon(_PokeMiners)/
├─ Addressable_Assets/
│ ├─ pm1.icon.png
│ ├─ pm2.icon.png
│ ├─ pm3.icon.png
├─ pokemon_icon_001_00.png
├─ pokemon_icon_002_00.png
├─ pokemon_icon_003_00.png
New file structure:
pokemon(_PokeMiners)/
├─ pm1.icon.png
├─ pm2.icon.png
├─ pm3.icon.png
---
logic/raid_picture.php | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/logic/raid_picture.php b/logic/raid_picture.php
index 4a20b215..2c6161c1 100644
--- a/logic/raid_picture.php
+++ b/logic/raid_picture.php
@@ -321,24 +321,23 @@ function create_raid_picture($raid, $standalone_photo = false, $debug = false) {
$p_icon = $p_icon . ".png";
foreach($p_sources as $p_dir) {
+ // Icon dir named 'pokemon'? Then change path to not add '_repo-owner' to icon folder name
+ if($p_dir == 'pokemon') $asset_dir = 'pokemon'; else $asset_dir = 'pokemon_' . $p_dir;
// Set pokemon icon dir
- $p_img = IMAGES_PATH . "/pokemon_" . $p_dir . "/" . $p_icon;
- $p_add_img = IMAGES_PATH . "/pokemon_" . $p_dir . "/Addressable_Assets/" . $addressable_icon;
+ $p_img_base_path = IMAGES_PATH . "/" . $asset_dir;
- // Icon dir named 'pokemon'? Then change path to not add '_repo-owner' to icon folder name
- if($p_dir == 'pokemon') {
- $p_img = IMAGES_PATH . "/pokemon/" . $p_icon;
- $p_add_img = IMAGES_PATH . "/pokemon/Addressable_Assets" . $addressable_icon;
- }
// Check if file exists in this collection
// Prioritize addressable asset file
- if(file_exists($p_add_img) && filesize($p_add_img) > 0) {
- $img_file = $p_add_img;
- break;
- }else if(file_exists($p_img) && filesize($p_img) > 0) {
- $img_file = $p_img;
- break;
+ if(file_exists($p_img_base_path . "/" . $addressable_icon) && filesize($p_img_base_path . "/" . $addressable_icon) > 0) {
+ $img_file = $p_img_base_path . "/" . $addressable_icon;
+
+ // These elseifs become redundant after PokeMiners move the files from Addressable Assets folder to the parent directory on 1.6.2022
+ }else if(file_exists($p_img_base_path . "/Addressable_Assets/" . $addressable_icon) && filesize($p_img_base_path . "/Addressable_Assets/" . $addressable_icon) > 0) {
+ $img_file = $p_img_base_path . "/Addressable_Assets/" . $addressable_icon;
+ }else if(file_exists($p_img_base_path . "/" . $p_icon) && filesize($p_img_base_path . "/" . $p_icon) > 0) {
+ $img_file = $p_img_base_path . "/" . $p_icon;
}
+ break;
}
// If no image was found, substitute with a fallback
From c08e91ad3c87f0923f1bd3b2ff5a04238e00759f Mon Sep 17 00:00:00 2001
From: ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Fri, 3 Jun 2022 19:27:01 +0300
Subject: [PATCH 032/367] RDM support for webhooks Support incoming raid
webhooks from RDM
---
commands/raid_from_webhook.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/commands/raid_from_webhook.php b/commands/raid_from_webhook.php
index afdc3c8b..36eda590 100644
--- a/commands/raid_from_webhook.php
+++ b/commands/raid_from_webhook.php
@@ -71,7 +71,7 @@ function isPointInsidePolygon($point, $vertices) {
continue;
}
- $gym_name = $raid['message']['name'];
+ $gym_name = isset($raid['message']['name']) ? $raid['message']['name'] : $raid['message']['gym_name'];
if ($config->WEBHOOK_EXCLUDE_UNKNOWN && $gym_name === 'unknown') {
debug_log($raid['message']['gym_id'],'Ignoring raid, the gym name is unknown and WEBHOOK_EXCLUDE_UNKNOWN says to ignore. id:');
continue;
@@ -79,8 +79,8 @@ function isPointInsidePolygon($point, $vertices) {
$gym_lat = $raid['message']['latitude'];
$gym_lon = $raid['message']['longitude'];
$gym_id = $raid['message']['gym_id'];
- $gym_img_url = $raid['message']['url'];
- $gym_is_ex = ( $raid['message']['is_ex_raid_eligible'] ? 1 : 0 );
+ $gym_img_url = isset($raid['message']['url']) ? $raid['message']['url'] : $raid['message']['gym_url'];
+ $gym_is_ex = isset($raid['message']['is_ex_raid_eligible']) ? ( $raid['message']['is_ex_raid_eligible'] ? 1 : 0 ) : ( $raid['message']['ex_raid_eligible'] ? 1 : 0 );
$gym_internal_id = 0;
// Check geofence, if available, and skip current raid if not inside any fence
From 80171fbc722538251e02ddcea0df85fd2878bfaa Mon Sep 17 00:00:00 2001
From: ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Fri, 3 Jun 2022 19:28:00 +0300
Subject: [PATCH 033/367] Fixed asset image selector
---
logic/raid_picture.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/logic/raid_picture.php b/logic/raid_picture.php
index 2c6161c1..209ab152 100644
--- a/logic/raid_picture.php
+++ b/logic/raid_picture.php
@@ -330,14 +330,15 @@ function create_raid_picture($raid, $standalone_photo = false, $debug = false) {
// Prioritize addressable asset file
if(file_exists($p_img_base_path . "/" . $addressable_icon) && filesize($p_img_base_path . "/" . $addressable_icon) > 0) {
$img_file = $p_img_base_path . "/" . $addressable_icon;
-
+ break;
// These elseifs become redundant after PokeMiners move the files from Addressable Assets folder to the parent directory on 1.6.2022
}else if(file_exists($p_img_base_path . "/Addressable_Assets/" . $addressable_icon) && filesize($p_img_base_path . "/Addressable_Assets/" . $addressable_icon) > 0) {
$img_file = $p_img_base_path . "/Addressable_Assets/" . $addressable_icon;
+ break;
}else if(file_exists($p_img_base_path . "/" . $p_icon) && filesize($p_img_base_path . "/" . $p_icon) > 0) {
$img_file = $p_img_base_path . "/" . $p_icon;
+ break;
}
- break;
}
// If no image was found, substitute with a fallback
From 5f8c5fc39c869fb444faadf06cb7eb6ff324e32f Mon Sep 17 00:00:00 2001
From: ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Fri, 3 Jun 2022 19:28:27 +0300
Subject: [PATCH 034/367] New translations
---
core/lang/pokemon.json | 1 +
core/lang/pokemon_moves.json | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/core/lang/pokemon.json b/core/lang/pokemon.json
index 913d424c..b1470fd8 100644
--- a/core/lang/pokemon.json
+++ b/core/lang/pokemon.json
@@ -4139,6 +4139,7 @@
"RU": "Крабаминабл"
},
"pokemon_id_741": {
+ "PT-BR": "Oricório",
"EN": "Oricorio",
"FR": "Plumeline",
"DE": "Choreogel",
diff --git a/core/lang/pokemon_moves.json b/core/lang/pokemon_moves.json
index 55a1489b..374fa029 100644
--- a/core/lang/pokemon_moves.json
+++ b/core/lang/pokemon_moves.json
@@ -3724,7 +3724,7 @@
"NL": "Psychic Fangs",
"NO": "Psychic Fangs",
"PL": "Psychic Fangs",
- "FR": "Psychic Fangs",
+ "FR": "Psycho-Croc",
"DE": "Psychobeißer",
"IT": "Psicozanna",
"RU": "Психоклыки",
From b849495dc7b156768bab3a5c8d74d9f9fde35aa5 Mon Sep 17 00:00:00 2001
From: ninjasoturi <52629375+Ninjasoturi@users.noreply.github.com>
Date: Fri, 3 Jun 2022 19:41:29 +0300
Subject: [PATCH 035/367] Ultra wormhole support Support for raid level 8
---
config/defaults-config.json | 2 ++
constants.php | 8 ++++---
images/raid_eggs/pokemon_icon_9998_00.png | Bin 0 -> 24848 bytes
lang/language.json | 26 ++++++++++++++++++++++
sql/pokemon-raid-bot.sql | 2 +-
sql/upgrade/5.sql | 2 +-
6 files changed, 35 insertions(+), 5 deletions(-)
create mode 100644 images/raid_eggs/pokemon_icon_9998_00.png
diff --git a/config/defaults-config.json b/config/defaults-config.json
index 890f002e..7834c4e5 100644
--- a/config/defaults-config.json
+++ b/config/defaults-config.json
@@ -110,6 +110,7 @@
"WEBHOOK_CREATOR":"bot_or_user_id",
"WEBHOOK_CREATE_ONLY": false,
"WEBHOOK_CHATS_ALL_LEVELS":"",
+ "WEBHOOK_CHATS_LEVEL_8":"",
"WEBHOOK_CHATS_LEVEL_7":"",
"WEBHOOK_CHATS_LEVEL_6":"",
"WEBHOOK_CHATS_LEVEL_5":"",
@@ -117,6 +118,7 @@
"WEBHOOK_CHATS_LEVEL_3":"",
"WEBHOOK_CHATS_LEVEL_2":"",
"WEBHOOK_CHATS_LEVEL_1":"",
+ "WEBHOOK_CHATS_LEVEL_8_0":"",
"WEBHOOK_CHATS_LEVEL_7_0":"",
"WEBHOOK_CHATS_LEVEL_6_0":"",
"WEBHOOK_CHATS_LEVEL_5_0":"",
diff --git a/constants.php b/constants.php
index 2ff8075f..b0ecdf99 100644
--- a/constants.php
+++ b/constants.php
@@ -3,10 +3,11 @@
define('PORTAL_IMAGES_PATH', IMAGES_PATH . '/gyms');
// raid levels constant
-define('RAID_LEVEL_ALL', 'X76531');
+define('RAID_LEVEL_ALL', 'X876531');
// Raid eggs.
$eggs = array(
+ '9998', // Level 8 / Ultra beast
'9997', // Level 7 / Legendary Mega
'9996', // Level 6 / Mega
'9995', // Level 5
@@ -17,7 +18,7 @@
);
// Levels available for import at PokeBattler
-$pokebattler_levels = array('7', '6', '5', '3', '1');
+$pokebattler_levels = array('8', '7', '6', '5', '3', '1');
// Map our raid levels to tier names PokeBattler uses
$pokebattler_level_map = [
@@ -26,10 +27,11 @@
'5' => 5,
'6' => 'MEGA',
'7' => 'MEGA_5',
+ '8' => 'ULTRA_BEAST',
];
// Limit the tiers of upcoming raid bosses imported from PokeBattler to legendary and mega
-$pokebattler_import_future_tiers = [5, 6, 7];
+$pokebattler_import_future_tiers = [5, 6, 7, 8];
// Value used for denoting anytime attendance
define('ANYTIME', '1970-01-01 00:00:00');
diff --git a/images/raid_eggs/pokemon_icon_9998_00.png b/images/raid_eggs/pokemon_icon_9998_00.png
new file mode 100644
index 0000000000000000000000000000000000000000..8df11e880dfe8af66fe94bcc20b985c662267100
GIT binary patch
literal 24848
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