chore: use tStrippedWithObj and remove strippedWithObj

Author: Bilb

ts/localization/localeTools.ts

@@ -128,21 +128,6 @@ export function tStrippedWithObj<T extends MergedLocalizerTokens>(
   return builder.toString();
 }
 
-export function strippedWithObj<T extends MergedLocalizerTokens>(
-  opts: LocalizerComponentProps<T, string>
-): string | T {
-  const sanitizedArgs = opts.args ? sanitizeArgs(opts.args, '\u200B') : undefined;
-
-  // Note: the `as any` is needed sanitizeArgs does not preserve argument types
-  const i18nString = new LocalizedStringBuilder<T>(opts.token as any, localeInUse)
-    .withArgs(sanitizedArgs as any)
-    .toString();
-
-  const strippedString = i18nString.replaceAll(/<[^>]*>/g, '');
-
-  return deSanitizeHtmlTags(strippedString, '\u200B');
-}
-
 /**
  * Sanitizes the args to be used in the i18n function
  * @param args The args to sanitize

ts/models/message.ts

@@ -93,7 +93,7 @@ import { getTimerNotificationStr } from './timerNotifications';
 import { ExpirationTimerUpdate } from '../session/disappearing_messages/types';
 import { Model } from './models';
 import { ReduxOnionSelectors } from '../state/selectors/onions';
-import { strippedWithObj, tr, tStripped } from '../localization/localeTools';
+import { tStrippedWithObj, tr, tStripped } from '../localization/localeTools';
 
 // tslint:disable: cyclomatic-complexity
 
@@ -246,20 +246,20 @@ export class MessageModel extends Model<MessageAttributes> {
         this.getConversation()?.getNicknameOrRealUsernameOrPlaceholder() || tr('unknown');
 
       if (groupUpdate.left) {
-        return strippedWithObj(getLeftGroupUpdateChangeStr(groupUpdate.left));
+        return tStrippedWithObj(getLeftGroupUpdateChangeStr(groupUpdate.left));
       }
 
       if (groupUpdate.name) {
-        return strippedWithObj(getGroupNameChangeStr(groupUpdate.name));
+        return tStrippedWithObj(getGroupNameChangeStr(groupUpdate.name));
       }
 
       if (groupUpdate.avatarChange) {
-        return strippedWithObj(getGroupDisplayPictureChangeStr());
+        return tStrippedWithObj(getGroupDisplayPictureChangeStr());
       }
 
       if (groupUpdate.joined?.length) {
         const opts = getJoinedGroupUpdateChangeStr(groupUpdate.joined, isGroupV2, false, groupName);
-        return strippedWithObj(opts);
+        return tStrippedWithObj(opts);
       }
 
       if (groupUpdate.joinedWithHistory?.length) {
@@ -269,16 +269,16 @@ export class MessageModel extends Model<MessageAttributes> {
           true,
           groupName
         );
-        return strippedWithObj(opts);
+        return tStrippedWithObj(opts);
       }
 
       if (groupUpdate.kicked?.length) {
         const opts = getKickedGroupUpdateStr(groupUpdate.kicked, groupName);
-        return strippedWithObj(opts);
+        return tStrippedWithObj(opts);
       }
       if (groupUpdate.promoted?.length) {
         const opts = getPromotedGroupUpdateChangeStr(groupUpdate.promoted);
-        return strippedWithObj(opts);
+        return tStrippedWithObj(opts);
       }
       window.log.warn('did not build a specific change for getDescription of ', groupUpdate);
 
@@ -381,7 +381,7 @@ export class MessageModel extends Model<MessageAttributes> {
         timespanSeconds: expireTimer,
       });
 
-      return strippedWithObj(i18nProps);
+      return tStrippedWithObj(i18nProps);
     }
     const body = this.get('body');
     if (body) {

ts/session/utils/Toast.tsx

@@ -2,7 +2,7 @@ import { toast } from 'react-toastify';
 import { SessionToast, SessionToastType } from '../../components/basic/SessionToast';
 import { sectionActions, SectionType } from '../../state/ducks/section';
 import { getPromotedGroupUpdateChangeStr } from '../../models/groupUpdate';
-import { strippedWithObj, tStripped } from '../../localization/localeTools';
+import { tStripped, tStrippedWithObj } from '../../localization/localeTools';
 
 // if you push a toast manually with toast...() be sure to set the type attribute of the SessionToast component
 export function pushToastError(id: string, description: string) {
@@ -212,7 +212,7 @@ export function pushFailedToRemoveFromModerator(names: Array<string>) {
 
 export function pushUserAddedToModerators(userNames: Array<string>) {
   const opts = getPromotedGroupUpdateChangeStr(userNames);
-  pushToastSuccess('adminPromotedToAdmin', strippedWithObj(opts));
+  pushToastSuccess('adminPromotedToAdmin', tStrippedWithObj(opts));
 }
 
 export function pushUserRemovedFromModerators(names: Array<string>) {