Changed order in which the target symbol has to be added

Author: Endogen

opencryptobot/plugins/alltimehigh.py

@@ -31,8 +31,8 @@ def get_action(self, bot, update, args):
 
         if "-" in args[0]:
             pair = args[0].split("-", 1)
-            vs_cur = pair[0].lower()
-            coin = pair[1].upper()
+            vs_cur = pair[1].lower()
+            coin = pair[0].upper()
         else:
             coin = args[0].upper()
 
@@ -79,7 +79,7 @@ def get_action(self, bot, update, args):
                 now = datetime.date.today()
 
                 ath_p_str = f"Price ATH: {ath_p} {c.upper()}\n"
-                cur_p_str = f"Price now: {cur_p.rjust(len(ath_p))} {c.upper()}\n"
+                cur_p_str = f"Price NOW: {cur_p.rjust(len(ath_p))} {c.upper()}\n"
 
                 msg += f"`" \
                        f"{date_ath} ({(now - ath).days} days ago)\n" \
@@ -98,7 +98,7 @@ def get_action(self, bot, update, args):
             parse_mode=ParseMode.MARKDOWN)
 
     def get_usage(self):
-        return f"`/{self.get_cmds()[0]} (<target symbol>,[...]-)<symbol>`"
+        return f"`/{self.get_cmds()[0]} <symbol>(-<target symbol>,[...])`"
 
     def get_description(self):
         return "All time high price for coin"

opencryptobot/plugins/candlestick.py

@@ -41,8 +41,8 @@ def get_action(self, bot, update, args):
         # Coin or pair
         if "-" in args[0]:
             pair = args[0].split("-", 1)
-            base_coin = pair[0].upper()
-            coin = pair[1].upper()
+            base_coin = pair[1].upper()
+            coin = pair[0].upper()
         else:
             coin = args[0].upper()
 
@@ -275,7 +275,7 @@ def get_action(self, bot, update, args):
             parse_mode=ParseMode.MARKDOWN)
 
     def get_usage(self):
-        return f"`/{self.get_cmds()[0]} (<target symbol>-)<symbol> (<timeframe>m|h|d)`"
+        return f"`/{self.get_cmds()[0]} <symbol>(-<target symbol>) (<timeframe>m|h|d)`"
 
     def get_description(self):
         return "Candlestick chart for coin"

opencryptobot/plugins/change.py

@@ -29,8 +29,8 @@ def get_action(self, bot, update, args):
 
         if "-" in args[0]:
             pair = args[0].split("-", 1)
-            vs_cur = pair[0].lower()
-            coin = pair[1].upper()
+            vs_cur = pair[1].lower()
+            coin = pair[0].upper()
         else:
             coin = args[0].upper()
 
@@ -107,7 +107,7 @@ def get_action(self, bot, update, args):
             disable_web_page_preview=True)
 
     def get_usage(self):
-        return f"`/{self.get_cmds()[0]} (<target currency>-)<symbol>`"
+        return f"`/{self.get_cmds()[0]} <symbol>(-<target symbol>)`"
 
     def get_description(self):
         return "Price change over time"

opencryptobot/plugins/chart.py

@@ -37,8 +37,8 @@ def get_action(self, bot, update, args):
 
         if "-" in args[0]:
             pair = args[0].split("-", 1)
-            base_coin = pair[0].upper()
-            coin = pair[1].upper()
+            base_coin = pair[1].upper()
+            coin = pair[0].upper()
         else:
             coin = args[0].upper()
 
@@ -197,7 +197,7 @@ def get_action(self, bot, update, args):
             parse_mode=ParseMode.MARKDOWN)
 
     def get_usage(self):
-        return f"`/{self.get_cmds()[0]} (<vs symbol>-)<symbol> (<# of days>)`"
+        return f"`/{self.get_cmds()[0]} <symbol>(-<target symbol>) (<# of days>)`"
 
     def get_description(self):
         return "Chart with price and volume"

opencryptobot/plugins/marketcap.py

@@ -43,8 +43,8 @@ def get_action(self, bot, update, args):
         else:
             if "-" in args[0]:
                 pair = args[0].split("-", 1)
-                vs_cur = pair[0].lower()
-                coin = pair[1].lower()
+                vs_cur = pair[1].lower()
+                coin = pair[0].lower()
             else:
                 coin = args[0].lower()
 
@@ -120,7 +120,7 @@ def get_action(self, bot, update, args):
             parse_mode=ParseMode.MARKDOWN)
 
     def get_usage(self):
-        return f"`/{self.get_cmds()[0]} (<target symbol>-)<symbol> | top=<# or currencies>\n`"
+        return f"`/{self.get_cmds()[0]} <symbol>(-<target symbol>) | top=<# or currencies>\n`"
 
     def get_description(self):
         return "Market capitalization"

opencryptobot/plugins/price.py

@@ -9,7 +9,6 @@
 from opencryptobot.plugin import OpenCryptoPlugin, Category
 
 
-# TODO: Change order of currencies from 'eur-xmr' to 'xmr-eur'
 class Price(OpenCryptoPlugin):
 
     CG_URL = "https://www.coingecko.com/en/coins/"
@@ -31,8 +30,8 @@ def get_action(self, bot, update, args):
 
         if "-" in args[0]:
             pair = args[0].split("-", 1)
-            vs_cur = pair[0].upper()
-            coin = pair[1].upper()
+            vs_cur = pair[1].upper()
+            coin = pair[0].upper()
         else:
             coin = args[0].upper()
 
@@ -150,9 +149,9 @@ def get_usage(self):
         return f"`" \
                f"/{self.get_cmds()[0]} <symbol>\n\n" \
                f"/{self.get_cmds()[0]} <symbol> <exchange>\n\n" \
-               f"/{self.get_cmds()[0]} <target symbol>-<symbol>\n\n" \
+               f"/{self.get_cmds()[0]} <symbol>-<target symbol>,[...]\n\n" \
                f"{bot_name} /{self.get_cmds()[0]} <symbol>.\n\n" \
-               f"{bot_name} /{self.get_cmds()[0]} <target symbol>-<symbol>." \
+               f"{bot_name} /{self.get_cmds()[0]} <symbol>-<target symbol>,[...]." \
                f"`"
 
     def get_description(self):

opencryptobot/plugins/value.py

@@ -26,8 +26,8 @@ def get_action(self, bot, update, args):
 
         if "-" in args[0]:
             pair = args[0].split("-", 1)
-            vs_cur = pair[0].lower()
-            coin = pair[1].upper()
+            vs_cur = pair[1].lower()
+            coin = pair[0].upper()
         else:
             coin = args[0].upper()
 
@@ -85,7 +85,7 @@ def get_action(self, bot, update, args):
             parse_mode=ParseMode.MARKDOWN)
 
     def get_usage(self):
-        return f"`/{self.get_cmds()[0]} (<target symbol>,[...]-)<symbol> <quantity>`"
+        return f"`/{self.get_cmds()[0]} <symbol>(-<target symbol>,[...]) <quantity>`"
 
     def get_description(self):
         return "Value of coin quantity"

opencryptobot/plugins/volume.py

@@ -43,8 +43,8 @@ def get_action(self, bot, update, args):
         else:
             if "-" in args[0]:
                 pair = args[0].split("-", 1)
-                vs_cur = pair[0].lower()
-                coin = pair[1].lower()
+                vs_cur = pair[1].lower()
+                coin = pair[0].lower()
             else:
                 coin = args[0].lower()
 
@@ -120,7 +120,7 @@ def get_action(self, bot, update, args):
             parse_mode=ParseMode.MARKDOWN)
 
     def get_usage(self):
-        return f"`/{self.get_cmds()[0]} (<target symbol>-)<symbol> | top=<# of currencies>`"
+        return f"`/{self.get_cmds()[0]} <symbol>(-<target symbol>) | top=<# of currencies>`"
 
     def get_description(self):
         return "Volume of a coin"