diff --git a/launch.py b/launch.py index 664e34b1a9a0d368df83049601d29d209ba7cf2e..652a7db25b0e0fa9b058f07bc49093da21c0018d 100644 --- a/launch.py +++ b/launch.py @@ -16,23 +16,17 @@ REDDIT_AGENT = os.getenv('REDDIT_AGENT') subreddits = dict() class Entry: - name = "" - subName = "" - #subreddit - #hot_subreddit - - totalimgs = 0 - posts = [] - authors = [] - posturls = [] - def __init__(self, name, subName): self.subreddit = praw.Reddit( client_id=REDDIT_ID, \ client_secret=SECRET, \ user_agent=REDDIT_AGENT).subreddit(subName) - hot_subreddit = self.subreddit.hot(limit=500) self.name = name + subreddit = None self.subName = subName + self.posts = [] + self.authors = [] + self.posturls = [] + self.totalimgs = 0 subreddits['kumiko'] = Entry('kumiko', 'rarekumikos') subreddits['araragi'] = Entry('araragi', 'araragi') @@ -48,7 +42,7 @@ def refresh_posts(entry): entry.posturls.clear() entry.totalimgs=0 i=0 - for submission in entry.subreddit.hot(limit=100): + for submission in entry.subreddit.hot(limit=500): #_ = os.system('clear') i = i + 1 entry.totalimgs = entry.totalimgs + 1 @@ -87,6 +81,12 @@ async def on_ready(): async def on_message(message): if message.author == client.user: return + if message.content.lower() == "show me a help": + mess = "Usage : ``show me a xxxx``\nCurrently, I can show :```" + for entry in subreddits.key(): + str(entry.name) + " with a picture from r/" + str(entry.subName) + "\n" + "```" + await message.channel.send("") if "show me a" in message.content.lower(): name = re.search(r"show me a ([\S]+)", message.content.lower()) if name == None: @@ -95,10 +95,7 @@ async def on_message(message): name = name.group(1) if name in subreddits.keys(): - print('asking for the following entry:') - print(name) - print(subreddits[name].name) - print(subreddits[name].subName) + print('asking for the following entry: ' + name) postnumber = random.randint(1,subreddits[name].totalimgs) await message.channel.send(embed = create_embed(subreddits[name].posts[postnumber], subreddits[name].authors[postnumber], subreddits[name].posturls[postnumber]))