Merge branch 'master' of https://github.com/Pycord-Development/pycord

Author: BobDotCom

discord/commands/__init__.py

@@ -25,4 +25,5 @@
 
 from .commands import *
 from .context import *
-from .errors import *
+from .errors import *
+from .permissions import *

discord/commands/commands.py

@@ -58,6 +58,11 @@
     "ContextMenuCommand",
     "UserCommand",
     "MessageCommand",
+    "has_role",
+    "has_any_role",
+    "is_user",
+    "is_owner",
+    "permission",
 )
 
 def wrap_callback(coro):

discord/flags.py

@@ -459,15 +459,15 @@ def discord_certified_moderator(self):
 
     @flag_value
     def bot_http_interactions(self):
-        """:class:`bool`: Returns ``True`` if is a bot http interaction.
+        """:class:`bool`: Returns ``True`` if the bot has set an interactions endpoint url.
 
         .. versionadded:: 2.0
         """
         return UserFlags.bot_http_interactions.value
 
     @flag_value
     def spammer(self):
-        """:class:`bool`: Returns ``True`` if the user is flagged as spammer.
+        """:class:`bool`: Returns ``True`` if the user is disabled for being a spammer.
 
         .. versionadded:: 2.0
         """