From 7267588e74392208b3b8f580152630fee627a38c Mon Sep 17 00:00:00 2001 From: Andreas Bielawski Date: Mon, 8 Oct 2018 19:28:49 +0200 Subject: [PATCH 1/6] Logging can be configured now, just like in Nextbot --- bot.py | 29 +++++++++++++++++++---------- config.ini.example | 5 +++++ 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/bot.py b/bot.py index b9068bb..3578d95 100644 --- a/bot.py +++ b/bot.py @@ -16,22 +16,31 @@ from telegram.ext.dispatcher import run_async import utils -# Logging -logging.basicConfig( - format="%(asctime)s - %(levelname)s: %(message)s", - datefmt="%d.%m.%Y %H:%M:%S", - level=logging.INFO -) -logger = logging.getLogger(__name__) - -# Bot configuration config = ConfigParser() try: config.read_file(open('config.ini')) except FileNotFoundError: - logger.critical('Config.ini nicht gefunden') + logging.critical('Config.ini nicht gefunden') sys.exit(1) +# Logging +try: + logging_conf = config["LOGGING"] + logging_level = logging_conf.get("level", "INFO") + logging_format = logging_conf.get("format", "%(asctime)s - %(levelname)s: %(message)s", raw=True) + if logging_level not in ["DEBUG", "INFO", "CRITICAL", "ERROR", "WARNING"]: + logging.warning("Logging Level invalid. Will be changed to WARNING") + logging.basicConfig(format=logging_format, level=logging.INFO, datefmt="%d.%m.%Y %H:%M:%S") + else: + logging.basicConfig(format=logging_format, + level=eval("logging.{0}".format(logging_level.upper())), + datefmt="%d.%m.%Y %H:%M:%S") +except KeyError: + logging.basicConfig(format="%(asctime)s - %(levelname)s: %(message)s", + level=logging.INFO, + datefmt="%d.%m.%Y %H:%M:%S") +logger = logging.getLogger(__name__) + # Bot token try: bot_token = config['DEFAULT']['token'] diff --git a/config.ini.example b/config.ini.example index 1bac842..4299b0c 100644 --- a/config.ini.example +++ b/config.ini.example @@ -1,6 +1,11 @@ [DEFAULT] token = 1337:1234567890abcdefgh +[LOGGING] +# Valid options are ERROR, INFO, DEBUG, CRITICAL, WARNING +#level = INFO +#format = %(asctime)s - %(levelname)s: %(message)s + [REDIS] #db = 0 #host = localhost From fafd04eb3994ada49ef40883947f0849d269a790 Mon Sep 17 00:00:00 2001 From: Andreas Bielawski Date: Tue, 18 Dec 2018 18:50:23 +0100 Subject: [PATCH 2/6] Add feed url to error logging --- bot.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bot.py b/bot.py index 3578d95..32d6db2 100644 --- a/bot.py +++ b/bot.py @@ -256,9 +256,9 @@ def check_feed(bot, key): data = feedparser.parse(feed_url) if 'link' not in data.feed: if 'status' in data and data["status"] != 200: - logger.warning('Kein gültiger Feed, HTTP-Status-Code ' + str(data["status"])) + logger.warning(feed_url + ' - Kein gültiger Feed, HTTP-Status-Code ' + str(data["status"])) else: - logger.warning('Kein gültiger Feed: ' + str(data.bozo_exception)) + logger.warning(feed_url + ' - Kein gültiger Feed: ' + str(data.bozo_exception)) return None if 'title' not in data.feed: feed_title = data.feed['link'] From 1fd46d9a8f893badb409b7172584eda19b800c0c Mon Sep 17 00:00:00 2001 From: Andreas Bielawski Date: Sat, 5 Jan 2019 15:14:54 +0100 Subject: [PATCH 3/6] Faster startup time and replace ' with " --- bot.py | 173 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 86 insertions(+), 87 deletions(-) diff --git a/bot.py b/bot.py index 32d6db2..1cfb337 100644 --- a/bot.py +++ b/bot.py @@ -11,6 +11,7 @@ from urllib.parse import urlparse import feedparser import redis import telegram +from telegram.error import Unauthorized from telegram.ext import CommandHandler, Updater from telegram.ext.dispatcher import run_async @@ -18,9 +19,9 @@ import utils config = ConfigParser() try: - config.read_file(open('config.ini')) + config.read_file(open("config.ini")) except FileNotFoundError: - logging.critical('Config.ini nicht gefunden') + logging.critical("Config.ini nicht gefunden") sys.exit(1) # Logging @@ -43,35 +44,35 @@ logger = logging.getLogger(__name__) # Bot token try: - bot_token = config['DEFAULT']['token'] + bot_token = config["DEFAULT"]["token"] except KeyError: - logger.error('Kein Bot-Token gesetzt, bitte config.ini prüfen') + logger.error("Kein Bot-Token gesetzt, bitte config.ini prüfen") sys.exit(1) if not bot_token: - logger.error('Kein Bot-Token gesetzt, bitte config.ini prüfen') + logger.error("Kein Bot-Token gesetzt, bitte config.ini prüfen") sys.exit(1) # Admins try: admins = loads(config["ADMIN"]["id"]) except KeyError: - logger.error('Keine Admin-IDs gesetzt, bitte config.ini prüfen.') + logger.error("Keine Admin-IDs gesetzt, bitte config.ini prüfen.") sys.exit(1) if not admins: - logger.error('Keine Admin-IDs gesetzt, bitte config.ini prüfen.') + logger.error("Keine Admin-IDs gesetzt, bitte config.ini prüfen.") sys.exit(1) for admin in admins: if not isinstance(admin, int): - logger.error('Admin-IDs müssen Integer sein.') + logger.error("Admin-IDs müssen Integer sein.") sys.exit(1) # Redis -redis_conf = config['REDIS'] -redis_db = redis_conf.get('db', 0) -redis_host = redis_conf.get('host', '127.0.0.1') -redis_port = redis_conf.get('port', 6379) -redis_socket = redis_conf.get('socket_path') +redis_conf = config["REDIS"] +redis_db = redis_conf.get("db", 0) +redis_host = redis_conf.get("host", "127.0.0.1") +redis_port = redis_conf.get("port", 6379) +redis_socket = redis_conf.get("socket_path") if redis_socket: r = redis.Redis(unix_socket_path=redis_socket, db=int(redis_db), decode_responses=True) else: @@ -81,7 +82,7 @@ if not r.ping(): logging.getLogger("Redis").critical("Redis-Verbindungsfehler, config.ini prüfen") sys.exit(1) -feed_hash = 'pythonbot:rss:{0}' +feed_hash = "pythonbot:rss:{0}" @run_async @@ -89,7 +90,7 @@ def start(bot, update): if not utils.can_use_bot(update): return update.message.reply_text( - text='Willkommen beim RSS-Bot!\nSende /help, um zu starten.', + text="Willkommen beim RSS-Bot!\nSende /help, um zu starten.", parse_mode=telegram.ParseMode.HTML ) @@ -99,9 +100,9 @@ def help_text(bot, update): if not utils.can_use_bot(update): return update.message.reply_text( - text='/rss [Chat]: Abonnierte Feeds anzeigen\n' - '/sub Feed-URL [Chat]: Feed abonnieren\n' - '/del n [Chat]: Feed löschen', + text="/rss [Chat]: Abonnierte Feeds anzeigen\n" + "/sub Feed-URL [Chat]: Feed abonnieren\n" + "/del n [Chat]: Feed löschen", parse_mode=telegram.ParseMode.HTML ) @@ -115,24 +116,24 @@ def list_feeds(bot, update, args): try: resp = bot.getChat(chat_name) except telegram.error.BadRequest: - update.message.reply_text('❌ Dieser Kanal existiert nicht.') + update.message.reply_text("❌ Dieser Kanal existiert nicht.") return chat_id = str(resp.id) chat_title = resp.title else: chat_id = str(update.message.chat.id) - if update.message.chat.type == 'private': + if update.message.chat.type == "private": chat_title = update.message.chat.first_name else: chat_title = update.message.chat.title subs = r.smembers(feed_hash.format(chat_id)) if not subs: - text = '❌ Keine Feeds abonniert.' + text = "❌ Keine Feeds abonniert." else: - text = '' + html.escape(chat_title) + ' hat abonniert:\n' + text = "" + html.escape(chat_title) + " hat abonniert:\n" for n, feed in enumerate(subs): - text += '' + str(n + 1) + ') ' + feed + '\n' + text += "" + str(n + 1) + ") " + feed + "\n" update.message.reply_text( text=text, @@ -145,11 +146,11 @@ def subscribe(bot, update, args): if not utils.can_use_bot(update): return if not args: - update.message.reply_text('❌ Keine Feed-URL angegeben.') + update.message.reply_text("❌ Keine Feed-URL angegeben.") return feed_url = args[0] if not re.match("^http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&~+]|[!*(),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+$", feed_url): - update.message.reply_text('❌ Das ist keine URL.') + update.message.reply_text("❌ Das ist keine URL.") return # Get Chat ID from name if given @@ -158,45 +159,45 @@ def subscribe(bot, update, args): try: resp = bot.getChat(chat_name) except telegram.error.BadRequest: - update.message.reply_text('❌ Dieser Kanal existiert nicht.') + update.message.reply_text("❌ Dieser Kanal existiert nicht.") return chat_id = str(resp.id) resp = bot.getChatMember(chat_id, bot.id) - if resp.status != 'administrator': - update.message.reply_text('❌ Bot ist kein Administrator in diesem Kanal.') + if resp.status != "administrator": + update.message.reply_text("❌ Bot ist kein Administrator in diesem Kanal.") return else: chat_id = str(update.message.chat.id) bot.sendChatAction(update.message.chat.id, action=telegram.ChatAction.TYPING) data = feedparser.parse(feed_url) - if 'link' not in data.feed: - update.message.reply_text('❌ Kein gültiger Feed.') + if "link" not in data.feed: + update.message.reply_text("❌ Kein gültiger Feed.") return feed_url = data.href # Follow all redirects if r.sismember(feed_hash.format(chat_id), feed_url): - update.message.reply_text('✅ Dieser Feed wurde bereits abonniert.') + update.message.reply_text("✅ Dieser Feed wurde bereits abonniert.") return - if 'title' not in data.feed: + if "title" not in data.feed: feed_title = feed_url else: - feed_title = html.escape(data.feed['title']) + feed_title = html.escape(data.feed["title"]) # Save the last entry in Redis, if it doesn't exist if data.entries: - last_entry_hash = feed_hash.format(feed_url + ':last_entry') + last_entry_hash = feed_hash.format(feed_url + ":last_entry") if not r.exists(last_entry_hash): - if 'id' not in data.entries[0]: - last_entry = data.entries[0]['link'] + if "id" not in data.entries[0]: + last_entry = data.entries[0]["link"] else: - last_entry = data.entries[0]['id'] + last_entry = data.entries[0]["id"] r.set(last_entry_hash, last_entry) - r.sadd(feed_hash.format(feed_url + ':subs'), chat_id) + r.sadd(feed_hash.format(feed_url + ":subs"), chat_id) r.sadd(feed_hash.format(chat_id), feed_url) update.message.reply_text( - text='✅ ' + feed_title + ' hinzugefügt!', + text="✅ " + feed_title + " hinzugefügt!", parse_mode=telegram.ParseMode.HTML ) @@ -206,7 +207,7 @@ def unsubscribe(bot, update, args): if not utils.can_use_bot(update): return if not args: - update.message.reply_text('❌ Keine Nummer angegeben.') + update.message.reply_text("❌ Keine Nummer angegeben.") return # Get Chat ID from name if given @@ -215,7 +216,7 @@ def unsubscribe(bot, update, args): try: resp = bot.getChat(chat_name) except telegram.error.BadRequest: - update.message.reply_text('❌ Dieser Kanal existiert nicht.') + update.message.reply_text("❌ Dieser Kanal existiert nicht.") return chat_id = str(resp.id) else: @@ -224,78 +225,78 @@ def unsubscribe(bot, update, args): try: n = int(args[0]) except ValueError: - update.message.reply_text('❌ Keine Nummer angegeben.') + update.message.reply_text("❌ Keine Nummer angegeben.") return chat_hash = feed_hash.format(chat_id) subs = r.smembers(chat_hash) if n < 1: - update.message.reply_text('❌ Nummer muss größer als 0 sein!') + update.message.reply_text("❌ Nummer muss größer als 0 sein!") return elif n > len(subs): - update.message.reply_text('❌ Feed-ID zu hoch.') + update.message.reply_text("❌ Feed-ID zu hoch.") return feed_url = list(subs)[n - 1] - sub_hash = feed_hash.format(feed_url + ':subs') + sub_hash = feed_hash.format(feed_url + ":subs") r.srem(chat_hash, feed_url) r.srem(sub_hash, chat_id) if not r.smembers(sub_hash): # no one subscribed, remove it - r.delete(feed_hash.format(feed_url + ':last_entry')) + r.delete(feed_hash.format(feed_url + ":last_entry")) update.message.reply_text( - text='✅ ' + feed_url + ' entfernt.', + text="✅ " + feed_url + " entfernt.", parse_mode=telegram.ParseMode.HTML ) @run_async def check_feed(bot, key): - feed_url = re.match('^' + feed_hash.format('(.+):subs$'), key).group(1) + feed_url = re.match("^" + feed_hash.format("(.+):subs$"), key).group(1) logger.info(feed_url) data = feedparser.parse(feed_url) - if 'link' not in data.feed: - if 'status' in data and data["status"] != 200: - logger.warning(feed_url + ' - Kein gültiger Feed, HTTP-Status-Code ' + str(data["status"])) + if "link" not in data.feed: + if "status" in data and data["status"] != 200: + logger.warning(feed_url + " - Kein gültiger Feed, HTTP-Status-Code " + str(data["status"])) else: - logger.warning(feed_url + ' - Kein gültiger Feed: ' + str(data.bozo_exception)) + logger.warning(feed_url + " - Kein gültiger Feed: " + str(data.bozo_exception)) return None - if 'title' not in data.feed: - feed_title = data.feed['link'] + if "title" not in data.feed: + feed_title = data.feed["link"] else: - feed_title = data.feed['title'] - last_entry_hash = feed_hash.format(feed_url + ':last_entry') + feed_title = data.feed["title"] + last_entry_hash = feed_hash.format(feed_url + ":last_entry") last_entry = r.get(last_entry_hash) new_entries = utils.get_new_entries(data.entries, last_entry) for entry in reversed(new_entries): - if 'title' not in entry: - post_title = 'Kein Titel' + if "title" not in entry: + post_title = "Kein Titel" else: - post_title = utils.remove_html_tags(entry['title']).strip() - post_title = post_title.replace('<', '<').replace('>', '>') - if 'link' not in entry: + post_title = utils.remove_html_tags(entry["title"]).strip() + post_title = post_title.replace("<", "<").replace(">", ">") + if "link" not in entry: post_link = data.link link_name = post_link else: post_link = entry.link - feedproxy = re.search('^https?://feedproxy\.google\.com/~r/(.+?)/.*', post_link) # feedproxy.google.com + feedproxy = re.search("^https?://feedproxy\.google\.com/~r/(.+?)/.*", post_link) # feedproxy.google.com if feedproxy: link_name = feedproxy.group(1) else: link_name = urlparse(post_link).netloc - link_name = re.sub('^www\d?\.', '', link_name) # remove www. - if 'content' in entry: - content = utils.get_content(entry.content[0]['value']) - elif 'summary' in entry: + link_name = re.sub("^www\d?\.", "", link_name) # remove www. + if "content" in entry: + content = utils.get_content(entry.content[0]["value"]) + elif "summary" in entry: content = utils.get_content(entry.summary) else: - content = '' - text = '{post_title}\n{feed_title}\n{content}'.format( + content = "" + text = "{post_title}\n{feed_title}\n{content}".format( post_title=post_title, feed_title=feed_title, content=content ) - text += '\nAuf {link_name} weiterlesen\n'.format( + text += "\nAuf {link_name} weiterlesen\n".format( post_link=post_link, link_name=link_name ) @@ -308,12 +309,12 @@ def check_feed(bot, key): disable_web_page_preview=True ) except telegram.error.Unauthorized: - logger.warning('Chat ' + member + ' existiert nicht mehr, wird gelöscht.') + logger.warning("Chat " + member + " existiert nicht mehr, wird gelöscht.") r.srem(key, member) r.delete(feed_hash.format(member)) except telegram.error.ChatMigrated as new_chat: new_chat_id = new_chat.new_chat_id - logger.info('Chat migriert: ' + member + ' -> ' + str(new_chat_id)) + logger.info("Chat migriert: " + member + " -> " + str(new_chat_id)) r.srem(key, member) r.sadd(key, new_chat_id) r.rename(feed_hash.format(member), feed_hash.format(new_chat_id)) @@ -334,7 +335,7 @@ def check_feed(bot, key): # Set the new last entry if there are any if new_entries: - if 'id' not in new_entries[0]: + if "id" not in new_entries[0]: new_last_entry = new_entries[0].link else: new_last_entry = new_entries[0].id @@ -343,8 +344,8 @@ def check_feed(bot, key): @run_async def run_job(bot, job=None): - logger.info('================================') - keys = r.keys(feed_hash.format('*:subs')) + logger.info("================================") + keys = r.keys(feed_hash.format("*:subs")) for key in keys: check_feed(bot, key) @@ -358,27 +359,25 @@ def main(): # Setup the updater and show bot info updater = Updater(token=bot_token) try: - bot_info = updater.bot.getMe() - except telegram.error.Unauthorized: - logger.error('Anmeldung nicht möglich, Bot-Token falsch?') + logger.info("Starte {0}, AKA @{1} ({2})".format(updater.bot.first_name, updater.bot.username, updater.bot.id)) + except Unauthorized: + logger.critical("Anmeldung nicht möglich, Bot-Token falsch?") sys.exit(1) - logger.info('Starte ' + bot_info.first_name + ', AKA @' + bot_info.username + ' (' + str(bot_info.id) + ')') - # Register Handlers handlers = [ - CommandHandler('start', start), - CommandHandler('help', help_text), - CommandHandler('rss', list_feeds, pass_args=True), - CommandHandler('sub', subscribe, pass_args=True), - CommandHandler('del', unsubscribe, pass_args=True), - CommandHandler('sync', run_job) + CommandHandler("start", start), + CommandHandler("help", help_text), + CommandHandler("rss", list_feeds, pass_args=True), + CommandHandler("sub", subscribe, pass_args=True), + CommandHandler("del", unsubscribe, pass_args=True), + CommandHandler("sync", run_job) ] for handler in handlers: updater.dispatcher.add_handler(handler) # Hide "Error while getting Updates" because it's not our fault - updater.logger.addFilter((lambda log: not log.msg.startswith('Error while getting Updates:'))) + updater.logger.addFilter((lambda log: not log.msg.startswith("Error while getting Updates:"))) # Fix for Python <= 3.5 updater.dispatcher.add_error_handler(onerror) @@ -401,5 +400,5 @@ def main(): updater.idle() -if __name__ == '__main__': +if __name__ == "__main__": main() From cb8c281323c5009868d9c69328dede3b22918603 Mon Sep 17 00:00:00 2001 From: Andreas Bielawski Date: Mon, 18 Mar 2019 18:44:21 +0100 Subject: [PATCH 4/6] Open-Source release in english --- LICENSE | 661 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 18 +- bot.py | 70 +++--- 3 files changed, 705 insertions(+), 44 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..ea33296 --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + RSS Bot for Telegram Messenger + Copyright (C) 2016 - 2019 Andreas Bielawski + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/README.md b/README.md index a9587da..fb0dce3 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -RSS-Bot für Telegram +RSS bot for Telegram ===================== -1. **Klonen:** `git clone https://git.centzilius.de/iCON/rssbot` -2. **Python 3 installieren:** `sudo apt-get install python3 python3-pip` -3. **Module installieren:** `sudo pip3 install -r requirements.txt` -4. **Config kopieren:** `cp config.ini.example config.ini` -5. **Bot-Token** in `config.ini` einfügen - 1. Weitere Einstellungen für Redis vornehmen, falls vom Standard abweicht -6. **Eigene Admin-ID in die Config eintragen** +1. **Clone:** `git clone https://github.com/Brawl345/rssbot` +2. **Install Python 3 and Redis** +3. **Install modules:** `(sudo) pip3 install -r requirements.txt` +4. **Copy config:** `cp config.ini.example config.ini` +5. **Insert bot token** in `config.ini` + 1. Adjust redis settings if needed +6. **Insert your Telegram ID as admin** (send `@Brawlbot id` inside a chat to get yours) 7. `python3 bot.py` -(c) 2016-2017 Andreas Bielawski +(c) 2016-2019 Andreas Bielawski diff --git a/bot.py b/bot.py index 1cfb337..0ccbad4 100644 --- a/bot.py +++ b/bot.py @@ -21,7 +21,7 @@ config = ConfigParser() try: config.read_file(open("config.ini")) except FileNotFoundError: - logging.critical("Config.ini nicht gefunden") + logging.critical("config.ini not found") sys.exit(1) # Logging @@ -46,25 +46,25 @@ logger = logging.getLogger(__name__) try: bot_token = config["DEFAULT"]["token"] except KeyError: - logger.error("Kein Bot-Token gesetzt, bitte config.ini prüfen") + logger.error("Bot token is missing, check config.ini") sys.exit(1) if not bot_token: - logger.error("Kein Bot-Token gesetzt, bitte config.ini prüfen") + logger.error("Bot token is missing, check config.ini") sys.exit(1) # Admins try: admins = loads(config["ADMIN"]["id"]) except KeyError: - logger.error("Keine Admin-IDs gesetzt, bitte config.ini prüfen.") + logger.error("No admin IDs are set, check config.ini.") sys.exit(1) if not admins: - logger.error("Keine Admin-IDs gesetzt, bitte config.ini prüfen.") + logger.error("No admin IDs are set, check config.ini.") sys.exit(1) for admin in admins: if not isinstance(admin, int): - logger.error("Admin-IDs müssen Integer sein.") + logger.error("Admin IDs need to be integers.") sys.exit(1) # Redis @@ -79,7 +79,7 @@ else: r = redis.Redis(host=redis_host, port=int(redis_port), db=int(redis_db), decode_responses=True) if not r.ping(): - logging.getLogger("Redis").critical("Redis-Verbindungsfehler, config.ini prüfen") + logging.getLogger("Redis").critical("Failed to connect to Redis server") sys.exit(1) feed_hash = "pythonbot:rss:{0}" @@ -90,7 +90,7 @@ def start(bot, update): if not utils.can_use_bot(update): return update.message.reply_text( - text="Willkommen beim RSS-Bot!\nSende /help, um zu starten.", + text="Welcome to the RSS Bot!\nSend /help to get started.", parse_mode=telegram.ParseMode.HTML ) @@ -100,9 +100,9 @@ def help_text(bot, update): if not utils.can_use_bot(update): return update.message.reply_text( - text="/rss [Chat]: Abonnierte Feeds anzeigen\n" - "/sub Feed-URL [Chat]: Feed abonnieren\n" - "/del n [Chat]: Feed löschen", + text="/rss [Chat]: Show subbed feeds\n" + "/sub Feed URL [Chat]: Sub to feed (Chat is optional)\n" + "/del n [Chat]: Unsubscribe feed (Chat is optional)", parse_mode=telegram.ParseMode.HTML ) @@ -116,7 +116,7 @@ def list_feeds(bot, update, args): try: resp = bot.getChat(chat_name) except telegram.error.BadRequest: - update.message.reply_text("❌ Dieser Kanal existiert nicht.") + update.message.reply_text("❌ This channel does not exist.") return chat_id = str(resp.id) chat_title = resp.title @@ -129,9 +129,9 @@ def list_feeds(bot, update, args): subs = r.smembers(feed_hash.format(chat_id)) if not subs: - text = "❌ Keine Feeds abonniert." + text = "❌ There are no feeds." else: - text = "" + html.escape(chat_title) + " hat abonniert:\n" + text = "" + html.escape(chat_title) + " is subscribed to:\n" for n, feed in enumerate(subs): text += "" + str(n + 1) + ") " + feed + "\n" @@ -146,11 +146,11 @@ def subscribe(bot, update, args): if not utils.can_use_bot(update): return if not args: - update.message.reply_text("❌ Keine Feed-URL angegeben.") + update.message.reply_text("❌ No feed URL given.") return feed_url = args[0] if not re.match("^http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&~+]|[!*(),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+$", feed_url): - update.message.reply_text("❌ Das ist keine URL.") + update.message.reply_text("❌ That doesn't look like an URL.") return # Get Chat ID from name if given @@ -159,12 +159,12 @@ def subscribe(bot, update, args): try: resp = bot.getChat(chat_name) except telegram.error.BadRequest: - update.message.reply_text("❌ Dieser Kanal existiert nicht.") + update.message.reply_text("❌ This channel does not exist.") return chat_id = str(resp.id) resp = bot.getChatMember(chat_id, bot.id) if resp.status != "administrator": - update.message.reply_text("❌ Bot ist kein Administrator in diesem Kanal.") + update.message.reply_text("❌ You need to add the bot as an administrator to the channel.") return else: chat_id = str(update.message.chat.id) @@ -172,11 +172,11 @@ def subscribe(bot, update, args): bot.sendChatAction(update.message.chat.id, action=telegram.ChatAction.TYPING) data = feedparser.parse(feed_url) if "link" not in data.feed: - update.message.reply_text("❌ Kein gültiger Feed.") + update.message.reply_text("❌ Not a valid feed.") return feed_url = data.href # Follow all redirects if r.sismember(feed_hash.format(chat_id), feed_url): - update.message.reply_text("✅ Dieser Feed wurde bereits abonniert.") + update.message.reply_text("✅ Already subscribed to this feed.") return if "title" not in data.feed: @@ -197,7 +197,7 @@ def subscribe(bot, update, args): r.sadd(feed_hash.format(feed_url + ":subs"), chat_id) r.sadd(feed_hash.format(chat_id), feed_url) update.message.reply_text( - text="✅ " + feed_title + " hinzugefügt!", + text="✅ " + feed_title + " added!", parse_mode=telegram.ParseMode.HTML ) @@ -207,7 +207,7 @@ def unsubscribe(bot, update, args): if not utils.can_use_bot(update): return if not args: - update.message.reply_text("❌ Keine Nummer angegeben.") + update.message.reply_text("❌ No number given, check /rss first.") return # Get Chat ID from name if given @@ -216,7 +216,7 @@ def unsubscribe(bot, update, args): try: resp = bot.getChat(chat_name) except telegram.error.BadRequest: - update.message.reply_text("❌ Dieser Kanal existiert nicht.") + update.message.reply_text("❌ This channel does not exist.") return chat_id = str(resp.id) else: @@ -225,16 +225,16 @@ def unsubscribe(bot, update, args): try: n = int(args[0]) except ValueError: - update.message.reply_text("❌ Keine Nummer angegeben.") + update.message.reply_text("❌ No number given.".") return chat_hash = feed_hash.format(chat_id) subs = r.smembers(chat_hash) if n < 1: - update.message.reply_text("❌ Nummer muss größer als 0 sein!") + update.message.reply_text("❌ Number must be bigger than 0!") return elif n > len(subs): - update.message.reply_text("❌ Feed-ID zu hoch.") + update.message.reply_text("❌ Feed ID too high.") return feed_url = list(subs)[n - 1] @@ -245,7 +245,7 @@ def unsubscribe(bot, update, args): r.delete(feed_hash.format(feed_url + ":last_entry")) update.message.reply_text( - text="✅ " + feed_url + " entfernt.", + text="✅ " + feed_url + " removed.", parse_mode=telegram.ParseMode.HTML ) @@ -257,9 +257,9 @@ def check_feed(bot, key): data = feedparser.parse(feed_url) if "link" not in data.feed: if "status" in data and data["status"] != 200: - logger.warning(feed_url + " - Kein gültiger Feed, HTTP-Status-Code " + str(data["status"])) + logger.warning(feed_url + " - Not a valid feed, got HTTP code " + str(data["status"])) else: - logger.warning(feed_url + " - Kein gültiger Feed: " + str(data.bozo_exception)) + logger.warning(feed_url + " - Not a valid feed: " + str(data.bozo_exception)) return None if "title" not in data.feed: feed_title = data.feed["link"] @@ -270,7 +270,7 @@ def check_feed(bot, key): new_entries = utils.get_new_entries(data.entries, last_entry) for entry in reversed(new_entries): if "title" not in entry: - post_title = "Kein Titel" + post_title = "No title" else: post_title = utils.remove_html_tags(entry["title"]).strip() post_title = post_title.replace("<", "<").replace(">", ">") @@ -296,7 +296,7 @@ def check_feed(bot, key): feed_title=feed_title, content=content ) - text += "\nAuf {link_name} weiterlesen\n".format( + text += "\nRead more on {link_name}\n".format( post_link=post_link, link_name=link_name ) @@ -309,12 +309,12 @@ def check_feed(bot, key): disable_web_page_preview=True ) except telegram.error.Unauthorized: - logger.warning("Chat " + member + " existiert nicht mehr, wird gelöscht.") + logger.warning("Chat " + member + " doesn't exist anymore, will be deleted.") r.srem(key, member) r.delete(feed_hash.format(member)) except telegram.error.ChatMigrated as new_chat: new_chat_id = new_chat.new_chat_id - logger.info("Chat migriert: " + member + " -> " + str(new_chat_id)) + logger.info("Chat migrated: " + member + " -> " + str(new_chat_id)) r.srem(key, member) r.sadd(key, new_chat_id) r.rename(feed_hash.format(member), feed_hash.format(new_chat_id)) @@ -359,9 +359,9 @@ def main(): # Setup the updater and show bot info updater = Updater(token=bot_token) try: - logger.info("Starte {0}, AKA @{1} ({2})".format(updater.bot.first_name, updater.bot.username, updater.bot.id)) + logger.info("Starting {0}, AKA @{1} ({2})".format(updater.bot.first_name, updater.bot.username, updater.bot.id)) except Unauthorized: - logger.critical("Anmeldung nicht möglich, Bot-Token falsch?") + logger.critical("Logging in failed, check bot token") sys.exit(1) # Register Handlers From 69d9c78370391d4d62e428ab4cb81ef2a6239959 Mon Sep 17 00:00:00 2001 From: Andreas Bielawski Date: Mon, 18 Mar 2019 18:56:04 +0100 Subject: [PATCH 5/6] Update for Python-Telegram-Bot v12 --- .gitignore | 1 + bot.py | 66 +++++++++++++++++++++++++++++------------------------- 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 7d06023..2846d81 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ __pycache__/ *.py[cod] *$py.class src/ +venv/ # IDE .idea/ diff --git a/bot.py b/bot.py index 0ccbad4..643cff7 100644 --- a/bot.py +++ b/bot.py @@ -46,10 +46,10 @@ logger = logging.getLogger(__name__) try: bot_token = config["DEFAULT"]["token"] except KeyError: - logger.error("Bot token is missing, check config.ini") + logger.error("Bot token is missing, check config.ini.") sys.exit(1) if not bot_token: - logger.error("Bot token is missing, check config.ini") + logger.error("Bot token is missing, check config.ini.") sys.exit(1) # Admins @@ -79,14 +79,14 @@ else: r = redis.Redis(host=redis_host, port=int(redis_port), db=int(redis_db), decode_responses=True) if not r.ping(): - logging.getLogger("Redis").critical("Failed to connect to Redis server") + logging.getLogger("Redis").critical("Failed to connect to Redis server.") sys.exit(1) feed_hash = "pythonbot:rss:{0}" @run_async -def start(bot, update): +def start(update, context): if not utils.can_use_bot(update): return update.message.reply_text( @@ -96,7 +96,7 @@ def start(bot, update): @run_async -def help_text(bot, update): +def help_text(update, context): if not utils.can_use_bot(update): return update.message.reply_text( @@ -108,13 +108,13 @@ def help_text(bot, update): @run_async -def list_feeds(bot, update, args): +def list_feeds(update, context): if not utils.can_use_bot(update): return - if args: - chat_name = args[0] + if context.args: + chat_name = context.args[0] try: - resp = bot.getChat(chat_name) + resp = context.bot.getChat(chat_name) except telegram.error.BadRequest: update.message.reply_text("❌ This channel does not exist.") return @@ -142,34 +142,34 @@ def list_feeds(bot, update, args): @run_async -def subscribe(bot, update, args): +def subscribe(update, context): if not utils.can_use_bot(update): return - if not args: + if not context.args: update.message.reply_text("❌ No feed URL given.") return - feed_url = args[0] + feed_url = context.args[0] if not re.match("^http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&~+]|[!*(),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+$", feed_url): update.message.reply_text("❌ That doesn't look like an URL.") return # Get Chat ID from name if given - if len(args) > 1: - chat_name = args[1] + if len(context.args) > 1: + chat_name = context.args[1] try: - resp = bot.getChat(chat_name) + resp = context.bot.getChat(chat_name) except telegram.error.BadRequest: update.message.reply_text("❌ This channel does not exist.") return chat_id = str(resp.id) - resp = bot.getChatMember(chat_id, bot.id) + resp = context.bot.getChatMember(chat_id, context.bot.id) if resp.status != "administrator": update.message.reply_text("❌ You need to add the bot as an administrator to the channel.") return else: chat_id = str(update.message.chat.id) - bot.sendChatAction(update.message.chat.id, action=telegram.ChatAction.TYPING) + context.bot.sendChatAction(update.message.chat.id, action=telegram.ChatAction.TYPING) data = feedparser.parse(feed_url) if "link" not in data.feed: update.message.reply_text("❌ Not a valid feed.") @@ -203,18 +203,18 @@ def subscribe(bot, update, args): @run_async -def unsubscribe(bot, update, args): +def unsubscribe(update, context): if not utils.can_use_bot(update): return - if not args: + if not context.args: update.message.reply_text("❌ No number given, check /rss first.") return # Get Chat ID from name if given - if len(args) > 1: - chat_name = args[1] + if len(context.args) > 1: + chat_name = context.args[1] try: - resp = bot.getChat(chat_name) + resp = context.bot.getChat(chat_name) except telegram.error.BadRequest: update.message.reply_text("❌ This channel does not exist.") return @@ -223,9 +223,9 @@ def unsubscribe(bot, update, args): chat_id = str(update.message.chat.id) try: - n = int(args[0]) + n = int(context.args[0]) except ValueError: - update.message.reply_text("❌ No number given.".") + update.message.reply_text("❌ No number given.") return chat_hash = feed_hash.format(chat_id) @@ -343,25 +343,29 @@ def check_feed(bot, key): @run_async -def run_job(bot, job=None): +def run_job(context): logger.info("================================") keys = r.keys(feed_hash.format("*:subs")) for key in keys: - check_feed(bot, key) + check_feed(context.bot, key) -def onerror(bot, update, error): - logger.error(error) +def run_job_manually(update, context): + run_job(context) + + +def onerror(update, context): + logger.error("Update \"%s\" caused error \"%s\"", update, context.error) # Main function def main(): # Setup the updater and show bot info - updater = Updater(token=bot_token) + updater = Updater(token=bot_token, use_context=True) try: logger.info("Starting {0}, AKA @{1} ({2})".format(updater.bot.first_name, updater.bot.username, updater.bot.id)) except Unauthorized: - logger.critical("Logging in failed, check bot token") + logger.critical("Logging in failed, check bot token.") sys.exit(1) # Register Handlers @@ -371,7 +375,7 @@ def main(): CommandHandler("rss", list_feeds, pass_args=True), CommandHandler("sub", subscribe, pass_args=True), CommandHandler("del", unsubscribe, pass_args=True), - CommandHandler("sync", run_job) + CommandHandler("sync", run_job_manually) ] for handler in handlers: updater.dispatcher.add_handler(handler) From b99989282f2180a781d07b11b2a119a6be280449 Mon Sep 17 00:00:00 2001 From: Andreas Bielawski Date: Mon, 18 Mar 2019 20:33:47 +0100 Subject: [PATCH 6/6] Support multiple languages --- bot.py | 88 +++++++++++-------- config.ini.example | 1 + locales/base.pot | 140 ++++++++++++++++++++++++++++++ locales/de/LC_MESSAGES/base.mo | Bin 0 -> 3237 bytes locales/de/LC_MESSAGES/base.po | 148 +++++++++++++++++++++++++++++++ locales/en/LC_MESSAGES/base.mo | Bin 0 -> 3158 bytes locales/en/LC_MESSAGES/base.po | 154 +++++++++++++++++++++++++++++++++ 7 files changed, 494 insertions(+), 37 deletions(-) create mode 100644 locales/base.pot create mode 100644 locales/de/LC_MESSAGES/base.mo create mode 100644 locales/de/LC_MESSAGES/base.po create mode 100644 locales/en/LC_MESSAGES/base.mo create mode 100644 locales/en/LC_MESSAGES/base.po diff --git a/bot.py b/bot.py index 643cff7..20723f6 100644 --- a/bot.py +++ b/bot.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- +import gettext import html import logging import re @@ -24,13 +25,23 @@ except FileNotFoundError: logging.critical("config.ini not found") sys.exit(1) +# Language +try: + lang = config["DEFAULT"]["lang"] +except KeyError: + lang = "en" + +el = gettext.translation("base", localedir="locales", languages=[lang, "en"]) +el.install() +_ = el.gettext + # Logging try: logging_conf = config["LOGGING"] logging_level = logging_conf.get("level", "INFO") logging_format = logging_conf.get("format", "%(asctime)s - %(levelname)s: %(message)s", raw=True) if logging_level not in ["DEBUG", "INFO", "CRITICAL", "ERROR", "WARNING"]: - logging.warning("Logging Level invalid. Will be changed to WARNING") + logging.warning(_("Logging Level invalid. Will be changed to INFO")) logging.basicConfig(format=logging_format, level=logging.INFO, datefmt="%d.%m.%Y %H:%M:%S") else: logging.basicConfig(format=logging_format, @@ -46,25 +57,25 @@ logger = logging.getLogger(__name__) try: bot_token = config["DEFAULT"]["token"] except KeyError: - logger.error("Bot token is missing, check config.ini.") + logger.error(_("Bot token is missing, check config.ini.")) sys.exit(1) if not bot_token: - logger.error("Bot token is missing, check config.ini.") + logger.error(_("Bot token is missing, check config.ini.")) sys.exit(1) # Admins try: admins = loads(config["ADMIN"]["id"]) except KeyError: - logger.error("No admin IDs are set, check config.ini.") + logger.error(_("No admin IDs are set, check config.ini.")) sys.exit(1) if not admins: - logger.error("No admin IDs are set, check config.ini.") + logger.error(_("No admin IDs are set, check config.ini.")) sys.exit(1) for admin in admins: if not isinstance(admin, int): - logger.error("Admin IDs need to be integers.") + logger.error(_("Admin IDs need to be integers.")) sys.exit(1) # Redis @@ -79,7 +90,7 @@ else: r = redis.Redis(host=redis_host, port=int(redis_port), db=int(redis_db), decode_responses=True) if not r.ping(): - logging.getLogger("Redis").critical("Failed to connect to Redis server.") + logging.getLogger("Redis").critical(_("Failed to connect to Redis server.")) sys.exit(1) feed_hash = "pythonbot:rss:{0}" @@ -90,7 +101,7 @@ def start(update, context): if not utils.can_use_bot(update): return update.message.reply_text( - text="Welcome to the RSS Bot!\nSend /help to get started.", + text=_("Welcome to the RSS Bot!\nSend /help to get started."), parse_mode=telegram.ParseMode.HTML ) @@ -100,9 +111,10 @@ def help_text(update, context): if not utils.can_use_bot(update): return update.message.reply_text( - text="/rss [Chat]: Show subbed feeds\n" - "/sub Feed URL [Chat]: Sub to feed (Chat is optional)\n" - "/del n [Chat]: Unsubscribe feed (Chat is optional)", + text=_("/rss [Chat]: Show subbed feeds\n" + "/sub Feed URL [Chat]: Sub to feed\n" + "/del n [Chat]: Unsubscribe feed\n" + "[Chat] is an optional argument with the @Channelname."), parse_mode=telegram.ParseMode.HTML ) @@ -116,7 +128,7 @@ def list_feeds(update, context): try: resp = context.bot.getChat(chat_name) except telegram.error.BadRequest: - update.message.reply_text("❌ This channel does not exist.") + update.message.reply_text("❌ " + _("This channel does not exist.")) return chat_id = str(resp.id) chat_title = resp.title @@ -129,9 +141,9 @@ def list_feeds(update, context): subs = r.smembers(feed_hash.format(chat_id)) if not subs: - text = "❌ There are no feeds." + text = "❌ " + _("There are no feeds.") else: - text = "" + html.escape(chat_title) + " is subscribed to:\n" + text = _("{0} is subscribed to:\n").format(html.escape(chat_title)) for n, feed in enumerate(subs): text += "" + str(n + 1) + ") " + feed + "\n" @@ -146,11 +158,11 @@ def subscribe(update, context): if not utils.can_use_bot(update): return if not context.args: - update.message.reply_text("❌ No feed URL given.") + update.message.reply_text("❌ " + _("No feed URL given.")) return feed_url = context.args[0] if not re.match("^http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&~+]|[!*(),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+$", feed_url): - update.message.reply_text("❌ That doesn't look like an URL.") + update.message.reply_text("❌ " + _("That doesn't look like an URL.")) return # Get Chat ID from name if given @@ -159,12 +171,12 @@ def subscribe(update, context): try: resp = context.bot.getChat(chat_name) except telegram.error.BadRequest: - update.message.reply_text("❌ This channel does not exist.") + update.message.reply_text("❌ " + _("This channel does not exist.")) return chat_id = str(resp.id) resp = context.bot.getChatMember(chat_id, context.bot.id) if resp.status != "administrator": - update.message.reply_text("❌ You need to add the bot as an administrator to the channel.") + update.message.reply_text("❌ " + _("You need to add the bot as an administrator to the channel.")) return else: chat_id = str(update.message.chat.id) @@ -172,11 +184,11 @@ def subscribe(update, context): context.bot.sendChatAction(update.message.chat.id, action=telegram.ChatAction.TYPING) data = feedparser.parse(feed_url) if "link" not in data.feed: - update.message.reply_text("❌ Not a valid feed.") + update.message.reply_text("❌ " + _("Not a valid feed.")) return feed_url = data.href # Follow all redirects if r.sismember(feed_hash.format(chat_id), feed_url): - update.message.reply_text("✅ Already subscribed to this feed.") + update.message.reply_text("✅ " + _("Already subscribed to this feed.")) return if "title" not in data.feed: @@ -197,7 +209,7 @@ def subscribe(update, context): r.sadd(feed_hash.format(feed_url + ":subs"), chat_id) r.sadd(feed_hash.format(chat_id), feed_url) update.message.reply_text( - text="✅ " + feed_title + " added!", + text="✅ " + _("{0} added!").format(feed_title), parse_mode=telegram.ParseMode.HTML ) @@ -207,7 +219,7 @@ def unsubscribe(update, context): if not utils.can_use_bot(update): return if not context.args: - update.message.reply_text("❌ No number given, check /rss first.") + update.message.reply_text("❌ " + _("No number given.")) return # Get Chat ID from name if given @@ -216,7 +228,7 @@ def unsubscribe(update, context): try: resp = context.bot.getChat(chat_name) except telegram.error.BadRequest: - update.message.reply_text("❌ This channel does not exist.") + update.message.reply_text("❌ " + _("This channel does not exist.")) return chat_id = str(resp.id) else: @@ -225,16 +237,16 @@ def unsubscribe(update, context): try: n = int(context.args[0]) except ValueError: - update.message.reply_text("❌ No number given.") + update.message.reply_text("❌ " + _("No number given.")) return chat_hash = feed_hash.format(chat_id) subs = r.smembers(chat_hash) if n < 1: - update.message.reply_text("❌ Number must be bigger than 0!") + update.message.reply_text("❌ " + _("Number must be bigger than 0!")) return elif n > len(subs): - update.message.reply_text("❌ Feed ID too high.") + update.message.reply_text("❌ " + _("Feed ID too high.")) return feed_url = list(subs)[n - 1] @@ -245,7 +257,7 @@ def unsubscribe(update, context): r.delete(feed_hash.format(feed_url + ":last_entry")) update.message.reply_text( - text="✅ " + feed_url + " removed.", + text="✅ " + _("{0} removed!").format(feed_url), parse_mode=telegram.ParseMode.HTML ) @@ -257,9 +269,9 @@ def check_feed(bot, key): data = feedparser.parse(feed_url) if "link" not in data.feed: if "status" in data and data["status"] != 200: - logger.warning(feed_url + " - Not a valid feed, got HTTP code " + str(data["status"])) + logger.warning(_("{0} - Not a valid feed, got HTTP Code {1}").format(feed_url, data["status"])) else: - logger.warning(feed_url + " - Not a valid feed: " + str(data.bozo_exception)) + logger.warning(_("{0} - Not a valid feed: {1}").format(feed_url, str(data.bozo_exception))) return None if "title" not in data.feed: feed_title = data.feed["link"] @@ -270,7 +282,7 @@ def check_feed(bot, key): new_entries = utils.get_new_entries(data.entries, last_entry) for entry in reversed(new_entries): if "title" not in entry: - post_title = "No title" + post_title = _("No title") else: post_title = utils.remove_html_tags(entry["title"]).strip() post_title = post_title.replace("<", "<").replace(">", ">") @@ -296,9 +308,10 @@ def check_feed(bot, key): feed_title=feed_title, content=content ) - text += "\nRead more on {link_name}\n".format( + readmore = _("Read more on {0}").format(link_name) + text += "\n{readmore}\n".format( post_link=post_link, - link_name=link_name + readmore=readmore ) for member in r.smembers(key): try: @@ -309,12 +322,12 @@ def check_feed(bot, key): disable_web_page_preview=True ) except telegram.error.Unauthorized: - logger.warning("Chat " + member + " doesn't exist anymore, will be deleted.") + logger.warning(_("Chat {0} doesn't exist anymore, will be deleted.").format(member)) r.srem(key, member) r.delete(feed_hash.format(member)) except telegram.error.ChatMigrated as new_chat: new_chat_id = new_chat.new_chat_id - logger.info("Chat migrated: " + member + " -> " + str(new_chat_id)) + logger.info(_("Chat migrated: ") + member + " -> " + str(new_chat_id)) r.srem(key, member) r.sadd(key, new_chat_id) r.rename(feed_hash.format(member), feed_hash.format(new_chat_id)) @@ -355,7 +368,7 @@ def run_job_manually(update, context): def onerror(update, context): - logger.error("Update \"%s\" caused error \"%s\"", update, context.error) + logger.error(_("Update \"%s\" caused error \"%s\""), update, context.error) # Main function @@ -363,9 +376,10 @@ def main(): # Setup the updater and show bot info updater = Updater(token=bot_token, use_context=True) try: - logger.info("Starting {0}, AKA @{1} ({2})".format(updater.bot.first_name, updater.bot.username, updater.bot.id)) + logger.info( + _("Starting {0}, AKA @{1} ({2})").format(updater.bot.first_name, updater.bot.username, updater.bot.id)) except Unauthorized: - logger.critical("Logging in failed, check bot token.") + logger.critical(_("Logging in failed, check bot token.")) sys.exit(1) # Register Handlers diff --git a/config.ini.example b/config.ini.example index 4299b0c..a6b124d 100644 --- a/config.ini.example +++ b/config.ini.example @@ -1,5 +1,6 @@ [DEFAULT] token = 1337:1234567890abcdefgh +lang = en [LOGGING] # Valid options are ERROR, INFO, DEBUG, CRITICAL, WARNING diff --git a/locales/base.pot b/locales/base.pot new file mode 100644 index 0000000..99b324c --- /dev/null +++ b/locales/base.pot @@ -0,0 +1,140 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR ORGANIZATION +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2019-03-18 20:31+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=cp1252\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" + + +#: bot.py:45 +msgid "Logging Level invalid. Will be changed to INFO" +msgstr "" + +#: bot.py:61 bot.py:64 +msgid "Bot token is missing, check config.ini." +msgstr "" + +#: bot.py:71 bot.py:74 +msgid "No admin IDs are set, check config.ini." +msgstr "" + +#: bot.py:79 +msgid "Admin IDs need to be integers." +msgstr "" + +#: bot.py:94 +msgid "Failed to connect to Redis server." +msgstr "" + +#: bot.py:105 +msgid "" +"Welcome to the RSS Bot!\n" +"Send /help to get started." +msgstr "" + +#: bot.py:115 +msgid "" +"/rss [Chat]: Show subbed feeds\n" +"/sub Feed URL [Chat]: Sub to feed\n" +"/del n [Chat]: Unsubscribe feed\n" +"[Chat] is an optional argument with the @Channelname." +msgstr "" + +#: bot.py:132 bot.py:175 bot.py:232 +msgid "This channel does not exist." +msgstr "" + +#: bot.py:145 +msgid "There are no feeds." +msgstr "" + +#: bot.py:147 +msgid "" +"{0} is subscribed to:\n" +msgstr "" + +#: bot.py:162 +msgid "No feed URL given." +msgstr "" + +#: bot.py:166 +msgid "That doesn't look like an URL." +msgstr "" + +#: bot.py:180 +msgid "You need to add the bot as an administrator to the channel." +msgstr "" + +#: bot.py:188 +msgid "Not a valid feed." +msgstr "" + +#: bot.py:192 +msgid "Already subscribed to this feed." +msgstr "" + +#: bot.py:213 +msgid "{0} added!" +msgstr "" + +#: bot.py:223 bot.py:241 +msgid "No number given." +msgstr "" + +#: bot.py:247 +msgid "Number must be bigger than 0!" +msgstr "" + +#: bot.py:250 +msgid "Feed ID too high." +msgstr "" + +#: bot.py:261 +msgid "{0} removed!" +msgstr "" + +#: bot.py:273 +msgid "{0} - Not a valid feed, got HTTP Code {1}" +msgstr "" + +#: bot.py:275 +msgid "{0} - Not a valid feed: {1}" +msgstr "" + +#: bot.py:286 +msgid "No title" +msgstr "" + +#: bot.py:312 +msgid "Read more on {0}" +msgstr "" + +#: bot.py:326 +msgid "Chat {0} doesn't exist anymore, will be deleted." +msgstr "" + +#: bot.py:331 +msgid "Chat migrated: " +msgstr "" + +#: bot.py:372 +msgid "Update \"%s\" caused error \"%s\"" +msgstr "" + +#: bot.py:380 +msgid "Starting {0}, AKA @{1} ({2})" +msgstr "" + +#: bot.py:382 +msgid "Logging in failed, check bot token." +msgstr "" + diff --git a/locales/de/LC_MESSAGES/base.mo b/locales/de/LC_MESSAGES/base.mo new file mode 100644 index 0000000000000000000000000000000000000000..d1e5452014ed9221f505ef322d610ac4a2aaf44d GIT binary patch literal 3237 zcmah~NpBoQ6fQ!5FoXm`2s^x(C5hs0&p3*dOl%V;j)P?=XBNQ)!Cyc^;(!p}tM2iJEm|6V(^d7VzW2RXU;lb& z?0)1@J6z>3*di2i^s~0PF&v0R9e?J^lm|@bF%x zjsZ^t4+3ujtH21@2mBN$`+N&@f!_mP2JU&Fh|6w_Q z2Ppj4fWqS!pz!*u9N+(7vHk?`9L6sLCC~SP&jG&%`pEe^;BR<$ahR+-_^?t>0w;mb z0zKei;CsNAfFA>20p0~lzCQsa-+zFT*MW*sCxOF2$wLE0hZSHy@D6YQ_%rYs;J!zc zdJ5PF#E_~3<-AKk0=^BDyjFq2=Odu#^cC<3@Ef4$@&i!x`~&zp@W}q+oa;c*=L4XW zShU>yJdGFGAJdkvoc$<%au%diD3jF#VC#YHw>(ka|@R!_$ztlwXQbWy=fh0|b2AU%@q(|Pl*!HrULj!uGPP6TJiPF5;WS{1l{j?&B zG02%I4XGqj*swM*T<|nixyTh(b65NokXDz)9+= z(J*1pU*5VENMd)9*;U|)panLPcBIo(o1mXsZEh`4D>m~waJA8{l3HOtNIX!lQ}GV2 zqb4Vt1~Q$6j7^a`S$3taSBr&F4pAUOQwJyrghyvp zkE$6Ig+wTd4M9aUD?K5Z;-#NPCr9c0YV9^1Umd)CLN!GDp3Y$$FHoo#Seg{%Tud`I zl2lB=8Fg<+g+(5;sSU+kStD1?b$nEj`d&@@sO9A;vg9O*6FZ{biu3heLR;F77X3VX zEv$B^H2MGmWy6;Txk?(sq3vq)Q-Jt48jWeX82e1fY?qaFJ2#!g@1jAR3E#PnF2*&i zQ)T*E!?}oNmRsqJfq$I_tF^OE^^{XPgTM7twUgCawTgw#3@>U4+j-q!v2MysGpCVw zCJiN*I*l41`=@k4bLcIl3%W9e_R770od$amIP~7@XzR+Ai7S^j_|@EMeJZmFX}~ywDkslPIl|>DbqFc<>w*e}|77Iyy|X z6X&d%>}JNJP25n;Fe#ENDRp0A9kAKSl$~8n*BU;HzXD(vV z%7ruc#Mt7_awB`mWm~No9e|petn_9_ygBNwr72iU6vhnC(KuyHGpx^QOiOu!n*ncO zok8&4q1K?ChBfGUZild{PSRbQhp}qj*`TFxn+@6;vka2atu{=Y+llyd;^S*nh@H6# z7p$ht7%#Dx9tCu0*lkk`(inPei~? zAzsYDnj^@*ZJZi9F{XzibiP*TpAxqmo;V9AD5pNj+3pZf!dRLos+YmXq+7 z3t~iF%iD^%?&7E;x+%p4D$Z$Zvy#tu*KDy1OBZ_EWa+n#?%>On<*BpH*mqc8c>BM~ Ck%?*m literal 0 HcmV?d00001 diff --git a/locales/de/LC_MESSAGES/base.po b/locales/de/LC_MESSAGES/base.po new file mode 100644 index 0000000..e1a18fb --- /dev/null +++ b/locales/de/LC_MESSAGES/base.po @@ -0,0 +1,148 @@ +# RSS Bot translation +# Copyright (C) 2016-2019 Andreas Bielawski +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: 2019-03-18 20:31+0100\n" +"PO-Revision-Date: 2019-03-18 20:32+0100\n" +"Last-Translator: Andreas Bielawski\n" +"Language-Team: \n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"X-Generator: Poedit 2.2.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: bot.py:45 +msgid "Logging Level invalid. Will be changed to INFO" +msgstr "Logging-Level ungültig. Wird auf INFO geändert" + +#: bot.py:61 bot.py:64 +msgid "Bot token is missing, check config.ini." +msgstr "Bot-Token fehlt, prüfe die config.ini." + +#: bot.py:71 bot.py:74 +msgid "No admin IDs are set, check config.ini." +msgstr "Keine Admin-IDs gesetzt, prüfe die config.ini." + +#: bot.py:79 +msgid "Admin IDs need to be integers." +msgstr "Admin-IDs müssen Integer sein." + +#: bot.py:94 +msgid "Failed to connect to Redis server." +msgstr "Verbindung zum Redis-Server fehlgeschlagen." + +#: bot.py:105 +msgid "" +"Welcome to the RSS Bot!\n" +"Send /help to get started." +msgstr "" +"Willkommen beim RSS-Bot!\n" +"Sende /help, um zu starten." + +#: bot.py:115 +msgid "" +"/rss [Chat]: Show subbed feeds\n" +"/sub Feed URL [Chat]: Sub to feed\n" +"/del n [Chat]: Unsubscribe feed\n" +"[Chat] is an optional argument with the @Channelname." +msgstr "" +"/rss [Chat]: Abonnierte Feeds anzeigen\n" +"/sub Feed-URL [Chat]: Feed abonnieren\n" +"/del n [Chat]: Feed löschen\n" +"[Chat] ist ein optionales Argument mit dem @Kanalnamen." + +#: bot.py:132 bot.py:175 bot.py:232 +msgid "This channel does not exist." +msgstr "Dieser Kanal existiert nicht." + +#: bot.py:145 +msgid "There are no feeds." +msgstr "Keine Feeds abonniert." + +#: bot.py:147 +msgid "{0} is subscribed to:\n" +msgstr "{0} hat abonniert:\n" + +#: bot.py:162 +msgid "No feed URL given." +msgstr "Keine Feed-URL angegeben." + +#: bot.py:166 +msgid "That doesn't look like an URL." +msgstr "Das ist keine URL." + +#: bot.py:180 +msgid "You need to add the bot as an administrator to the channel." +msgstr "Du musst den Bot als Administrator zu diesem Kanal hinzufügen." + +#: bot.py:188 +msgid "Not a valid feed." +msgstr "Kein gültiger Feed." + +#: bot.py:192 +msgid "Already subscribed to this feed." +msgstr "Dieser Feed wurde bereits abonniert." + +#: bot.py:213 +msgid "{0} added!" +msgstr "{0} abonniert!" + +#: bot.py:223 bot.py:241 +msgid "No number given." +msgstr "Keine Nummer angegeben." + +#: bot.py:247 +msgid "Number must be bigger than 0!" +msgstr "Nummer muss größer als 0 sein!" + +#: bot.py:250 +msgid "Feed ID too high." +msgstr "Feed-ID zu hoch." + +#: bot.py:261 +msgid "{0} removed!" +msgstr "{0} entfernt!" + +#: bot.py:273 +msgid "{0} - Not a valid feed, got HTTP Code {1}" +msgstr "{0} - Kein gültiger Feed, HTTP-Status-Code {1}" + +#: bot.py:275 +msgid "{0} - Not a valid feed: {1}" +msgstr "{0} - Kein gültiger Feed: {1}" + +#: bot.py:286 +msgid "No title" +msgstr "Kein Titel" + +#: bot.py:312 +msgid "Read more on {0}" +msgstr "Auf {0} weiterlesen" + +#: bot.py:326 +msgid "Chat {0} doesn't exist anymore, will be deleted." +msgstr "Chat {0} existiert nicht mehr, wird gelöscht." + +#: bot.py:331 +msgid "Chat migrated: " +msgstr "Chat migriert: " + +#: bot.py:372 +msgid "Update \"%s\" caused error \"%s\"" +msgstr "Update \"%s\" verursachte Fehler \"%s\"" + +#: bot.py:380 +msgid "Starting {0}, AKA @{1} ({2})" +msgstr "Starte {0}, AKA @{1} ({2})" + +#: bot.py:382 +msgid "Logging in failed, check bot token." +msgstr "Anmeldung fehlgeschlagen, Bot-Token prüfen." + +#~ msgid "config.ini not found" +#~ msgstr "config.ini nicht gefunden" diff --git a/locales/en/LC_MESSAGES/base.mo b/locales/en/LC_MESSAGES/base.mo new file mode 100644 index 0000000000000000000000000000000000000000..bf8b0536ec12d67fb12d6dd0b67ed368adfa42a5 GIT binary patch literal 3158 zcmeH{%WvFN6vi(lKp6rprM${RCqd9gjh&gPDy7at&7&zJ(sYzeC^SC_PzI<`+esg z`==8lA1GYU<9-(R=sikJfPaE=eSAczAHbX71#stHr5*)81D^xG0UrZ@1|`RDAb}@G zlsXNb2akc*!7>{T`eEkB=69Jy4EVav!{&!i(g=biU6?@L}Ai zaHEt8$D|&|Etlv++B+`Mgc9a8cm#y~{R=IWYn6eg2cxj3&@$=)+)vpmd_%UAX>0t5{3PtgY%S(~yp(?tk3 zh9l$0?24;v9JOrBB0}cZH#TU|W@93vw818zsWwL)nGQLlH1m^;gFJG#yq8P$gMfoE z$u%5-ihY#<9fjQ$ZxMOPO5- zoe0`yBer9mrrLy))M|5Un_AXv>Cn|iyGqUq^I_scx<|!3v{GO>HK#M;8#>KUxPELC zo!=Wjw1!)D!g>i%+6WGmlp=%hJx>8dqL{(jB;gt2=zTz1ef)=7n==P1-Y zHhHM&#!XHR3}iZs7)fEBa&?2ct`!U8E{cLOG?SwpCz+K`?Q zr+As9g;y5n;%;S+&g@qACR9UeKdf_P?KVYvo25x1&c!q%kytT>W}JINPFTu=HqApZ zH#j3#ZFT~jB8|V8j#JC;rf|tgVv~GCy>7evy@a;RJ6h`J=buGhJDfE700D!BA8h0* zX$Xh@S&c~w5&v?dQKuyvFu~b>tn~7^dSc%~gE+Ooc@S={RHpIhovWNJSIT89bk@12CG76&s>QlhKh2y*;+r%QFCHzJ0Qpl|)ExOc z>9#JdqP@C)$WDX(7#fD}9i;PgG3ZtARbnGNUPnX}mUsME(!Lz20jK2_ZFrPrLn0uf!e z_=Ga5x>dJQsz=?#kDL{o#HmN7lfR~O)fp-t=gt@!o1@CaO#U-D{23qqj1Pathd<;0 H{TcraVlZ3n literal 0 HcmV?d00001 diff --git a/locales/en/LC_MESSAGES/base.po b/locales/en/LC_MESSAGES/base.po new file mode 100644 index 0000000..a906aa8 --- /dev/null +++ b/locales/en/LC_MESSAGES/base.po @@ -0,0 +1,154 @@ +# RSS Bot translation +# Copyright (C) 2019 Andreas Bielawski +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: 2019-03-18 20:31+0100\n" +"PO-Revision-Date: 2019-03-18 20:32+0100\n" +"Last-Translator: Andreas Bielawski\n" +"Language-Team: \n" +"Language: en\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"X-Generator: Poedit 2.2.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: bot.py:45 +msgid "Logging Level invalid. Will be changed to INFO" +msgstr "Logging Level invalid. Will be changed to INFO" + +#: bot.py:61 bot.py:64 +msgid "Bot token is missing, check config.ini." +msgstr "Bot token is missing, check config.ini." + +#: bot.py:71 bot.py:74 +msgid "No admin IDs are set, check config.ini." +msgstr "No admin IDs are set, check config.ini." + +#: bot.py:79 +msgid "Admin IDs need to be integers." +msgstr "Admin IDs need to be integers." + +#: bot.py:94 +msgid "Failed to connect to Redis server." +msgstr "Failed to connect to Redis server." + +#: bot.py:105 +msgid "" +"Welcome to the RSS Bot!\n" +"Send /help to get started." +msgstr "" +"Welcome to the RSS Bot!\n" +"Send /help to get started." + +#: bot.py:115 +msgid "" +"/rss [Chat]: Show subbed feeds\n" +"/sub Feed URL [Chat]: Sub to feed\n" +"/del n [Chat]: Unsubscribe feed\n" +"[Chat] is an optional argument with the @Channelname." +msgstr "" +"/rss [Chat]: Show subbed feeds\n" +"/sub Feed URL [Chat]: Sub to feed\n" +"/del n [Chat]: Unsubscribe feed\n" +"[Chat] is an optional argument with the @Channelname." + +#: bot.py:132 bot.py:175 bot.py:232 +msgid "This channel does not exist." +msgstr "This channel does not exist." + +#: bot.py:145 +msgid "There are no feeds." +msgstr "There are no feeds." + +#: bot.py:147 +msgid "{0} is subscribed to:\n" +msgstr "{0} is subscribed to:\n" + +#: bot.py:162 +msgid "No feed URL given." +msgstr "No feed URL given." + +#: bot.py:166 +msgid "That doesn't look like an URL." +msgstr "That doesn't look like an URL." + +#: bot.py:180 +msgid "You need to add the bot as an administrator to the channel." +msgstr "You need to add the bot as an administrator to the channel." + +#: bot.py:188 +msgid "Not a valid feed." +msgstr "Not a valid feed." + +#: bot.py:192 +msgid "Already subscribed to this feed." +msgstr "Already subscribed to this feed." + +#: bot.py:213 +msgid "{0} added!" +msgstr "{0} added!" + +#: bot.py:223 bot.py:241 +msgid "No number given." +msgstr "No number given." + +#: bot.py:247 +msgid "Number must be bigger than 0!" +msgstr "Number must be bigger than 0!" + +#: bot.py:250 +msgid "Feed ID too high." +msgstr "Feed ID too high." + +#: bot.py:261 +msgid "{0} removed!" +msgstr "{0} removed!" + +#: bot.py:273 +msgid "{0} - Not a valid feed, got HTTP Code {1}" +msgstr "{0} - Not a valid feed, got HTTP Code {1}" + +#: bot.py:275 +msgid "{0} - Not a valid feed: {1}" +msgstr "{0} - Not a valid feed: {1}" + +#: bot.py:286 +msgid "No title" +msgstr "No title" + +#: bot.py:312 +msgid "Read more on {0}" +msgstr "Read more on {0}" + +#: bot.py:326 +msgid "Chat {0} doesn't exist anymore, will be deleted." +msgstr "Chat {0} doesn't exist anymore, will be deleted." + +#: bot.py:331 +msgid "Chat migrated: " +msgstr "Chat migrated: " + +#: bot.py:372 +msgid "Update \"%s\" caused error \"%s\"" +msgstr "Update \"%s\" caused error \"%s\"" + +#: bot.py:380 +msgid "Starting {0}, AKA @{1} ({2})" +msgstr "Starting {0}, AKA @{1} ({2})" + +#: bot.py:382 +msgid "Logging in failed, check bot token." +msgstr "Logging in failed, check bot token." + +#~ msgid "config.ini not found" +#~ msgstr "config.ini not found" + +#~| msgid "WELCOMEMSG" +#~ msgid "WELCOMEMSG." +#~ msgstr "" +#~ "Welcome to the RSS Bot!\n" +#~ "Send /help to get started."