Merge branch 'dev'

member-counter · Apr 17, 2024 · 184c7a8 · 184c7a8
2 parents 8cc7e75 + 8bc3905
commit 184c7a8
Show file tree

Hide file tree

Showing 18 changed files with 318 additions and 516 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,8 +28,8 @@
   "homepage": "https://member-counter.eduardozgz.com",
   "dependencies": {
     "@arcanebot/redis-sharder": "github:eduardozgz/redis-sharder",
-    "@twurple/api": "^5.0.1",
-    "@twurple/auth": "^5.0.1",
+    "@twurple/api": "^7.0.6",
+    "@twurple/auth": "^7.0.6",
     "bufferutil": "^4.0.1",
     "colorthief": "2.3.2",
     "cron": "^1.8.2",

diff --git a/src/counters/Twitch.ts b/src/counters/Twitch.ts
@@ -1,37 +1,46 @@
 import { ApiClient } from "@twurple/api";
-import { ClientCredentialsAuthProvider } from "@twurple/auth";
+import { AppTokenAuthProvider } from "@twurple/auth";
 import getEnv from "../utils/getEnv";
 import Counter from "../typings/Counter";
 
 const { TWITCH_CLIENT_ID, TWITCH_CLIENT_SECRET } = getEnv();
 
-const authProvider = new ClientCredentialsAuthProvider(
+const authProvider = new AppTokenAuthProvider(
 	TWITCH_CLIENT_ID,
 	TWITCH_CLIENT_SECRET
 );
 
 const client = new ApiClient({ authProvider });
 
 const TwitchCounter: Counter = {
-	aliases: ["twitchFollowers", "twitchViews", "twitchChannelName"],
+	aliases: ["twitchFollowers", "twitchViewers", "twitchChannelName"],
 	isPremium: true,
 	isEnabled: true,
 	lifetime: 60 * 60 * 1000,
 	execute: async ({ unparsedArgs: userName }) => {
 		try {
 			if (!TWITCH_CLIENT_ID) throw new Error("TWITCH_CLIENT_ID not provided");
-			if (!TWITCH_CLIENT_SECRET)
-				throw new Error("TWITCH_CLIENT_SECRET not provided");
+			if (!TWITCH_CLIENT_SECRET) throw new Error("TWITCH_CLIENT_SECRET not provided");
 
-			const user = await client.users.getUserByName(userName);
-			const { views, displayName } = user;
-			const followers = await client.users
-				.getFollowsPaginated({ followedUser: user })
-				.getTotalCount();
+			const channel = await client.users.getUserByName(userName);
+			if (!channel) {
+				return {
+					twitchFollowers: "User Not Found",
+					twitchViewers: "User Not Found",
+					twitchChannelName: "User Not Found"
+				};
+			}
+			const { displayName } = channel;
+			const stream = await client.streams.getStreamByUserName(userName);
+			let viewers = "Offline";
+			if (stream !== null) {
+				viewers = stream.viewers.toString();
+			}
+			const followers = await client.channels.getChannelFollowerCount(channel.id);
 
 			return {
 				twitchFollowers: followers,
-				twitchViews: views,
+				twitchViewers: viewers,
 				twitchChannelName: displayName
 			};
 		} catch (e) {

diff --git a/src/lang/ca_ES.json b/src/lang/ca_ES.json
@@ -328,15 +328,15 @@
 						"{twitchFollowers:ninja} Followers"
 					]
 				},
-				"twitchViews": {
-					"name": "twitchViews:nickname",
-					"description": "Amount of views of a Twitch channel",
-					"detailedDescription": "Counts how many views has a Twitch channel, replace `nickname` with the desired channel name",
+				"twitchViewers": {
+					"name": "twitchViewers:nickname",
+					"description": "Amount of stream viewers",
+					"detailedDescription": "Counts how many viewers are there on an active stream, replace `nickname` with the desired channel name",
 					"usage": [
-						"{twitchViews:nickname}"
+						"{twitchViewers:nickname}"
 					],
 					"example": [
-						"{twitchViews:ninja} Views"
+						"{twitchViewers:ninja} Views"
 					]
 				},
 				"twitchChannelName": {
@@ -848,8 +848,8 @@
 							"statusCreated": "{CHECK_MARK} Follower counter created"
 						},
 						{
-							"name": "twitchViews",
-							"template": "{twitchViews:{RESOURCE}} Views",
+							"name": "twitchViewers",
+							"template": "Viewers {twitchViewers:{RESOURCE}}",
 							"statusCreating": "{LOADING} Creating views counter",
 							"statusCreated": "{CHECK_MARK} Views counter created"
 						}

diff --git a/src/lang/cs_CZ.json b/src/lang/cs_CZ.json
@@ -328,15 +328,15 @@
 						"{twitchFollowers:ninja} Followers"
 					]
 				},
-				"twitchViews": {
-					"name": "twitchViews:nickname",
-					"description": "Amount of views of a Twitch channel",
-					"detailedDescription": "Counts how many views has a Twitch channel, replace `nickname` with the desired channel name",
+				"twitchViewers": {
+					"name": "twitchViewers:nickname",
+					"description": "Amount of stream viewers",
+					"detailedDescription": "Counts how many viewers are there on an active stream, replace `nickname` with the desired channel name",
 					"usage": [
-						"{twitchViews:nickname}"
+						"{twitchViewers:nickname}"
 					],
 					"example": [
-						"{twitchViews:ninja} Views"
+						"{twitchViewers:ninja} Views"
 					]
 				},
 				"twitchChannelName": {
@@ -848,8 +848,8 @@
 							"statusCreated": "{CHECK_MARK} Follower counter created"
 						},
 						{
-							"name": "twitchViews",
-							"template": "{twitchViews:{RESOURCE}} sledujících",
+							"name": "twitchViewers",
+							"template": "Viewers {twitchViewers:{RESOURCE}}",
 							"statusCreating": "{LOADING} Creating views counter",
 							"statusCreated": "{CHECK_MARK} Views counter created"
 						}

diff --git a/src/lang/de_DE.json b/src/lang/de_DE.json
@@ -328,15 +328,15 @@
 						"{twitchFollowers:ninja} Followers"
 					]
 				},
-				"twitchViews": {
-					"name": "twitchViews:nickname",
-					"description": "Amount of views of a Twitch channel",
-					"detailedDescription": "Counts how many views has a Twitch channel, replace `nickname` with the desired channel name",
+				"twitchViewers": {
+					"name": "twitchViewers:nickname",
+					"description": "Amount of stream viewers",
+					"detailedDescription": "Counts how many viewers are there on an active stream, replace `nickname` with the desired channel name",
 					"usage": [
-						"{twitchViews:nickname}"
+						"{twitchViewers:nickname}"
 					],
 					"example": [
-						"{twitchViews:ninja} Views"
+						"{twitchViewers:ninja} Views"
 					]
 				},
 				"twitchChannelName": {
@@ -848,8 +848,8 @@
 							"statusCreated": "{CHECK_MARK} Follower counter created"
 						},
 						{
-							"name": "twitchViews",
-							"template": "{twitchViews:{RESOURCE}} Views",
+							"name": "twitchViewers",
+							"template": "Viewers {twitchViewers:{RESOURCE}}",
 							"statusCreating": "{LOADING} Creating views counter",
 							"statusCreated": "{CHECK_MARK} Views counter created"
 						}

diff --git a/src/lang/en_US.json b/src/lang/en_US.json
@@ -247,12 +247,16 @@
 					"usage": ["{twitchFollowers:nickname}"],
 					"example": ["{twitchFollowers:ninja} Followers"]
 				},
-				"twitchViews": {
-					"name": "twitchViews:nickname",
-					"description": "Amount of views of a Twitch channel",
-					"detailedDescription": "Counts how many views has a Twitch channel, replace `nickname` with the desired channel name",
-					"usage": ["{twitchViews:nickname}"],
-					"example": ["{twitchViews:ninja} Views"]
+				"twitchViewers": {
+					"name": "twitchViewers:nickname",
+					"description": "Amount of stream viewers",
+					"detailedDescription": "Counts how many viewers are there on an active stream, replace `nickname` with the desired channel name",
+					"usage": [
+						"{twitchViewers:nickname}"
+					],
+					"example": [
+						"{twitchViewers:ninja} Views"
+					]
 				},
 				"twitchChannelName": {
 					"name": "twitchChannelName:nickname",
@@ -642,8 +646,8 @@
 							"statusCreated": "{CHECK_MARK} Follower counter created"
 						},
 						{
-							"name": "twitchViews",
-							"template": "{twitchViews:{RESOURCE}} Views",
+							"name": "twitchViewers",
+							"template": "Viewers {twitchViewers:{RESOURCE}}",
 							"statusCreating": "{LOADING} Creating views counter",
 							"statusCreated": "{CHECK_MARK} Views counter created"
 						}

diff --git a/src/lang/es_ES.json b/src/lang/es_ES.json
@@ -328,15 +328,15 @@
 						"{twitchFollowers:ninja} Seguidores"
 					]
 				},
-				"twitchViews": {
-					"name": "twitchViews:nombre",
-					"description": "Cantidad de vistas de un canal de Twitch",
-					"detailedDescription": "Cuenta cuántas visualizaciones tiene un canal de Twitch, reemplaza `nombre` con el nombre del canal deseado",
+				"twitchViewers": {
+					"name": "twitchViewers:nickname",
+					"description": "Amount of stream viewers",
+					"detailedDescription": "Counts how many viewers are there on an active stream, replace `nickname` with the desired channel name",
 					"usage": [
-						"{twitchViews:nombre}"
+						"{twitchViewers:nickname}"
 					],
 					"example": [
-						"{twitchViews:ninja} Visualizaciones"
+						"{twitchViewers:ninja} Views"
 					]
 				},
 				"twitchChannelName": {
@@ -848,10 +848,10 @@
 							"statusCreated": "{CHECK_MARK} Contador de seguidores creado"
 						},
 						{
-							"name": "twitchViews",
-							"template": "{twitchViews:{RESOURCE}} Visitas",
-							"statusCreating": "{LOADING} Creando contador de visitas",
-							"statusCreated": "{CHECK_MARK} Contador de visitas creado"
+							"name": "twitchViewers",
+							"template": "Viewers {twitchViewers:{RESOURCE}}",
+							"statusCreating": "{LOADING} Creating views counter",
+							"statusCreated": "{CHECK_MARK} Views counter created"
 						}
 					]
 				},

diff --git a/src/lang/fa_IR.json b/src/lang/fa_IR.json
@@ -328,15 +328,15 @@
 						"{twitchFollowers:ninja} دنبال کننده ها"
 					]
 				},
-				"twitchViews": {
-					"name": "twitchViews:nickname",
-					"description": "تعداد بازدید های یک چنل توییچ",
-					"detailedDescription": "تعداد بازدید های یک چنل توییچ را می شمارد. قسمت `nickname` را با نام چنل توییچ دلخواه تغییر دهید",
+				"twitchViewers": {
+					"name": "twitchViewers:nickname",
+					"description": "Amount of stream viewers",
+					"detailedDescription": "Counts how many viewers are there on an active stream, replace `nickname` with the desired channel name",
 					"usage": [
-						"{twitchViews:nickname}"
+						"{twitchViewers:nickname}"
 					],
 					"example": [
-						"{twitchViews:ninja} بازدید ها"
+						"{twitchViewers:ninja} Views"
 					]
 				},
 				"twitchChannelName": {
@@ -848,10 +848,10 @@
 							"statusCreated": "{CHECK_MARK} شمارنده دنبال‌کننده ساخته شد"
 						},
 						{
-							"name": "twitchViews",
-							"template": "{twitchViews:{RESOURCE}} بازدید ها",
-							"statusCreating": "{LOADING} درحال ساخت شمارنده میزان بازدید ها",
-							"statusCreated": "{CHECK_MARK} شمارنده میزان بازدید ها ساخته شد"
+							"name": "twitchViewers",
+							"template": "Viewers {twitchViewers:{RESOURCE}}",
+							"statusCreating": "{LOADING} Creating views counter",
+							"statusCreated": "{CHECK_MARK} Views counter created"
 						}
 					]
 				},

diff --git a/src/lang/fr_FR.json b/src/lang/fr_FR.json
@@ -328,15 +328,15 @@
 						"{twitchFollowers:ninja} Followers"
 					]
 				},
-				"twitchViews": {
-					"name": "twitchViews:nickname",
-					"description": "Amount of views of a Twitch channel",
-					"detailedDescription": "Counts how many views has a Twitch channel, replace `nickname` with the desired channel name",
+				"twitchViewers": {
+					"name": "twitchViewers:nickname",
+					"description": "Amount of stream viewers",
+					"detailedDescription": "Counts how many viewers are there on an active stream, replace `nickname` with the desired channel name",
 					"usage": [
-						"{twitchViews:nickname}"
+						"{twitchViewers:nickname}"
 					],
 					"example": [
-						"{twitchViews:ninja} Views"
+						"{twitchViewers:ninja} Views"
 					]
 				},
 				"twitchChannelName": {
@@ -848,8 +848,8 @@
 							"statusCreated": "{CHECK_MARK} Follower counter created"
 						},
 						{
-							"name": "twitchViews",
-							"template": "{twitchViews:{RESOURCE}} Views",
+							"name": "twitchViewers",
+							"template": "Viewers {twitchViewers:{RESOURCE}}",
 							"statusCreating": "{LOADING} Creating views counter",
 							"statusCreated": "{CHECK_MARK} Views counter created"
 						}

diff --git a/src/lang/he_IL.json b/src/lang/he_IL.json
@@ -328,15 +328,15 @@
 						"{twitchFollowers:ninja} Followers"
 					]
 				},
-				"twitchViews": {
-					"name": "twitchViews:nickname",
-					"description": "Amount of views of a Twitch channel",
-					"detailedDescription": "Counts how many views has a Twitch channel, replace `nickname` with the desired channel name",
+				"twitchViewers": {
+					"name": "twitchViewers:nickname",
+					"description": "Amount of stream viewers",
+					"detailedDescription": "Counts how many viewers are there on an active stream, replace `nickname` with the desired channel name",
 					"usage": [
-						"{twitchViews:nickname}"
+						"{twitchViewers:nickname}"
 					],
 					"example": [
-						"{twitchViews:ninja} Views"
+						"{twitchViewers:ninja} Views"
 					]
 				},
 				"twitchChannelName": {
@@ -848,8 +848,8 @@
 							"statusCreated": "{CHECK_MARK} Follower counter created"
 						},
 						{
-							"name": "twitchViews",
-							"template": "{twitchViews:{RESOURCE}} Views",
+							"name": "twitchViewers",
+							"template": "Viewers {twitchViewers:{RESOURCE}}",
 							"statusCreating": "{LOADING} Creating views counter",
 							"statusCreated": "{CHECK_MARK} Views counter created"
 						}

diff --git a/src/lang/hi_IN.json b/src/lang/hi_IN.json
@@ -328,15 +328,15 @@
 						"{twitchFollowers:ninja} Followers"
 					]
 				},
-				"twitchViews": {
-					"name": "twitchViews:nickname",
-					"description": "Amount of views of a Twitch channel",
-					"detailedDescription": "Counts how many views has a Twitch channel, replace `nickname` with the desired channel name",
+				"twitchViewers": {
+					"name": "twitchViewers:nickname",
+					"description": "Amount of stream viewers",
+					"detailedDescription": "Counts how many viewers are there on an active stream, replace `nickname` with the desired channel name",
 					"usage": [
-						"{twitchViews:nickname}"
+						"{twitchViewers:nickname}"
 					],
 					"example": [
-						"{twitchViews:ninja} Views"
+						"{twitchViewers:ninja} Views"
 					]
 				},
 				"twitchChannelName": {
@@ -848,10 +848,10 @@
 							"statusCreated": "{CHECK_MARK} अनुयायी काउंटर बनाई गई"
 						},
 						{
-							"name": "twitchViews",
-							"template": "{twitchFollowers:{RESOURCE}} ट्विच दर्शक",
-							"statusCreating": "{LOADING} व्यू काउंटर बनाई जा रही है",
-							"statusCreated": "{CHECK_MARK} व्यू काउंटर बनाया गया"
+							"name": "twitchViewers",
+							"template": "Viewers {twitchViewers:{RESOURCE}}",
+							"statusCreating": "{LOADING} Creating views counter",
+							"statusCreated": "{CHECK_MARK} Views counter created"
 						}
 					]
 				},