From 74087980fc1e38f7c520d6ba624c72580bb2bbaa Mon Sep 17 00:00:00 2001
From: flifloo <flifloo@gmail.com>
Date: Sun, 2 Aug 2020 20:50:11 +0200
Subject: [PATCH] Add actions list on warn list command

---
 administrator/utils.py | 10 ++++++++++
 db/WarnAction.py       |  4 ++--
 extensions/reminder.py |  9 ++-------
 extensions/warn.py     | 17 +++++++++++++----
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/administrator/utils.py b/administrator/utils.py
index 32e609f..6908e4e 100644
--- a/administrator/utils.py
+++ b/administrator/utils.py
@@ -13,3 +13,13 @@ def time_pars(s: str) -> timedelta:
             w, d, h, m, s = [i if i else 0 for i in [w, d, h, m, s]]
             return timedelta(weeks=int(w), days=int(d), hours=int(h), minutes=int(m), seconds=int(s))
     raise BadArgument()
+
+
+def seconds_to_time_string(seconds: float) -> str:
+    days, seconds = divmod(seconds, 86400)
+    hours, seconds = divmod(seconds, 3600)
+    minutes, seconds = divmod(seconds, 60)
+    return f"""{f"{days}d {hours}h {minutes}m {seconds}s"
+    if days > 0 else f"{hours}h {minutes}m {seconds}s"
+    if hours > 0 else f"{minutes}m {seconds}s"
+    if minutes > 0 else f"{seconds}s"}"""
diff --git a/db/WarnAction.py b/db/WarnAction.py
index 634e29d..2f6cfe1 100644
--- a/db/WarnAction.py
+++ b/db/WarnAction.py
@@ -1,14 +1,14 @@
 from datetime import timedelta
 
 from db import Base
-from sqlalchemy import Column, Integer, BigInteger, Float, String
+from sqlalchemy import Column, Integer, BigInteger, String
 
 
 class WarnAction(Base):
     __tablename__ = "warn_actions"
     id = Column(Integer, primary_key=True)
     guild = Column(BigInteger, nullable=False)
-    count = Column(Float, nullable=False, unique=True)
+    count = Column(Integer, nullable=False, unique=True)
     action = Column(String, nullable=False)
     duration = Column(BigInteger)
 
diff --git a/extensions/reminder.py b/extensions/reminder.py
index d2b8913..1003f30 100644
--- a/extensions/reminder.py
+++ b/extensions/reminder.py
@@ -8,7 +8,7 @@ from discord.ext import tasks
 
 from administrator.logger import logger
 from administrator import db
-from administrator.utils import time_pars
+from administrator.utils import time_pars, seconds_to_time_string
 
 extension_name = "reminders"
 logger = logger.getChild(extension_name)
@@ -45,12 +45,7 @@ class Reminders(commands.Cog, name="Reminder"):
         s.commit()
         s.close()
 
-        hours, seconds = divmod(time.seconds, 3600)
-        minutes, seconds = divmod(seconds, 60)
-        await ctx.send(f"""Remind you in {f"{time.days}d {hours}h {minutes}m {seconds}s"
-        if time.days > 0 else f"{hours}h {minutes}m {seconds}s"
-        if hours > 0 else f"{minutes}m {seconds}s"
-        if minutes > 0 else f"{seconds}s"} !""")
+        await ctx.send(f"""Remind you in {seconds_to_time_string(time.total_seconds())} !""")
 
     @reminder.group("list", pass_context=True)
     async def reminder_list(self, ctx: commands.Context):
diff --git a/extensions/warn.py b/extensions/warn.py
index e481856..17a0ade 100644
--- a/extensions/warn.py
+++ b/extensions/warn.py
@@ -4,7 +4,7 @@ from discord.ext.commands import BadArgument
 
 from administrator import db
 from administrator.logger import logger
-from administrator.utils import time_pars
+from administrator.utils import time_pars, seconds_to_time_string
 
 extension_name = "warn"
 logger = logger.getChild(extension_name)
@@ -51,13 +51,16 @@ class Warn(commands.Cog):
         embed.add_field(name="add <user> <description>", value="Send a warn to a user", inline=False)
         embed.add_field(name="remove <user> <number>", value="Remove a number of warn to a user", inline=False)
         embed.add_field(name="purge <user>", value="Remove all warn of a user", inline=False)
-        embed.add_field(name="list [user]", value="List warn of the guild or a specified user", inline=False)
+        embed.add_field(name="list [user#discriminator|actions]", value="List warn of the guild or a specified user\n"
+                                                                        "If you specify `actions` instead of a user, "
+                                                                        "all the actions of the guild will be listed",
+                        inline=False)
         embed.add_field(name="action <count> <action>", value="Set an action for a count of warn\n"
                                                               "Actions: `mute<time>`, `kick`, `ban[time]`, `nothing`\n"
                                                               "Time: `?D?H?M?S`\n"
                                                               "Example: `action 1 mute1H` to mute someone for one hour "
                                                               "after only one war\n"
-                                                              "or `action 3 ban3D` to ban someone for one day after 3 "
+                                                              "or `action 3 ban1D` to ban someone for one day after 3 "
                                                               "warns", inline=False)
         await ctx.send(embed=embed)
 
@@ -108,7 +111,13 @@ class Warn(commands.Cog):
         embed = Embed(title="Warn list")
         ws = {}
 
-        if user:
+        if user == "actions":
+            embed.title = "Actions list"
+            for a in s.query(db.WarnAction).filter(db.WarnAction.guild == ctx.guild.id).order_by(db.WarnAction.count)\
+                    .all():
+                action = f"{a.action} for {seconds_to_time_string(a.duration)}" if a.duration else a.action
+                embed.add_field(name=f"{a.count} warn(s)", value=action, inline=False)
+        elif user:
             target = self.get_target(ctx, user)
             ws[target.id] = s.query(db.Warn).filter(db.Warn.guild == ctx.guild.id, db.Warn.user == target.id).all()
         else: