Remove _get_guild_id from Messageable ABC.

7 files changed, 11 insertions, 39 deletions

diff --git a/discord/abc.py b/discord/abc.py
index d2ef45fe..2a85d7f2 100644
--- a/discord/abc.py
+++ b/discord/abc.py
@@ -467,10 +467,6 @@ class Messageable(metaclass=abc.ABCMeta):
     def _get_channel(self):
         raise NotImplementedError
 
-    @abc.abstractmethod
-    def _get_guild_id(self):
-        raise NotImplementedError
-
     @asyncio.coroutine
     def send(self, content=None, *, tts=False, embed=None, file=None, filename=None, delete_after=None):
         """|coro|
@@ -531,7 +527,6 @@ class Messageable(metaclass=abc.ABCMeta):
         """
 
         channel = yield from self._get_channel()
-        guild_id = self._get_guild_id()
         state = self._state
         content = str(content) if content is not None else None
         if embed is not None:
@@ -546,10 +541,10 @@ class Messageable(metaclass=abc.ABCMeta):
             except TypeError:
                 buffer = file
 
-            data = yield from state.http.send_file(channel.id, buffer, guild_id=guild_id, filename=filename,
-                                                   content=content, tts=tts, embed=embed)
+            data = yield from state.http.send_file(channel.id, buffer, filename=filename, content=content,
+                                                   tts=tts, embed=embed)
         else:
-            data = yield from state.http.send_message(channel.id, content, guild_id=guild_id, tts=tts, embed=embed)
+            data = yield from state.http.send_message(channel.id, content, tts=tts, embed=embed)
 
         ret = state.create_message(channel=channel, data=data)
         if delete_after is not None:
@@ -657,9 +652,8 @@ class Messageable(metaclass=abc.ABCMeta):
 
         message_ids = [m.id for m in messages]
         channel = yield from self._get_channel()
-        guild_id = self._get_guild_id()
 
-        yield from self._state.http.delete_messages(channel.id, message_ids, guild_id)
+        yield from self._state.http.delete_messages(channel.id, message_ids)
 
     @asyncio.coroutine
     def pins(self):
diff --git a/discord/channel.py b/discord/channel.py
index 238e235b..6f4c5659 100644
--- a/discord/channel.py
+++ b/discord/channel.py
@@ -92,9 +92,6 @@ class TextChannel(discord.abc.Messageable, discord.abc.GuildChannel, Hashable):
     def _get_channel(self):
         return self
 
-    def _get_guild_id(self):
-        return self.guild.id
-
     def permissions_for(self, member):
         base = super().permissions_for(member)
 
@@ -285,9 +282,6 @@ class DMChannel(discord.abc.Messageable, Hashable):
     def _get_channel(self):
         return self
 
-    def _get_guild_id(self):
-        return None
-
     def __str__(self):
         return 'Direct Message with %s' % self.recipient
 
@@ -384,9 +378,6 @@ class GroupChannel(discord.abc.Messageable, Hashable):
     def _get_channel(self):
         return self
 
-    def _get_guild_id(self):
-        return None
-
     def __str__(self):
         if self.name:
             return self.name
diff --git a/discord/ext/commands/context.py b/discord/ext/commands/context.py
index c1d120f3..1ac4ddff 100644
--- a/discord/ext/commands/context.py
+++ b/discord/ext/commands/context.py
@@ -126,10 +126,6 @@ class Context(discord.abc.Messageable):
     def _get_channel(self):
         return self.channel
 
-    def _get_guild_id(self):
-        g = self.guild
-        return g.id if g is not None else None
-
     @property
     def cog(self):
         """Returns the cog associated with this context's command. None if it does not exist."""
diff --git a/discord/http.py b/discord/http.py
index ca02a023..f2d32e05 100644
--- a/discord/http.py
+++ b/discord/http.py
@@ -287,9 +287,7 @@ class HTTPClient:
 
         return self.request(Route('POST', '/users/@me/channels'), json=payload)
 
-    # TODO: remove guild_id parameters here
-
-    def send_message(self, channel_id, content, *, guild_id=None, tts=False, embed=None):
+    def send_message(self, channel_id, content, *, tts=False, embed=None):
         r = Route('POST', '/channels/{channel_id}/messages', channel_id=channel_id)
         payload = {
             'nonce': random_integer(-2**63, 2**63 - 1)
@@ -309,7 +307,7 @@ class HTTPClient:
     def send_typing(self, channel_id):
         return self.request(Route('POST', '/channels/{channel_id}/typing', channel_id=channel_id))
 
-    def send_file(self, channel_id, buffer, *, guild_id=None, filename=None, content=None, tts=False, embed=None):
+    def send_file(self, channel_id, buffer, *, filename=None, content=None, tts=False, embed=None):
         r = Route('POST', '/channels/{channel_id}/messages', channel_id=channel_id)
         form = aiohttp.FormData()
 
@@ -324,12 +322,12 @@ class HTTPClient:
 
         return self.request(r, data=form)
 
-    def delete_message(self, channel_id, message_id, guild_id=None):
+    def delete_message(self, channel_id, message_id):
         r = Route('DELETE', '/channels/{channel_id}/messages/{message_id}', channel_id=channel_id,
                                                                             message_id=message_id)
         return self.request(r)
 
-    def delete_messages(self, channel_id, message_ids, guild_id=None):
+    def delete_messages(self, channel_id, message_ids):
         r = Route('POST', '/channels/{channel_id}/messages/bulk_delete', channel_id=channel_id)
         payload = {
             'messages': message_ids
@@ -337,7 +335,7 @@ class HTTPClient:
 
         return self.request(r, json=payload)
 
-    def edit_message(self, message_id, channel_id, content, *, guild_id=None, embed=None):
+    def edit_message(self, message_id, channel_id, content, *, embed=None):
         r = Route('PATCH', '/channels/{channel_id}/messages/{message_id}', channel_id=channel_id,
                                                                            message_id=message_id)
         payload = {}
diff --git a/discord/member.py b/discord/member.py
index 5201bc41..97c9c254 100644
--- a/discord/member.py
+++ b/discord/member.py
@@ -177,9 +177,6 @@ class Member(discord.abc.Messageable):
         ch = yield from self.create_dm()
         return ch
 
-    def _get_guild_id(self):
-        return None
-
     def _update_roles(self, data):
         # update the roles
         self.roles = [self.guild.default_role]
diff --git a/discord/message.py b/discord/message.py
index 4854c23b..151744f8 100644
--- a/discord/message.py
+++ b/discord/message.py
@@ -413,7 +413,7 @@ class Message:
         HTTPException
             Deleting the message failed.
         """
-        yield from self._state.http.delete_message(self.channel.id, self.id, getattr(self.guild, 'id', None))
+        yield from self._state.http.delete_message(self.channel.id, self.id)
 
     @asyncio.coroutine
     def edit(self, *, content: str = None, embed: Embed = None):
@@ -436,10 +436,9 @@ class Message:
             Editing the message failed.
         """
 
-        guild_id = getattr(self.guild, 'id', None)
         content = str(content) if content else None
         embed = embed.to_dict() if embed else None
-        data = yield from self._state.http.edit_message(self.id, self.channel.id, content, guild_id=guild_id, embed=embed)
+        data = yield from self._state.http.edit_message(self.id, self.channel.id, content, embed=embed)
         self._update(channel=self.channel, data=data)
 
     @asyncio.coroutine
diff --git a/discord/user.py b/discord/user.py
index bbc6d1cc..c08a3fb7 100644
--- a/discord/user.py
+++ b/discord/user.py
@@ -91,9 +91,6 @@ class User(discord.abc.Messageable):
         ch = yield from self.create_dm()
         return ch
 
-    def _get_guild_id(self):
-        return None
-
     @property
     def dm_channel(self):
         """Returns the :class:`DMChannel` associated with this user if it exists.