TheHamkerCat 5 лет назад
Родитель
Сommit
e63631d929
3 измененных файлов с 11 добавлено и 8 удалено
  1. 3 3
      wbb/modules/chatbot.py
  2. 1 5
      wbb/modules/rss.py
  3. 7 0
      wbb/modules/stickers.py

+ 3 - 3
wbb/modules/chatbot.py

@@ -63,7 +63,7 @@ async def chat_bot_toggle(db, message: Message):
         )
     else:
         await edit_or_reply(
-            message, text="**Usage**\n/chatbot [ENABLE|DISABLE]"
+                message, text="**Usage:**\n/chatbot [ENABLE|DISABLE]"
         )
 
 
@@ -75,7 +75,7 @@ async def chat_bot_toggle(db, message: Message):
 async def chatbot_status(_, message: Message):
     if len(message.command) != 2:
         return await edit_or_reply(
-            message, text="**Usage**\n/chatbot [ENABLE|DISABLE]"
+                message, text="**Usage:**\n/chatbot [ENABLE|DISABLE]"
         )
     await chat_bot_toggle(active_chats_bot, message)
 
@@ -128,7 +128,7 @@ async def chatbot_talk(_, message: Message):
 async def chatbot_status_ubot(_, message: Message):
     if len(message.text.split()) != 2:
         return await edit_or_reply(
-            message, text="**Usage**\n.chatbot [ENABLE|DISABLE]"
+                message, text="**Usage:**\n.chatbot [ENABLE|DISABLE]"
         )
     await chat_bot_toggle(active_chats_ubot, message)
 

+ 1 - 5
wbb/modules/rss.py

@@ -28,7 +28,6 @@ __HELP__ = f"""
 async def rss_worker():
     print("[INFO]: RSS WORKER STARTED")
     while True:
-        t1 = time()
         feeds = await get_rss_feeds()
         if not feeds:
             await sleep(RSS_DELAY)
@@ -48,10 +47,7 @@ async def rss_worker():
             except Exception as e:
                 print(str(e), f"RSS {chat}")
                 pass
-        t2 = time()
-        if (t2 - t1) >= RSS_DELAY:
-            continue
-        await sleep(RSS_DELAY - (t2 - t1))
+        await sleep(RSS_DELAY)
 
 
 loop = get_event_loop()

+ 7 - 0
wbb/modules/stickers.py

@@ -137,8 +137,13 @@ async def kang(client, message):
     # Would be a good idea to cache the number instead of searching it every single time...
     packnum = 0
     packname = "f" + str(message.from_user.id) + "_by_" + BOT_USERNAME
+    limit = 0
     try:
         while True:
+            # Prevent infinite rules
+            if limit >= 50:
+                return await msg.delete()
+
             stickerset = await get_sticker_set_by_name(
                 client, packname
             )
@@ -160,6 +165,7 @@ async def kang(client, message):
                     + "_by_"
                     + BOT_USERNAME
                 )
+                limit += 1
                 continue
             else:
                 try:
@@ -170,6 +176,7 @@ async def kang(client, message):
                     return await msg.edit(
                         "[ERROR]: INVALID_EMOJI_IN_ARGUMENT"
                     )
+            limit += 1
             break
 
         await msg.edit(