From 1258fb38b90b655955da8c3e58ce3170e5df1aca Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Wed, 19 Jun 2019 10:10:31 -0400 Subject: [PATCH] test --- sopel_modules/SpiceBot/Reddit.py | 29 +++++++++++++++++-- .../SpiceBot_Core_Commands/Reddit.py | 8 ++--- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/sopel_modules/SpiceBot/Reddit.py b/sopel_modules/SpiceBot/Reddit.py index 363ce3a..70b4e74 100644 --- a/sopel_modules/SpiceBot/Reddit.py +++ b/sopel_modules/SpiceBot/Reddit.py @@ -6,20 +6,45 @@ This is the SpiceBot Reddit system. import spicemanip +import requests +from fake_useragent import UserAgent + class BotReddit(): """This Logs all channels known to the server""" def __init__(self): self.dict = {} + self.header = {'User-Agent': str(UserAgent().chrome)} def prerun(self, trigger): + # trigger_argsdict = self.trigger_handler(trigger) + page = self.check_reddit_up() + if not page: + message = "Reddit Appears to be down" + return message + elif str(page.status_code).startswith(tuple(["4", "5"])): + message = "Reddit is replying with http code " + str(page.status_code) + return message + + message = "Reddit is replying with http code " + str(page.status_code) + return message + + def trigger_handler(self, trigger): trigger_args = spicemanip.main(trigger.args[1], 'create') - trigger.sb = { + trigger_argsdict = { "slashcomm": spicemanip.main(trigger_args, 1).lower()[:1], "command": spicemanip.main(trigger_args, 1).lower()[2:], "args": spicemanip.main(trigger_args, "2+", 'list') } - return trigger + return trigger_argsdict + + def check_reddit_up(self): + try: + page = requests.get("https://www.reddit.com/", headers=self.header) + except Exception as e: + page = e + page = None + return page reddit = BotReddit() diff --git a/sopel_modules/SpiceBot_Core_Commands/Reddit.py b/sopel_modules/SpiceBot_Core_Commands/Reddit.py index 067af00..f9cc588 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Reddit.py +++ b/sopel_modules/SpiceBot_Core_Commands/Reddit.py @@ -13,8 +13,8 @@ import sopel_modules.SpiceBot as SpiceBot ) """) def bot_command_reddit_user(bot, trigger): - trigger = SpiceBot.reddit.prerun(trigger) - bot.osd(str(trigger.sb)) + message = SpiceBot.reddit.prerun(trigger) + bot.osd(str(message)) @sopel.module.rule(r"""(?:)r/ @@ -23,5 +23,5 @@ def bot_command_reddit_user(bot, trigger): ) """) def bot_command_reddit_subreddit(bot, trigger): - trigger = SpiceBot.reddit.prerun(trigger) - bot.osd(str(trigger.sb)) + message = SpiceBot.reddit.prerun(trigger) + bot.osd(str(message))