diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..4c49bd78f1d08f2bc09fa0bd8191ed38b7dce5e3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.env diff --git a/launch.py b/launch.py index 04b9fc7c63203f8e3c7edff146bcb1bba3652b84..21b236976ddfff40ab7b0a7dba7ea6b0264e12e0 100644 --- a/launch.py +++ b/launch.py @@ -2,12 +2,16 @@ import discord import os import praw import random +import re from dotenv import load_dotenv + load_dotenv() TOKEN = os.getenv('DISCORD_TOKEN') SECRET = os.getenv('REDDIT_SECRET') +REDDIT_ID = os.getenv('REDDIT_ID') +REDDIT_AGENT = os.getenv('REDDIT_AGENT') subreddits = dict() @@ -15,17 +19,17 @@ class Entry: name = "" subName = "" #subreddit - #hot_subredditu + #hot_subreddit totalimgs = 0 posts = [] authors = [] posturls = [] - def __init__(name, subName): - self.subreddit = praw.Reddit( client_id='yvXh2hrDELw6eg', \ + def __init__(self, name, subName): + self.subreddit = praw.Reddit( client_id=REDDIT_ID, \ client_secret=SECRET, \ - user_agent='SMAW').subreddit(subName) + user_agent=REDDIT_AGENT).subreddit(subName) hot_subreddit = self.subreddit.hot(limit=500) @@ -77,12 +81,18 @@ async def on_ready(): async def on_message(message): if message.author == client.user: return - if "showmea" in message.content.lower().replace(' ',''): + if "show me a" in message.content.lower(): + name = re.search(r"show me a ([\S]+)", message) + if name == None: + return + else: + name = name.group(1) + if name in subreddits: 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])) if "refresh the kumikos" in message.content.lower(): - refresh_posts() + refresh_all_posts() client.run(TOKEN)