.gitignore

@@ -1,3 +1,2 @@
 config.yaml
 redditbot.session*
-redditbot.json

redditbot.py

@@ -104,7 +104,7 @@ async def main():
                 random_post = await subreddit.random()
                 cpid = cpp = None
                 if random_post is None:
-                    async for submission in subreddit.hot(limit=None):
+                    async for submission in subreddit.hot():
                         if unique_id in give_ups:
                             return
                         cpid = getattr(submission, 'crosspost_parent', None)
@@ -123,7 +123,7 @@ async def main():
                                 if not (nsfw and allow_nsfw):
                                     nsfw = cpp.over_18
                                 if not (spoilers and allow_spoilers):
-                                    spoilers = cpp.spoiler
+                                    nsfw = cpp.spoiler
                             if is_self and not allow_selfposts:
                                 continue
                             if nsfw and not allow_nsfw:
@@ -132,9 +132,6 @@ async def main():
                                 continue
                         random_post = submission
                         break
-                if random_post is None:
-                    return
-
                 cpid = getattr(random_post, 'crosspost_parent', None)
                 if cpid and getattr(random_post, 'crosspost_parent_list', None):
                     cpid = cpid[3:]
@@ -152,7 +149,7 @@ async def main():
                         if not (nsfw and allow_nsfw):
                             nsfw = cpp.over_18
                         if not (spoilers and allow_spoilers):
-                            spoilers = cpp.spoiler
+                            nsfw = cpp.spoiler
                     if is_self and not allow_selfposts:
                         continue
                     if nsfw and not allow_nsfw:
@@ -168,23 +165,22 @@ async def main():
             while True:
                 unique_id = time.time()
                 try:
-                    result = await asyncio.wait_for(_get_submission(unique_id), timeout)
+                    random_post, cpp = await asyncio.wait_for(_get_submission(unique_id), timeout)
                 except asyncio.TimeoutError:
                     give_ups.add(unique_id)
                     logging.error('%s timed out', chat)
-                    return
-                except Exception:
+                    for i in bot_admins:
+                        await client.send_message(i, f'{chat} timed out')
+                    break
+                except BaseException:
                     give_ups.add(unique_id)
                     logging.exception(chat)
                     for i in bot_admins:
                         await client.send_message(i, f'{chat}\n{traceback.format_exc()}')
                 else:
-                    if not result:
-                        return
-                    random_post, cpp = result
                     try:
                         await _actual_start_post(random_post, [chat], cpp, show_nsfw_warning, show_spoilers_warning)
-                    except Exception:
+                    except BaseException:
                         logging.exception(random_post.id)
                         for i in bot_admins:
                             await client.send_message(i, f'{random_post.id}\n{traceback.format_exc()}', parse_mode=None)