Thanks to donation from 绵绵.

Fix error caused by logging.
ETM: Empty Image/stickers can now be replied.

Author: blueset

docs/donations.md

@@ -0,0 +1,12 @@
+# Support EFB
+
+You can donate to me via any of the following methods.
+
+* [![Beerpay](https://img.shields.io/badge/Donate-with%20Beerpay-red.svg)](https://beerpay.io/blueset/ehForwarderBot)
+* [![Donate with PayPal](https://img.shields.io/badge/Donate-with%20Paypal-blue.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=A5B55ARC7M6DS&lc=AU&item_name=Eana%20Hufwe%20%28GitHub%20ID%3a%20blueset%29&item_number=EFB&currency_code=AUD&bn=PP%2dDonationsBF%3aDonate%2dvia%2520Paypal%2dblue%2esvg%3aNonHosted)
+* [![Donate with AliPay](https://img.shields.io/badge/Donate-with%20AliPay-orange.svg)](https://images.1a23.com/di/K1OU/EFBdonate.png)
+* [![Donate with Patreon](https://img.shields.io/badge/Donate-with%20Patreon-orange.svg)](https://patreon.com/user?u=4886291)
+
+
+## Supporters
+* 绵绵: CNY 10.00

docs/index.md

@@ -1,9 +1,11 @@
 # EH Forwarder Bot
 
-![Python 3.x](https://img.shields.io/badge/Python-3.x-blue.svg) [![Gitter](https://img.shields.io/gitter/room/blueset/ehForwarderBot.svg)](https://gitter.im/blueset/ehForwarderBot)
+![Python 3.x](https://img.shields.io/badge/Python-3.x-blue.svg)
+[![Gitter](https://img.shields.io/gitter/room/blueset/ehForwarderBot.svg)](https://gitter.im/blueset/ehForwarderBot)
 [![Telegram support group](https://img.shields.io/badge/Chat-on%20Telegram-blue.svg)](https://telegram.me/efbsupport)
 [![Docs: Stable version](https://readthedocs.org/projects/ehforwarderbot/badge/?version=latest)](https://ehforwarderbot.readthedocs.io/en/latest/)
 [![Docs: Development version version](https://readthedocs.org/projects/ehforwarderbot/badge/?version=dev)](https://ehforwarderbot.readthedocs.io/en/dev/)
+[![tag](https://img.shields.io/github/tag/blueset/ehforwarderbot.svg)](https://github.com/blueset/ehForwarderBot/releases)
 
 ![EFB](https://images.1a23.com/upload/images/SPET.png)
 

mkdocs.yml

@@ -16,6 +16,7 @@ pages:
     - 'Official plugins':
         - 'EFB Telegram Master': 'ETM.md'
         - 'EFB WeChat Slave': 'EWS.md'
+    - 'Support EFB': 'donations.md'
 theme: readthedocs
 repo_url: 'https://github.com/blueset/ehforwarderbot'
 markdown_extensions:

plugins/eh_telegram_master/__init__.py

@@ -309,35 +309,37 @@ def process_msg(self, msg):
                                  os.stat(msg.path).st_size, msg.mime)
                 if os.stat(msg.path).st_size == 0:
                     os.remove(msg.path)
-                    return self.bot.bot.sendMessage(tg_dest,
+                    tg_msg = self.bot.bot.sendMessage(tg_dest,
                                                     msg_template % ("Error: Empty %s received. (MS01)" % msg.type))
-                if not msg.text:
-                    if msg.type == MsgType.Image:
-                        msg.text = "sent a picture."
-                    elif msg.type == MsgType.Sticker:
-                        msg.text = "sent a sticker."
-                if msg.mime == "image/gif":
-                    tg_msg = self.bot.bot.sendDocument(tg_dest, msg.file, caption=msg_template % msg.text)
                 else:
-                    try:
-                        tg_msg = self.bot.bot.sendPhoto(tg_dest, msg.file, caption=msg_template % msg.text)
-                    except telegram.error.BadRequest:
+                    if not msg.text:
+                        if msg.type == MsgType.Image:
+                            msg.text = "sent a picture."
+                        elif msg.type == MsgType.Sticker:
+                            msg.text = "sent a sticker."
+                    if msg.mime == "image/gif":
                         tg_msg = self.bot.bot.sendDocument(tg_dest, msg.file, caption=msg_template % msg.text)
-                os.remove(msg.path)
+                    else:
+                        try:
+                            tg_msg = self.bot.bot.sendPhoto(tg_dest, msg.file, caption=msg_template % msg.text)
+                        except telegram.error.BadRequest:
+                            tg_msg = self.bot.bot.sendDocument(tg_dest, msg.file, caption=msg_template % msg.text)
+                    os.remove(msg.path)
                 self.logger.debug("%s, process_msg_step_3_3", xid)
             elif msg.type == MsgType.File:
                 if os.stat(msg.path).st_size == 0:
                     os.remove(msg.path)
-                    return self.bot.bot.sendMessage(tg_dest,
+                    tg_msg = self.bot.bot.sendMessage(tg_dest,
                                                     msg_template % ("Error: Empty %s received. (MS02)" % msg.type))
-                if not msg.text:
-                    file_name = os.path.basename(msg.path)
-                    msg.text = "sent a file."
                 else:
-                    file_name = msg.text
-                tg_msg = self.bot.bot.sendDocument(tg_dest, msg.file, caption=msg_template % msg.text,
-                                                   filename=file_name)
-                os.remove(msg.path)
+                    if not msg.text:
+                        file_name = os.path.basename(msg.path)
+                        msg.text = "sent a file."
+                    else:
+                        file_name = msg.text
+                    tg_msg = self.bot.bot.sendDocument(tg_dest, msg.file, caption=msg_template % msg.text,
+                                                       filename=file_name)
+                    os.remove(msg.path)
             elif msg.type == MsgType.Audio:
                 if os.stat(msg.path).st_size == 0:
                     os.remove(msg.path)
@@ -387,7 +389,7 @@ def process_msg(self, msg):
             self.logger.debug("%s, process_msg_step_4", xid)
             if msg.source in (MsgSource.User, MsgSource.Group):
                 msg_log = {"master_msg_id": "%s.%s" % (tg_msg.chat.id, tg_msg.message_id),
-                           "text": msg.text,
+                           "text": msg.text or "Sent a %s." % msg.type,
                            "msg_type": msg.type,
                            "sent_to": "Master",
                            "slave_origin_uid": "%s.%s" % (msg.channel_id, msg.origin['uid']),
@@ -1169,9 +1171,20 @@ def poll(self):
 
     def error(self, bot, update, error):
         """
-        Print error to console, Triggered by python-telegram-bot error callback.
+        Print error to console, and send error message to first admin.
+        Triggered by python-telegram-bot error callback.
         """
-        self.logger.warning('ERRORRR! Update %s caused error %s' % (update, error))
+        if "Conflict: terminated by other long poll or webhook (409)" in str(error):
+            msg = 'Please immediately turn off all EFB instances.\nAnother bot instance or web-hook detected.'
+            self.logger.error(msg)
+            bot.sendMessage(getattr(config, self.channel_id)['admins'][0], msg)
+        else:
+            bot.sendMessage(getattr(config, self.channel_id)['admins'][0],
+                            "EFB Telegram Master channel encountered error <code>%s</code> "
+                            "caused by update <code>%s</code>.\n\n"
+                            "Report issue: <a href=\"https://github.com/blueset/ehForwarderBot/issues/new\">GitHub Issue Page</a>" %
+                            (html.escape(error), html.escape(update)))
+            self.logger.error('ERROR! Update %s caused error %s' % (update, error))
 
     def _flag(self, key, value):
         """