Updates and prepare for for Presentation

- Created ServerStats class, API endpoint, settings, and event triggers
- Added cog descriptions
- Renamed a few command functions to include _ for spaces
- Hid the dallas command
- Created nick command
- Updated LeagueCommands embed pages
- Fixed typo in league process_reactions where list_type was missing for "go back"
- Updates strike; Striker is now stored by id instead of name, and fixed embed footer saying "kicked by" instead of "striked by"
- Removed set_log_channel and config command
- Create prune command for message pruning
- Disabled NSFW commands
- Removed dead code from stats command
- Rewrote the help command to use page embeds and be more dynamic to use less repeated code

Author: Puyodead1

bot.py

@@ -15,7 +15,7 @@
 from requests_oauthlib import OAuth2Session
 
 from utils import loadAllCogs, loadAllExtensions, SetupLogger, RedisClient, Mongo, APIServer, ServerSettings, getLogger, \
-    UserProfiles, BotAdmins, getSystemLogChannel, Converter
+    UserProfiles, BotAdmins, getSystemLogChannel, Converter, ServerStats
 
 # get asyncio loop
 loop = asyncio.get_event_loop()
@@ -871,6 +871,19 @@ def server_toggle_module(server_id):
                                         pass
                                     except discord.HTTPException:
                                         pass
+                            elif module.lower() == "server_stats":
+                                if enabled:
+                                    enable_fut = asyncio.run_coroutine_threadsafe(
+                                        ServerStats(bot, server).enable(),
+                                        loop
+                                    )
+                                    enable_fut.result()
+                                else:
+                                    disable_fut = asyncio.run_coroutine_threadsafe(
+                                        ServerStats(bot, server).disable(),
+                                        loop
+                                    )
+                                    disable_fut.result()
                             return "Settings Updated", 200
                         else:
                             return "", 400

cogs/BotAdminCommands.py

@@ -1,21 +1,22 @@
 import ast
-import inspect
 from datetime import datetime
 
 import discord
 from discord.ext import commands
+
 import utils
 from utils import UserProfiles, getLogger, getSystemLogChannel, BotAdmins
 from .utils import checks
 
 
 class BotAdminCommandsCog(commands.Cog):
+    """Commands for Bot Admins"""
     def __init__(self, bot):
         self.bot = bot
 
     @commands.command(name="reloadcog", hidden=True, help="Reloads a cog")
     @checks.isBotAdmin()
-    async def reloadcog(self, ctx, *, cog: str):
+    async def reload_cog(self, ctx, *, cog: str):
         # to reload we need to unload it first
         try:
             self.bot.unload_extension(f"cogs.{cog}")
@@ -29,7 +30,7 @@ async def reloadcog(self, ctx, *, cog: str):
 
     @commands.command(name="loadcog", hidden=True, help="Loads a cog")
     @checks.isBotAdmin()
-    async def loadcog(self, ctx, *, cog: str):
+    async def load_cog(self, ctx, *, cog: str):
         # try to load cog
         try:
             self.bot.load_extension(f"cogs.{cog}")
@@ -42,7 +43,7 @@ async def loadcog(self, ctx, *, cog: str):
 
     @commands.command(name="unloadcog", hidden=True, help="Unloads a cog")
     @checks.isBotAdmin()
-    async def unloadcog(self, ctx, *, cog: str):
+    async def unload_cog(self, ctx, *, cog: str):
         try:
             self.bot.unload_extension(f"cogs.{cog}")
         except Exception as e:
@@ -54,7 +55,7 @@ async def unloadcog(self, ctx, *, cog: str):
 
     @commands.command(name="reloadext", hidden=True, help="Reloads an extension")
     @checks.isBotAdmin()
-    async def reloadext(self, ctx, *, ext: str):
+    async def reload_ext(self, ctx, *, ext: str):
         # to reload we need to unload it first
         try:
             self.bot.unload_extension(f"extensions.{ext}")
@@ -68,7 +69,7 @@ async def reloadext(self, ctx, *, ext: str):
 
     @commands.command(name="loadext", hidden=True, help="Loads an extension")
     @checks.isBotAdmin()
-    async def loadext(self, ctx, *, ext: str):
+    async def load_ext(self, ctx, *, ext: str):
         # try to load cog
         try:
             self.bot.load_extension(f"extensions.{ext}")
@@ -81,7 +82,7 @@ async def loadext(self, ctx, *, ext: str):
 
     @commands.command(name="unloadext", hidden=True, help="Unloads an extension")
     @checks.isBotAdmin()
-    async def unloadext(self, ctx, *, ext: str):
+    async def unload_ext(self, ctx, *, ext: str):
         try:
             self.bot.unload_extension(f"extensions.{ext}")
         except Exception as e:

cogs/FunCommands.py

@@ -1,17 +1,19 @@
 import asyncio
 import random
 from datetime import datetime
-from exchanges import *
+
 import discord
 import requests
 from discord import Forbidden, HTTPException, InvalidArgument, NotFound
 from discord.ext import commands
+from exchanges import *
 from prawcore import exceptions
 
-from utils import getRandomFact, RedditClient
+from utils import getRandomFact, RedditClient, getLogger
 
 
 class FunCommandsCog(commands.Cog):
+    """Misc commands for fun with not specific usage"""
     def __init__(self, bot):
         self.bot = bot
 
@@ -119,7 +121,7 @@ async def rob(self, ctx, member: discord.Member):
             embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
             await ctx.send(content=None, embed=embed)
 
-    @commands.command(name="dallas", help="Dallas is a fucking furry")
+    @commands.command(name="dallas", help="Dallas is a fucking furry", hidden=True)
     @commands.guild_only()
     async def dallas(self, ctx):
         embed = discord.Embed(title=None,
@@ -290,7 +292,8 @@ async def alex_jones(self, ctx):
         embed = discord.Embed(title=None,
                               description=None,
                               color=discord.Color.green(), timestamp=datetime.utcnow())
-        embed.set_image(url="https://media.discordapp.net/attachments/644927766197698593/647167462315393053/ezgif.com-video-to-gif.gif")
+        embed.set_image(
+            url="https://media.discordapp.net/attachments/644927766197698593/647167462315393053/ezgif.com-video-to-gif.gif")
         embed.set_footer(text=ctx.message.author.name, icon_url=ctx.message.author.avatar_url)
         embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
         await ctx.send(content=None, embed=embed)
@@ -532,7 +535,8 @@ async def meme(self, ctx, subreddit: str = "funny", listing_type: str = "new"):
             print(f"[FunCommands] Cought error in meme command! Error: {e}")
             return await ctx.send(f"An error occured!")
 
-    @commands.command(name="bitcoin", help="List exchanges, get current price for an exchange", description="Get current bitcoin price for an exchange")
+    @commands.command(name="bitcoin", help="List exchanges, get current price for an exchange",
+                      description="Get current bitcoin price for an exchange")
     @commands.guild_only()
     async def bitcoin(self, ctx, arg=None):
         if arg is not None:
@@ -634,6 +638,31 @@ async def bitcoin(self, ctx, arg=None):
             embed.set_thumbnail(url="https://miro.medium.com/max/3150/2*O3o3Gdam4S5MSXfUg_UxGg.png")
             return await ctx.send(content=None, embed=embed)
 
+    @commands.command(name="nick", help="Change nickname of a user", usage="<nickname> [user]")
+    @commands.guild_only()
+    @commands.bot_has_permissions(manage_nicknames=True)
+    async def nick(self, ctx, nick: str, member: discord.Member = None):
+        user = ctx.author if member is None else member
+        try:
+            await user.edit(nick=nick)
+            embed = discord.Embed(title=f"Nickname updated for {user}!", description=None,
+                                  color=discord.Color.green(),
+                                  timestamp=datetime.utcnow())
+            await ctx.send(content=None, embed=embed, delete_after=10)
+        except Forbidden:
+            # missing permission
+            getLogger().debug(f"[Nick] Missing permissions to change nickname for {user}!")
+            embed = discord.Embed(title=f"Missing permissions to change nickname for {user}!", description=None, color=discord.Color.red(),
+                                  timestamp=datetime.utcnow())
+            await ctx.send(content=None, embed=embed, delete_after=10)
+        except HTTPException:
+            # Failed to edit user
+            getLogger().debug(f"[Nick] failed to set nickname!")
+            embed = discord.Embed(title=f"failed to set nickname for {user}!", description=None,
+                                  color=discord.Color.red(),
+                                  timestamp=datetime.utcnow())
+            await ctx.send(content=None, embed=embed, delete_after=10)
+
 
 def getPostsByListingType(subreddit: str, type: str):
     if type == "top":

cogs/GameCommands.py

@@ -6,12 +6,13 @@
 
 
 class GameCommandsCog(commands.Cog):
+    """Commands for Games"""
     def __init__(self, bot):
         self.bot = bot
 
     @commands.command(name="rpgstart")
     @commands.guild_only()
-    async def rpgstart(self, ctx):
+    async def rpg_start(self, ctx):
         profile = UserProfiles(ctx.author)
         profile_data = profile.getUserProfile()
         isCreated = profile_data["RPGData"]["CreatedCharacter"]
@@ -109,7 +110,7 @@ def check(message):
 
     @commands.command(name="rpgprofile")
     @commands.guild_only()
-    async def rpgprofile(self, ctx, member=discord.Member):
+    async def rpg_profile(self, ctx, member=discord.Member):
         profile = UserProfiles(ctx.author)
         profile_data = profile.getUserProfile()
         a = profile_data['RPGData']['Name']

cogs/GuildEvents.py

@@ -1,7 +1,7 @@
 import discord
 from datetime import datetime
 import utils
-from utils import utc_to_epoch, ServerSettings
+from utils import utc_to_epoch, ServerSettings, ServerStats
 from discord.ext import commands
 from utils import UserProfiles
 
@@ -31,6 +31,10 @@ async def on_member_join(self, member):
             embed.set_footer(text=self.bot.user.name, icon_url=self.bot.user.avatar_url)
             await log_channel.send(content=None, embed=embed)
 
+        stats = ServerStats(self.bot, member.guild)
+        if stats.isEnabled():
+            await stats.update()
+
     @commands.Cog.listener()
     async def on_member_remove(self, member):
 
@@ -65,6 +69,10 @@ async def on_member_remove(self, member):
             embed.set_footer(text=self.bot.user.name, icon_url=self.bot.user.avatar_url)
             await log_channel.send(content=None, embed=embed)
 
+        stats = ServerStats(self.bot, member.guild)
+        if stats.isEnabled():
+            await stats.update()
+
     # commented out in favor of the message sent from the ban command
     # @commands.Cog.listener()
     # async def on_member_ban(self, guild: discord.Guild, member: discord.Member):
@@ -160,6 +168,10 @@ async def on_guild_channel_create(self, channel: discord.abc.GuildChannel):
         if log_channel is not None and enabled:
             await log_channel.send(f"Channel created: {channel.mention} [{channel.name}] ({channel.id})")
 
+        stats = ServerStats(self.bot, channel.guild)
+        if stats.isEnabled():
+            await stats.update()
+
     @commands.Cog.listener()
     async def on_guild_channel_delete(self, channel: discord.abc.GuildChannel):
         server_settings = ServerSettings(channel.guild).getServerSettings()
@@ -169,6 +181,10 @@ async def on_guild_channel_delete(self, channel: discord.abc.GuildChannel):
         if log_channel is not None and enabled:
             await log_channel.send(f"Channel deleted: {channel.name} ({channel.id})")
 
+        stats = ServerStats(self.bot, channel.guild)
+        if stats.isEnabled():
+            await stats.update()
+
     @commands.Cog.listener()
     async def on_guild_update(self, before: discord.Guild, after: discord.Guild):
         # TODO: Make this an embed
@@ -198,6 +214,10 @@ async def on_guild_role_create(self, role: discord.Role):
         if log_channel is not None and enabled:
             await log_channel.send(content=None, embed=embed)
 
+        stats = ServerStats(self.bot, role.guild)
+        if stats.isEnabled():
+            await stats.update()
+
     @commands.Cog.listener()
     async def on_guild_role_delete(self, role: discord.Role):
         server_settings = ServerSettings(role.guild).getServerSettings()
@@ -212,6 +232,10 @@ async def on_guild_role_delete(self, role: discord.Role):
         if log_channel is not None and enabled:
             await log_channel.send(content=None, embed=embed)
 
+        stats = ServerStats(self.bot, role.guild)
+        if stats.isEnabled():
+            await stats.update()
+
     @commands.Cog.listener()
     async def on_guild_role_update(self, before: discord.Role, after: discord.Role):
         # TODO: Make this an embed
@@ -242,4 +266,4 @@ async def on_guild_emojis_update(self, guild: discord.Guild, before: discord.Emo
 
 
 def setup(bot):
-    bot.add_cog(GuildEventsCog(bot))
+    bot.add_cog(GuildEventsCog(bot))

cogs/LeagueCommands.py

@@ -10,6 +10,7 @@
 
 
 class LeagueCommandsCog(commands.Cog):
+    """Commands for League of Legends module"""
     def __init__(self, bot):
         self.bot = bot
         self.boots_list = [
@@ -62,17 +63,17 @@ async def process_reactions(self, ctx, message, page, pagination, list_type):
                 new_embed.set_footer(text=ctx.message.author.name, icon_url=ctx.message.author.avatar_url)
                 new_embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
                 await message.clear_reactions()
-                if page + 2 >= 1 or page + 2 == len(pagination):
+                if page + 1 >= 1 or page + 1 == len(pagination):
                     await message.add_reaction("⬅")
-                if page + 2 <= 1 or page + 2 < len(pagination):
+                if page + 1 <= 1 or page + 1 < len(pagination):
                     await message.add_reaction("➡")
                 await message.add_reaction("❌")
 
                 await message.edit(content=None, embed=new_embed)
                 await self.process_reactions(ctx, message, page, pagination, list_type)
             elif reaction.emoji == "⬅":
                 page -= 1
-                new_embed = discord.Embed(title=f"Page {page + 1} of {len(pagination)} - Champions List",
+                new_embed = discord.Embed(title=f"Page {page + 1} of {len(pagination)} - {list_type} List",
                                           description="\n".join(pagination[page]),
                                           color=discord.Color.orange(),
                                           timestamp=datetime.utcnow())
@@ -108,7 +109,7 @@ async def league(self, ctx, decider: str, decider2: str = None):
             embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
 
             champion_list_message = await ctx.send(content=None, embed=embed)
-            if page + 2 <= 1 or page + 2 < len(pagination):
+            if page + 1 <= 1 or page + 1 < len(pagination):
                 await champion_list_message.add_reaction("➡")
             await champion_list_message.add_reaction("❌")
 
@@ -128,7 +129,7 @@ async def league(self, ctx, decider: str, decider2: str = None):
             embed.set_footer(text=ctx.message.author.name, icon_url=ctx.message.author.avatar_url)
             embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
             item_list_message = await ctx.send(content=None, embed=embed)
-            if page + 2 <= 1 or page + 2 < len(pagination):
+            if page + 1 <= 1 or page + 1 < len(pagination):
                 await item_list_message.add_reaction("➡")
             await item_list_message.add_reaction("❌")
 
@@ -148,7 +149,7 @@ async def league(self, ctx, decider: str, decider2: str = None):
             embed.set_footer(text=ctx.message.author.name, icon_url=ctx.message.author.avatar_url)
             embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
             rune_list_message = await ctx.send(content=None, embed=embed)
-            if page + 2 <= 1 or page + 2 < len(pagination):
+            if page + 1 <= 1 or page + 1 < len(pagination):
                 await rune_list_message.add_reaction("➡")
             await rune_list_message.add_reaction("❌")