From 70f4399efe2db969537df9e59d1900878043658b Mon Sep 17 00:00:00 2001 From: Chefkeks Date: Thu, 4 Feb 2021 19:38:37 +0100 Subject: [PATCH] Updated README and help for /list and /listall --- README.md | 12 +++++++++--- VERSION | 2 +- commands/help.php | 1 + config/config.json.example | 2 +- lang/help.json | 20 ++++++++++++++++---- 5 files changed, 28 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index e7705977..d91213e0 100644 --- a/README.md +++ b/README.md @@ -67,6 +67,7 @@ Telegram webhook bot for organizing raids in Pokemon Go. Developers are welcome * [Command: /pokemon](#command-pokemon) * [Command: /pokedex](#command-pokedex) * [Command: /list](#command-list) + * [Command: /listall](#command-listall) * [Command: /overview](#command-overview) * [Command: /delete](#command-delete) * [Command: /team](#command-team) @@ -90,7 +91,7 @@ Telegram webhook bot for organizing raids in Pokemon Go. Developers are welcome * [translate.py](#translatepy) * [Usage](#usage) - + @@ -838,7 +839,7 @@ A few examples for access files can be found below the permission overview table | | Create raids `/start`, `/raid` | `create` | | | Create ex-raids `/start` | `ex-raids` | | | Change raid duration `/start` | `raid-duration` | -| | List all raids `/list` | `list` | +| | List all raids `/list` and `/listall` | `list` | | | Manage overview `/overview` | `overview` | | | Delete OWN raid polls `/delete` | `delete-own` | | | Delete ALL raid polls `/delete` | `delete-all` | @@ -1057,8 +1058,9 @@ Edit the weather: ## Command: /list -The bot will allow you to get a list of the last 20 active raids and re-share or delete them. +The bot will allow you to get a list of the last 12 active raids and re-share or delete them. +In case more than 12 active raids are happening, the bot will automatically call the /listall command List existing raid polls with the `/list` command: @@ -1067,6 +1069,10 @@ List existing raid polls with the `/list` command: ![Command: /list](/screens/commands-list-active-raids.png?raw=true "Command: /list") +## Command: /listall + +The bot will allow you to get all active raids and re-share or delete them. The raids are grouped by gyms and their first letter or custom letters. + ## Command: /overview Share and delete the raid overview message. diff --git a/VERSION b/VERSION index 0e1b10b7..39bf317e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.035.2 +2.1.035.3 diff --git a/commands/help.php b/commands/help.php index 25d92ef4..2d52601c 100644 --- a/commands/help.php +++ b/commands/help.php @@ -13,6 +13,7 @@ $permissions[] = 'ex-raids'; $permissions[] = 'raid-duration'; $permissions[] = 'list'; + $permissions[] = 'listall'; $permissions[] = 'overview'; $permissions[] = 'delete-all'; $permissions[] = 'pokemon-all'; diff --git a/config/config.json.example b/config/config.json.example index 2b8567ff..4cdf55d8 100644 --- a/config/config.json.example +++ b/config/config.json.example @@ -1,5 +1,5 @@ { - "VERSION":"2.1.035.2", + "VERSION":"2.1.035.3", "DB_HOST":"localhost", "DB_NAME":"your_database_name", "DB_USER":"your_database_user", diff --git a/lang/help.json b/lang/help.json index 5b33df53..345486cd 100644 --- a/lang/help.json +++ b/lang/help.json @@ -48,16 +48,28 @@ "FI": "/start - Vaihda raidin kestoa" }, "help_list": { - "NL": "/list - alle actieve Raids", - "DE": "/list - Alle aktiven Raids", - "EN": "/list - All active raids", + "NL": "TRANSLATE", + "DE": "/list - Letzten 12 aktiven Raids", + "EN": "/list - Last 12 active raids", "IT": "TRANSLATE", "PT-BR": "TRANSLATE", "RU": "TRANSLATE", "NO": "TRANSLATE", "FR": "TRANSLATE", "PL": "TRANSLATE", - "FI": "/list - Kaikki aktiiviset raidit" + "FI": "TRANSLATE" + }, + "help_listall": { + "NL": "/listall - alle actieve Raids", + "DE": "/listall - Alle aktiven Raids", + "EN": "/listall - All active raids", + "IT": "TRANSLATE", + "PT-BR": "TRANSLATE", + "RU": "TRANSLATE", + "NO": "TRANSLATE", + "FR": "TRANSLATE", + "PL": "TRANSLATE", + "FI": "/listall - Kaikki aktiiviset raidit" }, "help_overview": { "NL": "/overview - Beheer raid overzicht",