Bladeren bron

Improving war format

JoostSijm 4 jaren geleden
bovenliggende
commit
91fd52d7c3
2 gewijzigde bestanden met toevoegingen van 8 en 6 verwijderingen
  1. 1 1
      Pipfile.lock
  2. 7 5
      src/vboo_info_bot/functions.py

+ 1 - 1
Pipfile.lock

@@ -190,7 +190,7 @@
         "rival-regions-wrapper": {
             "editable": true,
             "git": "https://github.com/jjoo914/rival_regions_wrapper",
-            "ref": "0fe85ed08017efb0947e9b9b505f57f8e8d9ba34"
+            "ref": "68ad07e44be7bfe16b41f17c15c52f6735ba0d96"
         },
         "selenium": {
             "hashes": [

+ 7 - 5
src/vboo_info_bot/functions.py

@@ -79,14 +79,16 @@ def telegram_format_war(war):
         roundk(war['damage']),
     )
 
-    link = '[mobile](https://m.rivalregions.com/#war/details/{}) \\| [desktop](http://rivalregions.com/#war/details/{})'.format(
-        war['war_id'],
-        war['war_id'],
+    link = '{} \\| {}'.format(
+        '[mobile](https://m.rivalregions.com/#war/details/{})'.format(war['war_id']),
+        '[desktop](http://rivalregions.com/#war/details/{})'.format(war['war_id']),
     )
 
-    formatted_war = '{}\n{}\n{}'.format(
+    formatted_war = '\n'.join([
         title,
         damage,
+        'finish: {} UTC'.format(escape_markdown(war['finish_date'].strftime('%Y-%m-%d %H:%M'), 2)),
+        'time left: {}'.format(escape_markdown(str(war['time_left']))),
         link,
-    )
+    ])
     return formatted_war