small update

Author: TalkingPanda0

bun.lock

@@ -18,6 +18,7 @@
     "@twurple/eventsub-ws": "^8.0.2",
     "@types/compression": "^1.8.1",
     "@types/cookie-parser": "^1.4.10",
+    "@types/cors": "^2.8.19",
     "@types/express-fileupload": "^1.5.1",
     "@types/fabric": "^5.3.10",
     "@types/grpc-error": "^1.0.3",
@@ -26,6 +27,7 @@
     "body-parser": "^2.2.1",
     "compression": "^1.8.1",
     "cookie-parser": "^1.4.7",
+    "cors": "^2.8.5",
     "discord.js": "^14.25.1",
     "dotenv": "^17.2.3",
     "entities": "^7.0.0",

package.json

@@ -9,6 +9,7 @@ import { DiscordAuthData, TalkingBot } from "./talkingbot";
 import { sign, verify } from "jsonwebtoken";
 import { getTTSSounds } from "./tts";
 import fileUpload, { UploadedFile } from "express-fileupload";
+import cors from "cors";
 import { getDiscordUserId, isDiscordAuthData } from "./util";
 import { handleKofiEvent, isKofiEvent } from "./kofi";
 import { MessageData } from "botModule";
@@ -24,6 +25,7 @@ app.use(express.static("public"));
 app.use(express.static("config/sounds"));
 app.use(express.static("config/images"));
 app.use(bodyParser.text());
+app.use(cors());
 app.use(cookieParser());
 app.use(express.urlencoded({ extended: true }));
 app.use(
@@ -404,10 +406,6 @@ app.get("/creditsList", (_req, res) => {
   res.send(bot.credits.getCreditsList());
 });
 
-app.get("/credits", (_req, res) => {
-  res.sendFile(__dirname + "/html/credits.html");
-});
-
 app.get("/tts", (_req: Request, res: Response) => {
   res.sendFile(__dirname + "/html/tts.html");
 });

src/app.ts

@@ -1293,8 +1293,8 @@ export class MessageHandler {
     data.color = user.color ?? data.color;
 
     if (data.isUserMod)
-      this.bot.credits.addToCredits(data.username, CreditType.Moderator);
-    this.bot.credits.addToCredits(data.username, CreditType.Chatter);
+      this.bot.credits.addToCredits(data.id,data.sender,data.color, CreditType.Moderator);
+    this.bot.credits.addToCredits(data.id,data.sender,data.color, CreditType.Chatter);
 
     if (this.bot.twitch.isStreamOnline) addRecentChatter(this.bot, data);
 

src/commands.ts

@@ -1,12 +1,16 @@
 import { TalkingBot } from "./talkingbot";
 
+export interface Chatter {
+  name: string,
+  color: string,
+}
+
 interface CreditsList {
-  followers: string[];
-  subscribers: string[];
-  moderators: string[];
-  cheers: string[];
-  chatters: string[];
-  whereWordWinner?: string;
+  followers: Chatter[];
+  subscribers: Chatter[];
+  moderators: Chatter[];
+  cheers: Chatter[];
+  chatters: Chatter[];
 }
 
 export enum CreditType {
@@ -18,11 +22,12 @@ export enum CreditType {
 }
 
 export class Credits {
-  private followers: Set<string> = new Set();
-  private subscribers: Set<string> = new Set();
-  private moderators: Set<string> = new Set();
-  private cheers: Set<string> = new Set();
-  private chatters: Set<string> = new Set();
+  private followers: Map<string,Chatter> = new Map();
+  private subscribers:  Map<string,Chatter> = new Map();
+
+  private moderators: Map<string,Chatter> = new Map();
+  private cheers: Map<string,Chatter> = new Map();
+  private chatters:Map<string,Chatter> = new Map();
   private bot: TalkingBot;
 
   constructor(bot: TalkingBot) {
@@ -37,22 +42,22 @@ export class Credits {
     this.chatters.clear();
   }
 
-  public addToCredits(name: string, type: CreditType) {
+  public addToCredits(id: string,name: string,color: string, type: CreditType) {
     switch (type) {
       case CreditType.Follow:
-        this.followers.add(name);
+        this.followers.set(id,{name,color});
         break;
       case CreditType.Moderator:
-        this.moderators.add(name);
+        this.moderators.set(id,{name,color})
         break;
       case CreditType.Subscription:
-        this.subscribers.add(name);
+        this.subscribers.set(id,{name,color})
         break;
       case CreditType.Cheer:
-        this.cheers.add(name);
+        this.cheers.set(id,{name,color})
         break;
       case CreditType.Chatter:
-        this.chatters.add(name);
+        this.chatters.set(id,{name,color});
         break;
     }
   }
@@ -66,12 +71,11 @@ export class Credits {
 
   public getCreditsList(): string {
     const list: CreditsList = {
-      followers: Array.from(this.followers),
-      subscribers: Array.from(this.subscribers),
-      moderators: Array.from(this.moderators),
-      cheers: Array.from(this.cheers),
-      chatters: Array.from(this.chatters),
-      whereWordWinner: this.bot.whereWord.getWinner()?.name,
+      followers: Array.from(this.followers.values()),
+      subscribers: Array.from(this.subscribers.values()),
+      moderators: Array.from(this.moderators.values()),
+      cheers: Array.from(this.cheers.values()),
+      chatters: Array.from(this.chatters.values()),
     };
     return JSON.stringify(list);
   }

src/credits.ts

@@ -46,6 +46,9 @@
     const searchParams = new URLSearchParams(queryString);
     const showCommands = searchParams.get("showcmd") === "yes";
     const showEmoteWall = searchParams.get("emotewall") === "sure";
+    const transparent = searchParams.has("transparent");
+    if(transparent) 
+      messageList.style.backgroundColor = "rgba(0,0,0,0)";
 
     const currentEmotes = [];
 
@@ -456,7 +459,7 @@
           "",
         );
         replyTo = msg.parentMessageUserDisplayName;
-        replyId = msg.parentMessageUserId;
+        replyId = `twitch-${msg.parentMessageUserId}`;
         replyText = msg.parentMessageText;
       }
 
@@ -470,7 +473,6 @@
           indexes.push(parseInt(index));
         });
       });
-      console.log(indexes);
 
       const isUserMod = msg.userInfo.isMod || msg.userInfo.isBroadcaster;
       const isUserVip = isUserMod || msg.userInfo.isVip;
@@ -500,7 +502,6 @@
         id: `twitch-${msg.id}`,
       };
       addToMessageList(message);
-      console.log(message);
     }
     async function getMessages() {
       console.log("getting new messages.");
@@ -512,7 +513,6 @@
       messages.messages.forEach((msg) => {
         if (!msg.includes("PRIVMSG")) return;
         const message = parseTwitchMessage(msg);
-        console.log(message);
         const isCommand =
           message.text.startsWith("!") ||
           message.userInfo.userId === "736013381" ||
@@ -637,7 +637,6 @@
     }
     body {
       margin: 0px;
-      background-color: #2b2e38;
     }
     .redeem {
       color: #a5a5a5;