From 968745341b937383d7e7f011f56bc8d110185839 Mon Sep 17 00:00:00 2001 From: Andrei Date: Wed, 12 Apr 2017 14:52:15 -0700 Subject: [PATCH] Create a non-authed client when using Webhook.from_url --- disco/api/http.py | 4 +++- disco/types/webhook.py | 9 ++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/disco/api/http.py b/disco/api/http.py index 5dff893..b8d7e03 100644 --- a/disco/api/http.py +++ b/disco/api/http.py @@ -189,13 +189,15 @@ class HTTPClient(LoggingClass): self.limiter = RateLimiter() self.headers = { - 'Authorization': 'Bot ' + token, 'User-Agent': 'DiscordBot (https://github.com/b1naryth1ef/disco {}) Python/{} requests/{}'.format( disco_version, py_version, requests_version), } + if token: + self.headers['Authorization'] = 'Bot ' + token + def __call__(self, route, args=None, **kwargs): return self.call(route, args, **kwargs) diff --git a/disco/types/webhook.py b/disco/types/webhook.py index e9c6080..aba55a5 100644 --- a/disco/types/webhook.py +++ b/disco/types/webhook.py @@ -19,7 +19,9 @@ class Webhook(SlottedModel): @classmethod def from_url(cls, url): - results = WEBHOOK_URL_RE.findall(url) + from disco.api.client import APIClient + + results = WEBHOOK_URL_RE.findall(url, client=APIClient(None)) if len(results) != 1: return Exception('Invalid Webhook URL') @@ -45,10 +47,11 @@ class Webhook(SlottedModel): else: return self.client.api.webhooks_modify(self.id, name, avatar) - def execute(self, content=None, username=None, avatar_url=None, tts=False, fobj=None, embeds=[], wait=False): + def execute(self, content=None, username=None, avatar_url=None, tts=False, fobj=None, embeds=[], wait=False, client=None): # TODO: support file stuff properly + client = client or self.client.api - return self.client.api.webhooks_token_execute(self.id, self.token, { + return client.webhooks_token_execute(self.id, self.token, { 'content': content, 'username': username, 'avatar_url': avatar_url,