src/app/mail/index.ts

@@ -79,14 +79,7 @@ export class MailNotifications {
   // Mail.sync) coalesce into a single PUT instead of racing two subscriptions.
   _register = maybe<Promise<void>>()
 
-  async register(
+  async register(email: string, frequency: string) {
-    email: string,
-    frequency: string,
-    hour = 17,
-    minute = 0,
-    dayOfWeek?: number,
-    timezone = Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC",
-  ) {
     if (this._register) return this._register
 
     this._register = call(async () => {
@@ -106,7 +99,7 @@ export class MailNotifications {
           throw new Error("Email notification server not configured")
         }
 
-        const body = {email, frequency, hour, minute, dayOfWeek, timezone}
+        const body = {email, frequency}
         const bodyJson = JSON.stringify(body)
 
         let authEvent
@@ -231,8 +224,7 @@ export class MailNotifications {
 
     // Register if we don't have a subscription yet
     if (!emailNotificationState.get().callback && email && frequency) {
-      const {emailHour, emailMinute, emailDayOfWeek, emailTimezone} = userSettingsValues.get()
+      await this.register(email, frequency)
-      await this.register(email, frequency, emailHour, emailMinute, emailDayOfWeek, emailTimezone)
     }
 
     // Sync kind 30390 subscriptions for the email digest. Filters are derived
@@ -262,16 +254,7 @@ export class MailNotifications {
   sync() {
     let reconciledPubkey: string | undefined
 
-    return userSettingsValues.subscribe(
+    return userSettingsValues.subscribe(async ({email, emailAddress, emailFrequency}) => {
-      async ({
-        email,
-        emailAddress,
-        emailFrequency,
-        emailHour,
-        emailMinute,
-        emailDayOfWeek,
-        emailTimezone,
-      }) => {
       const $pubkey = app.get().user?.pubkey
       if (!$pubkey || reconciledPubkey === $pubkey) return
 
@@ -293,23 +276,9 @@ export class MailNotifications {
 
       try {
         if (!existing) {
-            await this.register(
+          await this.register(emailAddress, emailFrequency)
-              emailAddress,
-              emailFrequency,
-              emailHour,
-              emailMinute,
-              emailDayOfWeek,
-              emailTimezone,
-            )
         } else if (existing.email !== emailAddress || existing.frequency !== emailFrequency) {
-            await this.register(
+          await this.register(emailAddress, emailFrequency)
-              emailAddress,
-              emailFrequency,
-              emailHour,
-              emailMinute,
-              emailDayOfWeek,
-              emailTimezone,
-            )
         } else {
           emailNotificationState.set({
             key: existing.key,
@@ -324,8 +293,7 @@ export class MailNotifications {
       }
 
       await this.enable()
-      },
+    })
-    )
   }
 
   _getSubscriptionIdentifier = async (relay: string, key: string) => {

src/app/settings.ts

@@ -37,10 +37,6 @@ export type SettingsValues = {
   emailAddress: string
   emailFrequency: string
   emailSalt: string
-  emailHour: number
-  emailMinute: number
-  emailDayOfWeek: number | undefined
-  emailTimezone: string
 }
 
 export const defaultSettings: SettingsValues = {
@@ -57,10 +53,6 @@ export const defaultSettings: SettingsValues = {
   emailAddress: "",
   emailFrequency: "daily",
   emailSalt: "",
-  emailHour: 17,
-  emailMinute: 0,
-  emailDayOfWeek: undefined,
-  emailTimezone: Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC",
 }
 
 export class Settings extends DerivedPlugin<AppDataReader> {
@@ -115,7 +107,6 @@ export const notificationSettings = withGetter(
     spaces: true,
     mentions: true,
     messages: true,
-    email: false,
   }),
 )
 
@@ -192,9 +183,3 @@ export const toggleRoomNotifications = (url: string, h: string) => {
 
   return publishSettings({alerts: [...alerts, {url, notify: true, exceptions: [h]}]})
 }
-
-export const publishEmailSettings = (
-  params: Partial<
-    Pick<SettingsValues, "emailHour" | "emailMinute" | "emailDayOfWeek" | "emailTimezone">
-  >,
-) => publishSettings(params)

src/routes/settings/alerts/+page.svelte

@@ -44,10 +44,6 @@
       email: $userSettingsValues.email,
       emailAddress: $userSettingsValues.emailAddress,
       emailFrequency: $userSettingsValues.emailFrequency,
-      emailHour: $userSettingsValues.emailHour,
-      emailMinute: $userSettingsValues.emailMinute,
-      emailDayOfWeek: $userSettingsValues.emailDayOfWeek,
-      emailTimezone: $userSettingsValues.emailTimezone,
     }
   }
 
@@ -84,14 +80,7 @@
       // Handle email notification registration
       if (settings.email && settings.emailAddress) {
         try {
-          await Mail.register(
+          await Mail.register(settings.emailAddress, settings.emailFrequency)
-            settings.emailAddress,
-            settings.emailFrequency,
-            settings.emailHour,
-            settings.emailMinute,
-            settings.emailDayOfWeek,
-            settings.emailTimezone,
-          )
           await Mail.enable()
         } catch (e) {
           settings.email = false
@@ -112,10 +101,6 @@
         email: settings.email,
         emailAddress: settings.emailAddress,
         emailFrequency: settings.emailFrequency,
-        emailHour: settings.emailHour,
-        emailMinute: settings.emailMinute,
-        emailDayOfWeek: settings.emailDayOfWeek,
-        emailTimezone: settings.emailTimezone,
       })
 
       notificationSettings.set({
@@ -125,7 +110,6 @@
         spaces: settings.spaces,
         mentions: settings.mentions,
         messages: settings.messages,
-        email: settings.email,
       })
 
       pushToast({message: "Your settings have been saved!"})
@@ -297,57 +281,12 @@
               <select
                 class="select select-bordered"
                 bind:value={settings.emailFrequency}
-                onchange={e => {
+                onchange={clearError}>
-                  if (e.currentTarget.value === "weekly" && !settings.emailDayOfWeek) {
-                    settings.emailDayOfWeek = 1
-                  }
-                  clearError()
-                }}>
                 <option value="daily">Daily</option>
                 <option value="weekly">Weekly</option>
               </select>
             {/snippet}
           </FieldInline>
-          <FieldInline>
-            {#snippet label()}
-              <p>Time</p>
-            {/snippet}
-            {#snippet input()}
-              <input
-                type="time"
-                class="input input-bordered w-auto"
-                value={String(settings.emailHour).padStart(2, "0") +
-                  ":" +
-                  String(settings.emailMinute).padStart(2, "0")}
-                oninput={e => {
-                  const [h, m] = e.currentTarget.value.split(":").map(Number)
-                  settings.emailHour = h
-                  settings.emailMinute = m
-                }} />
-            {/snippet}
-          </FieldInline>
-          {#if settings.emailFrequency === "weekly"}
-            <FieldInline>
-              {#snippet label()}
-                <p>Day of week</p>
-              {/snippet}
-              {#snippet input()}
-                <div class="flex gap-1">
-                  {#each [{label: "M", value: 1}, {label: "T", value: 2}, {label: "W", value: 3}, {label: "T", value: 4}, {label: "F", value: 5}, {label: "S", value: 6}, {label: "S", value: 7}] as day (day.value)}
-                    <button
-                      type="button"
-                      class={cx("button button-sm size-8 rounded-md", {
-                        "button-primary": settings.emailDayOfWeek === day.value,
-                        "button-ghost": settings.emailDayOfWeek !== day.value,
-                      })}
-                      onclick={() => {
-                        settings.emailDayOfWeek = day.value
-                      }}>{day.label}</button>
-                  {/each}
-                </div>
-              {/snippet}
-            </FieldInline>
-          {/if}
         {/if}
         {#if $emailNotificationState.error}
           <div class="text-sm text-error p-3">