From 6ec3d167ab52cb4be1d75cdac0cd82492a28de74 Mon Sep 17 00:00:00 2001
From: Will Hunt <half-shot@molrams.com>
Date: Mon, 18 Sep 2017 01:43:37 +0100
Subject: [PATCH] Fixed linting issues
---
src/bot.ts | 12 +++----
src/presencehandler.ts | 17 ++++++----
test/test_presencehandler.ts | 64 +++++++++++++++++++-----------------
3 files changed, 49 insertions(+), 44 deletions(-)
diff --git a/src/bot.ts b/src/bot.ts
index ed33d15..0187202 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -15,7 +15,7 @@ import * as path from "path";
// Due to messages often arriving before we get a response from the send call,
// messages get delayed from discord.
-const MSG_PROCESS_DELAY = 750
+const MSG_PROCESS_DELAY = 750;
const MIN_PRESENCE_UPDATE_DELAY = 250;
class ChannelLookupResult {
public channel: Discord.TextChannel;
@@ -81,13 +81,13 @@ export class DiscordBot {
this.bot = client;
if (!this.config.bridge.disablePresence) {
- this.bot.guilds.forEach((guild) =>{
+ this.bot.guilds.forEach((guild) => {
guild.members.forEach((member) => {
this.presenceHandler.EnqueueMember(member);
- })
- })
+ });
+ });
this.presenceHandler.Start(
- Math.max(this.config.bridge.presenceInterval, MIN_PRESENCE_UPDATE_DELAY)
+ Math.max(this.config.bridge.presenceInterval, MIN_PRESENCE_UPDATE_DELAY),
);
}
});
@@ -458,7 +458,7 @@ export class DiscordBot {
const intent = this.GetIntentFromDiscordMember(guildMember);
return Bluebird.each(this.GetRoomIdsFromGuild(guildMember.guild.id), (roomId) => {
this.presenceHandler.DequeueMember(guildMember);
- return intent.leave(roomId);
+ return intent.leave(roomId);
});
}
diff --git a/src/presencehandler.ts b/src/presencehandler.ts
index e1c191d..4db0814 100644
--- a/src/presencehandler.ts
+++ b/src/presencehandler.ts
@@ -41,7 +41,7 @@ export class PresenceHandler {
}
public EnqueueMember(member: Discord.GuildMember) {
- if(!this.presenceQueue.includes(member)) {
+ if (!this.presenceQueue.includes(member)) {
log.info("PresenceHandler", `Adding ${member.id} (${member.user.username}) to the presence queue`);
this.presenceQueue.push(member);
}
@@ -51,10 +51,13 @@ export class PresenceHandler {
const index = this.presenceQueue.findIndex((item) => {
return member === item;
});
- if(index !== -1) {
+ if (index !== -1) {
this.presenceQueue.splice(index, 1);
} else {
- log.warn("PresenceHandler", `Tried to remove ${member.id} from the presence queue but it could not be found`);
+ log.warn(
+ "PresenceHandler",
+ `Tried to remove ${member.id} from the presence queue but it could not be found`,
+ );
}
}
@@ -67,7 +70,7 @@ export class PresenceHandler {
private processIntervalThread() {
const member = this.presenceQueue.shift();
if (member) {
- if(!this.ProcessMember(member)) {
+ if (!this.ProcessMember(member)) {
this.presenceQueue.push(member);
} else {
log.info("PresenceHandler", `Dropping ${member.id} from the presence queue.`);
@@ -101,11 +104,11 @@ export class PresenceHandler {
private setMatrixPresence(guildMember: Discord.GuildMember, status: PresenceHandlerStatus) {
const intent = this.bot.GetIntentFromDiscordMember(guildMember);
- let status_obj :any = {presence: status.Presence};
+ const statusObj: any = {presence: status.Presence};
if (status.StatusMsg) {
- status_obj.status_msg = status.StatusMsg;
+ statusObj.status_msg = status.StatusMsg;
}
- intent.getClient().setPresence(status_obj).catch((ex) => {
+ intent.getClient().setPresence(statusObj).catch((ex) => {
log.warn("PresenceHandler", `Could not update Matrix presence for ${guildMember.id}`);
});
}
diff --git a/test/test_presencehandler.ts b/test/test_presencehandler.ts
index d3b634b..963397f 100644
--- a/test/test_presencehandler.ts
+++ b/test/test_presencehandler.ts
@@ -12,6 +12,7 @@ import { MockMember } from "./mocks/member";
Chai.use(ChaiAsPromised);
const expect = Chai.expect;
+const INTERVAL = 250;
let lastStatus = null;
// const assert = Chai.assert;
const bot = {
@@ -22,11 +23,11 @@ const bot = {
setPresence: (status) => {
lastStatus = status;
return Promise.resolve();
- }
+ },
};
- }
+ },
};
- }
+ },
};
describe("PresenceHandler", () => {
@@ -38,26 +39,27 @@ describe("PresenceHandler", () => {
describe("Start", () => {
it("should start without errors", () => {
const handler = new PresenceHandler(<DiscordBot> bot);
- handler.Start(250);
+ handler.Start(INTERVAL);
});
});
describe("Stop", () => {
it("should stop without errors", () => {
const handler = new PresenceHandler(<DiscordBot> bot);
- handler.Start(250);
+ handler.Start(INTERVAL);
handler.Stop();
});
});
describe("EnqueueMember", () => {
it("adds a user properly", () => {
const handler = new PresenceHandler(<DiscordBot> bot);
- handler.EnqueueMember(<any> new MockMember("abc","def"));
- handler.EnqueueMember(<any> new MockMember("abc","ghi"));
- Chai.assert.equal(handler.QueueCount, 2);
+ const COUNT = 2;
+ handler.EnqueueMember(<any> new MockMember("abc", "def"));
+ handler.EnqueueMember(<any> new MockMember("abc", "ghi"));
+ Chai.assert.equal(handler.QueueCount, COUNT);
});
it("does not add duplicate users", () => {
const handler = new PresenceHandler(<DiscordBot> bot);
- const member = <any> new MockMember("abc","def");
+ const member = <any> new MockMember("abc", "def");
handler.EnqueueMember(member);
handler.EnqueueMember(member);
Chai.assert.equal(handler.QueueCount, 1);
@@ -67,16 +69,16 @@ describe("PresenceHandler", () => {
it("removes users properly", () => {
const handler = new PresenceHandler(<DiscordBot> bot);
const members = [
- <any> new MockMember("abc","def"),
- <any> new MockMember("abc","ghi"),
- <any> new MockMember("abc","wew"),
- ]
+ <any> new MockMember("abc", "def"),
+ <any> new MockMember("abc", "ghi"),
+ <any> new MockMember("abc", "wew"),
+ ];
handler.EnqueueMember(members[0]);
handler.EnqueueMember(members[1]);
- handler.EnqueueMember(members[2]);
+ handler.EnqueueMember(members[members.length - 1]);
- handler.DequeueMember(members[2]);
- Chai.assert.equal(handler.QueueCount, 2);
+ handler.DequeueMember(members[members.length - 1]);
+ Chai.assert.equal(handler.QueueCount, members.length - 1);
handler.DequeueMember(members[1]);
Chai.assert.equal(handler.QueueCount, 1);
handler.DequeueMember(members[0]);
@@ -87,9 +89,9 @@ describe("PresenceHandler", () => {
it("processes an online user", () => {
lastStatus = null;
const handler = new PresenceHandler(<DiscordBot> bot);
- const member = <any> new MockMember("abc","def");
+ const member = <any> new MockMember("abc", "def");
member.MockSetPresence(new Discord.Presence({
- status: 'online',
+ status: "online",
}));
handler.ProcessMember(member);
Chai.assert.deepEqual(lastStatus, {
@@ -99,9 +101,9 @@ describe("PresenceHandler", () => {
it("processes an offline user", () => {
lastStatus = null;
const handler = new PresenceHandler(<DiscordBot> bot);
- const member = <any> new MockMember("abc","def");
+ const member = <any> new MockMember("abc", "def");
member.MockSetPresence(new Discord.Presence({
- status: 'offline',
+ status: "offline",
}));
handler.ProcessMember(member);
Chai.assert.deepEqual(lastStatus, {
@@ -112,9 +114,9 @@ describe("PresenceHandler", () => {
it("processes an idle user", () => {
lastStatus = null;
const handler = new PresenceHandler(<DiscordBot> bot);
- const member = <any> new MockMember("abc","def");
+ const member = <any> new MockMember("abc", "def");
member.MockSetPresence(new Discord.Presence({
- status: 'idle',
+ status: "idle",
}));
handler.ProcessMember(member);
Chai.assert.deepEqual(lastStatus, {
@@ -124,9 +126,9 @@ describe("PresenceHandler", () => {
it("processes an dnd user", () => {
lastStatus = null;
const handler = new PresenceHandler(<DiscordBot> bot);
- const member = <any> new MockMember("abc","def");
+ const member = <any> new MockMember("abc", "def");
member.MockSetPresence(new Discord.Presence({
- status: 'dnd',
+ status: "dnd",
}));
handler.ProcessMember(member);
Chai.assert.deepEqual(lastStatus, {
@@ -134,8 +136,8 @@ describe("PresenceHandler", () => {
status_msg: "Do not disturb",
});
member.MockSetPresence(new Discord.Presence({
- status: 'dnd',
- game: new Discord.Game({name:"Test Game"}),
+ status: "dnd",
+ game: new Discord.Game({name: "Test Game"}),
}));
handler.ProcessMember(member);
Chai.assert.deepEqual(lastStatus, {
@@ -146,10 +148,10 @@ describe("PresenceHandler", () => {
it("processes a user playing games", () => {
lastStatus = null;
const handler = new PresenceHandler(<DiscordBot> bot);
- const member = <any> new MockMember("abc","def");
+ const member = <any> new MockMember("abc", "def");
member.MockSetPresence(new Discord.Presence({
- status: 'online',
- game: new Discord.Game({name:"Test Game"}),
+ status: "online",
+ game: new Discord.Game({name: "Test Game"}),
}));
handler.ProcessMember(member);
Chai.assert.deepEqual(lastStatus, {
@@ -157,8 +159,8 @@ describe("PresenceHandler", () => {
status_msg: "Playing Test Game",
});
member.MockSetPresence(new Discord.Presence({
- status: 'online',
- game: new Discord.Game({name:"Test Game", type: 1}),
+ status: "online",
+ game: new Discord.Game({name: "Test Game", type: 1}),
}));
handler.ProcessMember(member);
Chai.assert.deepEqual(lastStatus, {
--
GitLab