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

This commit is contained in:
Simon Schick
2015-11-28 17:57:22 +01:00
parent 47b6f6cadd
commit faa744b1e3
25 changed files with 151 additions and 185 deletions

View File

@@ -1,18 +1,16 @@
"use strict";
var Equality = require("../Util/Equality.js");
var Cache = require("../Util/Cache.js");
var PermissionOverwrite = require("./PermissionOverwrite.js");
var reg = require("../Util/ArgumentRegulariser.js").reg;
import Equality from "../Util/Equality";
import {reg} from "../Util/ArgumentRegulariser";
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;

View File

@@ -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;

View File

@@ -1,9 +1,6 @@
"use strict";
var Server = require("./Server.js");
var ServerChannel = require("./ServerChannel.js");
class Invite{
export default 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;

View File

@@ -1,11 +1,11 @@
"use strict";
var Cache = require("../Util/Cache.js");
var User = require("./User.js");
var reg = require("../Util/ArgumentRegulariser.js").reg;
var Equality = require("../Util/Equality");
import Cache from "../Util/Cache";
import User from "./User";
import {reg} from "../Util/ArgumentRegulariser";
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;

View File

@@ -1,12 +1,11 @@
"use strict";
var Channel = require("./Channel.js");
var User = require("./User.js");
var Equality = require("../Util/Equality.js");
var Cache = require("../Util/Cache.js");
var reg = require("../Util/ArgumentRegulariser.js").reg;
import Channel from "./Channel";
import User from "./User";
import Cache from "../Util/Cache";
import {reg} from "../Util/ArgumentRegulariser";
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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -1,18 +1,18 @@
"use strict";
var Equality = require("../Util/Equality.js");
var Endpoints = require("../Constants.js").Endpoints;
var Cache = require("../Util/Cache.js");
var User = require("./User.js");
var TextChannel = require("./TextChannel.js");
var VoiceChannel = require("./VoiceChannel.js");
var Role = require("./Role.js");
import Equality from "../Util/Equality";
import {Endpoints} from "../Constants";
import Cache from "../Util/Cache";
import User from "./User";
import TextChannel from "./TextChannel";
import VoiceChannel from "./VoiceChannel";
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;

View File

@@ -1,12 +1,12 @@
"use strict";
var Channel = require("./Channel.js");
var Cache = require("../Util/Cache.js");
var PermissionOverwrite = require("./PermissionOverwrite.js");
var ChannelPermissions = require("./ChannelPermissions.js");
var reg = require("../Util/ArgumentRegulariser.js").reg;
import Channel from "./Channel";
import Cache from "../Util/Cache";
import PermissionOverwrite from "./PermissionOverwrite";
import ChannelPermissions from "./ChannelPermissions";
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;

View File

@@ -1,10 +1,10 @@
"use strict";
var ServerChannel = require("./ServerChannel.js");
var Cache = require("../Util/Cache.js");
var reg = require("../Util/ArgumentRegulariser.js").reg;
import ServerChannel from "./ServerChannel";
import Cache from "../Util/Cache";
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;

View File

@@ -1,9 +1,9 @@
"use strict";
var Equality = require("../Util/Equality.js");
var Endpoints = require("../Constants.js").Endpoints;
import Equality from "../Util/Equality";
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;

View File

@@ -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;