From d160994f027f8a680e02718701e9c016d83f1811 Mon Sep 17 00:00:00 2001 From: Instafluff <35773245+instafluff@users.noreply.github.com> Date: Wed, 23 Oct 2019 11:59:45 -0700 Subject: [PATCH] Founder, Highlight Messages, Custom Reward ID --- app.js | 11 +++++++++-- package-lock.json | 50 +++++++++++++++++++++++------------------------ package.json | 2 +- test.js | 7 +++++-- 4 files changed, 40 insertions(+), 30 deletions(-) diff --git a/app.js b/app.js index 202cfcd..efd0bd1 100644 --- a/app.js +++ b/app.js @@ -226,8 +226,10 @@ var comfyJS = { var user = userstate[ "display-name" ] || userstate[ "username" ] || username; var isBroadcaster = ( "#" + userstate[ "username" ] ) === channel; var isMod = userstate[ "mod" ]; - var isSubscriber = ( userstate[ "badges" ] && typeof userstate[ "badges" ].subscriber !== "undefined" ) || userstate[ "subscriber" ]; + var isFounder = ( userstate[ "badges" ] && userstate[ "badges" ].founder === "0" ) + var isSubscriber = isFounder || ( userstate[ "badges" ] && typeof userstate[ "badges" ].subscriber !== "undefined" ) || userstate[ "subscriber" ]; var isVIP = ( userstate[ "badges" ] && userstate[ "badges" ].vip === "1" ) || false; + var isHighlightedMessage = userstate[ "msg-id" ] === "highlighted-message"; var userId = userstate[ "user-id" ]; var messageId = userstate[ "id" ]; var roomId = userstate[ "room-id" ]; @@ -236,11 +238,15 @@ var comfyJS = { var emotes = userstate[ "emotes" ]; var isEmoteOnly = userstate[ "emote-only" ] || false; var messageType = userstate[ "message-type" ]; + var customRewardId = userstate[ "custom-reward-id" ] || null; var flags = { broadcaster: isBroadcaster, mod: isMod, + founder: isFounder, subscriber: isSubscriber, - vip: isVIP + vip: isVIP, + highlighted: isHighlightedMessage, + customReward: !!customRewardId }; var extra = { id: messageId, @@ -254,6 +260,7 @@ var comfyJS = { displayName: userstate[ "display-name" ], userColor: userColor, userBadges: badges, + customRewardId: customRewardId, }; if( !self && message[ 0 ] === "!" ) { // Message is a command diff --git a/package-lock.json b/package-lock.json index 0dc1368..c3a65f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,9 +45,9 @@ "dev": true }, "ajv": { - "version": "6.9.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz", - "integrity": "sha512-4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg==", + "version": "6.10.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", + "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", "requires": { "fast-deep-equal": "^2.0.1", "fast-json-stable-stringify": "^2.0.0", @@ -136,9 +136,9 @@ "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" }, "async-limiter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz", - "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", + "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==" }, "asynckit": { "version": "0.4.0", @@ -652,9 +652,9 @@ } }, "combined-stream": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", - "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "requires": { "delayed-stream": "~1.0.0" } @@ -1512,16 +1512,16 @@ "dev": true }, "mime-db": { - "version": "1.38.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz", - "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==" + "version": "1.40.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", + "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==" }, "mime-types": { - "version": "2.1.22", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz", - "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==", + "version": "2.1.24", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", + "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", "requires": { - "mime-db": "~1.38.0" + "mime-db": "1.40.0" } }, "minimalistic-assert": { @@ -1863,9 +1863,9 @@ "dev": true }, "psl": { - "version": "1.1.31", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz", - "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==" + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz", + "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==" }, "public-encrypt": { "version": "4.0.3", @@ -2306,9 +2306,9 @@ } }, "tmi.js": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/tmi.js/-/tmi.js-1.3.1.tgz", - "integrity": "sha512-hLT2XCVzd9LwTRKdPhVCtQUO/bcsgbD24IigyrugC3Cx6y97zluOeSMhHbl/XJ+0LXPfoIaxLKvQiHga7g3amA==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/tmi.js/-/tmi.js-1.5.0.tgz", + "integrity": "sha512-JyWKy9dRkZDG1h6PnpE8fJVsTrW82/yANXoP7R3u02vG7PLCvHGRGTWzBwk0ymMJGX9A+YzDx5tXQDsTeJd/5A==", "requires": { "request": "2.88.0", "ws": "6.1.3" @@ -2458,9 +2458,9 @@ "dev": true }, "uuid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz", + "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==" }, "validate-npm-package-license": { "version": "3.0.4", diff --git a/package.json b/package.json index 92a7476..46ac5b2 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "homepage": "https://github.com/instafluff/ComfyJS#readme", "dependencies": { - "tmi.js": "^1.3.1" + "tmi.js": "^1.5.0" }, "devDependencies": { "babelify": "7.2.0", diff --git a/test.js b/test.js index 663b473..5222701 100644 --- a/test.js +++ b/test.js @@ -1,9 +1,12 @@ require('dotenv').config(); var ComfyJS = require("./app"); -ComfyJS.onCommand = ( user, command, message, flags ) => { - console.log( command, user, message, flags ); +ComfyJS.onCommand = ( user, command, message, flags, extra ) => { + console.log( command, user, message, flags, extra ); if( command == "say" ) { ComfyJS.Say( "test reply" ); } } +ComfyJS.onChat = ( user, message, flags, self, extra ) => { + console.log( user, message, flags, self, extra ); +} ComfyJS.Init( process.env.TWITCHUSER, process.env.OAUTH );