Browse Source

naming and create guilds args

pull/138/head
Luke 6 years ago
parent
commit
a6730be3cf
  1. 16
      disco/api/client.py
  2. 4
      disco/api/http.py
  3. 4
      disco/types/guild.py

16
disco/api/client.py

@ -298,13 +298,13 @@ class APIClient(LoggingClass):
verification_level=None, verification_level=None,
default_message_notifications=None, default_message_notifications=None,
explicit_content_filter=None, explicit_content_filter=None,
roles=[], roles=None,
channels=[]): channels=None):
payload = { payload = {
'name': name, 'name': name,
'roles': [i.to_dict() for i in roles], 'roles': (roles or []),
'channels': [i.to_dict() for i in channels], 'channels': (channels or []),
} }
payload.update(optional( payload.update(optional(
@ -416,8 +416,8 @@ class APIClient(LoggingClass):
r = self.http(Routes.GUILDS_BANS_LIST, dict(guild=guild)) r = self.http(Routes.GUILDS_BANS_LIST, dict(guild=guild))
return GuildBan.create_hash(self.client, 'user.id', r.json()) return GuildBan.create_hash(self.client, 'user.id', r.json())
def guilds_ban_get(self, guild, user): def guilds_bans_get(self, guild, user):
r = self.http(Routes.GUILDS_BAN_GET, dict(guild=guild, user=user)) r = self.http(Routes.GUILDS_BANS_GET, dict(guild=guild, user=user))
return GuildBan.create(self.client, r.json()) return GuildBan.create(self.client, r.json())
def guilds_bans_create(self, guild, user, delete_message_days=0, reason=None): def guilds_bans_create(self, guild, user, delete_message_days=0, reason=None):
@ -504,8 +504,8 @@ class APIClient(LoggingClass):
r = self.http(Routes.GUILDS_WEBHOOKS_LIST, dict(guild=guild)) r = self.http(Routes.GUILDS_WEBHOOKS_LIST, dict(guild=guild))
return Webhook.create_map(self.client, r.json()) return Webhook.create_map(self.client, r.json())
def guilds_emoji_get(self, guild, emoji): def guilds_emojis_get(self, guild, emoji):
r = self.http(Routes.GUILDS_EMOJI_GET, dict(guild=guild, emoji=emoji)) r = self.http(Routes.GUILDS_EMOJIS_GET, dict(guild=guild, emoji=emoji))
return GuildEmoji.create(self.client, r.json()) return GuildEmoji.create(self.client, r.json())
def guilds_emojis_list(self, guild): def guilds_emojis_list(self, guild):

4
disco/api/http.py

@ -80,7 +80,7 @@ class Routes(object):
GUILDS_MEMBERS_KICK = (HTTPMethod.DELETE, GUILDS + '/members/{member}') GUILDS_MEMBERS_KICK = (HTTPMethod.DELETE, GUILDS + '/members/{member}')
GUILDS_MEMBERS_ADD = (HTTPMethod.PUT, GUILDS + '/members/{member}') GUILDS_MEMBERS_ADD = (HTTPMethod.PUT, GUILDS + '/members/{member}')
GUILDS_BANS_LIST = (HTTPMethod.GET, GUILDS + '/bans') GUILDS_BANS_LIST = (HTTPMethod.GET, GUILDS + '/bans')
GUILDS_BAN_GET = (HTTPMethod.GET, GUILDS + '/bans/{user}') GUILDS_BANS_GET = (HTTPMethod.GET, GUILDS + '/bans/{user}')
GUILDS_BANS_CREATE = (HTTPMethod.PUT, GUILDS + '/bans/{user}') GUILDS_BANS_CREATE = (HTTPMethod.PUT, GUILDS + '/bans/{user}')
GUILDS_BANS_DELETE = (HTTPMethod.DELETE, GUILDS + '/bans/{user}') GUILDS_BANS_DELETE = (HTTPMethod.DELETE, GUILDS + '/bans/{user}')
GUILDS_ROLES_LIST = (HTTPMethod.GET, GUILDS + '/roles') GUILDS_ROLES_LIST = (HTTPMethod.GET, GUILDS + '/roles')
@ -103,7 +103,7 @@ class Routes(object):
GUILDS_WEBHOOKS_LIST = (HTTPMethod.GET, GUILDS + '/webhooks') GUILDS_WEBHOOKS_LIST = (HTTPMethod.GET, GUILDS + '/webhooks')
GUILDS_EMOJIS_LIST = (HTTPMethod.GET, GUILDS + '/emojis') GUILDS_EMOJIS_LIST = (HTTPMethod.GET, GUILDS + '/emojis')
GUILDS_EMOJIS_CREATE = (HTTPMethod.POST, GUILDS + '/emojis') GUILDS_EMOJIS_CREATE = (HTTPMethod.POST, GUILDS + '/emojis')
GUILDS_EMOJI_GET = (HTTPMethod.GET, GUILDS + '/emojis/{emoji}') GUILDS_EMOJIS_GET = (HTTPMethod.GET, GUILDS + '/emojis/{emoji}')
GUILDS_EMOJIS_MODIFY = (HTTPMethod.PATCH, GUILDS + '/emojis/{emoji}') GUILDS_EMOJIS_MODIFY = (HTTPMethod.PATCH, GUILDS + '/emojis/{emoji}')
GUILDS_EMOJIS_DELETE = (HTTPMethod.DELETE, GUILDS + '/emojis/{emoji}') GUILDS_EMOJIS_DELETE = (HTTPMethod.DELETE, GUILDS + '/emojis/{emoji}')
GUILDS_AUDITLOGS_LIST = (HTTPMethod.GET, GUILDS + '/audit-logs') GUILDS_AUDITLOGS_LIST = (HTTPMethod.GET, GUILDS + '/audit-logs')

4
disco/types/guild.py

@ -435,7 +435,7 @@ class Guild(SlottedModel, Permissible):
return self.client.api.guilds_bans_list(self.id) return self.client.api.guilds_bans_list(self.id)
def get_ban(self, user): def get_ban(self, user):
return self.client.api.guilds_ban_get(self.id, user) return self.client.api.guilds_bans_get(self.id, user)
def delete_ban(self, user, **kwargs): def delete_ban(self, user, **kwargs):
self.client.api.guilds_bans_delete(self.id, to_snowflake(user), **kwargs) self.client.api.guilds_bans_delete(self.id, to_snowflake(user), **kwargs)
@ -505,7 +505,7 @@ class Guild(SlottedModel, Permissible):
return self.client.api.guilds_emojis_list(self.id) return self.client.api.guilds_emojis_list(self.id)
def get_emoji(self, emoji): def get_emoji(self, emoji):
return self.client.api.guilds_emoji_get(self.id, emoji) return self.client.api.guilds_emojis_get(self.id, emoji)
def get_icon_url(self, fmt='webp', size=1024): def get_icon_url(self, fmt='webp', size=1024):
if not self.icon: if not self.icon:

Loading…
Cancel
Save