Merge pull request #3515 from crowbartools/v5

5.66.5 Release

Author: zunderscore

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

@@ -1,31 +1,31 @@
 name: Bump dev version on release
 
 on:
-    release:
-        types: [released]
+  release:
+    types: [released]
 
 jobs:
-    bumpversion:
-        name: Bump version
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout repo
-              uses: actions/checkout@v5
-              with:
-                  ref: v5
+  bumpversion:
+    name: Bump version
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v5
+        with:
+          ref: v5
 
-            - name: Setup Nodejs
-              uses: actions/setup-node@v5
-              with:
-                  node-version: latest
+      - name: Setup Nodejs
+        uses: actions/setup-node@v5
+        with:
+          node-version: latest
 
-            - name: Git config
-              run: |
-                  git config --local user.email "github-actions[bot]@users.noreply.github.com"
-                  git config --local user.name "github-actions[bot]"
+      - name: Git config
+        run: |
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
 
-            - name: Update patch version
-              run: npm version patch
+      - name: Update patch version
+        run: npm version patch
 
-            - name: Push
-              run: git push
+      - name: Push
+        run: git push --force

package-lock.json

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

package.json

@@ -51,41 +51,44 @@ class FirebotPronounManager {
         }
     }
 
-    async getUserPronouns(username: string): Promise<UserPronoun | undefined> {
-        const cachedPronouns = this._userPronounCache.get<UserPronoun>(username);
+    async getUserPronouns(username: string, fallback: string = "they/them"): Promise<UserPronoun | undefined> {
+        if (!!username?.length) {
+            const cachedPronouns =  this._userPronounCache.get<UserPronoun>(username);
 
-        if (cachedPronouns) {
-            return cachedPronouns;
-        } else if (this._userNoPronounCache[username] === true) {
-            return;
-        }
-
-        const url = `${PRONOUN_SERVICE_BASE_URL}users/${username}?t=${new Date().getTime()}`;
-
-        try {
-            const response = await this.callUrl(url);
-
-            if (response.ok) {
-                const pronouns = await response.json() as UserPronounResponse;
-                this._userPronounCache.set<UserPronoun>(username, {
-                    primary: pronouns.pronoun_id,
-                    secondary: pronouns.alt_pronoun_id
-                });
-                return this._userPronounCache.get<UserPronoun>(username);
-            } else if (response.status === 404) {
-                logger.debug(`No pronouns set for ${username}`);
-                this._userNoPronounCache.set(username, true);
+            if (cachedPronouns) {
+                return cachedPronouns;
+            } else if (this._userNoPronounCache[username] === true) {
                 return;
             }
-        } catch (error) {
-            logger.warn(`Unable to get pronouns for ${username}`, error);
+
+            const url = `${PRONOUN_SERVICE_BASE_URL}users/${username}?t=${new Date().getTime()}`;
+
+            try {
+                const response = await this.callUrl(url);
+
+                if (response.ok) {
+                    const pronouns = await response.json() as UserPronounResponse;
+                    this._userPronounCache.set<UserPronoun>(username, {
+                        primary: pronouns.pronoun_id,
+                        secondary: pronouns.alt_pronoun_id
+                    });
+                    return this._userPronounCache.get<UserPronoun>(username);
+                } else if (response.status === 404) {
+                    logger.debug(`No pronouns set for ${username}`);
+                    this._userNoPronounCache.set(username, true);
+                }
+            } catch (error) {
+                logger.warn(`Unable to get pronouns for ${username}`, error);
+            }
         }
 
-        return;
+        return !!fallback?.length
+            ? { primary: fallback.replace("/", "") }
+            : undefined;
     };
 
-    async getUserFriendlyPronounString(username: string, type: "subject" | "object" | "both" = "both") {
-        const pronouns = await this.getUserPronouns(username);
+    async getUserFriendlyPronounString(username: string, fallback: string = "they/them", type: "subject" | "object" | "both" = "both") {
+        const pronouns = await this.getUserPronouns(username, fallback);
 
         if (pronouns) {
             return this.getFriendlyPronounString(pronouns.primary, pronouns.secondary, type);

src/backend/pronouns/pronoun-manager.ts

@@ -29,6 +29,10 @@ const model : ReplaceVariable = {
         pronounNumber: number | string = 0,
         fallback : string = "they/them"
     ) => {
+        if (!username?.length) {
+            username = trigger.metadata.username;
+        }
+
         if (typeof pronounNumber === 'string' || <unknown>pronounNumber instanceof String) {
             pronounNumber = Number(`${pronounNumber}`);
         }
@@ -57,7 +61,7 @@ const model : ReplaceVariable = {
                 break;
         }
 
-        const pronoun = await FirebotPronounManager.getUserFriendlyPronounString(username, type);
+        const pronoun = await FirebotPronounManager.getUserFriendlyPronounString(username, fallback, type);
 
         return !!pronoun?.length
             ? pronoun