From 4601789da0473e6c88d33bd464bdd3454674c3ae Mon Sep 17 00:00:00 2001 From: Zevaryx Date: Wed, 20 Apr 2022 00:50:25 -0600 Subject: [PATCH] Enforce limits on subreddits --- jarvis/cogs/reddit.py | 12 ++++++++++++ jarvis/cogs/twitter.py | 10 +++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/jarvis/cogs/reddit.py b/jarvis/cogs/reddit.py index 4341abd..ff6cf12 100644 --- a/jarvis/cogs/reddit.py +++ b/jarvis/cogs/reddit.py @@ -69,6 +69,18 @@ class RedditCog(Scale): await ctx.send("Subreddit may be private, quarantined, or nonexistent.", ephemeral=True) return + count = len([i async for i in SubredditFollow.find(q(guild=ctx.guild.id))]) + if len(count) >= 12: + await ctx.send("Cannot follow more than 12 Subreddits", ephemeral=True) + return + + exists = await SubredditFollow.find_one( + q(display_name=subreddit.display_name, guild=ctx.guild.id) + ) + if exists: + await ctx.send("Subreddit already being followed in this guild", ephemeral=True) + return + sr = await Subreddit.find_one(q(display_name=subreddit.display_name)) if not sr: sr = Subreddit(display_name=subreddit.display_name, over18=subreddit.over18) diff --git a/jarvis/cogs/twitter.py b/jarvis/cogs/twitter.py index 0804075..326ee3a 100644 --- a/jarvis/cogs/twitter.py +++ b/jarvis/cogs/twitter.py @@ -80,16 +80,16 @@ class TwitterCog(Scale): ) return - count = len([i async for i in TwitterFollow.find(q(guild=ctx.guild.id))]) - if count >= 12: - await ctx.send("Cannot follow more than 12 Twitter accounts", ephemeral=True) - return - exists = await TwitterFollow.find_one(q(twitter_id=account.id, guild=ctx.guild.id)) if exists: await ctx.send("Twitter account already being followed in this guild", ephemeral=True) return + count = len([i async for i in TwitterFollow.find(q(guild=ctx.guild.id))]) + if count >= 12: + await ctx.send("Cannot follow more than 12 Twitter accounts", ephemeral=True) + return + ta = await TwitterAccount.find_one(q(twitter_id=account.id)) if not ta: ta = TwitterAccount(