Disabled info command

cogs/info.py

@@ -0,0 +1,31 @@
+import discord
+from discord.ext import commands
+from mcstatus import MinecraftServer
+
+
+class ServerInfo(commands.Cog):
+    def __init__(self, client):
+        self.client = client
+
+    @commands.command(name="info")
+    async def info(self, ctx):
+        port = "25201"
+        ip = "81.82.224.207"
+        server = MinecraftServer.lookup(f"{ip}:{port}")
+        # List of colours for the amount of servers that are online
+
+        embed = discord.Embed()
+        embed.set_author(name="Info")
+        embed.colour = discord.Colour.orange()
+        embed.add_field(name="Ip", value=f"play.worldcraft.us", inline=False)
+        embed.add_field(
+            name="Dynmap", value=f"https://map.worldcraft.us/", inline=False)
+        embed.add_field(
+            name="Online", value=f"There are **{server.status().players.online}** players online!", inline=False)
+
+        await ctx.send(embed=embed)
+
+
+def setup(client):
+    # client.add_cog(ServerInfo(client))
+    pass

cogs/leaderboards.py

@@ -31,7 +31,25 @@ class Leaderboards(commands.Cog):
         if column == "quizWins":
             top_players = []
             quizplayersdb = QuizPlayersDB()
-            for player in quizplayersdb.get_top_players():
+            for player in quizplayersdb.get_top_players("wins"):
+                discorduser = {}
+                discorduser["playerName"] = deEmojify((await self.client.fetch_user(player["discordid"])).name).strip()
+                discorduser["stat"] = player["stat"]
+                top_players.append(discorduser)
+            quizplayersdb.close()
+        elif column == "max_streak":
+            top_players = []
+            quizplayersdb = QuizPlayersDB()
+            for player in quizplayersdb.get_top_players("max_streak"):
+                discorduser = {}
+                discorduser["playerName"] = deEmojify((await self.client.fetch_user(player["discordid"])).name).strip()
+                discorduser["stat"] = player["stat"]
+                top_players.append(discorduser)
+            quizplayersdb.close()
+        elif column == "streak_count":
+            top_players = []
+            quizplayersdb = QuizPlayersDB()
+            for player in quizplayersdb.get_top_players("streak_count"):
                 discorduser = {}
                 discorduser["playerName"] = deEmojify((await self.client.fetch_user(player["discordid"])).name).strip()
                 discorduser["stat"] = player["stat"]
@@ -104,6 +122,16 @@ class Leaderboards(commands.Cog):
         embed = await self.create_leaderboard_embed("Quiz wins", "quizWins")
         await ctx.send(embed=embed)
 
+    @top.command(name="streak", case_insensitive=True)
+    async def top_streak(self, ctx):
+        embed = await self.create_leaderboard_embed("Longest streak", "max_streak")
+        await ctx.send(embed=embed)
+
+    @top.command(name="streakcount", case_insensitive=True)
+    async def top_streak_count(self, ctx):
+        embed = await self.create_leaderboard_embed("Streak count", "streak_count")
+        await ctx.send(embed=embed)
+
 
 def setup(client):
     client.add_cog(Leaderboards(client))

cogs/quiz.py

@@ -144,7 +144,7 @@ class Quiz(commands.Cog):
     def __init__(self, client):
         self.client = client
         #self.interval = (1, 4)
-        self.interval = (5*60, 20*60)
+        self.interval = (5*60, 15*60)
         self.auto = False
         self.timeout = 10*60
 

cogs/suggestion.py

@@ -0,0 +1,38 @@
+import discord
+from discord.ext import commands
+from functions.checks import *
+import requests
+from io import BytesIO
+
+class SuggestionMessage(commands.Cog):
+    def __init__(self, client):
+        self.client = client
+        self.channels = ["740308147385663518", "761327043894968330"]
+
+    @commands.command(name="suggestion")
+    async def suggestion(self, ctx, *, arg):
+        if str(ctx.channel.id) in self.channels or isModPlus(ctx):
+            embed = discord.Embed()
+            embed.set_author(name=ctx.author.display_name)
+            embed.colour = discord.Colour.orange()
+            embed.description = f"{arg}"
+            if len(ctx.message.attachments) > 0:
+                attachment_url = ctx.message.attachments[0].url
+                embed.set_image(url="attachment://image.png")
+                message = await ctx.send(embed=embed, file=self.get_image_from_url(attachment_url))
+            else:
+                message = await ctx.send(embed=embed)
+            await ctx.message.delete()
+            await message.add_reaction("✅")
+            await message.add_reaction("❌")
+
+    def get_image_from_url(self, url):
+        res = requests.get(url)
+        arr = BytesIO(res.content)
+        arr.seek(0)
+        file=discord.File(fp=arr, filename='image.png')
+        return file
+
+
+def setup(client):
+    client.add_cog(SuggestionMessage(client))

data/DatabaseConnection.py

@@ -76,7 +76,7 @@ class QuizPlayersDB:
             sql = f"UPDATE {self.tablename} SET wins = wins + 1, rewards = rewards + {str(reward)}, toclaim = toclaim + {str(reward)} WHERE discordid = {str(discordid)}"
             cursor.execute(sql)
         else:
-            sql = f"INSERT INTO {self.tablename} (discordid, wins, rewards, toclaim) VALUES ({str(discordid)}, 1, {reward}, {reward}, 0, 0)"
+            sql = f"INSERT INTO {self.tablename} (discordid, wins, rewards, toclaim, cur_streak, max_streak, streak_count) VALUES ({str(discordid)}, 1, {reward}, {reward}, 0, 0, 0)"
             cursor.execute(sql)
 
         self.increment_cur_streak(discordid)
@@ -98,9 +98,9 @@ class QuizPlayersDB:
         cursor.execute(sql)
         self.discorddbconn.get_db().commit()
 
-    def get_top_players(self, limit = 20):
+    def get_top_players(self, column, limit = 20):
         cursor = self.discorddbconn.get_cursor(dictionary=True)
-        sql = f"SELECT discordid, wins as stat FROM {self.tablename} ORDER BY wins DESC LIMIT {str(limit)}"
+        sql = f"SELECT discordid, {column} as stat FROM {self.tablename} ORDER BY {column} DESC LIMIT {str(limit)}"
         cursor.execute(sql)
         return list(cursor.fetchall())
 

requirements.txt

@@ -1,3 +1,4 @@
 discord.py==1.5.0
 mcstatus==4.0.0
 mysql-connector-python==8.0.21
+requests==2.25.0