mirror of
https://github.com/discordjs/discord.js.git
synced 2026-03-11 00:53:31 +01:00
Use import/export since we are using babel, removed unused imports
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
"use strict";
|
||||
|
||||
var InternalClient = require("./InternalClient.js");
|
||||
var EventEmitter = require("events");
|
||||
import InternalClient from "./InternalClient";
|
||||
import EventEmitter from "events";
|
||||
|
||||
function errCB(callback) {
|
||||
return error => {
|
||||
@@ -10,7 +10,7 @@ function errCB(callback) {
|
||||
};
|
||||
}
|
||||
|
||||
class Client extends EventEmitter {
|
||||
export default class Client extends EventEmitter {
|
||||
/*
|
||||
this class is an interface for the internal
|
||||
client.
|
||||
@@ -479,5 +479,3 @@ class Client extends EventEmitter {
|
||||
return this.setStatus(null, game);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = Client;
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
exports.IDLE = 0;
|
||||
exports.LOGGING_IN = 1;
|
||||
exports.LOGGED_IN = 2;
|
||||
exports.READY = 3;
|
||||
exports.DISCONNECTED = 4;
|
||||
export default {
|
||||
IDLE: 0,
|
||||
LOGGING_IN: 1,
|
||||
LOGGED_IN: 2,
|
||||
READY: 3,
|
||||
DISCONNECTED: 4
|
||||
};
|
||||
|
||||
@@ -1,27 +1,25 @@
|
||||
"use strict";
|
||||
|
||||
var request = require("superagent");
|
||||
var WebSocket = require("ws");
|
||||
var ConnectionState = require("./ConnectionState.js");
|
||||
var qs = require("querystring");
|
||||
import request from "superagent";
|
||||
import WebSocket from "ws";
|
||||
import ConnectionState from "./ConnectionState";
|
||||
import qs from "querystring";
|
||||
|
||||
var Constants = require("../Constants.js"),
|
||||
Endpoints = Constants.Endpoints,
|
||||
PacketType = Constants.PacketType;
|
||||
import {Endpoints, PacketType, Permissions} from "../Constants";
|
||||
|
||||
var Cache = require("../Util/Cache.js");
|
||||
var Resolver = require("./Resolver/Resolver.js");
|
||||
import Cache from "../Util/Cache";
|
||||
import Resolver from "./Resolver/Resolver";
|
||||
|
||||
var User = require("../Structures/User.js"),
|
||||
Channel = require("../Structures/Channel.js"),
|
||||
TextChannel = require("../Structures/TextChannel.js"),
|
||||
VoiceChannel = require("../Structures/VoiceChannel.js"),
|
||||
PMChannel = require("../Structures/PMChannel.js"),
|
||||
Server = require("../Structures/Server.js"),
|
||||
Message = require("../Structures/Message.js"),
|
||||
Role = require("../Structures/Role.js"),
|
||||
Invite = require("../Structures/Invite.js"),
|
||||
VoiceConnection = require("../Voice/VoiceConnection.js");
|
||||
import User from "../Structures/User";
|
||||
import Channel from "../Structures/Channel";
|
||||
import TextChannel from "../Structures/TextChannel";
|
||||
import VoiceChannel from "../Structures/VoiceChannel";
|
||||
import PMChannel from "../Structures/PMChannel";
|
||||
import Server from "../Structures/Server";
|
||||
import Message from "../Structures/Message";
|
||||
import Role from "../Structures/Role";
|
||||
import Invite from "../Structures/Invite";
|
||||
import VoiceConnection from "../Voice/VoiceConnection";
|
||||
|
||||
var zlib;
|
||||
|
||||
@@ -62,7 +60,7 @@ function delay(ms) {
|
||||
return new Promise(resolve => setTimeout(resolve, ms));
|
||||
}
|
||||
|
||||
class InternalClient {
|
||||
export default class InternalClient {
|
||||
constructor(discordClient) {
|
||||
this.client = discordClient;
|
||||
this.state = ConnectionState.IDLE;
|
||||
@@ -553,7 +551,7 @@ class InternalClient {
|
||||
newData.permissions = 0;
|
||||
for (var perm of data.permissions) {
|
||||
if (perm instanceof String || typeof perm === "string") {
|
||||
newData.permissions |= (Constants.Permissions[perm] || 0);
|
||||
newData.permissions |= (Permissions[perm] || 0);
|
||||
} else {
|
||||
newData.permissions |= perm;
|
||||
}
|
||||
@@ -714,13 +712,13 @@ class InternalClient {
|
||||
for (var perm in updated) {
|
||||
if (updated[perm]) {
|
||||
if (perm instanceof String || typeof perm === "string") {
|
||||
data.allow |= (Constants.Permissions[perm] || 0);
|
||||
data.allow |= (Permissions[perm] || 0);
|
||||
} else {
|
||||
data.allow |= perm;
|
||||
}
|
||||
} else {
|
||||
if (perm instanceof String || typeof perm === "string") {
|
||||
data.deny |= (Constants.Permissions[perm] || 0);
|
||||
data.deny |= (Permissions[perm] || 0);
|
||||
} else {
|
||||
data.deny |= perm;
|
||||
}
|
||||
@@ -1342,5 +1340,3 @@ class InternalClient {
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = InternalClient;
|
||||
|
||||
@@ -1,37 +1,37 @@
|
||||
"use strict";
|
||||
/* global Buffer */
|
||||
|
||||
var fs = require("fs");
|
||||
import fs from "fs";
|
||||
|
||||
var User = require("../../Structures/User.js"),
|
||||
Channel = require("../../Structures/Channel.js"),
|
||||
TextChannel = require("../../Structures/TextChannel.js"),
|
||||
VoiceChannel = require("../../Structures/VoiceChannel.js"),
|
||||
ServerChannel = require("../../Structures/ServerChannel.js"),
|
||||
PMChannel = require("../../Structures/PMChannel.js"),
|
||||
Server = require("../../Structures/Server.js"),
|
||||
Message = require("../../Structures/Message.js"),
|
||||
Invite = require("../../Structures/Invite.js"),
|
||||
Games = require("../../../ref/gameMap.js");
|
||||
import User from "../../Structures/User";
|
||||
import Channel from "../../Structures/Channel";
|
||||
import TextChannel from "../../Structures/TextChannel";
|
||||
import VoiceChannel from "../../Structures/VoiceChannel";
|
||||
import ServerChannel from "../../Structures/ServerChannel";
|
||||
import PMChannel from "../../Structures/PMChannel";
|
||||
import Server from "../../Structures/Server";
|
||||
import Message from "../../Structures/Message";
|
||||
import Invite from "../../Structures/Invite";
|
||||
import Games from "../../../ref/gameMap";
|
||||
|
||||
class Resolver {
|
||||
export default class Resolver {
|
||||
constructor(internal) {
|
||||
this.internal = internal;
|
||||
}
|
||||
|
||||
|
||||
resolveGameID(resource) {
|
||||
if (!isNaN(resource) && parseInt(resource) % 1 === 0) {
|
||||
return resource;
|
||||
} else if (typeof resource == "string" || resource instanceof String) {
|
||||
|
||||
|
||||
for (var game of Games) {
|
||||
if (game.name.toUpperCase() === resource.toUpperCase()) {
|
||||
return game.id;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -194,4 +194,3 @@ class Resolver {
|
||||
|
||||
}
|
||||
}
|
||||
module.exports = Resolver;
|
||||
Reference in New Issue
Block a user