Merge branch 'hotfix/1.5.6'

Author: blueset

main.py

@@ -10,7 +10,7 @@
 if sys.version_info.major < 3:
     raise Exception("Python 3.x is required. Your version is %s." % sys.version)
 
-__version__ = "1.5.5"
+__version__ = "1.5.6"
 
 parser = argparse.ArgumentParser(description="EH Forwarder Bot is an extensible chat tunnel framework which allows "
                                              "users to contact people from other chat platforms, and ultimately "

plugins/eh_telegram_master/__init__.py

@@ -1273,8 +1273,8 @@ def stop_polling(self, val):
 
     @staticmethod
     def b64en(s):
-        return base64.b64encode(s.encode()).decode()
+        return base64.b64encode(s.encode(), b"-_").decode().rstrip("=")
 
     @staticmethod
     def b64de(s):
-        return base64.b64decode(s).decode()
+        return base64.b64decode((s + '=' * (- len(s) % 4)).encode(), b"-_").decode()