[WIP] Remove user bots

src/client/Client.js

@@ -14,7 +14,6 @@ const VoiceBroadcast = require('./voice/VoiceBroadcast');
 const UserStore = require('../stores/UserStore');
 const ChannelStore = require('../stores/ChannelStore');
 const GuildStore = require('../stores/GuildStore');
-const ClientPresenceStore = require('../stores/ClientPresenceStore');
 const GuildEmojiStore = require('../stores/GuildEmojiStore');
 const { Events, browser } = require('../util/Constants');
 const DataResolver = require('../util/DataResolver');
@@ -96,17 +95,10 @@ class Client extends BaseClient {
      */
     this.channels = new ChannelStore(this);
 
-    /**
-     * Presences that have been received for the client user's friends, mapped by user IDs
-     * <warn>This is only filled when using a user account.</warn>
-     * @type {ClientPresenceStore<Snowflake, Presence>}
-     */
-    this.presences = new ClientPresenceStore(this);
-
     Object.defineProperty(this, 'token', { writable: true });
     if (!browser && !this.token && 'CLIENT_TOKEN' in process.env) {
       /**
-       * Authorization token for the logged in user/bot
+       * Authorization token for the logged in bot
        * <warn>This should be kept private at all times.</warn>
        * @type {?string}
        */
@@ -240,10 +232,6 @@ class Client extends BaseClient {
 
   /**
    * Logs the client in, establishing a websocket connection to Discord.
-   * <info>Both bot and regular user accounts are supported, but it is highly recommended to use a bot account whenever
-   * possible. User accounts are subject to harsher ratelimits and other restrictions that don't apply to bot accounts.
-   * Bot accounts also have access to many features that user accounts cannot utilise. User accounts that are found to
-   * be abusing/overusing the API will be banned, locking you out of Discord entirely.</info>
    * @param {string} token Token of the account to log in with
    * @returns {Promise<string>} Token of the account used
    * @example
@@ -269,20 +257,6 @@ class Client extends BaseClient {
     return this.manager.destroy();
   }
 
-  /**
-   * Requests a sync of guild data with Discord.
-   * <info>This can be done automatically every 30 seconds by enabling {@link ClientOptions#sync}.</info>
-   * <warn>This is only available when using a user account.</warn>
-   * @param {Guild[]|Collection<Snowflake, Guild>} [guilds=this.guilds] An array or collection of guilds to sync
-   */
-  syncGuilds(guilds = this.guilds) {
-    if (this.user.bot) return;
-    this.ws.send({
-      op: 12,
-      d: guilds instanceof Collection ? guilds.keyArray() : guilds.map(g => g.id),
-    });
-  }
-
   /**
    * Obtains an invite from Discord.
    * @param {InviteResolvable} invite Invite code or URL

src/client/ClientManager.js

@@ -64,14 +64,9 @@ class ClientManager {
   destroy() {
     this.client.ws.destroy();
     if (!this.client.user) return Promise.resolve();
-    if (this.client.user.bot) {
+    return this.client.api.logout.post().then(() => {
       this.client.token = null;
-      return Promise.resolve();
-    } else {
-      return this.client.api.logout.post().then(() => {
-        this.client.token = null;
-      });
-    }
+    });
   }
 }
 

src/errors/Messages.js

@@ -6,8 +6,6 @@ const Messages = {
   TOKEN_INVALID: 'An invalid token was provided.',
   TOKEN_MISSING: 'Request to use token, but token was unavailable to the client.',
 
-  FEATURE_USER_ONLY: 'Only user accounts are able to make use of this feature.',
-
   WS_CONNECTION_TIMEOUT: 'The connection to the gateway timed out.',
   WS_CONNECTION_EXISTS: 'There is already an existing WebSocket connection.',
   WS_NOT_OPEN: (data = 'data') => `Websocket not open to send ${data}`,

src/index.js

@@ -25,7 +25,6 @@ module.exports = {
 
   // Stores
   ChannelStore: require('./stores/ChannelStore'),
-  ClientPresenceStore: require('./stores/ClientPresenceStore'),
   GuildChannelStore: require('./stores/GuildChannelStore'),
   GuildEmojiStore: require('./stores/GuildEmojiStore'),
   GuildEmojiRoleStore: require('./stores/GuildEmojiRoleStore'),
@@ -57,8 +56,6 @@ module.exports = {
     return require('./structures/ClientUser');
   },
   ClientUserChannelOverride: require('./structures/ClientUserChannelOverride'),
-  ClientUserGuildSettings: require('./structures/ClientUserGuildSettings'),
-  ClientUserSettings: require('./structures/ClientUserSettings'),
   Collector: require('./structures/interfaces/Collector'),
   DMChannel: require('./structures/DMChannel'),
   Emoji: require('./structures/Emoji'),

src/rest/RESTManager.js

@@ -39,8 +39,7 @@ class RESTManager {
 
   getAuth() {
     const token = this.client.token || this.client.accessToken;
-    const prefixed = !!this.client.application || (this.client.user && this.client.user.bot);
-    if (token && prefixed) return `${this.tokenPrefix} ${token}`;
+    if (token && this.client.application) return `${this.tokenPrefix} ${token}`;
     else if (token) return token;
     throw new Error('TOKEN_MISSING');
   }

src/stores/GuildStore.js

@@ -39,7 +39,7 @@ class GuildStore extends DataStore {
 
   /**
    * Creates a guild.
-   * <warn>This is only available to bots in less than 10 guilds and user accounts.</warn>
+   * <warn>This is only available to bots in less than 10 guilds.</warn>
    * @param {string} name The name of the guild
    * @param {Object} [options] Options for the creating
    * @param {string} [options.region] The region for the server, defaults to the closest one available

src/stores/MessageStore.js

@@ -1,7 +1,6 @@
 const DataStore = require('./DataStore');
 const Collection = require('../util/Collection');
 const Message = require('../structures/Message');
-const { Error } = require('../errors');
 
 /**
  * Stores messages for text-based channels.
@@ -68,12 +67,6 @@ class MessageStore extends DataStore {
   }
 
   async _fetchId(messageID) {
-    if (!this.client.user.bot) {
-      const messages = await this._fetchMany({ limit: 1, around: messageID });
-      const msg = messages.get(messageID);
-      if (!msg) throw new Error('MESSAGE_MISSING');
-      return msg;
-    }
     const data = await this.client.api.channels[this.channel.id].messages[messageID].get();
     return this.add(data);
   }

src/structures/ClientApplication.js

@@ -174,26 +174,6 @@ class ClientApplication extends Base {
     } });
   }
 
-  /**
-   * Resets the app's secret.
-   * <warn>This is only available when using a user account.</warn>
-   * @returns {Promise<ClientApplication>}
-   */
-  resetSecret() {
-    return this.client.api.oauth2.applications[this.id].reset.post()
-      .then(app => new ClientApplication(this.client, app));
-  }
-
-  /**
-   * Resets the app's bot token.
-   * <warn>This is only available when using a user account.</warn>
-   * @returns {Promise<ClientApplication>}
-   */
-  resetToken() {
-    return this.client.api.oauth2.applications[this.id].bot.reset.post()
-      .then(app => new ClientApplication(this.client, Object.assign({}, this, { bot: app })));
-  }
-
   /**
    * When concatenated with a string, this automatically returns the application's name instead of the
    * ClientApplication object.