Trying to fix say()

Nisgrak · May 27, 2018 · 13d5931 · 13d5931
1 parent 954701c
commit 13d5931
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/src/livechat.ts b/src/livechat.ts
@@ -68,7 +68,7 @@ export class LiveChat extends EventEmitter {
  snippet: {
  liveChatId: this.config.liveChatID,
  textMessageDetails: {
- messageText: message,
+ messageText: "" + message,
  },
  type: "textMessageEvent",
  },
@@ -80,7 +80,10 @@ export class LiveChat extends EventEmitter {
  url: "https://www.googleapis.com/youtube/v3/liveChat/messages",
  })
  .then((res) => resolve(res.data))
- .catch((err) => this.error.bind(this, err, reject)());
+ .catch((err) => {
+ this.error(err);
+ reject(err);
+ });
  });
  }
 
@@ -98,7 +101,10 @@ export class LiveChat extends EventEmitter {
  url: "https://www.googleapis.com/youtube/v3/liveChat/messages",
  })
  .then(() => resolve(this))
- .catch((err) => this.error.bind(this, err, reject)());
+ .catch((err) => {
+ this.error(err);
+ reject(err);
+ });
  });
  }
 
@@ -136,10 +142,10 @@ export class LiveChat extends EventEmitter {
  },
  url: "https://www.googleapis.com/youtube/v3/liveChat/messages",
  }).then((res) => {
- this.parse.bind(this, res)();
+ this.parse(res);
  }).catch((err) => {
- this.error.bind(this, err)();
- this.parse.bind(this, undefined)();
+ this.error(err);
+ this.parse(undefined);
  });
  return this;
  }
@@ -176,9 +182,8 @@ export class LiveChat extends EventEmitter {
  * Parse errors
  * @param err Error from any requests
  */
- private error(err: any, cb?: (err: any) => void): this {
+ private error(err: any): this {
  if (!err.errors || !err.errors || !err.errors[0]) {
- if (cb) { cb(err); }
  this.emit("error", err);
  return this;
  }
@@ -189,7 +194,6 @@ export class LiveChat extends EventEmitter {
  this.refreshAuth();
  break;
  default:
- if (cb) { cb(err); }
  this.emit("error", err);
  }
  return this;

diff --git a/src/test.ts b/src/test.ts
@@ -59,14 +59,14 @@ describe("Connection to YouTube API", () => {
 
 describe("Messages", () => {
  it("Should send message without errors", (done) => {
- userClient.say("Hey! I'm running a test :D")
+ userClient.say("Hello world!")
  .then(() => done())
  .catch(done);
  });
 
- it("Should receive the message", () => {
- userClient.on("chat", (msg: LiveChatMessage) => {
- expect(msg.snippet.textMessageDetails.messageText).to.be.a("string");
+ it("Should receive the message", (done) => {
+ userClient.on("chat", () => {
+ done();
  });
  });