Limit options for "Delete Messages from Server" for chatmail accounts

closes #4113
deltachat · Oct 26, 2024 · 83d7168 · 83d7168
1 parent ffa54d6
commit 83d7168
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ## Changed
 - style: avoid scrolling to account list items such that they're at the very edge of the list #4252
 - Update local help (2024-10-25)
+- Limit options for "Delete Messages from Server" for chatmail accounts
 
 ## Fixed
 - image thumbnails not showing in chat list #4247

diff --git a/packages/frontend/src/components/Settings/Autodelete.tsx b/packages/frontend/src/components/Settings/Autodelete.tsx
@@ -22,12 +22,12 @@ import useTranslationFunction from '../../hooks/useTranslationFunction'
 
 import type { DialogProps } from '../../contexts/DialogContext'
 
-function durationToString(configValue: number | string) {
+function durationToString(configValue: number | string, is_chatmail: boolean) {
   if (typeof configValue === 'string') configValue = Number(configValue)
   const tx = window.static_translate
   switch (configValue) {
     case AutodeleteDuration.NEVER:
-      return tx('never')
+      return is_chatmail ? tx('automatic') : tx('never')
     case AutodeleteDuration.AT_ONCE:
       return tx('autodel_at_once')
     case AutodeleteDuration.ONE_MINUTE:
@@ -56,24 +56,36 @@ export default function Autodelete({
   const accountId = selectedAccountId()
   const tx = useTranslationFunction()
 
+  const isChatMail = settingsStore.settings.is_chatmail === '1'
+
   const AUTODELETE_DURATION_OPTIONS_DEVICE = [
     AutodeleteDuration.NEVER,
     AutodeleteDuration.ONE_HOUR,
     AutodeleteDuration.ONE_DAY,
     AutodeleteDuration.ONE_WEEK,
     AutodeleteDuration.FIVE_WEEKS,
     AutodeleteDuration.ONE_YEAR,
-  ].map(value => [String(value), durationToString(value)] as SelectDialogOption)
+  ].map(
+    value =>
+      [String(value), durationToString(value, false)] as SelectDialogOption
+  )
 
   const AUTODELETE_DURATION_OPTIONS_SERVER = [
     AutodeleteDuration.NEVER,
     AutodeleteDuration.AT_ONCE,
-    AutodeleteDuration.ONE_HOUR,
-    AutodeleteDuration.ONE_DAY,
-    AutodeleteDuration.ONE_WEEK,
-    AutodeleteDuration.FIVE_WEEKS,
-    AutodeleteDuration.ONE_YEAR,
-  ].map(value => [String(value), durationToString(value)] as SelectDialogOption)
+    ...(isChatMail
+      ? []
+      : [
+          AutodeleteDuration.ONE_HOUR,
+          AutodeleteDuration.ONE_DAY,
+          AutodeleteDuration.ONE_WEEK,
+          AutodeleteDuration.FIVE_WEEKS,
+          AutodeleteDuration.ONE_YEAR,
+        ]),
+  ].map(
+    value =>
+      [String(value), durationToString(value, isChatMail)] as SelectDialogOption
+  )
 
   const onOpenDialog = async (fromServer: boolean) => {
     openDialog(SmallSelectDialog, {
@@ -117,15 +129,17 @@ export default function Autodelete({
       <SettingsSelector
         onClick={onOpenDialog.bind(null, false)}
         currentValue={durationToString(
-          settingsStore.settings['delete_device_after']
+          settingsStore.settings['delete_device_after'],
+          false
         )}
       >
         {tx('autodel_device_title')}
       </SettingsSelector>
       <SettingsSelector
         onClick={onOpenDialog.bind(null, true)}
         currentValue={durationToString(
-          settingsStore.settings['delete_server_after']
+          settingsStore.settings['delete_server_after'],
+          isChatMail
         )}
       >
         {tx('autodel_server_title')}
@@ -170,7 +184,7 @@ function AutodeleteConfirmationDialog({
           <p style={{ whiteSpace: 'pre-line' }}>
             {tx(fromServer ? 'autodel_server_ask' : 'autodel_device_ask', [
               String(estimateCount),
-              durationToString(seconds),
+              durationToString(seconds, false),
             ])}
           </p>
           <div style={{ display: 'flex' }}>