aboutsummaryrefslogtreecommitdiff
path: root/discord/gateway.py
diff options
context:
space:
mode:
authorRapptz <[email protected]>2016-10-17 18:25:23 -0400
committerRapptz <[email protected]>2017-01-03 09:51:54 -0500
commitd1d54a468a88323a8ef7798ff084a1371d5893ec (patch)
tree21dd315df95acd2c8d6cf63cc51fa4cadc0c7155 /discord/gateway.py
parentStateful Message and remove Invite.xkcd since it is removed. (diff)
downloaddiscord.py-d1d54a468a88323a8ef7798ff084a1371d5893ec.tar.xz
discord.py-d1d54a468a88323a8ef7798ff084a1371d5893ec.zip
Rename Server to Guild everywhere.
Diffstat (limited to 'discord/gateway.py')
-rw-r--r--discord/gateway.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/discord/gateway.py b/discord/gateway.py
index 415eed41..169d6fb1 100644
--- a/discord/gateway.py
+++ b/discord/gateway.py
@@ -115,15 +115,15 @@ class DiscordWebSocket(websockets.client.WebSocketClientProtocol):
PRESENCE
Send only. Updates your presence.
VOICE_STATE
- Send only. Starts a new connection to a voice server.
+ Send only. Starts a new connection to a voice guild.
VOICE_PING
- Send only. Checks ping time to a voice server, do not use.
+ Send only. Checks ping time to a voice guild, do not use.
RESUME
Send only. Resumes an existing connection.
RECONNECT
Receive only. Tells the client to reconnect to a new gateway.
REQUEST_MEMBERS
- Send only. Asks for the full member list of a server.
+ Send only. Asks for the full member list of a guild.
INVALIDATE_SESSION
Receive only. Tells the client to invalidate the session and IDENTIFY
again.
@@ -436,8 +436,8 @@ class DiscordWebSocket(websockets.client.WebSocketClientProtocol):
if status_enum is Status.invisible:
status_enum = Status.offline
- for server in self._connection.servers:
- me = server.me
+ for guild in self._connection.guilds:
+ me = guild.me
if me is None:
continue
@@ -524,7 +524,7 @@ class DiscordVoiceWebSocket(websockets.client.WebSocketClientProtocol):
identify = {
'op': cls.IDENTIFY,
'd': {
- 'server_id': client.guild_id,
+ 'guild_id': client.guild_id,
'user_id': client.user.id,
'session_id': client.session_id,
'token': client.token