Skip to content
This repository has been archived by the owner on Aug 1, 2021. It is now read-only.

Commit

Permalink
Clean up some interfaces
Browse files Browse the repository at this point in the history
  • Loading branch information
b1naryth1ef committed Aug 23, 2017
1 parent 9e70c54 commit 530a79f
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 27 deletions.
9 changes: 5 additions & 4 deletions disco/types/channel.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,17 @@ def compiled(self):
value += self.allow
return value

def save(self):
def save(self, **kwargs):
self.client.api.channels_permissions_modify(self.channel_id,
self.id,
self.allow.value or 0,
self.deny.value or 0,
self.type.name)
self.type.name,
**kwargs)
return self

def delete(self):
self.client.api.channels_permissions_delete(self.channel_id, self.id)
def delete(self, **kwargs):
self.client.api.channels_permissions_delete(self.channel_id, self.id, **kwargs)


class Channel(SlottedModel, Permissible):
Expand Down
46 changes: 23 additions & 23 deletions disco/types/guild.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ def __str__(self):
def update(self, **kwargs):
return self.client.api.guilds_emojis_modify(self.guild_id, self.id, **kwargs)

def delete(self):
return self.client.api.guilds_emojis_delete(self.guild_id, self.id)
def delete(self, **kwargs):
return self.client.api.guilds_emojis_delete(self.guild_id, self.id, **kwargs)

@property
def url(self):
Expand Down Expand Up @@ -113,8 +113,8 @@ class Role(SlottedModel):
def __str__(self):
return self.name

def delete(self):
self.guild.delete_role(self)
def delete(self, **kwargs):
self.guild.delete_role(self, **kwargs)

def update(self, *args, **kwargs):
self.guild.update_role(self, *args, **kwargs)
Expand Down Expand Up @@ -182,13 +182,13 @@ def get_voice_state(self):
"""
return self.guild.get_voice_state(self)

def kick(self):
def kick(self, **kwargs):
"""
Kicks the member from the guild.
"""
self.client.api.guilds_members_kick(self.guild.id, self.user.id)
self.client.api.guilds_members_kick(self.guild.id, self.user.id, **kwargs)

def ban(self, delete_message_days=0):
def ban(self, delete_message_days=0, **kwargs):
"""
Bans the member from the guild.
Expand All @@ -197,15 +197,15 @@ def ban(self, delete_message_days=0):
delete_message_days : int
The number of days to retroactively delete messages for.
"""
self.guild.create_ban(self, delete_message_days)
self.guild.create_ban(self, delete_message_days, **kwargs)

def unban(self):
def unban(self, **kwargs):
"""
Unbans the member from the guild.
"""
self.guild.delete_ban(self)
self.guild.delete_ban(self, **kwargs)

def set_nickname(self, nickname=None):
def set_nickname(self, nickname=None, **kwargs):
"""
Sets the member's nickname (or clears it if None).
Expand All @@ -215,18 +215,18 @@ def set_nickname(self, nickname=None):
The nickname (or none to reset) to set.
"""
if self.client.state.me.id == self.user.id:
self.client.api.guilds_members_me_nick(self.guild.id, nick=nickname or '')
self.client.api.guilds_members_me_nick(self.guild.id, nick=nickname or '', **kwargs)
else:
self.client.api.guilds_members_modify(self.guild.id, self.user.id, nick=nickname or '')
self.client.api.guilds_members_modify(self.guild.id, self.user.id, nick=nickname or '', **kwargs)

def modify(self, **kwargs):
self.client.api.guilds_members_modify(self.guild.id, self.user.id, **kwargs)

def add_role(self, role):
self.client.api.guilds_members_roles_add(self.guild.id, self.user.id, to_snowflake(role))
def add_role(self, role, **kwargs):
self.client.api.guilds_members_roles_add(self.guild.id, self.user.id, to_snowflake(role), **kwargs)

def remove_role(self, role):
self.client.api.guilds_members_roles_remove(self.guild.id, self.user.id, to_snowflake(role))
def remove_role(self, role, **kwargs):
self.client.api.guilds_members_roles_remove(self.guild.id, self.user.id, to_snowflake(role), **kwargs)

@cached_property
def owner(self):
Expand Down Expand Up @@ -396,7 +396,7 @@ def get_member(self, user):

return self.members.get(user)

def create_role(self):
def create_role(self, **kwargs):
"""
Create a new role.
Expand All @@ -405,13 +405,13 @@ def create_role(self):
:class:`Role`
The newly created role.
"""
return self.client.api.guilds_roles_create(self.id)
return self.client.api.guilds_roles_create(self.id, **kwargs)

def delete_role(self, role):
def delete_role(self, role, **kwargs):
"""
Delete a role.
"""
self.client.api.guilds_roles_delete(self.id, to_snowflake(role))
self.client.api.guilds_roles_delete(self.id, to_snowflake(role), **kwargs)

def update_role(self, role, **kwargs):
if 'permissions' in kwargs and isinstance(kwargs['permissions'], PermissionValue):
Expand All @@ -433,8 +433,8 @@ def sync(self):
def get_bans(self):
return self.client.api.guilds_bans_list(self.id)

def delete_ban(self, user):
self.client.api.guilds_bans_delete(self.id, to_snowflake(user))
def delete_ban(self, user, **kwargs):
self.client.api.guilds_bans_delete(self.id, to_snowflake(user), **kwargs)

def create_ban(self, user, *args, **kwargs):
self.client.api.guilds_bans_create(self.id, to_snowflake(user), *args, **kwargs)
Expand Down

0 comments on commit 530a79f

Please sign in to comment.