Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix: enable visitor mention notifications by default

Pranav Varshney060fb4818cda
diff --git a/app/models/enum/notification.go b/app/models/enum/notification.go
index 90a8fffaa..6503ecdb8 100644
--- a/app/models/enum/notification.go
+++ b/app/models/enum/notification.go
@@ -60,6 +60,7 @@ var (
DefaultEnabledUserRoles: []Role{
RoleAdministrator,
RoleCollaborator,
+ RoleVisitor,
},
Validate: notificationEventValidation,
}
diff --git a/app/services/sqlstore/postgres/mention_defaults_test.go b/app/services/sqlstore/postgres/mention_defaults_test.go
new file mode 100644
index 000000000..cc93ffd5d
--- /dev/null
+++ b/app/services/sqlstore/postgres/mention_defaults_test.go
@@ -0,0 +1,65 @@
+package postgres_test
+
+import (
+ "slices"
+ "testing"
+
+ "github.com/getfider/fider/app/models/cmd"
+ "github.com/getfider/fider/app/models/entity"
+ "github.com/getfider/fider/app/models/enum"
+ "github.com/getfider/fider/app/models/query"
+ "github.com/getfider/fider/app/pkg/bus"
+)
+
+func TestVisitorMentionPreferences(t *testing.T) {
+ for _, tc := range []struct {
+ name string
+ setting string
+ web bool
+ email bool
+ }{
+ {name: "default", web: true, email: true},
+ {name: "opted out", setting: "0"},
+ {name: "web only", setting: "1", web: true},
+ {name: "email only", setting: "2", email: true},
+ {name: "both", setting: "3", web: true, email: true},
+ } {
+ t.Run(tc.name, func(t *testing.T) {
+ SetupDatabaseTest(t)
+ defer TeardownDatabaseTest()
+ if aryaStark.Role != enum.RoleVisitor {
+ t.Fatal("expected a visitor fixture")
+ }
+ if tc.setting != "" {
+ if err := bus.Dispatch(aryaStarkCtx, &cmd.UpdateCurrentUserSettings{Settings: map[string]string{
+ enum.NotificationEventMention.UserSettingsKeyName: tc.setting,
+ }}); err != nil {
+ t.Fatal(err)
+ }
+ }
+ settings := &query.GetCurrentUserSettings{}
+ if err := bus.Dispatch(aryaStarkCtx, settings); err != nil {
+ t.Fatal(err)
+ }
+ want := tc.setting
+ if want == "" {
+ want = "3"
+ }
+ if got := settings.Result[enum.NotificationEventMention.UserSettingsKeyName]; got != want {
+ t.Errorf("mention setting = %q, want %q", got, want)
+ }
+ for channel, enabled := range map[enum.NotificationChannel]bool{
+ enum.NotificationChannelWeb: tc.web, enum.NotificationChannelEmail: tc.email,
+ } {
+ subscribers := &query.GetActiveSubscribers{Channel: channel, Event: enum.NotificationEventMention}
+ if err := bus.Dispatch(aryaStarkCtx, subscribers); err != nil {
+ t.Fatal(err)
+ }
+ got := slices.ContainsFunc(subscribers.Result, func(user *entity.User) bool { return user.ID == aryaStark.ID })
+ if got != enabled {
+ t.Errorf("visitor eligible on channel %d = %t, want %t", channel, got, enabled)
+ }
+ }
+ })
+ }
+}
diff --git a/app/services/sqlstore/postgres/user_test.go b/app/services/sqlstore/postgres/user_test.go
index 44274689e..3cb85b3a1 100644
--- a/app/services/sqlstore/postgres/user_test.go
+++ b/app/services/sqlstore/postgres/user_test.go
@@ -332,6 +332,7 @@ func TestUserStorage_DefaultUserSettings(t *testing.T) {
Expect(err).IsNil()
Expect(getSettings.Result).Equals(map[string]string{
enum.NotificationEventChangeStatus.UserSettingsKeyName: enum.NotificationEventChangeStatus.DefaultSettingValue,
+ enum.NotificationEventMention.UserSettingsKeyName: enum.NotificationEventMention.DefaultSettingValue,
})
}
@@ -354,6 +355,7 @@ func TestUserStorage_SaveGetUserSettings(t *testing.T) {
Expect(firstSettings.Result).Equals(map[string]string{
enum.NotificationEventNewPost.UserSettingsKeyName: "0",
enum.NotificationEventChangeStatus.UserSettingsKeyName: "1",
+ enum.NotificationEventMention.UserSettingsKeyName: enum.NotificationEventMention.DefaultSettingValue,
})
err = bus.Dispatch(aryaStarkCtx, &cmd.UpdateCurrentUserSettings{Settings: nil})