Просмотр исходного кода

Merge branch 'dev' of https://github.com/thehamkercat/WilliamButcherBot into dev

TheHamkerCat 5 лет назад
Родитель
Сommit
b0046e057c
2 измененных файлов с 12 добавлено и 8 удалено
  1. 1 1
      wbb/modules/admin.py
  2. 11 7
      wbb/modules/reddit.py

+ 1 - 1
wbb/modules/admin.py

@@ -116,7 +116,7 @@ async def kick(_, message):
                     await message.reply_text("You Wanna Kick The Elevated One?")
                 else:
                     if (await app.get_users(username)).id in \
-                            await list_members(chat_):
+                            await list_members(chat_id):
                         await message.chat.kick_member(username)
                         await message.chat.unban_member(username)
                         await message.reply_text(f"Kicked {username}")

+ 11 - 7
wbb/modules/reddit.py

@@ -13,12 +13,16 @@ async def reddit(_, message):
         await message.reply_text("/reddit needs an argument")
         return
     subreddit = message.text.split(None, 1)[1]
-    res = await fetch(f"{ARQ}reddit?query={subreddit}")
-    sreddit = res["subreddit"]
-    title = res["title"]
-    image = res["url"]
-    link = res["postLink"]
-    caption = f"""**Title:** `{title}`
+    try:
+        res = await fetch(f"{ARQ}reddit?query={subreddit}")
+        sreddit = res["subreddit"]
+        title = res["title"]
+        image = res["url"]
+        link = res["postLink"]
+        caption = f"""**Title:** `{title}`
 **Subreddit:** {sreddit}
 **PostLink:** {link}"""
-    await message.reply_photo(photo=image, caption=caption)
+        await message.reply_photo(photo=image, caption=caption)
+    except Exception as e:
+        print(str(e))
+        await message.reply_text(str(e))