Merge tag 'v1.5.5' into extend

ETM: Bug fix.

Author: RoyXiang

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.0"
+__version__ = "1.5.5"
 
 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

@@ -15,6 +15,7 @@
 import pydub
 import threading
 import traceback
+import base64
 from . import db, speech
 from .whitelisthandler import WhitelistHandler
 from channel import EFBChannel, EFBMsg, MsgType, MsgSource, TargetType, ChannelType
@@ -595,7 +596,7 @@ def link_chat_confirm(self, bot, tg_chat_id, tg_msg_id, callback_uid):
         txt += "\nWhat would you like to do?"
 
         link_url = "https://telegram.me/%s?startgroup=%s" % (
-            self.me.username, urllib.parse.quote("%s.%s" % (tg_chat_id, tg_msg_id)))
+            self.me.username, urllib.parse.quote(self.b64en("%s.%s" % (tg_chat_id, tg_msg_id))))
         self.logger.debug("Telegram start trigger for linking chat: %s", link_url)
         if linked:
             btn_list = [telegram.InlineKeyboardButton("Relink", url=link_url),
@@ -974,7 +975,7 @@ def msg(self, bot, update):
             elif mtype == TGMsgType.Audio:
                 m.type = MsgType.Audio
                 m.text = "%s - %s\n%s" % (
-                    update.message.audio.title, update.message.audio.perfomer, update.message.caption)
+                    update.message.audio.title, update.message.audio.performer, update.message.caption)
                 m.path, m.mime = self._download_file(update.message, update.message.audio, m.type)
             elif mtype == TGMsgType.Voice:
                 m.type = MsgType.Audio
@@ -1065,7 +1066,10 @@ def start(self, bot, update, args=[]):
             args: Arguments from message
         """
         if update.message.from_user.id != update.message.chat.id:  # from group
-            data = self.msg_storage[args[0]]
+            try:
+                data = self.msg_storage[self.b64de(args[0])]
+            except KeyError:
+                update.message.reply_text("Session expired or unknown parameter. (SE02)")
             chat_uid = data["chat_uid"]
             chat_display_name = data["chat_display_name"]
             slave_channel, slave_chat_uid = chat_uid.split('.', 1)
@@ -1267,3 +1271,10 @@ def stop_polling(self, val):
             self.queue.put(None)
         self._stop_polling = val
 
+    @staticmethod
+    def b64en(s):
+        return base64.b64encode(s.encode()).decode()
+
+    @staticmethod
+    def b64de(s):
+        return base64.b64decode(s).decode()

plugins/eh_wechat_slave.py

@@ -458,13 +458,19 @@ def wechat_link_msg(self, msg):
     @wechat_msg_meta
     def wechat_raw_link_msg(self, msg, title, description, image, url):
         mobj = EFBMsg(self)
-        mobj.type = MsgType.Link
-        mobj.attributes = {
-            "title": title,
-            "description": description,
-            "image": image,
-            "url": url
-        }
+        if url:
+            mobj.type = MsgType.Link
+            mobj.attributes = {
+                "title": title,
+                "description": description,
+                "image": image,
+                "url": url
+            }
+        else:
+            mobj.type = MsgType.Text
+            mobj.text = "%s\n%s" % (title, description)
+            if image:
+                mobj.text += "\n\n%s" % image
         return mobj
 
     def wechat_newsapp_msg(self, msg):
@@ -795,7 +801,9 @@ def uin_rate(self, param=""):
 
         users = self.itchat.get_friends(True) + self.itchat.get_mps(True)
         users_uin = len([i for i in users if i.get("Uin", None)])
-        users_all = len(users)
+        users_all = len(users) or 1
+        groups_all = groups_all or 1
+        members_all = members_all or 1
 
         return "`Uin` rate checkup.\n\n" \
                "Users + MP: %s/%s (%.2f%%)\n" \
@@ -810,6 +818,7 @@ def uin_rate(self, param=""):
                 "Usage: {function_name}")
     def force_log_out(self, param=""):
         self.itchat.logout()
+        return "Done."
 
     # Command functions
 
@@ -953,11 +962,7 @@ def _itchat_send_fn(self, fileDir, toUserName=None, mediaId=None, filename=None)
             return ReturnValue(rawResponse=r)
 
         try:
-            fn = kwargs.get("filename", None)
-            if fn is not None:
-                return _itchat_send_fn(self.itchat, *args, **kwargs)
-            else:
-                return self.itchat.send_file(*args, **kwargs)
+            _itchat_send_fn(self.itchat, *args, **kwargs)
         except Exception as e:
             raise EFBMessageError(repr(e))