Fixing issue of unidentified MIME types

Author: blueset

mimetypes

@@ -0,0 +1,7 @@
+image/jpeg jpg
+image/jpg jpg
+image/gif gif
+image/webp webp
+video/mp4 mp4
+text/plain txt
+application/efb efb

plugins/eh_telegram_master/__init__.py

@@ -104,7 +104,7 @@ def __init__(self, queue, slaves):
             self.bot = telegram.ext.Updater(getattr(config, self.channel_id)['token'])
         except (AttributeError, KeyError):
             raise ValueError("Token is not properly defined. Please define it in `config.py`.")
-        mimetypes.init()
+        mimetypes.init(files=["mimetypes"])
         self.admins = getattr(config, self.channel_id)['admins']
         self.logger = logging.getLogger("plugins.%s.TelegramChannel" % self.channel_id)
         self.me = self.bot.bot.get_me()

plugins/eh_wechat_slave.py

@@ -115,13 +115,12 @@ def __init__(self, queue):
         self.itchat = itchat.new_instance()
         itchat.set_logging(showOnCmd=False)
         self.itchat_msg_register()
-
         self.itchat.auto_login(enableCmdQR=2,
                                hotReload=True,
                                statusStorageDir="storage/%s.pkl" % self.channel_id,
                                exitCallback=self.exit_callback,
                                qrCallback=self.console_qr_code)
-
+        mimetypes.init(files=["mimetypes"])
         self.logger.info("EWS Inited!!!\n---")
 
     #
@@ -666,7 +665,11 @@ def send_message(self, msg):
                         tgt_text = "「%s」" % qt_txt
                     else:
                         tgt_text = ""
-                    msg.text = "@%s\u2005 %s\n\n%s" % (msg.target['target'].member['alias'], tgt_text, msg.text)
+                    if UserName.startswith("@@"):
+                        tgt_alias = "@%s\u2005 " % msg.target['target'].member['alias']
+                    else:
+                        tgt_alias = ""
+                    msg.text = "%s%s\n\n%s" % (tgt_alias, tgt_text, msg.text)
             r = self.itchat.send(msg.text, UserName)
         elif msg.type in [MsgType.Image, MsgType.Sticker]:
             self.logger.info("Image/Sticker %s, %s", msg.type, msg.path)