From ac04f999cb63aba4c8f5abb4f38497ad9fb2ef3a Mon Sep 17 00:00:00 2001 From: Andrei Date: Wed, 1 May 2019 13:15:33 -0700 Subject: [PATCH 1/9] Add API Client support for kicking guild members --- disco/api/client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disco/api/client.py b/disco/api/client.py index 2437ff4..0993ea3 100644 --- a/disco/api/client.py +++ b/disco/api/client.py @@ -348,7 +348,7 @@ class APIClient(LoggingClass): self.http( Routes.GUILDS_MEMBERS_MODIFY, dict(guild=guild, member=member), - json=optional(**kwargs), + json=kwargs, headers=_reason_header(reason)) def guilds_members_roles_add(self, guild, member, role, reason=None): From 06a5e4921a266f479d6c56dd270cfde16c190744 Mon Sep 17 00:00:00 2001 From: Andrei Date: Wed, 1 May 2019 13:17:43 -0700 Subject: [PATCH 2/9] Add GuildMember.disconnect to disconnect a member from voice --- disco/types/guild.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/disco/types/guild.py b/disco/types/guild.py index b02091d..80149f2 100644 --- a/disco/types/guild.py +++ b/disco/types/guild.py @@ -222,6 +222,12 @@ class GuildMember(SlottedModel): else: self.client.api.guilds_members_modify(self.guild.id, self.user.id, nick=nickname or '', **kwargs) + def disconnect(self): + """ + Disconnects the member from voice (if they are connected). + """ + self.modify(channel_id=None) + def modify(self, **kwargs): self.client.api.guilds_members_modify(self.guild.id, self.user.id, **kwargs) From 9bcc9185e7faf1119155caaf0d524440b9748825 Mon Sep 17 00:00:00 2001 From: Justin <14909116+ThatGuyJustin@users.noreply.github.com> Date: Sat, 4 May 2019 13:12:14 -0400 Subject: [PATCH 3/9] Updating emoji cdn (#137) Apparently the /api endpoint stopped working, so updating to use the cdn link. --- disco/types/guild.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disco/types/guild.py b/disco/types/guild.py index 80149f2..929ee9f 100644 --- a/disco/types/guild.py +++ b/disco/types/guild.py @@ -75,7 +75,7 @@ class GuildEmoji(Emoji): @property def url(self): - return 'https://discordapp.com/api/emojis/{}.{}'.format(self.id, 'gif' if self.animated else 'png') + return 'https://cdn.discordapp.com/emojis/{}.{}'.format(self.id, 'gif' if self.animated else 'png') @cached_property def guild(self): From cec1afd17855685569e306ac7b83d98c6c86530a Mon Sep 17 00:00:00 2001 From: Justin <14909116+ThatGuyJustin@users.noreply.github.com> Date: Thu, 27 Jun 2019 13:07:49 -0400 Subject: [PATCH 4/9] Adding missing permissions (#144) - Add Reactions - View Audit Log - Priority Speaker (cherry picked from commit 4fb136ee085b9219ae57d844bfe0c4999ea33219) --- disco/types/permissions.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/disco/types/permissions.py b/disco/types/permissions.py index d11b08f..37f7e2a 100644 --- a/disco/types/permissions.py +++ b/disco/types/permissions.py @@ -7,6 +7,9 @@ Permissions = Enum( ADMINISTRATOR=1 << 3, MANAGE_CHANNELS=1 << 4, MANAGE_GUILD=1 << 5, + ADD_REACTIONS=1 << 6, + VIEW_AUDIT_LOG=1 << 7, + PRIORITY_SPEAKER=1 << 8, READ_MESSAGES=1 << 10, SEND_MESSAGES=1 << 11, SEND_TSS_MESSAGES=1 << 12, From 02c0051f755edac47f1e5c8d4e72bab55490bc26 Mon Sep 17 00:00:00 2001 From: One-Nub <38899321+One-Nub@users.noreply.github.com> Date: Sun, 6 Oct 2019 18:02:15 -0500 Subject: [PATCH 5/9] Defining a specific YAML loader (#155) As per using one of the "'sugar' methods" mentioned in https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation#how-to-disable-the-warning --- disco/util/serializer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/disco/util/serializer.py b/disco/util/serializer.py index de6264a..f842ecc 100644 --- a/disco/util/serializer.py +++ b/disco/util/serializer.py @@ -21,8 +21,8 @@ class Serializer(object): @staticmethod def yaml(): - from yaml import load, dump - return (load, dump) + from yaml import full_load, dump + return (full_load, dump) @staticmethod def pickle(): From a98cd1aac99e73940adce6b2ea9384e924f3868c Mon Sep 17 00:00:00 2001 From: Andrei Date: Sat, 2 Nov 2019 15:49:48 -0700 Subject: [PATCH 6/9] readme: remove invite url --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6d1413f..b71d8ac 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![PyPI](https://img.shields.io/pypi/v/disco-py.svg)](https://pypi.python.org/pypi/disco-py/) [![TravisCI](https://img.shields.io/travis/b1naryth1ef/disco.svg)](https://travis-ci.org/b1naryth1ef/disco/) -Disco is an extensive and extendable Python 2.x/3.x library for the [Discord API](https://discordapp.com/developers/docs/intro). Join the Official channel and chat [here](https://discord.gg/WMzzPec). Disco boasts the following major features: +Disco is an extensive and extendable Python 2.x/3.x library for the [Discord API](https://discordapp.com/developers/docs/intro). Disco boasts the following major features: - Expressive, functional interface that gets out of the way - Built for high-performance and efficiency From 31b688ab89d8b9558c2d2b1a4bba2a2119d3aa94 Mon Sep 17 00:00:00 2001 From: Oleg Butuzov Date: Wed, 20 Nov 2019 21:39:25 +0200 Subject: [PATCH 7/9] Added Long Description type (#166) In order to display long description properly at the pypi.org page we need to specify mime type `text/markdown` for the long desccription if readme is in markdown. Current https://pypi.org/project/disco-py/, doesn't looks nice atm. --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index eae8156..8d5224c 100644 --- a/setup.py +++ b/setup.py @@ -32,6 +32,7 @@ setup( license='MIT', description='A Python library for Discord', long_description=readme, + long_description_content_type="text/markdown", include_package_data=True, install_requires=requirements, extras_require=extras_require, From 9ffac51b1979bc74c0f004527e82256df664a9d9 Mon Sep 17 00:00:00 2001 From: Matt Carey Date: Sat, 7 Dec 2019 22:51:38 -0500 Subject: [PATCH 8/9] Fix typo (#169) `xsalsa20_poly1305_suffx` -> `xsalsa20_poly1305_suffix` --- disco/voice/udp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disco/voice/udp.py b/disco/voice/udp.py index c3fc05c..8b32080 100644 --- a/disco/voice/udp.py +++ b/disco/voice/udp.py @@ -234,7 +234,7 @@ class UDPVoiceClient(LoggingClass): if self.vc.mode == 'xsalsa20_poly1305_lite': nonce[:4] = data[-4:] data = data[:-4] - elif self.vc.mode == 'xsalsa20_poly1305_suffx': + elif self.vc.mode == 'xsalsa20_poly1305_suffix': nonce[:24] = data[-24:] data = data[:-24] elif self.vc.mode == 'xsalsa20_poly1305': From fd63334c82c7aeb338f61d39d1308a25929569ae Mon Sep 17 00:00:00 2001 From: "slicedlime (Mikael Hedberg)" Date: Fri, 20 Dec 2019 20:37:36 +0100 Subject: [PATCH 9/9] Support 'User (mention)' style mentions used by recent client updates (#171) * Support 'User (mention)' style mentions. * Remove conditional that should no longer be needed. (from PR feedback) --- disco/bot/bot.py | 5 ++--- disco/types/user.py | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/disco/bot/bot.py b/disco/bot/bot.py index 0679381..d8a3c1d 100644 --- a/disco/bot/bot.py +++ b/disco/bot/bot.py @@ -308,10 +308,9 @@ class Bot(LoggingClass): if msg.guild: member = msg.guild.get_member(self.client.state.me) if member: - # If nickname is set, filter both the normal and nick mentions - if member.nick: - content = content.replace(member.mention, '', 1) + # Filter both the normal and nick mentions content = content.replace(member.user.mention, '', 1) + content = content.replace(member.user.mention_nickname, '', 1) else: content = content.replace(self.client.state.me.mention, '', 1) elif mention_everyone: diff --git a/disco/types/user.py b/disco/types/user.py index 63e9542..974233c 100644 --- a/disco/types/user.py +++ b/disco/types/user.py @@ -44,6 +44,10 @@ class User(SlottedModel, with_equality('id'), with_hash('id')): def mention(self): return '<@{}>'.format(self.id) + @property + def mention_nickname(self): + return '<@!{}>'.format(self.id) + def open_dm(self): return self.client.api.users_me_dms_create(self.id)