Merge pull request #128 from NabDev/dev

v1.6.1
Galarzaa90 · Sep 7, 2018 · 983df3b · 983df3b
2 parents a88e75b + a7487ec
commit 983df3b
Show file tree

Hide file tree

Showing 174 changed files with 54 additions and 49 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,7 +21,7 @@ script:
 - python -m compileall ./utils
 - cp CHANGELOG.md docs/changelog.md
 - python -m mkdocs build
-- echo 'nabbot.xyz' > ./site/CNAME
+- echo 'docs.nabbot.xyz' > ./site/CNAME
 
 deploy:
   provider: pages

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
 # Changelog
+## Version 1.6.1 (2018-09-06)
+- Fixed bug with /worlds
+- Unified missing argument error messages
+- Commands in `/help` are now sorted alphabetically
+
 ## Version 1.6.0 (2018-08-27)
 - New command: `/rashid`.
 - `/time` no longer displays Mexico and Brazil's timezones.
@@ -210,7 +215,7 @@
 - Migrated many services from Tibia.com to TibiaData.com for better reliability.
 - TibiaWiki database is now more recent and is now a [separate project](https://github.com/Galarzaa90/tibiawiki-sql)
 - Added tons of new commands and rewrote many of them.
-- Added [documentation site](https://galarzaa90.github.io/NabBot/)
+- Added [documentation site](https://nabdev.github.io/NabBot/)
 - And too many changes too list them here.
 
 ## Version 0.1.3 (2018-03-08)

diff --git a/README.md b/README.md
@@ -25,11 +25,11 @@ You can also host your own instance of NabBot.
 - git
 
 ### Installing and running
-Follow the [install guide](https://galarzaa90.github.io/NabBot/install/) on the official documentation site.
+Follow the [install guide](https://nabdev.github.io/NabBot/install/) on the official documentation site.
 
 
 ## Documentation
-See https://galarzaa90.github.io/NabBot/
+See https://nabdev.github.io/NabBot/
 
 ## Support
 Visit our support server

diff --git a/cogs/admin.py b/cogs/admin.py
@@ -19,14 +19,6 @@ class Admin:
     def __init__(self, bot: NabBot):
         self.bot = bot
 
-    async def __error(self, ctx: NabCtx, error):
-        if isinstance(error, commands.BadArgument):
-            if not error.args:
-                await ctx.send(f"{ctx.tick(False)} The correct syntax is: "
-                               f"`{ctx.clean_prefix}{ctx.invoked_with} {ctx.usage}`")
-            else:
-                await ctx.send(error)
-
     @checks.is_owner()
     @checks.is_tracking_world()
     @commands.command(name="addaccount", aliases=["addacc"], usage="<user>,<character>")

diff --git a/cogs/general.py b/cogs/general.py
@@ -32,10 +32,6 @@ async def __error(self, ctx: NabCtx, error):
         if isinstance(error, BadTime):
             await ctx.send(error)
             return
-        if isinstance(error, commands.UserInputError):
-            await ctx.send(f"{ctx.tick(False)} The correct syntax is: "
-                           f"`{ctx.clean_prefix}{ctx.command.qualified_name} {ctx.usage}`.\n"
-                           f"Try `{ctx.clean_prefix}help {ctx.command.qualified_name}` for more info.")
 
     async def game_update(self):
         """Updates the bot's status.

diff --git a/cogs/info.py b/cogs/info.py
@@ -279,12 +279,10 @@ def repl(obj):
             await destination.send(page)
 
     @commands.guild_only()
-    @commands.command()
     @checks.can_embed()
+    @commands.command(usage=" ")
     async def serverinfo(self, ctx: NabCtx, server=None):
         """Shows the server's information.
-
-        The bot owner can additionally check the information of a specific server where the bot is.
         """
         if await checks.is_owner_check(ctx) and server is not None:
             try:

diff --git a/cogs/mod.py b/cogs/mod.py
@@ -95,7 +95,7 @@ async def ignore_list(self, ctx: NabCtx):
             await ctx.send(e)
 
     @commands.command()
-    @checks.is_mod_somewhere()
+    @checks.is_channel_mod_somewhere()
     async def makesay(self, ctx: NabCtx, *, message: str):
         """Makes the bot say a message.
 
@@ -104,6 +104,7 @@ async def makesay(self, ctx: NabCtx, *, message: str):
 
         If it's used on a private message, the bot will ask on which channel he should say the message.
         Each channel in the list is numerated, by choosing a number, the message will be sent in the chosen channel.
+        You can only send messages on channels where you have `Manage Channel` permissions.
         """
         if ctx.is_private:
             description_list = []
@@ -121,7 +122,8 @@ async def makesay(self, ctx: NabCtx, *, message: str):
                     author_permissions = author.permissions_in(channel)
                     bot_permissions = bot_member.permissions_in(channel)
                     # Check if both the author and the bot have permissions to send messages and add channel to list
-                    if author_permissions.send_messages and bot_permissions.send_messages:
+                    if author_permissions.send_messages and bot_permissions.send_messages \
+                            and author_permissions.manage_channels:
                         separator = ""
                         if prev_server is not server:
                             separator = "---------------\n\t"
@@ -131,7 +133,7 @@ async def makesay(self, ctx: NabCtx, *, message: str):
                         prev_server = server
                         num += 1
             if len(description_list) < 1:
-                await ctx.send("We don't have any channels where we both can send messages.")
+                await ctx.send("We don't have any channels where we both can send messages and that you manage.")
                 return
             await ctx.send("Choose a channel for me to send your message (number only): \n\t0: *Cancel*\n\t" +
                            "\n\t".join(["{0}".format(i) for i in description_list]))
@@ -154,6 +156,10 @@ def check(m):
             except asyncio.TimeoutError:
                 await ctx.send("... are you there? Fine, nevermind!")
         else:
+            if not ctx.bot_permissions.manage_messages:
+                return await ctx.send(f"{ctx.tick(False)} I need `Manage Messages` permission to use this command.")
+            if not ctx.author_permissions.manage_channels:
+                return await ctx.send(f"{ctx.tick(False)} You need `Manage Channel` permission to use this command.")
             await ctx.message.delete()
             await ctx.channel.send(message)
 
@@ -215,12 +221,6 @@ async def unregistered(self, ctx: NabCtx):
         except CannotPaginate as e:
             await ctx.send(e)
 
-    @ignore.error
-    @unignore.error
-    async def ignore_error(self, ctx, error):
-        if isinstance(error, commands.errors.BadArgument):
-            await ctx.send(error)
-
     def reload_ignored(self):
         """Refresh the world list from the database
 

diff --git a/cogs/tibia.py b/cogs/tibia.py
@@ -40,10 +40,6 @@ def __init__(self, bot: NabBot):
         self.bot = bot
         self.news_announcements_task = self.bot.loop.create_task(self.scan_news())
 
-    async def __error(self, ctx: NabCtx, error):
-        if isinstance(error, commands.UserInputError):
-            await self.bot.show_help(ctx)
-
     # Commands
     @commands.command(aliases=['bless'])
     async def blessings(self, ctx: NabCtx, level: int):
@@ -1789,9 +1785,9 @@ async def worlds(self, ctx: NabCtx, *, query=None):
         try:
             worlds = await get_world_list()
             if worlds is None:
-                return await ctx.send(f"{ctx.tick(False)} Something went wrong...'")
+                return await ctx.send(f"{ctx.tick(False)} Something went wrong...")
         except NetworkError:
-            return await ctx.send(f"{ctx.tick(False)} I'm having network errors, please try again later.'")
+            return await ctx.send(f"{ctx.tick(False)} I'm having network errors, please try again later.")
         if query is None:
             params = []
         else:

diff --git a/cogs/tibiawiki.py b/cogs/tibiawiki.py
@@ -28,12 +28,6 @@ class TibiaWiki:
     def __init__(self, bot: NabBot):
         self.bot = bot
 
-    async def __error(self, ctx, error):
-        if isinstance(error, commands.UserInputError):
-            cmd = ctx.bot.get_command('help')
-            command = ctx.command.qualified_name
-            await ctx.invoke(cmd, command=command)
-
     # Commands
     @checks.can_embed()
     @commands.command(aliases=["achiev"])

diff --git a/docs/README.md b/docs/README.md
@@ -4,7 +4,7 @@ The markdown files in this folder might contain markdown not supported by GitHub
 They are meant to be read from the static site generated by mkdocs.
 
 To view online:  
-https://galarzaa90.github.io/NabBot/
+https://nabdev.github.io/NabBot/
 
 To view locally:
 1. Install the required python modules:

diff --git a/docs/assets/images/commands/about.png b/docs/assets/images/commands/about.png
diff --git a/docs/assets/images/commands/achievement.png b/docs/assets/images/commands/achievement.png
diff --git a/docs/assets/images/commands/admins_message_2.png b/docs/assets/images/commands/admins_message_2.png
diff --git a/docs/assets/images/commands/autorole_add_1.png b/docs/assets/images/commands/autorole_add_1.png
diff --git a/docs/assets/images/commands/autorole_add_2.png b/docs/assets/images/commands/autorole_add_2.png
diff --git a/docs/assets/images/commands/autorole_list.png b/docs/assets/images/commands/autorole_list.png
diff --git a/docs/assets/images/commands/autorole_remove.png b/docs/assets/images/commands/autorole_remove.png
diff --git a/docs/assets/images/commands/bestiary_1.png b/docs/assets/images/commands/bestiary_1.png
diff --git a/docs/assets/images/commands/bestiary_2.png b/docs/assets/images/commands/bestiary_2.png
diff --git a/docs/assets/images/commands/bless_1.png b/docs/assets/images/commands/bless_1.png
diff --git a/docs/assets/images/commands/bless_2.png b/docs/assets/images/commands/bless_2.png
diff --git a/docs/assets/images/commands/botinfo.png b/docs/assets/images/commands/botinfo.png
diff --git a/docs/assets/images/commands/checkchannel.png b/docs/assets/images/commands/checkchannel.png
diff --git a/docs/assets/images/commands/choose.png b/docs/assets/images/commands/choose.png
diff --git a/docs/assets/images/commands/cleanup.png b/docs/assets/images/commands/cleanup.png
diff --git a/docs/assets/images/commands/commands.png b/docs/assets/images/commands/commands.png
diff --git a/docs/assets/images/commands/deaths_1.png b/docs/assets/images/commands/deaths_1.png
diff --git a/docs/assets/images/commands/deaths_mob.png b/docs/assets/images/commands/deaths_mob.png
diff --git a/docs/assets/images/commands/deaths_stats.png b/docs/assets/images/commands/deaths_stats.png
diff --git a/docs/assets/images/commands/deaths_user.png b/docs/assets/images/commands/deaths_user.png
diff --git a/docs/assets/images/commands/diagnose.png b/docs/assets/images/commands/diagnose.png
diff --git a/docs/assets/images/commands/emojiinfo_2.png b/docs/assets/images/commands/emojiinfo_2.png
diff --git a/docs/assets/images/commands/eval.png b/docs/assets/images/commands/eval.png
diff --git a/docs/assets/images/commands/event.png b/docs/assets/images/commands/event.png
diff --git a/docs/assets/images/commands/event_add.png b/docs/assets/images/commands/event_add.png
diff --git a/docs/assets/images/commands/event_info.png b/docs/assets/images/commands/event_info.png
diff --git a/docs/assets/images/commands/event_join.png b/docs/assets/images/commands/event_join.png
diff --git a/docs/assets/images/commands/event_leave.png b/docs/assets/images/commands/event_leave.png
diff --git a/docs/assets/images/commands/event_participants.png b/docs/assets/images/commands/event_participants.png
diff --git a/docs/assets/images/commands/event_remove.png b/docs/assets/images/commands/event_remove.png
diff --git a/docs/assets/images/commands/event_unsub.png b/docs/assets/images/commands/event_unsub.png
diff --git a/docs/assets/images/commands/group.png b/docs/assets/images/commands/group.png
diff --git a/docs/assets/images/commands/group_1.png b/docs/assets/images/commands/group_1.png
diff --git a/docs/assets/images/commands/group_2.png b/docs/assets/images/commands/group_2.png
diff --git a/docs/assets/images/commands/group_add.png b/docs/assets/images/commands/group_add.png
diff --git a/docs/assets/images/commands/group_list.png b/docs/assets/images/commands/group_list.png
diff --git a/docs/assets/images/commands/guild.png b/docs/assets/images/commands/guild.png
diff --git a/docs/assets/images/commands/guildmembers.png b/docs/assets/images/commands/guildmembers.png
diff --git a/docs/assets/images/commands/help_1.png b/docs/assets/images/commands/help_1.png
diff --git a/docs/assets/images/commands/help_2.png b/docs/assets/images/commands/help_2.png
diff --git a/docs/assets/images/commands/help_3.png b/docs/assets/images/commands/help_3.png
diff --git a/docs/assets/images/commands/highscores1.png b/docs/assets/images/commands/highscores1.png
diff --git a/docs/assets/images/commands/highscores3.png b/docs/assets/images/commands/highscores3.png
diff --git a/docs/assets/images/commands/house_1.png b/docs/assets/images/commands/house_1.png
diff --git a/docs/assets/images/commands/house_2.png b/docs/assets/images/commands/house_2.png
diff --git a/docs/assets/images/commands/im.png b/docs/assets/images/commands/im.png
diff --git a/docs/assets/images/commands/imbuement_1.png b/docs/assets/images/commands/imbuement_1.png
diff --git a/docs/assets/images/commands/imbuement_2.png b/docs/assets/images/commands/imbuement_2.png
diff --git a/docs/assets/images/commands/imnot.png b/docs/assets/images/commands/imnot.png
diff --git a/docs/assets/images/commands/item_1.png b/docs/assets/images/commands/item_1.png
diff --git a/docs/assets/images/commands/item_2.png b/docs/assets/images/commands/item_2.png
diff --git a/docs/assets/images/commands/key.png b/docs/assets/images/commands/key.png
diff --git a/docs/assets/images/commands/key_search_1.png b/docs/assets/images/commands/key_search_1.png
diff --git a/docs/assets/images/commands/key_search_2.png b/docs/assets/images/commands/key_search_2.png
diff --git a/docs/assets/images/commands/leave.png b/docs/assets/images/commands/leave.png
diff --git a/docs/assets/images/commands/levels_1.png b/docs/assets/images/commands/levels_1.png
diff --git a/docs/assets/images/commands/levels_user.png b/docs/assets/images/commands/levels_user.png
diff --git a/docs/assets/images/commands/load.png b/docs/assets/images/commands/load.png
diff --git a/docs/assets/images/commands/loot_input.png b/docs/assets/images/commands/loot_input.png
diff --git a/docs/assets/images/commands/loot_legend.png b/docs/assets/images/commands/loot_legend.png
diff --git a/docs/assets/images/commands/merge.png b/docs/assets/images/commands/merge.png
diff --git a/docs/assets/images/commands/monster_1.png b/docs/assets/images/commands/monster_1.png
diff --git a/docs/assets/images/commands/monster_2.png b/docs/assets/images/commands/monster_2.png
diff --git a/docs/assets/images/commands/news_1.png b/docs/assets/images/commands/news_1.png
diff --git a/docs/assets/images/commands/news_2.png b/docs/assets/images/commands/news_2.png
diff --git a/docs/assets/images/commands/noroles.png b/docs/assets/images/commands/noroles.png
diff --git a/docs/assets/images/commands/npc_1.png b/docs/assets/images/commands/npc_1.png
diff --git a/docs/assets/images/commands/npc_2.png b/docs/assets/images/commands/npc_2.png
diff --git a/docs/assets/images/commands/online.png b/docs/assets/images/commands/online.png
diff --git a/docs/assets/images/commands/permissions.png b/docs/assets/images/commands/permissions.png
diff --git a/docs/assets/images/commands/ping.png b/docs/assets/images/commands/ping.png
diff --git a/docs/assets/images/commands/quote.png b/docs/assets/images/commands/quote.png
diff --git a/docs/assets/images/commands/rashid.png b/docs/assets/images/commands/rashid.png
diff --git a/docs/assets/images/commands/reload.png b/docs/assets/images/commands/reload.png
diff --git a/docs/assets/images/commands/roleinfo.png b/docs/assets/images/commands/roleinfo.png
diff --git a/docs/assets/images/commands/rolemembers.png b/docs/assets/images/commands/rolemembers.png
diff --git a/docs/assets/images/commands/roles_1.png b/docs/assets/images/commands/roles_1.png
diff --git a/docs/assets/images/commands/roles_2.png b/docs/assets/images/commands/roles_2.png
diff --git a/docs/assets/images/commands/roll_1.png b/docs/assets/images/commands/roll_1.png
diff --git a/docs/assets/images/commands/roll_2.png b/docs/assets/images/commands/roll_2.png
diff --git a/docs/assets/images/commands/roll_3.png b/docs/assets/images/commands/roll_3.png
diff --git a/docs/assets/images/commands/searchteam_1.png b/docs/assets/images/commands/searchteam_1.png
diff --git a/docs/assets/images/commands/searchteam_2.png b/docs/assets/images/commands/searchteam_2.png
diff --git a/docs/assets/images/commands/searchteam_3.png b/docs/assets/images/commands/searchteam_3.png
diff --git a/docs/assets/images/commands/searchworld_1.png b/docs/assets/images/commands/searchworld_1.png
diff --git a/docs/assets/images/commands/searchworld_2.png b/docs/assets/images/commands/searchworld_2.png
diff --git a/docs/assets/images/commands/searchworld_3.png b/docs/assets/images/commands/searchworld_3.png
diff --git a/docs/assets/images/commands/searchworld_4.png b/docs/assets/images/commands/searchworld_4.png
diff --git a/docs/assets/images/commands/serverinfo.png b/docs/assets/images/commands/serverinfo.png
diff --git a/docs/assets/images/commands/servers.png b/docs/assets/images/commands/servers.png
diff --git a/docs/assets/images/commands/seteventschannel_1.png b/docs/assets/images/commands/seteventschannel_1.png
diff --git a/docs/assets/images/commands/seteventschannel_2.png b/docs/assets/images/commands/seteventschannel_2.png
diff --git a/docs/assets/images/commands/setlevelsdeathschannel_1.png b/docs/assets/images/commands/setlevelsdeathschannel_1.png
diff --git a/docs/assets/images/commands/setlevelsdeathschannel_2.png b/docs/assets/images/commands/setlevelsdeathschannel_2.png
diff --git a/docs/assets/images/commands/setwelcome_1.png b/docs/assets/images/commands/setwelcome_1.png
diff --git a/docs/assets/images/commands/setwelcome_2.png b/docs/assets/images/commands/setwelcome_2.png
diff --git a/docs/assets/images/commands/setworld_1.png b/docs/assets/images/commands/setworld_1.png
diff --git a/docs/assets/images/commands/setworld_2.png b/docs/assets/images/commands/setworld_2.png
diff --git a/docs/assets/images/commands/share_1.png b/docs/assets/images/commands/share_1.png
diff --git a/docs/assets/images/commands/share_2.png b/docs/assets/images/commands/share_2.png
diff --git a/docs/assets/images/commands/share_3.png b/docs/assets/images/commands/share_3.png
diff --git a/docs/assets/images/commands/share_4.png b/docs/assets/images/commands/share_4.png
diff --git a/docs/assets/images/commands/spell_1.png b/docs/assets/images/commands/spell_1.png
diff --git a/docs/assets/images/commands/spell_2.png b/docs/assets/images/commands/spell_2.png
diff --git a/docs/assets/images/commands/sql.png b/docs/assets/images/commands/sql.png
diff --git a/docs/assets/images/commands/stamina_1.png b/docs/assets/images/commands/stamina_1.png
diff --git a/docs/assets/images/commands/stamina_2.png b/docs/assets/images/commands/stamina_2.png
diff --git a/docs/assets/images/commands/stats_2.png b/docs/assets/images/commands/stats_2.png
diff --git a/docs/assets/images/commands/time.png b/docs/assets/images/commands/time.png
diff --git a/docs/assets/images/commands/time_add.png b/docs/assets/images/commands/time_add.png
diff --git a/docs/assets/images/commands/timeline_1.png b/docs/assets/images/commands/timeline_1.png
diff --git a/docs/assets/images/commands/unload.png b/docs/assets/images/commands/unload.png
diff --git a/docs/assets/images/commands/unregistered.png b/docs/assets/images/commands/unregistered.png
diff --git a/docs/assets/images/commands/uptime.png b/docs/assets/images/commands/uptime.png
diff --git a/docs/assets/images/commands/userinfo.png b/docs/assets/images/commands/userinfo.png
diff --git a/docs/assets/images/commands/versions.png b/docs/assets/images/commands/versions.png
diff --git a/docs/assets/images/commands/watched.png b/docs/assets/images/commands/watched.png
diff --git a/docs/assets/images/commands/watched_add.png b/docs/assets/images/commands/watched_add.png
diff --git a/docs/assets/images/commands/watched_guilds.png b/docs/assets/images/commands/watched_guilds.png
diff --git a/docs/assets/images/commands/watched_info.png b/docs/assets/images/commands/watched_info.png
diff --git a/docs/assets/images/commands/watched_list.png b/docs/assets/images/commands/watched_list.png
diff --git a/docs/assets/images/commands/watched_message_1.png b/docs/assets/images/commands/watched_message_1.png
diff --git a/docs/assets/images/commands/watched_remove.png b/docs/assets/images/commands/watched_remove.png
diff --git a/docs/assets/images/commands/watched_removeguild.png b/docs/assets/images/commands/watched_removeguild.png
diff --git a/docs/assets/images/commands/whois_1.png b/docs/assets/images/commands/whois_1.png
diff --git a/docs/assets/images/commands/whois_2.png b/docs/assets/images/commands/whois_2.png
diff --git a/docs/assets/images/commands/wikistats.png b/docs/assets/images/commands/wikistats.png
diff --git a/docs/assets/images/commands/worlds_1.png b/docs/assets/images/commands/worlds_1.png
diff --git a/docs/assets/images/commands/worlds_2.png b/docs/assets/images/commands/worlds_2.png
diff --git a/docs/assets/images/commands/worlds_3.png b/docs/assets/images/commands/worlds_3.png
diff --git a/docs/assets/images/icon.png b/docs/assets/images/icon.png
diff --git a/images/Unknown.png b/images/Unknown.png
diff --git a/images/emoji/axe.png b/images/emoji/axe.png
diff --git a/images/emoji/charms.png b/images/emoji/charms.png
diff --git a/images/emoji/club.png b/images/emoji/club.png
diff --git a/images/emoji/deathDamage.png b/images/emoji/deathDamage.png
diff --git a/images/emoji/difficultyOff.png b/images/emoji/difficultyOff.png
diff --git a/images/emoji/difficultyOn.png b/images/emoji/difficultyOn.png
diff --git a/images/emoji/distance.png b/images/emoji/distance.png
diff --git a/images/emoji/dnd.png b/images/emoji/dnd.png
diff --git a/images/emoji/energyDamage.png b/images/emoji/energyDamage.png
diff --git a/images/emoji/experience.png b/images/emoji/experience.png
diff --git a/images/emoji/false.png b/images/emoji/false.png
diff --git a/images/emoji/fishing.png b/images/emoji/fishing.png
diff --git a/images/emoji/fist.png b/images/emoji/fist.png
diff --git a/images/emoji/iceDamage.png b/images/emoji/iceDamage.png
diff --git a/images/emoji/idle.png b/images/emoji/idle.png
diff --git a/images/emoji/magic.png b/images/emoji/magic.png
diff --git a/images/emoji/ocurrenceOff.png b/images/emoji/ocurrenceOff.png
diff --git a/images/emoji/ocurrenceOn.png b/images/emoji/ocurrenceOn.png
diff --git a/images/emoji/offline.png b/images/emoji/offline.png
diff --git a/images/emoji/online.png b/images/emoji/online.png
diff --git a/images/emoji/physicalDamage.png b/images/emoji/physicalDamage.png
diff --git a/images/emoji/shield.png b/images/emoji/shield.png
diff --git a/images/emoji/sword.png b/images/emoji/sword.png
diff --git a/images/emoji/true.png b/images/emoji/true.png
diff --git a/images/emoji/warn.png b/images/emoji/warn.png
diff --git a/images/legend.png b/images/legend.png
diff --git a/images/slot.png b/images/slot.png
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -39,13 +39,13 @@ google_analytics:
 extra:
   social:
     - type: 'github'
-      link: 'https://github.com/galarzaa90'
+      link: 'https://github.com/NabDev'
     - type: 'gitlab'
-      link: 'https://gitlab.com/Galarzaa90'
+      link: 'https://gitlab.com/NabBot'
     - type: 'discord'
       link: 'https://discord.me/NabBot'
 
-repo_url: https://github.com/Galarzaa90/NabBot
+repo_url: https://github.com/NabDev/NabBot
 edit_uri: ""
 nav:
     - Home: index.md

diff --git a/nabbot.py b/nabbot.py
@@ -43,7 +43,7 @@ def __init__(self):
         # A list version is created from the dictionary
         self.tracked_worlds = {}
         self.tracked_worlds_list = []
-        self.__version__ = "1.6.0"
+        self.__version__ = "1.6.1"
         self.__min_discord__ = 1480
 
     async def on_ready(self):
@@ -115,6 +115,13 @@ async def on_command_error(self, ctx: context.NabCtx, error):
             await ctx.send(error)
         elif isinstance(error, CannotEmbed):
             await ctx.send(f"{ctx.tick(False)} Sorry, `Embed Links` permission is required for this command.")
+        elif isinstance(error, commands.MissingRequiredArgument):
+            await ctx.send(f"{ctx.tick(False)} The correct syntax is: "
+                           f"`{ctx.clean_prefix}{ctx.command.qualified_name} {ctx.usage}`.\n"
+                           f"Try `{ctx.clean_prefix}help {ctx.command.qualified_name}` for more info.")
+        elif isinstance(error, commands.BadArgument):
+            await ctx.send(f"{ctx.tick(False)} {error}\n"
+                           f"Try `{ctx.clean_prefix}help {ctx.command.qualified_name}` for more info.")
         elif isinstance(error, commands.CommandInvokeError):
             log.error(f"Exception in command: {ctx.message.clean_content}", exc_info=error.original)
             if isinstance(error.original, discord.HTTPException):
@@ -160,7 +167,6 @@ async def on_guild_join(self, guild: discord.Guild):
         except discord.HTTPException as e:
             log.error(f"Could not send join message on server: {guild.name}.", exc_info=e)
 
-
     async def on_guild_remove(self, guild: discord.Guild):
         """Called when the bot leaves a guild (server)."""
         log.info("Nab Bot left server: {0.name} (ID: {0.id})".format(guild))

diff --git a/utils/checks.py b/utils/checks.py
@@ -56,6 +56,23 @@ async def predicate(ctx):
     return commands.check(predicate)
 
 
+def is_channel_mod_somewhere():
+    """Checks if the author has manage guild permissions in any guild"""
+    async def predicate(ctx):
+        ret = await is_owner_check(ctx)
+        if ret:
+            return True
+        if ctx.guild is not None:
+            return await check_guild_permissions(ctx, {'manage_channels': True})
+        for guild in ctx.bot.get_user_guilds(ctx.author.id):
+            member = guild.get_member(ctx.author.id)
+            permissions = member.guild_permissions
+            if permissions.administrator or permissions.manage_channels:
+                return True
+        return False
+    return commands.check(predicate)
+
+
 def is_tracking_world():
     """Checks if the current server is tracking a tibia world
 

diff --git a/utils/pages.py b/utils/pages.py
@@ -353,7 +353,7 @@ async def from_bot(cls, ctx):
         def key(c):
             return c.cog_name or '\u200bMisc'
 
-        entries = sorted(ctx.bot.commands, key=key)
+        entries = sorted(sorted(ctx.bot.commands, key=lambda c: c.name), key=key)
         nested_pages = []
         per_page = 10
 

diff --git a/utils/tibia.py b/utils/tibia.py
@@ -1152,7 +1152,7 @@ async def get_world_list(tries=3) -> Optional[List[World]]:
 
     worlds = []
     try:
-        if not isinstance(json_content["worlds"], list):
+        if not isinstance(json_content["worlds"], dict):
             return
         for world in json_content["worlds"]["allworlds"]:
             try:
@@ -1161,7 +1161,8 @@ async def get_world_list(tries=3) -> Optional[List[World]]:
                 world["online"] = 0
             worlds.append(World(name=world["name"], online=world["online"], location=world["location"],
                                 pvp_type=world["worldtype"], online_count=world["online"]))
-    except KeyError:
+    except KeyError as e:
+        print(e)
         return
     CACHE_WORLD_LIST[0] = worlds
     return worlds