From 1060b0a73e08e7965854c97c36e71ee4bd5a998d Mon Sep 17 00:00:00 2001
From: Elliu <elliu@marge.iiens.net>
Date: Thu, 24 Dec 2020 10:33:06 +0100
Subject: [PATCH] Hopefully better formatting on help
---
launch.py | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/launch.py b/launch.py
index 8a6d00c..d7c8a22 100644
--- a/launch.py
+++ b/launch.py
@@ -4,6 +4,7 @@ import praw
import random
import re
import csv
+import aiohttp
from dotenv import load_dotenv
@@ -14,6 +15,7 @@ SECRET = os.getenv('REDDIT_SECRET')
REDDIT_ID = os.getenv('REDDIT_ID')
REDDIT_AGENT = os.getenv('REDDIT_AGENT')
+PROXY = os.getenv('PROXY')
postLimit = int(os.getenv('POST_LIMIT'))
subreddits = dict()
@@ -75,7 +77,11 @@ def create_embed(post,author,posturl):
return embed
refresh_all_posts()
-client = discord.Client()
+
+if PROXY != "":
+ client = discord.Client(proxy=PROXY)
+else:
+ client = discord.Client()
@client.event
async def on_ready():
@@ -87,10 +93,10 @@ async def on_message(message):
return
lower = message.content.lower()
if lower == "show me an help" or lower == "show me a help":
- mess = "Usage : ``show me a xxxx`` or ``show me an xxxx``\nCurrently, I can show :```"
+ mess = "Usage : ``show me a xxxx`` or ``show me an xxxx``\nCurrently, I can show :```\n"
for entry in subreddits.values():
mess += entry.name + " with a picture from r/" + entry.subName + "\n"
- mess += "```"
+ mess += "\n```"
await message.channel.send(mess)
if "show me a" in lower:
name = re.search(r"show me an? ([\S]+)", lower)
--
GitLab