ente-io · mngshm · Mar 5, 2025 · Mar 7, 2025 · Mar 7, 2025 · Mar 8, 2025
diff --git a/server/cmd/museum/main.go b/server/cmd/museum/main.go
@@ -5,7 +5,6 @@ import (
 	"database/sql"
 	b64 "encoding/base64"
 	"fmt"
-	"github.com/ente-io/museum/pkg/controller/collections"
 	"net/http"
 	"os"
 	"os/signal"
@@ -15,6 +14,8 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/ente-io/museum/pkg/controller/collections"
+
 	"github.com/ente-io/museum/ente/base"
 	"github.com/ente-io/museum/pkg/controller/emergency"
 	"github.com/ente-io/museum/pkg/controller/file_copy"
@@ -983,9 +984,8 @@ func setupAndStartCrons(userAuthRepo *repo.UserAuthRepository, publicCollectionR
 		_ = castDb.DeleteUnclaimedCodes(context.Background(), timeUtil.MicrosecondsBeforeMinutes(60))
 		dataCleanupCtrl.DeleteDataCron()
 	})
-
 	schedule(c, "@every 24h", func() {
-		emailNotificationCtrl.SendStorageLimitExceededMails()
+		emailNotificationCtrl.SendStorageAlerts()
 	})
 
 	schedule(c, "@every 1m", func() {
@@ -996,6 +996,10 @@ func setupAndStartCrons(userAuthRepo *repo.UserAuthRepository, publicCollectionR
 		pushController.ClearExpiredTokens()
 	})
 
+	// schedule(c, "@every 3s", func() {
+	// 	emailNotificationCtrl.SendFamilyNudgeEmail()
+	// })
+
 	scheduleAndRun(c, "@every 60m", func() {
 		emergencyCtrl.SendRecoveryReminder()
 		kexCtrl.DeleteOldKeys()

diff --git a/server/mail-templates/90_percent_storage_consumed.html b/server/mail-templates/90_percent_storage_consumed.html
@@ -0,0 +1,144 @@
+<!DOCTYPE html>
+<html>
+  <meta content="text/html; charset=utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1,
+  minimum-scale=1" />
+  <style>
+    body {
+      background-color: #f0f1f3;
+      font-family: "Helvetica Neue", "Segoe UI", Helvetica, sans-serif;
+      font-size: 16px;
+      line-height: 27px;
+      margin: 0;
+      color: #444;
+    }
+
+    pre {
+      background: #f4f4f4f4;
+      padding: 2px;
+    }
+
+    table {
+      width: 100%;
+      border: 1px solid #ddd;
+    }
+
+    table td {
+      border-color: #ddd;
+      padding: 5px;
+    }
+
+    .wrap {
+      background-color: #fff;
+      padding: 30px;
+      max-width: 525px;
+      margin: 0 auto;
+      border-radius: 5px;
+    }
+
+    .button {
+      background: #0055d4;
+      border-radius: 3px;
+      text-decoration: none !important;
+      color: #fff !important;
+      font-weight: bold;
+      padding: 10px 30px;
+      display: inline-block;
+    }
+
+    .button:hover {
+      background: #111;
+    }
+
+    .footer {
+      text-align: center;
+      font-size: 12px;
+      color: #888;
+    }
+
+    .footer a {
+      color: #888;
+      margin-right: 5px;
+    }
+
+    .gutter {
+      padding: 30px;
+    }
+
+    img {
+      max-width: 100%;
+      height: auto;
+    }
+
+    a {
+      color: #0055d4;
+    }
+
+    a:hover {
+      color: #111;
+    }
+
+    @media screen and (max-width: 600px) {
+      .wrap {
+        max-width: auto;
+      }
+
+      .gutter {
+        padding: 10px;
+      }
+    }
+
+    .footer-icons {
+      padding: 4px !important;
+      width: 24px !important;
+    }
+  </style>
+
+  <body>
+    <div class="gutter" style="padding: 4px">&nbsp;</div>
+    <div class="wrap" style=" background-color: rgb(255, 255, 255); padding: 2px
+    30px 30px 30px; max-width: 525px; margin: 0 auto; border-radius: 5px;
+    font-size: 16px; ">
+    <p>
+        <p>
+            You have used 90% of your available storage on Ente Photos. All your photos on Ente will continue to remain safe and accessible. However, new photos will not be backed up after you get to 100%. 
+        </p>
+        <p>
+            Please upgrade your plan so that all the new photos you take can be backed up. You can also use our referral program to get more storage at no additional cost. 
+        </p>
+        <p>
+            For any help, please reach out to [email protected] or reply to this email.
+        </p>
+    </p>
+    </div>
+    <br />
+    <div class="footer" style="text-align: center; font-size: 12px; color:
+    rgb(136, 136, 136)" >
+      <div> 
+        <a href="https://ente.io" target="_blank" ><img
+        src="https://email-assets.ente.io/ente-green.png" style="width: 100px;
+        padding: 24px" title="Ente" alt="Ente" /></a>
+      </div>
+      <div>
+        <a href="https://fosstodon.org/@ente" target="_blank" ><img
+        src="https://email-assets.ente.io/mastodon-icon.png"
+        class="footer-icons" style="width: 24px; padding: 4px" title="Mastodon"
+        alt="Mastodon" /></a>
+        <a href="https://twitter.com/enteio" target="_blank" ><img
+        src="https://email-assets.ente.io/twitter-icon.png" class="footer-icons"
+        style="width: 24px; padding: 4px" title="Twitter" alt="Twitter" /></a>
+        <a href="https://discord.ente.io" target="_blank" ><img
+        src="https://email-assets.ente.io/discord-icon.png" class="footer-icons"
+        style="width: 24px; padding: 4px" title="Discord" alt="Discord" /></a>
+        <a href="https://github.com/ente-io" target="_blank" ><img
+        src="https://email-assets.ente.io/github-icon.png" class="footer-icons"
+        style="width: 24px; padding: 4px" title="GitHub" alt="GitHub" /></a>
+      </div>
+      <p>
+        Ente Technologies, Inc.
+        <br /> 1111B S Governors Ave 6032 Dover, DE 19904
+      </p>
+      <br />
+    </div>
+  </body>
+</html>
diff --git a/server/mail-templates/nudge_for_family.html b/server/mail-templates/nudge_for_family.html
@@ -0,0 +1,139 @@
+<!DOCTYPE html>
+<html>
+  <meta content="text/html; charset=utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1,
+  minimum-scale=1" />
+  <style>
+    body {
+      background-color: #f0f1f3;
+      font-family: "Helvetica Neue", "Segoe UI", Helvetica, sans-serif;
+      font-size: 16px;
+      line-height: 27px;
+      margin: 0;
+      color: #444;
+    }
+
+    pre {
+      background: #f4f4f4f4;
+      padding: 2px;
+    }
+
+    table {
+      width: 100%;
+      border: 1px solid #ddd;
+    }
+
+    table td {
+      border-color: #ddd;
+      padding: 5px;
+    }
+
+    .wrap {
+      background-color: #fff;
+      padding: 30px;
+      max-width: 525px;
+      margin: 0 auto;
+      border-radius: 5px;
+    }
+
+    .button {
+      background: #0055d4;
+      border-radius: 3px;
+      text-decoration: none !important;
+      color: #fff !important;
+      font-weight: bold;
+      padding: 10px 30px;
+      display: inline-block;
+    }
+
+    .button:hover {
+      background: #111;
+    }
+
+    .footer {
+      text-align: center;
+      font-size: 12px;
+      color: #888;
+    }
+
+    .footer a {
+      color: #888;
+      margin-right: 5px;
+    }
+
+    .gutter {
+      padding: 30px;
+    }
+
+    img {
+      max-width: 100%;
+      height: auto;
+    }
+
+    a {
+      color: #0055d4;
+    }
+
+    a:hover {
+      color: #111;
+    }
+
+    @media screen and (max-width: 600px) {
+      .wrap {
+        max-width: auto;
+      }
+
+      .gutter {
+        padding: 10px;
+      }
+    }
+
+    .footer-icons {
+      padding: 4px !important;
+      width: 24px !important;
+    }
+  </style>
+
+  <body>
+    <div class="gutter" style="padding: 4px">&nbsp;</div>
+    <div class="wrap" style=" background-color: rgb(255, 255, 255); padding: 2px
+    30px 30px 30px; max-width: 525px; margin: 0 auto; border-radius: 5px;
+    font-size: 16px; " >
+    <p>
+        Your subscription includes our family plan where you can share your subscription with upto 5 additional members at no extra cost. <br>
+        <br>
+         You can add family members to your account by going to Settings -> Manage Subscriptions -> Manage Family.  For more information, you can also visit 
+        <a href="https://help.ente.io/photos/features/family-plans">our help page</a> or reach out to [email protected]
+    </p>
+    </div>
+    <br />
+    <div class="footer" style="text-align: center; font-size: 12px; color:
+    rgb(136, 136, 136)" >
+      <div>
+        <a href="https://ente.io" target="_blank" ><img
+        src="https://email-assets.ente.io/ente-green.png" style="width: 100px;
+        padding: 24px" title="Ente" alt="Ente" /></a>
+      </div>
+      <div>
+        <a href="https://fosstodon.org/@ente" target="_blank" ><img
+        src="https://email-assets.ente.io/mastodon-icon.png"
+        class="footer-icons" style="width: 24px; padding: 4px" title="Mastodon"
+        alt="Mastodon" /></a>
+        <a href="https://twitter.com/enteio" target="_blank" ><img
+        src="https://email-assets.ente.io/twitter-icon.png" class="footer-icons"
+        style="width: 24px; padding: 4px" title="Twitter" alt="Twitter" /></a>
+        <a href="https://discord.ente.io" target="_blank" ><img
+        src="https://email-assets.ente.io/discord-icon.png" class="footer-icons"
+        style="width: 24px; padding: 4px" title="Discord" alt="Discord" /></a>
+        <a href="https://github.com/ente-io" target="_blank" ><img
+        src="https://email-assets.ente.io/github-icon.png" class="footer-icons"
+        style="width: 24px; padding: 4px" title="GitHub" alt="GitHub" /></a>
+      </div>
+      <p>
+        Ente Technologies, Inc.
+        <br /> 1111B S Governors Ave 6032 Dover, DE 19904
+      </p>
+      <br />
+    </div>
+  </body>
+</html>
diff --git a/server/pkg/controller/billing.go b/server/pkg/controller/billing.go
@@ -5,9 +5,10 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
-	"github.com/ente-io/museum/pkg/controller/commonbilling"
 	"strconv"
 
+	"github.com/ente-io/museum/pkg/controller/commonbilling"
+
 	"github.com/ente-io/museum/pkg/repo/storagebonus"
 
 	"github.com/ente-io/museum/pkg/controller/discord"
@@ -292,6 +293,7 @@ func (c *BillingController) VerifySubscription(
 	if err != nil {
 		return ente.Subscription{}, stacktrace.Propagate(err, "")
 	}
+
 	log.Info("Replaced subscription")
 	newSubscription.ID = currentSubscription.ID
 	if paymentProvider == ente.PlayStore &&