More auto delete icon durations and hour type

Author: H7GhosT

assets/icons/auto_delete_circle_7.svg

@@ -0,0 +1,54 @@
+import {DurationType} from '@helpers/formatDuration';
+import Icon, {OverlayedIcon} from './icon';
+import {findMatchingAutoDeleteIconOption} from './sidebarLeft/tabs/autoDeleteMessages/options';
+
+const shiftedIcons = [DurationType.Days, DurationType.Years]
+
+const typeToIcon: Partial<Record<DurationType, Icon>> = {
+  [DurationType.Hours]: 'auto_delete_circle_hours',
+  [DurationType.Days]: 'auto_delete_circle_days',
+  [DurationType.Weeks]: 'auto_delete_circle_weeks',
+  [DurationType.Months]: 'auto_delete_circle_months',
+  [DurationType.Years]: 'auto_delete_circle_years'
+};
+
+const durationToIcon: Partial<Record<number, Icon>> = {
+  1: 'auto_delete_circle_1',
+  2: 'auto_delete_circle_2',
+  3: 'auto_delete_circle_3',
+  4: 'auto_delete_circle_4',
+  5: 'auto_delete_circle_5',
+  6: 'auto_delete_circle_6',
+  7: 'auto_delete_circle_7',
+  8: 'auto_delete_circle_8'
+};
+
+export function createAutoDeleteIcon(period?: number) {
+  const defaultResult = () => Icon('auto_delete_circle_clock');
+
+  if(!period) return defaultResult();
+
+  const option = findMatchingAutoDeleteIconOption(period);
+  if(!option) return defaultResult();
+
+  const durationIcon = durationToIcon[option.duration];
+  const typeIcon = typeToIcon[option.type];
+
+  if(!durationIcon || !typeIcon) return defaultResult();
+
+  const isShifted = shiftedIcons.includes(option.type);
+
+  return OverlayedIcon(
+    [
+      'auto_delete_circle_empty',
+      {
+        icon: durationIcon,
+        className: isShifted ? 'auto-delete-icon--shifted' : undefined
+      },
+      {
+        icon: typeIcon,
+        className: isShifted ? 'auto-delete-icon--shifted' : undefined
+      }
+    ],
+  );
+}

assets/icons/auto_delete_circle_8.svg

@@ -48,7 +48,7 @@ import currencyStarIcon from '@components/currencyStarIcon';
 import type {ActiveAccountNumber} from '@lib/accounts/types';
 import {getCurrentAccount} from '@lib/accounts/getCurrentAccount';
 import {appSettings} from '@stores/appSettings';
-import {createAutoDeleteIcon} from '@components/chat/utils';
+import {createAutoDeleteIcon} from '@components/autoDeleteIcon';
 import {resolveElements} from '@solid-primitives/refs';
 import toArray from '@helpers/array/toArray';
 import computeLockColor from '@helpers/computeLockColor';

assets/icons/auto_delete_circle_hours.svg

@@ -32,7 +32,7 @@ import tsNow from '@helpers/tsNow';
 import appNavigationController, {NavigationItem} from '@components/appNavigationController';
 import {IS_MOBILE, IS_MOBILE_SAFARI} from '@environment/userAgent';
 import I18n, {FormatterArguments, i18n, join, LangPackKey} from '@lib/langPack';
-import {AttachedMediaType, canUploadAsWhenEditing, createAutoDeleteIcon, generateTail, getMediaTypeForMessage, slowModeTimer} from '@components/chat/utils';
+import {AttachedMediaType, canUploadAsWhenEditing, generateTail, getMediaTypeForMessage, slowModeTimer} from '@components/chat/utils';
 import findUpClassName from '@helpers/dom/findUpClassName';
 import ButtonCorner from '@components/buttonCorner';
 import blurActiveElement from '@helpers/dom/blurActiveElement';
@@ -159,6 +159,7 @@ import getPhotoDownloadOptions from '@lib/appManagers/utils/photos/getPhotoDownl
 import {getFileNameByLocation} from '@helpers/fileName';
 import {Middleware, getMiddleware, MiddlewareHelper} from '@helpers/middleware';
 import {openCreatePollPopup} from '@components/popups/createPoll';
+import {createAutoDeleteIcon} from '@components/autoDeleteIcon';
 
 // console.log('Recorder', Recorder);
 

public/assets/fonts/tgico.svg

@@ -81,7 +81,7 @@ import createSubmenuTrigger from '@components/createSubmenuTrigger';
 import ButtonMenu, {ButtonMenuItemOptionsVerifiable} from '@components/buttonMenu';
 import Icon from '@components/icon';
 import {getDefaultOptions} from '@components/sidebarLeft/tabs/autoDeleteMessages/options';
-import {createAutoDeleteIcon} from '@components/chat/utils';
+import {createAutoDeleteIcon} from '@components/autoDeleteIcon';
 import PopupBoost from '@components/popups/boost';
 import PopupPremium from '@components/popups/premium';
 import showNoForwardsPopup from '@components/popups/noForwards';