Merge pull request #3519 from crowbartools/v5

5.66.6 Release

Author: zunderscore

.github/workflows/bump-version-on-release.yml

@@ -3,6 +3,7 @@ name: Bump dev version on release
 on:
   release:
     types: [released]
+  workflow_dispatch:
 
 jobs:
   bumpversion:
@@ -13,6 +14,7 @@ jobs:
         uses: actions/checkout@v5
         with:
           ref: v5
+          token: ${{ secrets.ZUNDER_TOKEN }}
 
       - name: Setup Nodejs
         uses: actions/setup-node@v5

package-lock.json

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

package.json

@@ -51,9 +51,9 @@ class FirebotPronounManager {
         }
     }
 
-    async getUserPronouns(username: string, fallback: string = "they/them"): Promise<UserPronoun | undefined> {
+    async getUserPronouns(username: string, fallback: string = undefined): Promise<UserPronoun | undefined> {
         if (!!username?.length) {
-            const cachedPronouns =  this._userPronounCache.get<UserPronoun>(username);
+            const cachedPronouns = this._userPronounCache.get<UserPronoun>(username);
 
             if (cachedPronouns) {
                 return cachedPronouns;
@@ -87,7 +87,7 @@ class FirebotPronounManager {
             : undefined;
     };
 
-    async getUserFriendlyPronounString(username: string, fallback: string = "they/them", type: "subject" | "object" | "both" = "both") {
+    async getUserFriendlyPronounString(username: string, fallback: string = undefined, type: "subject" | "object" | "both" = "both") {
         const pronouns = await this.getUserPronouns(username, fallback);
 
         if (pronouns) {

src/backend/pronouns/pronoun-manager.ts

@@ -43,17 +43,18 @@ const model : ReplaceVariable = {
         }
 
         const fallbackParts = (fallback ?? "").split("/");
+        let fallbackPart = fallback;
         let type: "subject" | "object" | "both";
 
         switch (pronounNumber) {
             case 1:
                 type = "subject";
-                fallback = fallbackParts[0];
+                fallbackPart = fallbackParts[0];
                 break;
 
             case 2:
                 type = "object";
-                fallback = fallbackParts[1] ?? fallbackParts[0];
+                fallbackPart = fallbackParts[1] ?? fallbackParts[0];
                 break;
 
             default:
@@ -65,7 +66,7 @@ const model : ReplaceVariable = {
 
         return !!pronoun?.length
             ? pronoun
-            : fallback;
+            : fallbackPart;
     }
 };
 export default model;