aboutsummaryrefslogtreecommitdiff
path: root/discord/emoji.py
diff options
context:
space:
mode:
authorRapptz <[email protected]>2016-10-17 18:25:23 -0400
committerRapptz <[email protected]>2017-01-03 09:51:54 -0500
commitd1d54a468a88323a8ef7798ff084a1371d5893ec (patch)
tree21dd315df95acd2c8d6cf63cc51fa4cadc0c7155 /discord/emoji.py
parentStateful Message and remove Invite.xkcd since it is removed. (diff)
downloaddiscord.py-d1d54a468a88323a8ef7798ff084a1371d5893ec.tar.xz
discord.py-d1d54a468a88323a8ef7798ff084a1371d5893ec.zip
Rename Server to Guild everywhere.
Diffstat (limited to 'discord/emoji.py')
-rw-r--r--discord/emoji.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/discord/emoji.py b/discord/emoji.py
index 65a276db..9e90bff6 100644
--- a/discord/emoji.py
+++ b/discord/emoji.py
@@ -62,16 +62,16 @@ class Emoji(Hashable):
If colons are required to use this emoji in the client (:PJSalt: vs PJSalt).
managed: bool
If this emoji is managed by a Twitch integration.
- server: :class:`Server`
- The server the emoji belongs to.
+ guild: :class:`Guild`
+ The guild the emoji belongs to.
roles: List[:class:`Role`]
A list of :class:`Role` that is allowed to use this emoji. If roles is empty,
the emoji is unrestricted.
"""
- __slots__ = ('require_colons', 'managed', 'id', 'name', 'roles', 'server', '_state')
+ __slots__ = ('require_colons', 'managed', 'id', 'name', 'roles', 'guild', '_state')
- def __init__(self, *, server, state, data):
- self.server = server
+ def __init__(self, *, guild, state, data):
+ self.guild = guild
self._state = state
self._from_data(data)
@@ -83,7 +83,7 @@ class Emoji(Hashable):
self.roles = emoji.get('roles', [])
if self.roles:
roles = set(self.roles)
- self.roles = [role for role in self.server.roles if role.id in roles]
+ self.roles = [role for role in self.guild.roles if role.id in roles]
def _iterator(self):
for attr in self.__slots__: