Rename Server to Guild everywhere.

4 files changed, 36 insertions, 36 deletions

diff --git a/discord/ext/commands/bot.py b/discord/ext/commands/bot.py
index 1f4b355f..093f4a5d 100644
--- a/discord/ext/commands/bot.py
+++ b/discord/ext/commands/bot.py
@@ -55,9 +55,9 @@ def _get_variable(name):
 def when_mentioned(bot, msg):
     """A callable that implements a command prefix equivalent
     to being mentioned, e.g. ``@bot ``."""
-    server = msg.server
-    if server is not None:
-        return '{0.me.mention} '.format(server)
+    guild = msg.guild
+    if guild is not None:
+        return '{0.me.mention} '.format(guild)
     return '{0.user.mention} '.format(bot)
 
 def when_mentioned_or(*prefixes):
diff --git a/discord/ext/commands/converter.py b/discord/ext/commands/converter.py
index b57e9436..eb1023b0 100644
--- a/discord/ext/commands/converter.py
+++ b/discord/ext/commands/converter.py
@@ -35,10 +35,10 @@ __all__ = [ 'Converter', 'MemberConverter', 'UserConverter',
             'ChannelConverter', 'InviteConverter', 'RoleConverter',
             'GameConverter', 'ColourConverter' ]
 
-def _get_from_servers(bot, getter, argument):
+def _get_from_guilds(bot, getter, argument):
     result = None
-    for server in bot.servers:
-        result = getattr(server, getter)(argument)
+    for guild in bot.guilds:
+        result = getattr(guild, getter)(argument)
         if result:
             return result
     return result
@@ -81,20 +81,20 @@ class MemberConverter(IDConverter):
         message = self.ctx.message
         bot = self.ctx.bot
         match = self._get_id_match() or re.match(r'<@!?([0-9]+)>$', self.argument)
-        server = message.server
+        guild = message.guild
         result = None
         if match is None:
             # not a mention...
-            if server:
-                result = server.get_member_named(self.argument)
+            if guild:
+                result = guild.get_member_named(self.argument)
             else:
-                result = _get_from_servers(bot, 'get_member_named', self.argument)
+                result = _get_from_guilds(bot, 'get_member_named', self.argument)
         else:
             user_id = int(match.group(1))
-            if server:
-                result = server.get_member(user_id)
+            if guild:
+                result = guild.get_member(user_id)
             else:
-                result = _get_from_servers(bot, 'get_member', user_id)
+                result = _get_from_guilds(bot, 'get_member', user_id)
 
         if result is None:
             raise BadArgument('Member "{}" not found'.format(self.argument))
@@ -110,19 +110,19 @@ class ChannelConverter(IDConverter):
 
         match = self._get_id_match() or re.match(r'<#([0-9]+)>$', self.argument)
         result = None
-        server = message.server
+        guild = message.guild
         if match is None:
             # not a mention
-            if server:
-                result = discord.utils.get(server.channels, name=self.argument)
+            if guild:
+                result = discord.utils.get(guild.channels, name=self.argument)
             else:
                 result = discord.utils.get(bot.get_all_channels(), name=self.argument)
         else:
             channel_id = int(match.group(1))
-            if server:
-                result = server.get_channel(channel_id)
+            if guild:
+                result = guild.get_channel(channel_id)
             else:
-                result = _get_from_servers(bot, 'get_channel', channel_id)
+                result = _get_from_guilds(bot, 'get_channel', channel_id)
 
         if result is None:
             raise BadArgument('Channel "{}" not found.'.format(self.argument))
@@ -146,13 +146,13 @@ class ColourConverter(Converter):
 
 class RoleConverter(IDConverter):
     def convert(self):
-        server = self.ctx.message.server
-        if not server:
+        guild = self.ctx.message.guild
+        if not guild:
             raise NoPrivateMessage()
 
         match = self._get_id_match() or re.match(r'<@&([0-9]+)>$', self.argument)
         params = dict(id=int(match.group(1))) if match else dict(name=self.argument)
-        result = discord.utils.get(server.roles, **params)
+        result = discord.utils.get(guild.roles, **params)
         if result is None:
             raise BadArgument('Role "{}" not found.'.format(self.argument))
         return result
@@ -178,11 +178,11 @@ class EmojiConverter(IDConverter):
 
         match = self._get_id_match() or re.match(r'<:[a-zA-Z0-9]+:([0-9]+)>$', self.argument)
         result = None
-        server = message.server
+        guild = message.guild
         if match is None:
-            # Try to get the emoji by name. Try local server first.
-            if server:
-                result = discord.utils.get(server.emojis, name=self.argument)
+            # Try to get the emoji by name. Try local guild first.
+            if guild:
+                result = discord.utils.get(guild.emojis, name=self.argument)
 
             if result is None:
                 result = discord.utils.get(bot.get_all_emojis(), name=self.argument)
@@ -190,8 +190,8 @@ class EmojiConverter(IDConverter):
             emoji_id = int(match.group(1))
 
             # Try to look up emoji by id.
-            if server:
-                result = discord.utils.get(server.emojis, id=emoji_id)
+            if guild:
+                result = discord.utils.get(guild.emojis, id=emoji_id)
 
             if result is None:
                 result = discord.utils.get(bot.get_all_emojis(), id=emoji_id)
diff --git a/discord/ext/commands/cooldowns.py b/discord/ext/commands/cooldowns.py
index fb1fe51a..52a5be30 100644
--- a/discord/ext/commands/cooldowns.py
+++ b/discord/ext/commands/cooldowns.py
@@ -31,7 +31,7 @@ __all__ = ['BucketType', 'Cooldown', 'CooldownMapping']
 class BucketType(enum.Enum):
     default = 0
     user    = 1
-    server  = 2
+    guild  = 2
     channel = 3
 
 class Cooldown:
@@ -97,8 +97,8 @@ class CooldownMapping:
         bucket_type = self._cooldown.type
         if bucket_type is BucketType.user:
             return msg.author.id
-        elif bucket_type is BucketType.server:
-            return getattr(msg.server, 'id', msg.author.id)
+        elif bucket_type is BucketType.guild:
+            return getattr(msg.guild, 'id', msg.author.id)
         elif bucket_type is BucketType.channel:
             return msg.channel.id
 
diff --git a/discord/ext/commands/core.py b/discord/ext/commands/core.py
index e3f7148f..8ae3262e 100644
--- a/discord/ext/commands/core.py
+++ b/discord/ext/commands/core.py
@@ -847,7 +847,7 @@ def bot_has_role(name):
         ch = ctx.message.channel
         if ch.is_private:
             return False
-        me = ch.server.me
+        me = ch.guild.me
         role = discord.utils.get(me.roles, name=name)
         return role is not None
     return check(predicate)
@@ -860,7 +860,7 @@ def bot_has_any_role(*names):
         ch = ctx.message.channel
         if ch.is_private:
             return False
-        me = ch.server.me
+        me = ch.guild.me
         getter = functools.partial(discord.utils.get, me.roles)
         return any(getter(name=name) is not None for name in names)
     return check(predicate)
@@ -871,7 +871,7 @@ def bot_has_permissions(**perms):
     """
     def predicate(ctx):
         ch = ctx.message.channel
-        me = ch.server.me if not ch.is_private else ctx.bot.user
+        me = ch.guild.me if not ch.is_private else ctx.bot.user
         permissions = ch.permissions_for(me)
         return all(getattr(permissions, perm, None) == value for perm, value in perms.items())
     return check(predicate)
@@ -882,13 +882,13 @@ def cooldown(rate, per, type=BucketType.default):
 
     A cooldown allows a command to only be used a specific amount
     of times in a specific time frame. These cooldowns can be based
-    either on a per-server, per-channel, per-user, or global basis.
+    either on a per-guild, per-channel, per-user, or global basis.
     Denoted by the third argument of ``type`` which must be of enum
     type ``BucketType`` which could be either:
 
     - ``BucketType.default`` for a global basis.
     - ``BucketType.user`` for a per-user basis.
-    - ``BucketType.server`` for a per-server basis.
+    - ``BucketType.guild`` for a per-guild basis.
     - ``BucketType.channel`` for a per-channel basis.
 
     If a cooldown is triggered, then :exc:`CommandOnCooldown` is triggered in