Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix: disable new comment emails (#756)

Guilherme Oenning33a3270b54a5
diff --git a/app/models/enum/notification.go b/app/models/enum/notification.go
index 35685b4ef..03fe67c6e 100644
--- a/app/models/enum/notification.go
+++ b/app/models/enum/notification.go
@@ -49,7 +49,6 @@ var (
DefaultEnabledUserRoles: []Role{
RoleAdministrator,
RoleCollaborator,
- RoleVisitor,
},
Validate: notificationEventValidation,
}
diff --git a/app/services/sqlstore/postgres/subscription_test.go b/app/services/sqlstore/postgres/subscription_test.go
index 27f990c49..b04762f7f 100644
--- a/app/services/sqlstore/postgres/subscription_test.go
+++ b/app/services/sqlstore/postgres/subscription_test.go
@@ -29,9 +29,8 @@ func TestSubscription_NoSettings(t *testing.T) {
Expect(newPostSubscribers.Result).HasLen(1)
Expect(newPostSubscribers.Result[0].ID).Equals(jonSnow.ID)
- Expect(newCommentSubscribers.Result).HasLen(2)
+ Expect(newCommentSubscribers.Result).HasLen(1)
Expect(newCommentSubscribers.Result[0].ID).Equals(jonSnow.ID)
- Expect(newCommentSubscribers.Result[1].ID).Equals(aryaStark.ID)
Expect(changeStatusSubscribers.Result).HasLen(2)
Expect(changeStatusSubscribers.Result[0].ID).Equals(jonSnow.ID)
@@ -289,7 +288,7 @@ func TestSubscription_DeletedPost(t *testing.T) {
bus.Dispatch(aryaStarkCtx, &cmd.SetPostResponse{Post: newPost.Result, Text: "Invalid Post!", Status: enum.PostDeleted})
- q := &query.GetActiveSubscribers{Number: newPost.Result.Number, Channel: enum.NotificationChannelWeb, Event: enum.NotificationEventNewComment}
+ q := &query.GetActiveSubscribers{Number: newPost.Result.Number, Channel: enum.NotificationChannelWeb, Event: enum.NotificationEventChangeStatus}
err = bus.Dispatch(aryaStarkCtx, q)
Expect(err).IsNil()
Expect(q.Result).HasLen(2)
diff --git a/app/services/sqlstore/postgres/user_test.go b/app/services/sqlstore/postgres/user_test.go
index 93932a66d..849d34580 100644
--- a/app/services/sqlstore/postgres/user_test.go
+++ b/app/services/sqlstore/postgres/user_test.go
@@ -308,7 +308,6 @@ func TestUserStorage_DefaultUserSettings(t *testing.T) {
err = bus.Dispatch(aryaStarkCtx, getSettings)
Expect(err).IsNil()
Expect(getSettings.Result).Equals(map[string]string{
- enum.NotificationEventNewComment.UserSettingsKeyName: enum.NotificationEventNewComment.DefaultSettingValue,
enum.NotificationEventChangeStatus.UserSettingsKeyName: enum.NotificationEventChangeStatus.DefaultSettingValue,
})
}
@@ -319,7 +318,7 @@ func TestUserStorage_SaveGetUserSettings(t *testing.T) {
disableAll := map[string]string{
enum.NotificationEventNewPost.UserSettingsKeyName: "0",
- enum.NotificationEventChangeStatus.UserSettingsKeyName: "0",
+ enum.NotificationEventChangeStatus.UserSettingsKeyName: "1",
}
err := bus.Dispatch(aryaStarkCtx, &cmd.UpdateCurrentUserSettings{Settings: disableAll})
@@ -331,8 +330,7 @@ func TestUserStorage_SaveGetUserSettings(t *testing.T) {
Expect(firstSettings.Result).Equals(map[string]string{
enum.NotificationEventNewPost.UserSettingsKeyName: "0",
- enum.NotificationEventNewComment.UserSettingsKeyName: enum.NotificationEventNewComment.DefaultSettingValue,
- enum.NotificationEventChangeStatus.UserSettingsKeyName: "0",
+ enum.NotificationEventChangeStatus.UserSettingsKeyName: "1",
})
err = bus.Dispatch(aryaStarkCtx, &cmd.UpdateCurrentUserSettings{Settings: nil})