Revert "feat: Notify users of plan changes" (#4278)

This reverts commit d48fe9a. This commit introduces a regression as a notification is sent whenever a new instance is created. We'll try a different approach by letting the cloudery decide when a notification should be sent via https://docs.cozy.io/en/cozy-stack/notifications/#post-notifications.
cozy · Jan 2, 2024 · f743cec · f743cec
2 parents 423258a + 7f410bf
commit f743cec
Show file tree

Hide file tree

Showing 15 changed files with 905 additions and 1,195 deletions.
diff --git a/assets/locales/de.po b/assets/locales/de.po
@@ -893,31 +893,6 @@ msgstr "Check our plans"
 msgid "Notifications OAuth Clients Devices Text"
 msgstr "Manage my devices"
 
-msgid "Notifications Plan Changed Title"
-msgstr "Your plan change has been validated!"
-
-msgid "Notifications Plan Changed Message"
-msgstr "Click here to reload the app and apply the changes."
-
-msgid "Notifications Plan Changed Greeting"
-msgstr "Hello,"
-
-msgid "Notifications Plan Changed Intro"
-msgstr ""
-"We are pleased to confirm that your plan change has been validated.\n"
-"Here are our recommendations to make the most of it:"
-
-msgid "Notifications Plan Changed Recommendation 1"
-msgstr "On your computer: refresh the page if your Cozy is open."
-
-msgid "Notifications Plan Changed Recommendation 2"
-msgstr "On your smartphone (Cozy app): close and relaunch the app."
-
-msgid "Notifications Plan Changed Outro"
-msgstr ""
-"Don't hesitate to contact us if you have any questions about subscriptions or using your Cozy.\n"
-"Claude will be delighted to help you with all your questions!"
-
 msgid "Terms of services have been updated"
 msgstr ""
 "Um DSGVO-konform zu sein hat Cozy Cloud seine Nutzungsbedingungen zum 25. "

diff --git a/assets/locales/en.po b/assets/locales/en.po
@@ -1170,31 +1170,6 @@ msgstr "Check our plans"
 msgid "Notifications OAuth Clients Devices Text"
 msgstr "Manage my devices"
 
-msgid "Notifications Plan Changed Title"
-msgstr "Your plan change has been validated!"
-
-msgid "Notifications Plan Changed Message"
-msgstr "Click here to reload the app and apply the changes."
-
-msgid "Notifications Plan Changed Greeting"
-msgstr "Hello,"
-
-msgid "Notifications Plan Changed Intro"
-msgstr ""
-"We are pleased to confirm that your plan change has been validated.\n"
-"Here are our recommendations to make the most of it:"
-
-msgid "Notifications Plan Changed Recommendation 1"
-msgstr "On your computer: refresh the page if your Cozy is open."
-
-msgid "Notifications Plan Changed Recommendation 2"
-msgstr "On your smartphone (Cozy app): close and relaunch the app."
-
-msgid "Notifications Plan Changed Outro"
-msgstr ""
-"Don't hesitate to contact us if you have any questions about subscriptions or using your Cozy.\n"
-"Claude will be delighted to help you with all your questions!"
-
 msgid "Terms of services have been updated"
 msgstr "To comply with the GDPR, Cozy Cloud has updated its Terms of Services that have taken effect on May 25, 2018"
 

diff --git a/assets/locales/es.po b/assets/locales/es.po
@@ -907,31 +907,6 @@ msgstr "Check our plans"
 msgid "Notifications OAuth Clients Devices Text"
 msgstr "Manage my devices"
 
-msgid "Notifications Plan Changed Title"
-msgstr "Your plan change has been validated!"
-
-msgid "Notifications Plan Changed Message"
-msgstr "Click here to reload the app and apply the changes."
-
-msgid "Notifications Plan Changed Greeting"
-msgstr "Hello,"
-
-msgid "Notifications Plan Changed Intro"
-msgstr ""
-"We are pleased to confirm that your plan change has been validated.\n"
-"Here are our recommendations to make the most of it:"
-
-msgid "Notifications Plan Changed Recommendation 1"
-msgstr "On your computer: refresh the page if your Cozy is open."
-
-msgid "Notifications Plan Changed Recommendation 2"
-msgstr "On your smartphone (Cozy app): close and relaunch the app."
-
-msgid "Notifications Plan Changed Outro"
-msgstr ""
-"Don't hesitate to contact us if you have any questions about subscriptions or using your Cozy.\n"
-"Claude will be delighted to help you with all your questions!"
-
 msgid "Terms of services have been updated"
 msgstr ""
 "Para cumplir con la GDPR que estará vigente a partir del 25 de mayo de 2018,"

diff --git a/assets/locales/fr.po b/assets/locales/fr.po
@@ -1275,31 +1275,6 @@ msgstr "Voir les offres"
 msgid "Notifications OAuth Clients Devices Text"
 msgstr "Gérer mes appareils"
 
-msgid "Notifications Plan Changed Title"
-msgstr "Votre changement d’offre a été validé !"
-
-msgid "Notifications Plan Changed Message"
-msgstr "Cliquez ici pour relancer l’app, et appliquer les modifications."
-
-msgid "Notifications Plan Changed Greeting"
-msgstr "Bonjour,"
-
-msgid "Notifications Plan Changed Intro"
-msgstr ""
-"Nous avons le plaisir de vous confirmer que votre changement d’offre a bien été validé.\n"
-"Voici nos recommendations pour en profiter au mieux :"
-
-msgid "Notifications Plan Changed Recommendation 1"
-msgstr "Sur votre ordinateur : actualiser la page si votre Cozy est ouvert."
-
-msgid "Notifications Plan Changed Recommendation 2"
-msgstr "Sur votre smartphone (app Cozy) : fermer et relancer l’app."
-
-msgid "Notifications Plan Changed Outro"
-msgstr ""
-"N’hésitez pas à nous contacter pour toute question en lien avec les abonnements, ou l’utilisation de votre Cozy.\n"
-"Claude se fera un plaisir de vous accompagner sur tous vos sujets !"
-
 msgid "Terms of services have been updated"
 msgstr ""
 "Dans le cadre du RGPD, Cozy Cloud met à jour ses Conditions Générales "

diff --git a/assets/locales/ja.po b/assets/locales/ja.po
@@ -715,31 +715,6 @@ msgstr "Check our plans"
 msgid "Notifications OAuth Clients Devices Text"
 msgstr "Manage my devices"
 
-msgid "Notifications Plan Changed Title"
-msgstr "Your plan change has been validated!"
-
-msgid "Notifications Plan Changed Message"
-msgstr "Click here to reload the app and apply the changes."
-
-msgid "Notifications Plan Changed Greeting"
-msgstr "Hello,"
-
-msgid "Notifications Plan Changed Intro"
-msgstr ""
-"We are pleased to confirm that your plan change has been validated.\n"
-"Here are our recommendations to make the most of it:"
-
-msgid "Notifications Plan Changed Recommendation 1"
-msgstr "On your computer: refresh the page if your Cozy is open."
-
-msgid "Notifications Plan Changed Recommendation 2"
-msgstr "On your smartphone (Cozy app): close and relaunch the app."
-
-msgid "Notifications Plan Changed Outro"
-msgstr ""
-"Don't hesitate to contact us if you have any questions about subscriptions or using your Cozy.\n"
-"Claude will be delighted to help you with all your questions!"
-
 msgid "Terms of services have been updated"
 msgstr "GDPR を遵守するため、Cozy Cloud は2018年5月25日に施行された利用規約を更新しました"
 

diff --git a/assets/locales/nl_NL.po b/assets/locales/nl_NL.po
@@ -1091,31 +1091,6 @@ msgstr "Check our plans"
 msgid "Notifications OAuth Clients Devices Text"
 msgstr "Manage my devices"
 
-msgid "Notifications Plan Changed Title"
-msgstr "Your plan change has been validated!"
-
-msgid "Notifications Plan Changed Message"
-msgstr "Click here to reload the app and apply the changes."
-
-msgid "Notifications Plan Changed Greeting"
-msgstr "Hello,"
-
-msgid "Notifications Plan Changed Intro"
-msgstr ""
-"We are pleased to confirm that your plan change has been validated.\n"
-"Here are our recommendations to make the most of it:"
-
-msgid "Notifications Plan Changed Recommendation 1"
-msgstr "On your computer: refresh the page if your Cozy is open."
-
-msgid "Notifications Plan Changed Recommendation 2"
-msgstr "On your smartphone (Cozy app): close and relaunch the app."
-
-msgid "Notifications Plan Changed Outro"
-msgstr ""
-"Don't hesitate to contact us if you have any questions about subscriptions or using your Cozy.\n"
-"Claude will be delighted to help you with all your questions!"
-
 msgid "Terms of services have been updated"
 msgstr ""
 "Om te voldoen aan de GDPR heeft Cozy Cloud zijn algemene voorwaarden "

diff --git a/assets/mails/notifications_plan_changed.mjml b/assets/mails/notifications_plan_changed.mjml
diff --git a/assets/mails/notifications_plan_changed.text b/assets/mails/notifications_plan_changed.text
diff --git a/docs/assets.md b/docs/assets.md
@@ -53,7 +53,6 @@ with given parameter. For example:
 * http://cozy.localhost:8080/dev/mails/notifications_diskquota
 * http://cozy.localhost:8080/dev/mails/notifications_oauthclients
 * http://cozy.localhost:8080/dev/mails/notifications_sharing
-* http://cozy.localhost:8080/dev/mails/notifications_plan_changed
 * http://cozy.localhost:8080/dev/mails/passphrase_hint
 * http://cozy.localhost:8080/dev/mails/passphrase_reset
 * http://cozy.localhost:8080/dev/mails/sharing_request

diff --git a/model/instance/instance.go b/model/instance/instance.go
@@ -737,15 +737,6 @@ func (i *Instance) HasPremiumLinksEnabled() bool {
 	return false
 }
 
-func (i *Instance) HasFeatureSet(set string) bool {
-	for _, s := range i.FeatureSets {
-		if set == s {
-			return true
-		}
-	}
-	return false
-}
-
 // ensure Instance implements couchdb.Doc
 var (
 	_ couchdb.Doc = &Instance{}

diff --git a/model/instance/manager.go b/model/instance/manager.go
@@ -82,19 +82,3 @@ func APIManagerClient(inst *Instance) *manager.APIClient {
 
 	return manager.NewAPIClient(api.URL, api.Token)
 }
-
-var cbPlanChanged func(i *Instance)
-
-// RegisterPlanChangeCallback registers the given callback, called whenever
-// PushPlanChangeNotification is called.
-func RegisterPlanChangeCallback(cb func(*Instance)) {
-	cbPlanChanged = cb
-}
-
-// PushPlanChangeNotification calls the plan change callback for the given instance if
-// it was registered.
-func PushPlanChangeNotification(inst *Instance) {
-	if cbPlanChanged != nil {
-		cbPlanChanged(inst)
-	}
-}
diff --git a/model/notification/center/notification_center.go b/model/notification/center/notification_center.go
@@ -28,9 +28,6 @@ const (
 	// NotificationOAuthClients category for sending alert when exceeding the
 	// connected OAuth clients limit.
 	NotificationOAuthClients = "oauth-clients"
-	// NotificationsPlanChanged category for sending alert when a we receive a
-	// request for a feature set (i.e. plan) change.
-	NotificationsPlanChanged = "plan-changed"
 )
 
 var (
@@ -48,12 +45,6 @@ var (
 			Stateful:     false,
 			MailTemplate: "notifications_oauthclients",
 		},
-		NotificationsPlanChanged: {
-			Description:  "Invite the user to reload their app to reload the flags after a plan change",
-			Collapsible:  false,
-			Stateful:     false,
-			MailTemplate: "notifications_plan_changed",
-		},
 	}
 )
 
@@ -118,20 +109,6 @@ func init() {
 		}
 		PushStack(i.DomainName(), NotificationOAuthClients, n)
 	})
-
-	instance.RegisterPlanChangeCallback(func(i *instance.Instance) {
-		n := &notification.Notification{
-			Title:   i.Translate("Notifications Plan Changed Title"),
-			Message: i.Translate("Notifications Plan Changed Message"),
-			Slug:    consts.SettingsSlug,
-			Data: map[string]interface{}{
-				// For mobile push notification
-				"refresh": "true",
-			},
-			PreferredChannels: []string{"mobile"},
-		}
-		PushStack(i.DomainName(), NotificationsPlanChanged, n)
-	})
 }
 
 // PushStack creates and sends a new notification where the source is the stack.

diff --git a/web/instances/feature.go b/web/instances/feature.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"net/http"
 	"sort"
-	"strings"
 
 	"github.com/cozy/cozy-stack/model/feature"
 	"github.com/cozy/cozy-stack/model/instance"
@@ -68,29 +67,10 @@ func putFeatureSets(c echo.Context) error {
 		return wrapError(err)
 	}
 	sort.Strings(list)
-
-	hasNewPlan := false
-	for _, newSet := range list {
-		// Skip sponsorship sets
-		if strings.HasPrefix(newSet, "s-") {
-			continue
-		}
-
-		if !inst.HasFeatureSet(newSet) {
-			hasNewPlan = true
-			break
-		}
-	}
-
 	inst.FeatureSets = list
 	if err := instance.Update(inst); err != nil {
 		return wrapError(err)
 	}
-
-	if hasNewPlan {
-		instance.PushPlanChangeNotification(inst)
-	}
-
 	return c.JSON(http.StatusOK, inst.FeatureSets)
 }