From fc073343e4c40565fa26ff8379b3a333c0a58902 Mon Sep 17 00:00:00 2001
From: Will Tekulve <tekulvwc@mail.uc.edu>
Date: Sat, 27 Feb 2016 04:17:01 -0500
Subject: [PATCH] add get_server for admin/mod settings for modset help

---
 cogs/general.py        | 5 +++++
 cogs/mod.py            | 7 ++++++-
 cogs/utils/settings.py | 5 +++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/cogs/general.py b/cogs/general.py
index 852e31dab..a3de88c93 100644
--- a/cogs/general.py
+++ b/cogs/general.py
@@ -21,6 +21,11 @@ class General:
                      "Don't count on it", "My reply is no", "My sources say no", "Outlook not so good", "Very doubtful"]
         self.poll_sessions = []
 
+    @commands.command()
+    async def ping(self):
+        """Pong."""
+        self.bot.say("Pong.")
+
     @commands.command()
     async def choose(self, *choices):
         """Chooses between multiple choices.
diff --git a/cogs/mod.py b/cogs/mod.py
index 4c71d34bd..ba8e4e6cc 100644
--- a/cogs/mod.py
+++ b/cogs/mod.py
@@ -17,12 +17,17 @@ class Mod:
         self.ignore_list = fileIO("data/mod/ignorelist.json", "load")
         self.filter = fileIO("data/mod/filter.json", "load")
 
-    @commands.group(pass_context=True)
+    @commands.group(pass_context=True,no_pm=True)
     @checks.admin_or_permissions(manage_server=True)
     async def modset(self,ctx):
         """Manages server administration settings."""
         if ctx.invoked_subcommand is None:
             await send_cmd_help(ctx)
+            msg = "```"
+            for k, v in settings.get_server(ctx.message.server).items():
+                msg += str(k) + ": " + str(v) + "\n"
+            msg += "```"
+            await self.bot.say(msg)
 
     @modset.command(name="adminrole",pass_context=True,no_pm=True)
     async def _modset_adminrole(self,ctx,role_name : str):
diff --git a/cogs/utils/settings.py b/cogs/utils/settings.py
index cd513d51f..55ee46b8d 100644
--- a/cogs/utils/settings.py
+++ b/cogs/utils/settings.py
@@ -49,6 +49,7 @@ class Settings:
 
     @prefixes.setter
     def prefixes(self,value):
+        assert isinstance(value,list)
         self.bot_settings["PREFIXES"] = value
         self.save_settings()
 
@@ -86,6 +87,10 @@ class Settings:
             ret.update({server:self.bot_settings[server]})
         return ret
 
+    def get_server(self,server):
+        assert isinstance(server,discord.Server)
+        return self.bot_settings.get(server.id,self.bot_settings["default"].copy())
+
     def get_server_admin(self,server):
         assert isinstance(server,discord.Server)
         if server is None: