aboutsummaryrefslogtreecommitdiff
path: root/discord/role.py
diff options
context:
space:
mode:
authorRapptz <[email protected]>2016-06-01 19:27:48 -0400
committerRapptz <[email protected]>2016-06-01 19:27:48 -0400
commit5016f120795cdd27f56f9949ff668accdc8d076c (patch)
tree65456fe25f1c6b1d9eebf0152af961c0a20b42d9 /discord/role.py
parentUpdate voice client main ws references when reconnecting. (diff)
downloaddiscord.py-5016f120795cdd27f56f9949ff668accdc8d076c.tar.xz
discord.py-5016f120795cdd27f56f9949ff668accdc8d076c.zip
Add Role.server attribute.
This breaks events that expected a server parameter for the role events.
Diffstat (limited to 'discord/role.py')
-rw-r--r--discord/role.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/discord/role.py b/discord/role.py
index 84cd9fbb..678d4d1f 100644
--- a/discord/role.py
+++ b/discord/role.py
@@ -54,6 +54,8 @@ class Role(Hashable):
The name of the role.
permissions : :class:`Permissions`
Represents the role's permissions.
+ server : :class:`Server`
+ The server the role belongs to.
colour : :class:`Colour`
Represents the role colour. An alias exists under ``color``.
hoist : bool
@@ -68,10 +70,10 @@ class Role(Hashable):
"""
__slots__ = ['id', 'name', 'permissions', 'color', 'colour', 'position',
- 'managed', 'mentionable', '_is_everyone', 'hoist' ]
+ 'managed', 'mentionable', 'hoist', 'server' ]
def __init__(self, **kwargs):
- self._is_everyone = kwargs.get('everyone', False)
+ self.server = kwargs.pop('server')
self._update(**kwargs)
def __str__(self):
@@ -87,13 +89,11 @@ class Role(Hashable):
self.managed = kwargs.get('managed', False)
self.mentionable = kwargs.get('mentionable', False)
self.color = self.colour
- if 'everyone' in kwargs:
- self._is_everyone = kwargs['everyone']
@property
def is_everyone(self):
"""Checks if the role is the @everyone role."""
- return self._is_everyone
+ return self.server.id == self.id
@property
def created_at(self):