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

This commit is contained in:
abalabahaha
2015-12-05 10:31:29 -08:00
2 changed files with 85 additions and 12 deletions

View File

@@ -65,6 +65,8 @@ The channel where AFK users are moved to, ServerChannel_ object. If one isn't se
defaultChannel
~~~~~~~~~~~~~~
**Aliases** `generalChannel, general`
The ``#general`` ServerChannel_ of the server.
owner
@@ -87,36 +89,107 @@ rolesOfUser(user)
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()
~~~~~~~
| **Shortcut of:** ``client.leaveServer(server)``
| **Aliases:** `delete`
| **See:** client.leaveServer_
| **Shortcut of** ``client.leaveServer(server)``
| **Aliases** `delete`
| **See** client.leaveServer_
------
|
createInvite(`options`, `callback`)
~~~~~~~
| **Shortcut of:** ``client.createInvite(server, options, callback)``
| **See:** client.createInvite_
| **Shortcut of** ``client.createInvite(server, options, callback)``
| **See** client.createInvite_
|
------
createRole(`data`, `callback`)
~~~~~~~
| **Shortcut of:** ``client.createRole(server, data, callback)``
| **See:** client.createRole_
| **Shortcut of** ``client.createRole(server, data, callback)``
| **See** client.createRole_
|
------
createChannel(name, `type`, `callback`)
~~~~~~~
| **Shortcut of:** ``client.createChannel(server, name, type, callback)``
| **See:** client.createChannel_
| **Shortcut of** ``client.createChannel(server, name, type, callback)``
| **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.createInvite : ./docs_client.html#createinvite-channel-options-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

View File

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