Merge branch 'staging' into patch-9

idsus · May 18, 2021 · 59f25d1 · 59f25d1
2 parents 4a44ca1 + bbdc370
commit 59f25d1
Show file tree

Hide file tree

Showing 95 changed files with 2,446 additions and 477 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -190,6 +190,8 @@ WEBRTC_LISTEN_IP=127.0.0.1
 Then run `yarn build` and `yarn start`.
 
 ## Issues
+> NOTE: If your bug is a **security vulnerability**, please instead see the [security policy](https://github.com/benawad/dogehouse/security/policy)
+
 We use GitHub issues to track public bugs. Please ensure your description is
 clear and has sufficient instructions to be able to reproduce the issue. Report a bug by <a href="https://github.com/benawad/dogehouse/issues">opening a new issue</a>; it's that easy!
 

diff --git a/dolma/src/lib/filterString.ts b/dolma/src/lib/filterString.ts
@@ -12,13 +12,26 @@ export function filterString(emotes: { name: string }[], message: string) {
 
   vals.map((e) => {
     let tkn = msgToken.getType(e);
-    if (tkn == "emote") {
-			emotes.find((emote) => `:${emote.name}:` == e.trim()) ? "" : tkn = "text";
-    }
-    if (tkn == "mention") {
-      e = e.substr(1);
-    }
-    let value = msgToken.getValue(tkn, e);
+    tokenSwitch:
+      switch (tkn) {
+        case "emote":
+          for(const emote of emotes) {
+            if(e.trim() === `:${emote.name}:`) {
+              e = emote.name;
+              break tokenSwitch;
+            }
+          }
+          tkn = "text";
+          break;
+        case "block":
+          e = e.slice(1, -1);
+          break;
+        case "mention":
+          e = e.substr(1);
+          break;
+      }
+
+    const value = msgToken.getValue(tkn, e);
 
     return tokens.push(msgToken.newToken(tkn, value));
   });

diff --git a/kibbeh/public/locales/af/translation.json b/kibbeh/public/locales/af/translation.json
@@ -16,7 +16,9 @@
     "copied": "gekopieër",
     "formattedIntlDate": "{{date, intlDate}}",
     "formattedIntlTime": "{{time, intlTime}}",
-    "requestPermissions": "Please give DogeHouse Accessibility permessions"
+    "requestPermissions": "Please give DogeHouse Accessibility permessions",
+    "copy": "Copy",
+    "error": "Error"
   },
   "header": {
     "_comment": "Main Header UI Internationalization Strings",
@@ -134,7 +136,11 @@
       "block": "Block",
       "unblock": "Unblock",
       "sendDM": "Send DM",
-      "aboutSuffix": ""
+      "aboutSuffix": "",
+      "errors": {
+        "blocked": "This user has blocked you.",
+        "default": "Whoops! We couldn't load this user."
+      }
     },
     "voiceSettings": {
       "header": "Stem instellings",
@@ -162,6 +168,14 @@
       "title": "Privacy Settings",
       "header": "Privacy Settings",
       "whispers": { "label": "Whispers", "on": "On", "off": "Off" }
+    },
+    "botEdit": {
+      "yourBots": "Your Bots",
+      "bots": "Bots",
+      "title": "Bot Information",
+      "apiKey": "ApiKey",
+      "regenerate": "Regenerate",
+      "reveal": "Click to reveal ApiKey"
     }
   },
   "components": {
@@ -276,6 +290,11 @@
           "disabled": "Disabled",
           "followerOnly": "Follower Only"
         }
+      },
+      "createBotModal": {
+        "usernameTaken": "Username is taken",
+        "subtitle": "Please fill the details below to create your bot",
+        "title": "Create Bot"
       }
     },
     "followingOnline": {
@@ -305,7 +324,8 @@
         "debugAudio": "Debug Audio",
         "stopDebugger": "Stop Debugger"
       },
-      "downloadApp": "Download App"
+      "downloadApp": "Download App",
+      "developer": "Developer Settings"
     },
     "userBadges": {
       "dhStaff": "DogeHouse Staff",

diff --git a/kibbeh/public/locales/am/translation.json b/kibbeh/public/locales/am/translation.json
@@ -16,7 +16,9 @@
     "copied": "ተቀድቷል!",
     "formattedIntlDate": "{{date, intlDate}}",
     "formattedIntlTime": "{{time, intlTime}}",
-    "requestPermissions": "Please give DogeHouse Accessibility permessions"
+    "requestPermissions": "Please give DogeHouse Accessibility permessions",
+    "copy": "Copy",
+    "error": "Error"
   },
   "header": {
     "_comment": "Main Header UI Internationalization Strings",
@@ -134,7 +136,11 @@
       "block": "Block",
       "unblock": "Unblock",
       "sendDM": "Send DM",
-      "aboutSuffix": ""
+      "aboutSuffix": "",
+      "errors": {
+        "blocked": "This user has blocked you.",
+        "default": "Whoops! We couldn't load this user."
+      }
     },
     "voiceSettings": {
       "header": "የድምፅ ቅንብሮች",
@@ -163,6 +169,14 @@
       "title": "Privacy Settings",
       "header": "Privacy Settings",
       "whispers": { "label": "Whispers", "on": "On", "off": "Off" }
+    },
+    "botEdit": {
+      "yourBots": "Your Bots",
+      "bots": "Bots",
+      "title": "Bot Information",
+      "apiKey": "ApiKey",
+      "regenerate": "Regenerate",
+      "reveal": "Click to reveal ApiKey"
     }
   },
   "components": {
@@ -275,6 +289,11 @@
           "disabled": "Disabled",
           "followerOnly": "Follower Only"
         }
+      },
+      "createBotModal": {
+        "usernameTaken": "Username is taken",
+        "subtitle": "Please fill the details below to create your bot",
+        "title": "Create Bot"
       }
     },
     "followingOnline": {
@@ -304,7 +323,8 @@
         "debugAudio": "Debug Audio",
         "stopDebugger": "Stop Debugger"
       },
-      "downloadApp": "Download App"
+      "downloadApp": "Download App",
+      "developer": "Developer Settings"
     },
     "userBadges": {
       "dhStaff": "DogeHouse Staff",

diff --git a/kibbeh/public/locales/ar/translation.json b/kibbeh/public/locales/ar/translation.json
@@ -16,7 +16,9 @@
     "copied": "تم النسخ",
     "formattedIntlDate": "{{date, intlDate}}",
     "formattedIntlTime": "{{time, intlTime}}",
-    "requestPermissions": "Please give DogeHouse Accessibility permessions"
+    "requestPermissions": "Please give DogeHouse Accessibility permessions",
+    "copy": "Copy",
+    "error": "Error"
   },
   "header": {
     "_comment": "Main Header UI Internationalization Strings",
@@ -134,7 +136,11 @@
       "block": "Block",
       "unblock": "Unblock",
       "sendDM": "Send DM",
-      "aboutSuffix": ""
+      "aboutSuffix": "",
+      "errors": {
+        "blocked": "This user has blocked you.",
+        "default": "Whoops! We couldn't load this user."
+      }
     },
     "voiceSettings": {
       "header": "إعدادات المحادثة الصوتية",
@@ -162,6 +168,14 @@
       "title": "Privacy Settings",
       "header": "Privacy Settings",
       "whispers": { "label": "Whispers", "on": "On", "off": "Off" }
+    },
+    "botEdit": {
+      "yourBots": "Your Bots",
+      "bots": "Bots",
+      "title": "Bot Information",
+      "apiKey": "ApiKey",
+      "regenerate": "Regenerate",
+      "reveal": "Click to reveal ApiKey"
     }
   },
   "components": {
@@ -274,6 +288,11 @@
           "disabled": "Disabled",
           "followerOnly": "Follower Only"
         }
+      },
+      "createBotModal": {
+        "usernameTaken": "Username is taken",
+        "subtitle": "Please fill the details below to create your bot",
+        "title": "Create Bot"
       }
     },
     "followingOnline": {
@@ -303,7 +322,8 @@
         "debugAudio": "Debug Audio",
         "stopDebugger": "Stop Debugger"
       },
-      "downloadApp": "تنزيل التطبيق"
+      "downloadApp": "تنزيل التطبيق",
+      "developer": "Developer Settings"
     },
     "userBadges": {
       "dhStaff": "DogeHouse Staff",

diff --git a/kibbeh/public/locales/az/translation.json b/kibbeh/public/locales/az/translation.json
@@ -16,7 +16,9 @@
     "copied": "Kopyalandı",
     "formattedIntlDate": "{{date, intlDate}}",
     "formattedIntlTime": "{{time, intlTime}}",
-    "requestPermissions": "Zəhmət olmasa DogeHouse-a lazımlı icazələri verin"
+    "requestPermissions": "Zəhmət olmasa DogeHouse-a lazımlı icazələri verin",
+    "copy": "Copy",
+    "error": "Error"
   },
   "header": {
     "_comment": "Main Header UI Internationalization Strings",
@@ -134,7 +136,11 @@
       "block": "Block",
       "unblock": "Unblock",
       "sendDM": "Send DM",
-      "aboutSuffix": ""
+      "aboutSuffix": "",
+      "errors": {
+        "blocked": "This user has blocked you.",
+        "default": "Whoops! We couldn't load this user."
+      }
     },
     "voiceSettings": {
       "header": "Səs parametrləri",
@@ -165,6 +171,14 @@
       "title": "Privacy Settings",
       "header": "Privacy Settings",
       "whispers": { "label": "Whispers", "on": "On", "off": "Off" }
+    },
+    "botEdit": {
+      "yourBots": "Your Bots",
+      "bots": "Bots",
+      "title": "Bot Information",
+      "apiKey": "ApiKey",
+      "regenerate": "Regenerate",
+      "reveal": "Click to reveal ApiKey"
     }
   },
   "components": {
@@ -282,6 +296,11 @@
           "disabled": "Disabled",
           "followerOnly": "Follower Only"
         }
+      },
+      "createBotModal": {
+        "usernameTaken": "Username is taken",
+        "subtitle": "Please fill the details below to create your bot",
+        "title": "Create Bot"
       }
     },
     "followingOnline": {
@@ -311,7 +330,8 @@
         "debugAudio": "Səsi incələ",
         "stopDebugger": "İncələmən dayandır"
       },
-      "downloadApp": "Download App"
+      "downloadApp": "Download App",
+      "developer": "Developer Settings"
     },
     "userBadges": {
       "dhStaff": "DogeHouse Staff",

diff --git a/kibbeh/public/locales/bg/translation.json b/kibbeh/public/locales/bg/translation.json
@@ -16,7 +16,9 @@
     "copied": "копирано",
     "formattedIntlDate": "{{date, intlDate}}",
     "formattedIntlTime": "{{time, intlTime}}",
-    "requestPermissions": "Please give DogeHouse Accessibility permessions"
+    "requestPermissions": "Please give DogeHouse Accessibility permessions",
+    "copy": "Copy",
+    "error": "Error"
   },
   "header": {
     "_comment": "Main Header UI Internationalization Strings",
@@ -134,7 +136,11 @@
       "block": "Block",
       "unblock": "Unblock",
       "sendDM": "Send DM",
-      "aboutSuffix": ""
+      "aboutSuffix": "",
+      "errors": {
+        "blocked": "This user has blocked you.",
+        "default": "Whoops! We couldn't load this user."
+      }
     },
     "voiceSettings": {
       "header": "Звукови настройки",
@@ -162,6 +168,14 @@
       "title": "Privacy Settings",
       "header": "Privacy Settings",
       "whispers": { "label": "Whispers", "on": "On", "off": "Off" }
+    },
+    "botEdit": {
+      "yourBots": "Your Bots",
+      "bots": "Bots",
+      "title": "Bot Information",
+      "apiKey": "ApiKey",
+      "regenerate": "Regenerate",
+      "reveal": "Click to reveal ApiKey"
     }
   },
   "components": {
@@ -276,6 +290,11 @@
           "disabled": "Disabled",
           "followerOnly": "Follower Only"
         }
+      },
+      "createBotModal": {
+        "usernameTaken": "Username is taken",
+        "subtitle": "Please fill the details below to create your bot",
+        "title": "Create Bot"
       }
     },
     "followingOnline": {
@@ -305,7 +324,8 @@
         "debugAudio": "Debug Audio",
         "stopDebugger": "Stop Debugger"
       },
-      "downloadApp": "Download App"
+      "downloadApp": "Download App",
+      "developer": "Developer Settings"
     },
     "userBadges": {
       "dhStaff": "DogeHouse Staff",