Merge branch 'master' into absolute_fluoride

1 files changed, 20 insertions, 12 deletions

diff --git a/service/transport.go b/service/transport.go
index a022b02..02e6106 100644
--- a/service/transport.go
+++ b/service/transport.go
@@ -415,7 +415,13 @@ func NewHandler(s *service, logger *log.Logger, staticDir string) http.Handler {
 
 	mute := handle(func(c *client) error {
 		id, _ := mux.Vars(c.r)["id"]
-		err := s.Mute(c, id)
+		q := c.r.URL.Query()
+		var notifications *bool
+		if r, ok := q["notifications"]; ok && len(r) > 0 {
+			notifications = new(bool)
+			*notifications = r[0] == "true"
+		}
+		err := s.Mute(c, id, notifications)
 		if err != nil {
 			return err
 		}
@@ -484,20 +490,22 @@ func NewHandler(s *service, logger *log.Logger, staticDir string) http.Handler {
 		fluorideMode := c.r.FormValue("fluoride_mode") == "true"
 		darkMode := c.r.FormValue("dark_mode") == "true"
 		antiDopamineMode := c.r.FormValue("anti_dopamine_mode") == "true"
+		hideUnsupportedNotifs := c.r.FormValue("hide_unsupported_notifs") == "true"
 		css := c.r.FormValue("css")
 
 		settings := &model.Settings{
-			DefaultVisibility:    visibility,
-			DefaultFormat:        format,
-			CopyScope:            copyScope,
-			ThreadInNewTab:       threadInNewTab,
-			HideAttachments:      hideAttachments,
-			MaskNSFW:             maskNSFW,
-			NotificationInterval: ni,
-			FluorideMode:         fluorideMode,
-			DarkMode:             darkMode,
-			AntiDopamineMode:     antiDopamineMode,
-			CSS:                  css,
+			DefaultVisibility:     visibility,
+			DefaultFormat:         format,
+			CopyScope:             copyScope,
+			ThreadInNewTab:        threadInNewTab,
+			HideAttachments:       hideAttachments,
+			MaskNSFW:              maskNSFW,
+			NotificationInterval:  ni,
+			FluorideMode:          fluorideMode,
+			DarkMode:              darkMode,
+			AntiDopamineMode:      antiDopamineMode,
+			HideUnsupportedNotifs: hideUnsupportedNotifs,
+			CSS:                   css,
 		}
 
 		err := s.SaveSettings(c, settings)