Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-19 13:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/indev' into indev

Browse Source
This commit is contained in:
abalabahaha
2015-12-05 10:31:29 -08:00
parent ccc794229e 1d8905d25a
commit 50646503cd
2 changed files with 85 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
docs/docs_server.rst
View File

@@ -65,6 +65,8 @@ The channel where AFK users are moved to, ServerChannel_ object. If one isn't se
defaultChannel defaultChannel
~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~
**Aliases** `generalChannel, general`
The ``#general`` ServerChannel_ of the server. The ``#general`` ServerChannel_ of the server.
owner owner
@@ -87,36 +89,107 @@ rolesOfUser(user)
Returns an array of the roles affecting a user server-wide. Returns an array of the roles affecting a user server-wide.
------
detailsOfUser(user)
~~~~~~~~~~~~~~~~~~~
**Aliases** `detailsOf`
Returns an object containing metadata of a user within the server, containing a structure similar to the following:
.. code-block:: js
{
joinedAt : 1449339323747,
mute : false,
deaf : false
}
----------
leave() leave()
~~~~~~~ ~~~~~~~
| **Shortcut of:** ``client.leaveServer(server)`` | **Shortcut of** ``client.leaveServer(server)``
| **Aliases:** `delete` | **Aliases** `delete`
| **See:** client.leaveServer_ | **See** client.leaveServer_
------
| |
createInvite(`options`, `callback`) createInvite(`options`, `callback`)
~~~~~~~ ~~~~~~~
| **Shortcut of:** ``client.createInvite(server, options, callback)`` | **Shortcut of** ``client.createInvite(server, options, callback)``
| **See:** client.createInvite_ | **See** client.createInvite_
| |
------
createRole(`data`, `callback`) createRole(`data`, `callback`)
~~~~~~~ ~~~~~~~
| **Shortcut of:** ``client.createRole(server, data, callback)`` | **Shortcut of** ``client.createRole(server, data, callback)``
| **See:** client.createRole_ | **See** client.createRole_
| |
------
createChannel(name, `type`, `callback`) createChannel(name, `type`, `callback`)
~~~~~~~ ~~~~~~~
| **Shortcut of:** ``client.createChannel(server, name, type, callback)`` | **Shortcut of** ``client.createChannel(server, name, type, callback)``
| **See:** client.createChannel_ | **See** client.createChannel_
| |
------
getBans(`callback`)
~~~~~~~~~~~~~~~~~~~
| **Shortcut of** ``client.getBans(server, callback)``
| **See** client.getBans_
|
------
banMember(user, `length`, `callback`)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| **Shortcut of** ``client.banMember(member, server, length, callback)``
| **Aliases** `banUser, ban`
| **See** client.banMember_
|
------
unbanMember(user, `callback`)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| **Shortcut of** ``client.unbanMember(member, server, callback)``
| **Aliases** `unbanUser, unban`
| **See** client.unbanMember_
|
------
kickMember(user, `callback`)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| **Shortcut of** ``client.kickMember(member, server, callback)``
| **Aliases** `kickUser, kick`
| **See** client.kickMember_
|
------
.. _client.leaveServer : ./docs_client.html#leaveserver-server-callback .. _client.leaveServer : ./docs_client.html#leaveserver-server-callback
.. _client.createInvite : ./docs_client.html#createinvite-channel-options-callback .. _client.createInvite : ./docs_client.html#createinvite-channel-options-callback
.. _client.createRole : ./docs_client.html#createrole-server-data-callback .. _client.createRole : ./docs_client.html#createrole-server-data-callback
.. _client.createChannel : ./docs_client.html#createchannel-server-name-type-callback .. _client.createChannel : ./docs_client.html#createchannel-server-name-type-callback
.. _client.banMember : ./docs_client.html#banmember-user-server-length-callback
.. _client.unbanMember : ./docs_client.html#unbanmember-user-server-callback
.. _client.kickMember : ./docs_client.html#kickmember-user-server-callback
.. _client.getBans : ./docs_client.html#getbans-server-callback

4
src/Structures/Server.js
View File

@@ -71,7 +71,7 @@ export default class Server extends Equality {
} }
} }
details(user) { detailsOf(user) {
user = this.client.internal.resolver.resolveUser(user); user = this.client.internal.resolver.resolveUser(user);
if (user) { if (user) {
return this.memberMap[user.id]; return this.memberMap[user.id];
@@ -80,7 +80,7 @@ export default class Server extends Equality {
} }
} }
detailsOf(user) { detailsOfUser(user) {
return this.details(user); return this.details(user);
} }