Merge pull request #5484 from javajohnHub/quick-fix-for-telegram

Quick fix for telegram
PokemonGoF · Sep 16, 2016 · 214dcde · 214dcde
2 parents 5ae0afc + 6f5325f
commit 214dcde
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/pokemongo_bot/cell_workers/transfer_pokemon.py b/pokemongo_bot/cell_workers/transfer_pokemon.py
@@ -245,7 +245,8 @@ def release_pokemon(self, pokemon):
                 'ivcp': pokemon.ivcp,
                 'candy': candy.quantity
             },
-            formatted="Released {} (CP: {}, IV: {}, IVCP: {}) You now have {} {} candies".format(pokemon.name, pokemon.cp, pokemon.iv, pokemon.ivcp, candy.quantity, pokemon.name),
+
+            formatted="Released {} (CP: {}, IV: {}, IVCP: {:.2f}) You now have {} {} candies".format(pokemon.name, pokemon.cp, pokemon.iv, pokemon.ivcp, candy.quantity, pokemon.name),
         )
         with self.bot.database as conn:
             c = conn.cursor()

diff --git a/pokemongo_bot/event_handlers/telegram_handler.py b/pokemongo_bot/event_handlers/telegram_handler.py
@@ -376,12 +376,12 @@ def run(self):
                             "/showsubs - show current subscriptions",
                             "/events <filter> - show available events, filtered by regular expression  <filter>",
                             "/top <num> <cp-or-iv> - show top X pokemons, sorted by CP or IV",
-                            "/evolved <num> <cp-or-iv> - show last x pokemon evolved",
-                            "/hatched <num> <cp-or-iv> - show last x pokemon hatched",
-                            "/caught <num> <cp-or-iv>- show last x pokemon caught",
-                            "/pokestop - show last x pokestops",
-                            "/transfers <num> <cp-or-iv> - show last x transfers",
-                            "/vanished <num> <cp-or-iv> - show last x vanished",
+                            "/evolved <num> <cp-or-iv> - show top x pokemon evolved, sorted by CP or IV",
+                            "/hatched <num> <cp-or-iv> - show top x pokemon hatched, sorted by CP or IV",
+                            "/caught <num> <cp-or-iv>- show top x pokemon caught, sorted by CP or IV",
+                            "/pokestops - show last x pokestops visited",
+                            "/transfers <num> <cp-or-iv> - show top x transfers, sorted by CP or IV",
+                            "/vanished <num> <cp-or-iv> - show top x vanished, sorted by CP or IV",
                             "/softbans - info about possible softbans"
                         )
                         self.sendMessage(chat_id=update.message.chat_id, parse_mode='Markdown', text="\n".join(res))