Merge pull request #69 from SimonSchick/importexport

Use import/export since we are using babel, removed unused imports

src/Client/Client.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var InternalClient = require("./InternalClient.js");
+import InternalClient from "./InternalClient";
-var EventEmitter = require("events");
+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;

src/Client/ConnectionState.js

@@ -1,5 +1,7 @@
-exports.IDLE = 0;
+export default {
-exports.LOGGING_IN = 1;
+	IDLE: 0,
-exports.LOGGED_IN = 2;
+	LOGGING_IN: 1,
-exports.READY = 3;
+	LOGGED_IN: 2,
-exports.DISCONNECTED = 4;
+	READY: 3,
+	DISCONNECTED: 4
+};

src/Client/InternalClient.js

@@ -1,33 +1,31 @@
 "use strict";
 
-var request = require("superagent");
+import request from "superagent";
-var WebSocket = require("ws");
+import WebSocket from "ws";
-var ConnectionState = require("./ConnectionState.js");
+import ConnectionState from "./ConnectionState";
-var qs = require("querystring");
+import qs from "querystring";
 
-var Constants = require("../Constants.js"),
+import {Endpoints, PacketType, Permissions} from "../Constants";
-	Endpoints = Constants.Endpoints,
-	PacketType = Constants.PacketType;
 
-var Cache = require("../Util/Cache.js");
+import Cache from "../Util/Cache";
-var Resolver = require("./Resolver/Resolver.js");
+import Resolver from "./Resolver/Resolver";
 
-var User = require("../Structures/User.js"),
+import User from "../Structures/User";
-	Channel = require("../Structures/Channel.js"),
+import Channel from "../Structures/Channel";
-	TextChannel = require("../Structures/TextChannel.js"),
+import TextChannel from "../Structures/TextChannel";
-	VoiceChannel = require("../Structures/VoiceChannel.js"),
+import VoiceChannel from "../Structures/VoiceChannel";
-	PMChannel = require("../Structures/PMChannel.js"),
+import PMChannel from "../Structures/PMChannel";
-	Server = require("../Structures/Server.js"),
+import Server from "../Structures/Server";
-	Message = require("../Structures/Message.js"),
+import Message from "../Structures/Message";
-	Role = require("../Structures/Role.js"),
+import Role from "../Structures/Role";
-	Invite = require("../Structures/Invite.js"),
+import Invite from "../Structures/Invite";
-	VoiceConnection = require("../Voice/VoiceConnection.js");
+import VoiceConnection from "../Voice/VoiceConnection";
 
 var zlib;
 
 //todo: move this somewhere else
-var originalEnd = request.Request.prototype.prototype.end;
+var originalEnd = request.Request.prototype.end;
-request.Request.prototype.prototype.end = function(callback) {
+request.Request.prototype.end = function(callback) {
 	return new Promise((resolve, reject) => {
 		originalEnd.call(this, (err, response) => {
 			if (callback) {
@@ -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;

src/Client/Resolver/Resolver.js

@@ -1,37 +1,37 @@
 "use strict";
 /* global Buffer */
 
-var fs = require("fs");
+import fs from "fs";
 
-var User = require("../../Structures/User.js"),
+import User from "../../Structures/User";
-	Channel = require("../../Structures/Channel.js"),
+import Channel from "../../Structures/Channel";
-	TextChannel = require("../../Structures/TextChannel.js"),
+import TextChannel from "../../Structures/TextChannel";
-	VoiceChannel = require("../../Structures/VoiceChannel.js"),
+import VoiceChannel from "../../Structures/VoiceChannel";
-	ServerChannel = require("../../Structures/ServerChannel.js"),
+import ServerChannel from "../../Structures/ServerChannel";
-	PMChannel = require("../../Structures/PMChannel.js"),
+import PMChannel from "../../Structures/PMChannel";
-	Server = require("../../Structures/Server.js"),
+import Server from "../../Structures/Server";
-	Message = require("../../Structures/Message.js"),
+import Message from "../../Structures/Message";
-	Invite = require("../../Structures/Invite.js"),
+import Invite from "../../Structures/Invite";
-	Games = require("../../../ref/gameMap.js");
+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;

src/Constants.js

@@ -1,5 +1,7 @@
-var API = "https://discordapp.com/api";
+"use strict";
-var Endpoints = {
+
+export const API = "https://discordapp.com/api";
+export const Endpoints = {
 	// general endpoints
 	LOGIN: `${API}/auth/login`,
 	LOGOUT: `${API}/auth/logout`,
@@ -32,7 +34,7 @@ var Endpoints = {
 	CHANNEL_MESSAGE: (channelID, messageID) => `${Endpoints.CHANNEL_MESSAGES(channelID)}/${messageID}`
 };
 
-var Permissions = {
+export const Permissions = {
 	// general
 	createInstantInvite: 1 << 0,
 	kickMembers: 1 << 1,
@@ -61,7 +63,7 @@ var Permissions = {
 
 };
 
-var PacketType = {
+export const PacketType = {
 	READY : "READY",
 	MESSAGE_CREATE : "MESSAGE_CREATE",
 	MESSAGE_UPDATE : "MESSAGE_UPDATE",
@@ -82,9 +84,4 @@ var PacketType = {
 	TYPING : "TYPING_START",
 	SERVER_BAN_ADD : "GUILD_BAN_ADD",
 	SERVER_BAN_REMOVE : "GUILD_BAN_REMOVE"
-}
+};
-
-exports.API_ENDPOINT = API;
-exports.Endpoints = Endpoints;
-exports.PacketType = PacketType;
-exports.Permissions = Permissions;

src/Structures/Channel.js

@@ -1,18 +1,16 @@
 "use strict";
 
-var Equality = require("../Util/Equality.js");
+import Equality from "../Util/Equality";
-var Cache = require("../Util/Cache.js");
+import {reg} from "../Util/ArgumentRegulariser";
-var PermissionOverwrite = require("./PermissionOverwrite.js");
-var reg = require("../Util/ArgumentRegulariser.js").reg;
 
-class Channel extends Equality{
+export default class Channel extends Equality {
 
 	constructor(data, client){
 		super();
 		this.id = data.id;
 		this.client = client;
 	}
-	
+
 	get isPrivate() {
 		return !!this.server;
 	}
@@ -22,5 +20,3 @@ class Channel extends Equality{
 	}
 
 }
-
-module.exports = Channel;

src/Structures/ChannelPermissions.js

@@ -1,8 +1,8 @@
 "use strict";
 
-var Permissions = require("../Constants.js").Permissions;
+import {Permissions} from "../Constants";
 
-class ChannelPermissions{
+export default class ChannelPermissions {
 	constructor(permissions){
 		this.permissions = permissions;
 	}
@@ -59,5 +59,3 @@ class ChannelPermissions{
 		return !!(this.permissions & perm);
 	}
 }
-
-module.exports = ChannelPermissions;

src/Structures/Invite.js

@@ -1,9 +1,6 @@
 "use strict";
 
-var Server = require("./Server.js");
+export default class Invite {
-var ServerChannel = require("./ServerChannel.js");
-
-class Invite{
 	constructor(data, chan, client){
 		this.maxAge = data.max_age;
         this.code = data.code;
@@ -22,5 +19,3 @@ class Invite{
         return `https://discord.gg/${this.code}`;
     }
 }
-
-module.exports = Invite;

src/Structures/Message.js

@@ -1,11 +1,11 @@
 "use strict";
 
-var Cache = require("../Util/Cache.js");
+import Cache from "../Util/Cache";
-var User = require("./User.js");
+import User from "./User";
-var reg = require("../Util/ArgumentRegulariser.js").reg;
+import {reg} from "../Util/ArgumentRegulariser";
-var Equality = require("../Util/Equality");
+import Equality from "../Util/Equality";
 
-class Message extends Equality{
+export default class Message extends Equality{
 	constructor(data, channel, client) {
 		super();
 		this.channel = channel;
@@ -73,5 +73,3 @@ class Message extends Equality{
 		return this.author;
 	}
 }
-
-module.exports = Message;

src/Structures/PMChannel.js

@@ -1,12 +1,11 @@
 "use strict";
 
-var Channel = require("./Channel.js");
+import Channel from "./Channel";
-var User = require("./User.js");
+import User from "./User";
-var Equality = require("../Util/Equality.js");
+import Cache from "../Util/Cache";
-var Cache = require("../Util/Cache.js");
+import {reg} from "../Util/ArgumentRegulariser";
-var reg = require("../Util/ArgumentRegulariser.js").reg;
 
-class PMChannel extends Channel{
+export default class PMChannel extends Channel {
 	constructor(data, client){
 		super(data, client);
 
@@ -33,5 +32,3 @@ class PMChannel extends Channel{
 		return this.client.sendTTSMessage.apply(this.client, reg(this, arguments));
 	}
 }
-
-module.exports = PMChannel;

src/Structures/PermissionOverwrite.js

@@ -1,8 +1,8 @@
 "use strict";
 
-var Permissions = require("../Constants.js").Permissions;
+import {Permissions} from "../Constants";
 
-class PermissionOverwrite {
+export default class PermissionOverwrite {
 
 	constructor(data) {
 		this.id = data.id;
@@ -64,7 +64,4 @@ class PermissionOverwrite {
 			}
 		} );
 	}
-
 }
-
-module.exports = PermissionOverwrite;

src/Structures/Role.js

@@ -1,5 +1,5 @@
 "use strict";
-var Permissions = require("../Constants.js").Permissions;
+import {Permissions} from "../Constants";
 /*
 
 example data
@@ -28,7 +28,7 @@ const DefaultRole = [
 	Permissions.voiceUseVAD
 ].reduce( (previous, current) => previous | current, 0 );
 
-class Role{
+export default class Role {
 	constructor(data, server, client){
 		this.position = data.position || -1;
 		this.permissions = data.permissions || (data.name === "@everyone" ? DefaultRole : 0 );
@@ -131,5 +131,3 @@ class Role{
 		return "#"+val;
 	}
 }
-
-module.exports = Role;

src/Structures/Server.js

@@ -1,18 +1,18 @@
 "use strict";
 
-var Equality = require("../Util/Equality.js");
+import Equality from "../Util/Equality";
-var Endpoints = require("../Constants.js").Endpoints;
+import {Endpoints} from "../Constants";
-var Cache = require("../Util/Cache.js");
+import Cache from "../Util/Cache";
-var User = require("./User.js");
+import User from "./User";
-var TextChannel = require("./TextChannel.js");
+import TextChannel from "./TextChannel";
-var VoiceChannel = require("./VoiceChannel.js");
+import VoiceChannel from "./VoiceChannel";
-var Role = require("./Role.js");
+import Role from "./Role";
 
 var strictKeys = [
 	"region", "ownerID", "name", "id", "icon", "afkTimeout", "afkChannelID"
 ];
 
-class Server extends Equality {
+export default class Server extends Equality {
 	constructor(data, client) {
 
 		super();
@@ -121,5 +121,3 @@ class Server extends Equality {
 	}
 
 }
-
-module.exports = Server;

src/Structures/ServerChannel.js

@@ -1,12 +1,12 @@
 "use strict";
 
-var Channel = require("./Channel.js");
+import Channel from "./Channel";
-var Cache = require("../Util/Cache.js");
+import Cache from "../Util/Cache";
-var PermissionOverwrite = require("./PermissionOverwrite.js");
+import PermissionOverwrite from "./PermissionOverwrite";
-var ChannelPermissions = require("./ChannelPermissions.js");
+import ChannelPermissions from "./ChannelPermissions";
-var reg = require("../Util/ArgumentRegulariser.js").reg;
+import {reg} from "../Util/ArgumentRegulariser";
 
-class ServerChannel extends Channel{
+export default class ServerChannel extends Channel{
 	constructor(data, client, server){
 		super(data, client);
 		this.name = data.name;
@@ -73,5 +73,3 @@ class ServerChannel extends Channel{
 		return this.client.setChannelName.apply(this.client, reg(this, arguments));
 	}
 }
-
-module.exports = ServerChannel;

src/Structures/TextChannel.js

@@ -1,10 +1,10 @@
 "use strict";
 
-var ServerChannel = require("./ServerChannel.js");
+import ServerChannel from "./ServerChannel";
-var Cache = require("../Util/Cache.js");
+import Cache from "../Util/Cache";
-var reg = require("../Util/ArgumentRegulariser.js").reg;
+import {reg} from "../Util/ArgumentRegulariser";
 
-class TextChannel extends ServerChannel{
+export default class TextChannel extends ServerChannel{
 	constructor(data, client, server){
 		super(data, client, server);
 
@@ -38,5 +38,3 @@ class TextChannel extends ServerChannel{
 		return this.client.sendTTSMessage.apply(this.client, reg(this, arguments));
 	}
 }
-
-module.exports = TextChannel;

src/Structures/User.js

@@ -1,9 +1,9 @@
 "use strict";
 
-var Equality = require("../Util/Equality.js");
+import Equality from "../Util/Equality";
-var Endpoints = require("../Constants.js").Endpoints;
+import {Endpoints} from "../Constants";
 
-class User extends Equality{
+export default class User extends Equality{
 	constructor(data, client){
 		super();
 		this.client = client;
@@ -61,5 +61,3 @@ class User extends Equality{
 			return false;
 	}
 }
-
-module.exports = User;

src/Structures/VoiceChannel.js

@@ -1,11 +1,9 @@
 "use strict";
 
-var ServerChannel = require("./ServerChannel.js");
+import ServerChannel from "./ServerChannel";
 
-class VoiceChannel extends ServerChannel{
+export default class VoiceChannel extends ServerChannel{
 	constructor(data, client, server){
 		super(data, client, server);
 	}
 }
-
-module.exports = VoiceChannel;

src/Util/ArgumentRegulariser.js

@@ -1,3 +1,5 @@
-exports.reg = function (c, a) {
+"use strict";
+
+export function reg (c, a) {
 	return [c].concat(Array.prototype.slice.call(a));
-};
+}

src/Util/Cache.js

@@ -1,6 +1,6 @@
 "use strict";
 
-class Cache extends Array {
+export default class Cache extends Array {
 	constructor(discrim, limit) {
 		super();
 		this.discrim = discrim || "id";
@@ -61,7 +61,7 @@ class Cache extends Array {
 			return false;
 		}
 	}
-	
+
 	random() {
 		return this[Math.floor(Math.random()*this.length)];
 	}
@@ -79,5 +79,3 @@ class Cache extends Array {
 		return false;
 	}
 }
-
-module.exports = Cache;

src/Util/Equality.js

@@ -9,7 +9,7 @@
 
 	Instead, use objectThatExtendsEquality.equals()
 */
-class Equality{
+export default class Equality{
 	constructor(){
 
 	}
@@ -30,5 +30,3 @@ class Equality{
 		return;
 	}
 }
-
-module.exports = Equality;

src/Voice/AudioEncoder.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var cpoc = require("child_process");
+import cpoc from "child_process";
 
 var opus;
 try{
@@ -8,9 +8,8 @@ try{
 }catch(e){
 	// no opus!
 }
-var VoicePacket = require("./VoicePacket.js");
 
-class AudioEncoder{
+export default class AudioEncoder {
 	constructor(){
 		if(opus){
 			this.opus = new opus.OpusEncoder(48000, 1);
@@ -116,5 +115,3 @@ class AudioEncoder{
 		});
 	}
 }
-
-module.exports = AudioEncoder;

src/Voice/StreamIntent.js

@@ -1,11 +1,9 @@
 "use strict";
 // represents an intent of streaming music
-var EventEmitter = require("events");
+import EventEmitter from "events";
 
-class StreamIntent extends EventEmitter{
+export default class StreamIntent extends EventEmitter {
 	constructor(){
 		super();
 	}
 }
-
-module.exports = StreamIntent;

src/Voice/VoiceConnection.js

@@ -7,16 +7,15 @@
 	been possible!
 */
 
-var WebSocket = require("ws");
+import WebSocket from "ws";
-var dns = require("dns");
+import dns from "dns";
-var udp = require("dgram");
+import udp from "dgram";
-var fs = require("fs");
+import AudioEncoder from "./AudioEncoder";
-var AudioEncoder = require("./AudioEncoder.js");
+import VoicePacket from "./VoicePacket";
-var VoicePacket = require("./VoicePacket.js");
+import StreamIntent from "./StreamIntent";
-var StreamIntent = require("./StreamIntent.js");
+import EventEmitter from "events";
-var EventEmitter = require("events");
 
-class VoiceConnection extends EventEmitter {
+export default class VoiceConnection extends EventEmitter {
 	constructor(channel, client, session, token, server, endpoint) {
 		super();
 		this.id = channel.id;
@@ -325,5 +324,3 @@ class VoiceConnection extends EventEmitter {
 		});
 	}
 }
-
-module.exports = VoiceConnection;

src/Voice/VoicePacket.js

@@ -1,6 +1,6 @@
 "use strict";
 
-class VoicePacket{
+export default class VoicePacket {
 	constructor(data, sequence, time, ssrc){
 
 		var audioBuffer = data,
@@ -22,5 +22,3 @@ class VoicePacket{
 
 	}
 }
-
-module.exports = VoicePacket;

src/index.js

@@ -1,16 +1,33 @@
-module.exports = {
+"use strict";
-	Client : require("./Client/Client"),
+
-	Channel : require("./Structures/Channel"),
+import Client from "./Client/Client";
-	ChannelPermissions : require("./Structures/ChannelPermissions"),
+import Channel from "./Structures/Channel";
-	Invite : require("./Structures/Invite"),
+import ChannelPermissions from "./Structures/ChannelPermissions";
-	Message : require("./Structures/Message"),
+import Invite from "./Structures/Invite";
-	PermissionOverwrite : require("./Structures/PermissionOverwrite"),
+import Message from "./Structures/Message";
-	PMChannel : require("./Structures/PMChannel"),
+import PermissionOverwrite from "./Structures/PermissionOverwrite";
-	Role : require("./Structures/Role"),
+import PMChannel from "./Structures/PMChannel";
-	Server : require("./Structures/Server"),
+import Role from "./Structures/Role";
-	ServerChannel : require("./Structures/ServerChannel"),
+import Server from "./Structures/Server";
-	TextChannel : require("./Structures/TextChannel"),
+import ServerChannel from "./Structures/ServerChannel";
-	User : require("./Structures/User"),
+import TextChannel from "./Structures/TextChannel";
-	VoiceChannel: require("./Structures/VoiceChannel"),
+import User from "./Structures/User";
-	Constants : require("./Constants.js")
+import VoiceChannel from "./Structures/VoiceChannel";
-}
+import Constants from "./Constants";
+
+export default {
+	Client,
+	Channel,
+	ChannelPermissions,
+	Invite,
+	Message,
+	PermissionOverwrite,
+	PMChannel,
+	Role,
+	Server,
+	ServerChannel,
+	TextChannel,
+	User,
+	VoiceChannel,
+	Constants
+};