v5.62.1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebotv5",
-  "version": "5.62.0",
+  "version": "5.62.1",
   "description": "Powerful all-in-one bot for Twitch streamers.",
   "main": "build/main.js",
   "scripts": {

src/backend/effects/builtin/show-text.js

@@ -30,7 +30,7 @@ const showText = {
    */
     optionsTemplate: `
     <eos-container header="Text">
-        <div ng-class="editorClass" replace-variables on-variable-insert="onVariableInsert(variable)" menu-position="bottom">
+        <div ng-class="editorClass" replace-variables on-variable-insert="onVariableInsert(text)" menu-position="bottom">
             <summernote on-editor-ready="editorReady(editor)" ng-model="effect.text" config="editorOptions" editor="editor" editable="editable"></summernote>
         </div>
         <div style="margin-top: 10px;">

src/backend/events/twitch-events/ad.ts

@@ -22,7 +22,7 @@ export function triggerAdBreakStart(
         isAdBreakScheduled
     });
 
-    adManager.triggerAdBreak(adBreakDuration, adBreakEnd);
+    adManager.triggerAdBreakStart(adBreakDuration, adBreakEnd);
 }
 
 export function triggerAdBreakEnd(

src/backend/games/builtin/bid/bid-command.js

@@ -12,7 +12,8 @@ const NodeCache = require("node-cache");
 let activeBiddingInfo = {
     "active": false,
     "currentBid": 0,
-    "topBidder": ""
+    "topBidder": "",
+    "topBidderDisplayName": ""
 };
 let bidTimer;
 const cooldownCache = new NodeCache({checkperiod: 5});
@@ -30,7 +31,7 @@ function purgeCaches() {
 async function stopBidding(chatter) {
     clearTimeout(bidTimer);
     if (activeBiddingInfo.topBidder) {
-        await twitchChat.sendChatMessage(`${activeBiddingInfo.topBidder} has won the bidding with ${activeBiddingInfo.currentBid}!`, null, chatter);
+        await twitchChat.sendChatMessage(`${activeBiddingInfo.topBidderDisplayName} has won the bidding with ${activeBiddingInfo.currentBid}!`, null, chatter);
     } else {
         await twitchChat.sendChatMessage(`There is no winner, because no one bid!`, null, chatter);
     }
@@ -150,6 +151,7 @@ const bidCommand = {
             const triggeredArg = userCommand.args[0];
             const bidAmount = parseInt(triggeredArg);
             const username = userCommand.commandSender;
+            const userDisplayName = chatMessage?.userDisplayName ?? username;
 
             if (activeBiddingInfo.active === false) {
                 await twitchChat.sendChatMessage(`There is no active bidding in progress.`, null, chatter, chatMessage.id);
@@ -203,10 +205,10 @@ const bidCommand = {
 
             await currencyManager.adjustCurrencyForViewer(username, currencyId, -Math.abs(bidAmount));
             const newTopBidWithRaise = bidAmount + raiseMinimum;
-            await twitchChat.sendChatMessage(`${username} is the new high bidder at ${bidAmount} ${currencyName}. To bid, type !bid ${newTopBidWithRaise} (or higher).`);
+            await twitchChat.sendChatMessage(`${userDisplayName} is the new high bidder at ${bidAmount} ${currencyName}. To bid, type !bid ${newTopBidWithRaise} (or higher).`);
 
             // eslint-disable-next-line no-use-before-define
-            setNewHighBidder(username, bidAmount);
+            setNewHighBidder(username, userDisplayName, bidAmount);
 
             const cooldownSecs = bidSettings.settings.cooldownSettings.cooldown;
             if (cooldownSecs && cooldownSecs > 0) {
@@ -229,9 +231,10 @@ function unregisterBidCommand() {
     commandManager.unregisterSystemCommand(BID_COMMAND_ID);
 }
 
-function setNewHighBidder(username, amount) {
+function setNewHighBidder(username, userDisplayName, amount) {
     activeBiddingInfo.currentBid = amount;
     activeBiddingInfo.topBidder = username;
+    activeBiddingInfo.topBidderDisplayName = userDisplayName;
 }
 
 exports.purgeCaches = purgeCaches;

src/backend/games/builtin/heist/heist-command.js

@@ -80,7 +80,7 @@ const heistCommand = {
         if (heistRunner.lobbyOpen && heistRunner.userOnTeam(username)) {
             if (heistSettings.settings.entryMessages.alreadyJoined) {
                 const alreadyJoinedMsg = heistSettings.settings.entryMessages.alreadyJoined
-                    .replace("{user}", username);
+                    .replace("{user}", user.displayName);
 
                 await twitchChat.sendChatMessage(alreadyJoinedMsg, null, chatter);
             }
@@ -95,7 +95,7 @@ const heistCommand = {
             if ((defaultWager == null || defaultWager < 1)) {
                 if (heistSettings.settings.entryMessages.noWagerAmount) {
                     const noWagerAmountMsg = heistSettings.settings.entryMessages.noWagerAmount
-                        .replace("{user}", username);
+                        .replace("{user}", user.displayName);
 
                     await twitchChat.sendChatMessage(noWagerAmountMsg, null, chatter);
                 }
@@ -109,7 +109,7 @@ const heistCommand = {
         } else {
             if (heistSettings.settings.entryMessages.invalidWagerAmount) {
                 const invalidWagerAmountMsg = heistSettings.settings.entryMessages.invalidWagerAmount
-                    .replace("{user}", username);
+                    .replace("{user}", user.displayName);
 
                 await twitchChat.sendChatMessage(invalidWagerAmountMsg, null, chatter);
             }
@@ -125,7 +125,7 @@ const heistCommand = {
             if (wagerAmount < minWager) {
                 if (heistSettings.settings.entryMessages.wagerAmountTooLow) {
                     const wagerAmountTooLowMsg = heistSettings.settings.entryMessages.wagerAmountTooLow
-                        .replace("{user}", username)
+                        .replace("{user}", user.displayName)
                         .replace("{minWager}", minWager);
 
                     await twitchChat.sendChatMessage(wagerAmountTooLowMsg, null, chatter);
@@ -139,7 +139,7 @@ const heistCommand = {
             if (wagerAmount > maxWager) {
                 if (heistSettings.settings.entryMessages.wagerAmountTooHigh) {
                     const wagerAmountTooHighMsg = heistSettings.settings.entryMessages.wagerAmountTooHigh
-                        .replace("{user}", username)
+                        .replace("{user}", user.displayName)
                         .replace("{maxWager}", maxWager);
 
                     await twitchChat.sendChatMessage(wagerAmountTooHighMsg, null, chatter);
@@ -154,7 +154,7 @@ const heistCommand = {
         if (userBalance < wagerAmount) {
             if (heistSettings.settings.entryMessages.notEnoughToWager) {
                 const notEnoughToWagerMsg = heistSettings.settings.entryMessages.notEnoughToWager
-                    .replace("{user}", username);
+                    .replace("{user}", user.displayName);
 
                 await twitchChat.sendChatMessage(notEnoughToWagerMsg, null, chatter);
             }
@@ -212,7 +212,7 @@ const heistCommand = {
             heistRunner.triggerLobbyStart(startDelay);
 
             const teamCreationMessage = heistSettings.settings.generalMessages.teamCreation
-                .replace("{user}", username)
+                .replace("{user}", user.displayName)
                 .replace("{command}", userCommand.trigger)
                 .replace("{maxWager}", maxWager)
                 .replace("{minWager}", minWager)
@@ -226,13 +226,14 @@ const heistCommand = {
         // add the user to the game
         heistRunner.addUser({
             username: username,
+            userDisplayName: user.displayName,
             wager: wagerAmount,
             successPercentage: successChance,
             winnings: Math.floor(wagerAmount * winningsMultiplier)
         });
 
         const onJoinMessage = heistSettings.settings.entryMessages.onJoin
-            .replace("{user}", username)
+            .replace("{user}", user.displayName)
             .replace("{wager}", util.commafy(wagerAmount))
             .replace("{currency}", currency.name);
 

src/backend/games/builtin/heist/heist-runner.js

@@ -9,6 +9,7 @@ const util = require("../../../utility");
 /**
  * @typedef HeistUser
  * @property {string} username - The user's name
+ * @property {string} userDisplayName - The user's display name
  * @property {number} wager - The amount the user wagered
  * @property {number} successPercentage - The users win percentage
  * @property {number} winnings - The winnings the user will receive should they win
@@ -100,7 +101,7 @@ async function runHeist() {
 
     if (usersInHeist.length === 1) {
         outcomeMessage = outcomeMessage
-            .replace("{user}", usersInHeist[0].username);
+            .replace("{user}", usersInHeist[0].userDisplayName);
     }
 
     const currencyId = heistSettings.settings.currencySettings.currencyId;
@@ -111,7 +112,7 @@ async function runHeist() {
     let winningsString;
     if (percentSurvived > 0) {
         winningsString = survivers
-            .map(s => `${s.username} (${util.commafy(s.winnings)})`)
+            .map(s => `${s.userDisplayName} (${util.commafy(s.winnings)})`)
             .join(", ");
     } else {
         winningsString = "None";
@@ -165,7 +166,7 @@ exports.triggerLobbyStart = (startDelayMins) => {
             let teamTooSmallMessage = heistSettings.settings.generalMessages.teamTooSmall;
             if (usersInHeist.length > 0 && teamTooSmallMessage) {
                 teamTooSmallMessage = teamTooSmallMessage
-                    .replace("{user}", usersInHeist[0].username);
+                    .replace("{user}", usersInHeist[0].userDisplayName);
 
                 await twitchChat.sendChatMessage(teamTooSmallMessage, null, chatter);
             }

src/backend/games/builtin/slots/spin-command.js

@@ -61,7 +61,7 @@ const spinCommand = {
             if (defaultWager == null || defaultWager < 1) {
                 if (slotsSettings.settings.generalMessages.noWagerAmount) {
                     const noWagerAmountMsg = slotsSettings.settings.generalMessages.noWagerAmount
-                        .replace("{user}", username);
+                        .replace("{user}", user.displayName);
 
                     await twitchChat.sendChatMessage(noWagerAmountMsg, null, chatter);
                 }
@@ -75,7 +75,7 @@ const spinCommand = {
         } else {
             if (slotsSettings.settings.generalMessages.invalidWagerAmount) {
                 const invalidWagerAmountMsg = slotsSettings.settings.generalMessages.invalidWagerAmount
-                    .replace("{user}", username);
+                    .replace("{user}", user.displayName);
 
                 await twitchChat.sendChatMessage(invalidWagerAmountMsg, null, chatter);
             }
@@ -86,7 +86,7 @@ const spinCommand = {
         if (activeSpinners.get(username)) {
             if (slotsSettings.settings.generalMessages.alreadySpinning) {
                 const alreadySpinningMsg = slotsSettings.settings.generalMessages.alreadySpinning
-                    .replace("{username}", username);
+                    .replace("{username}", user.displayName);
 
                 await twitchChat.sendChatMessage(alreadySpinningMsg, null, chatter);
             }
@@ -99,7 +99,7 @@ const spinCommand = {
             if (slotsSettings.settings.generalMessages.onCooldown) {
                 const timeRemainingDisplay = util.secondsForHumans(Math.abs(moment().diff(cooldownExpireTime, 'seconds')));
                 const cooldownMsg = slotsSettings.settings.generalMessages.onCooldown
-                    .replace("{username}", username).replace("{timeRemaining}", timeRemainingDisplay);
+                    .replace("{username}", user.displayName).replace("{timeRemaining}", timeRemainingDisplay);
 
                 await twitchChat.sendChatMessage(cooldownMsg, null, chatter);
             }
@@ -110,7 +110,7 @@ const spinCommand = {
         if (wagerAmount < 1) {
             if (slotsSettings.settings.generalMessages.moreThanZero) {
                 const moreThanZeroMsg = slotsSettings.settings.generalMessages.moreThanZero
-                    .replace("{username}", username);
+                    .replace("{username}", user.displayName);
 
                 await twitchChat.sendChatMessage(moreThanZeroMsg, null, chatter);
             }
@@ -123,7 +123,7 @@ const spinCommand = {
             if (wagerAmount < minWager) {
                 if (slotsSettings.settings.generalMessages.minWager) {
                     const minWagerMsg = slotsSettings.settings.generalMessages.minWager
-                        .replace("{username}", username).replace("{minWager}", minWager);
+                        .replace("{username}", user.displayName).replace("{minWager}", minWager);
 
                     await twitchChat.sendChatMessage(minWagerMsg, null, chatter);
                 }
@@ -136,7 +136,7 @@ const spinCommand = {
             if (wagerAmount > maxWager) {
                 if (slotsSettings.settings.generalMessages.maxWager) {
                     const maxWagerMsg = slotsSettings.settings.generalMessages.maxWager
-                        .replace("{username}", username).replace("{maxWager}", maxWager);
+                        .replace("{username}", user.displayName).replace("{maxWager}", maxWager);
 
                     await twitchChat.sendChatMessage(maxWagerMsg, null, chatter);
                 }
@@ -157,7 +157,7 @@ const spinCommand = {
         if (userBalance < wagerAmount) {
             if (slotsSettings.settings.generalMessages.notEnough) {
                 const notEnoughMsg = slotsSettings.settings.generalMessages.notEnough
-                    .replace("{username}", username);
+                    .replace("{username}", user.displayName);
 
                 await twitchChat.sendChatMessage(notEnoughMsg, null, chatter);
             }
@@ -177,7 +177,7 @@ const spinCommand = {
             await currencyManager.adjustCurrencyForViewerById(user.id, currencyId, 0 - Math.abs(wagerAmount));
         } catch (error) {
             logger.error(error);
-            await twitchChat.sendChatMessage(`Sorry ${username}, there was an error deducting currency from your balance so the spin has been canceled.`, null, chatter);
+            await twitchChat.sendChatMessage(`Sorry ${user.displayName}, there was an error deducting currency from your balance so the spin has been canceled.`, null, chatter);
             activeSpinners.del(username);
             return;
         }
@@ -213,7 +213,7 @@ const spinCommand = {
         }
 
         const spinInActionMsg = slotsSettings.settings.generalMessages.spinInAction
-            .replace("{username}", username);
+            .replace("{username}", user.displayName);
         const showSpinInActionMsg = !!slotsSettings.settings.generalMessages.spinInAction;
         const successfulRolls = await slotMachine.spin(showSpinInActionMsg, spinInActionMsg, successChance, chatter);
 
@@ -227,7 +227,7 @@ const spinCommand = {
             const currency = currencyAccess.getCurrencyById(currencyId);
 
             const spinSuccessfulMsg = slotsSettings.settings.generalMessages.spinSuccessful
-                .replace("{username}", username)
+                .replace("{username}", user.displayName)
                 .replace("{successfulRolls}", successfulRolls)
                 .replace("{winningsAmount}", util.commafy(winnings))
                 .replace("{currencyName}", currency.name);