Add in-app notification configuration

app/assets/stylesheets/settings.scss

@@ -63,3 +63,33 @@
 .account-data h6 {
   color: $text-grey;
 }
+
+.preference-row {
+  align-items: center;
+  display: flex;
+}
+
+.icon-checkbox {
+  i {
+    color: $medium-gray;
+    cursor: pointer;
+    font-size: 32px;
+  }
+
+  [type="checkbox"] {
+    display: none;
+  }
+
+  [type="checkbox"]:checked ~ i {
+    color: $black;
+  }
+}
+
+.notification-text {
+  margin-left: 16px;
+}
+
+.hidden-bell {
+  color: transparent;
+  font-size: 32px;
+}

app/controllers/notifications_controller.rb

@@ -97,16 +97,7 @@ def render_as_json(unread_count, unread_count_by_type, notification_list)
   end
 
   def types
-    {
-      "also_commented"       => "Notifications::AlsoCommented",
-      "comment_on_post"      => "Notifications::CommentOnPost",
-      "liked"                => "Notifications::Liked",
-      "mentioned"            => "Notifications::MentionedInPost",
-      "mentioned_in_comment" => "Notifications::MentionedInComment",
-      "reshared"             => "Notifications::Reshared",
-      "started_sharing"      => "Notifications::StartedSharing",
-      "contacts_birthday"    => "Notifications::ContactsBirthday"
-    }
+    NotificationService::NOTIFICATIONS_JSON_TYPES
   end
   helper_method :types
 end

app/controllers/users_controller.rb

@@ -137,7 +137,7 @@ def user_params
       :post_default_public,
       :exported_photos_file,
       :export,
-      email_preferences: UserPreference::VALID_EMAIL_TYPES.map(&:to_sym)
+      email_preferences: UserPreference::VALID_EMAIL_TYPES.to_h {|type| [type.to_sym, %i[mail in_app]] }
     )
   end
 
@@ -249,10 +249,17 @@ def change_settings(user_data, successful="users.update.settings_updated", error
   end
 
   def set_email_preferences
-    @email_prefs = Hash.new(true)
-
-    @user.user_preferences.each do |pref|
-      @email_prefs[pref.email_type] = false
+    @email_prefs = @user.user_preferences.to_h do |pref|
+      [
+        pref.email_type, {
+          mail:   pref.email_enabled,
+          in_app: pref.in_app_enabled
+        }
+      ]
     end
+    @email_prefs.default = {
+      mail:   true,
+      in_app: true
+    }
   end
 end

app/mailers/report_mailer.rb

@@ -16,7 +16,8 @@ def new_report(type, id, reason, role)
     person = Person.find(role.person_id)
     return unless person.local?
     user = User.find_by_id(person.owner_id)
-    return if user.user_preferences.exists?(email_type: :someone_reported)
+    return if NotificationSettingsService.new(user).email_disabled?(:someone_reported)
+
     I18n.with_locale(user.language) do
       resource[:email] = user.email
       format(resource)

app/models/notification.rb

@@ -53,6 +53,11 @@ def self.create_notification(recipient, target, actor)
   end
 
   private_class_method def self.suppress_notification?(recipient, actor)
-    recipient.blocks.where(person: actor).exists?
+    return true if recipient.blocks.exists?(person: actor)
+
+    pref_name = NotificationService::NOTIFICATIONS_REVERSE_JSON_TYPES[name]
+    NotificationSettingsService
+      .new(recipient)
+      .in_app_disabled?(pref_name)
   end
 end

app/models/notifications/mentioned_in_comment.rb

@@ -17,7 +17,7 @@ def self.filter_mentions(mentions, mentionable, _recipient_user_ids)
     end
 
     def mail_job
-      if !recipient.user_preferences.exists?(email_type: "mentioned_in_comment")
+      if NotificationSettingsService.new(recipient).email_enabled?(:mentioned_in_comment)
         Workers::Mail::MentionedInComment
       elsif shareable.author.owner_id == recipient_id
         Workers::Mail::CommentOnPost

app/models/user.rb

@@ -179,21 +179,21 @@ def send_reset_password_instructions
   end
 
   def update_user_preferences(pref_hash)
+    # binding.pry
     if self.disable_mail
-      UserPreference::VALID_EMAIL_TYPES.each{|x| self.user_preferences.find_or_create_by(email_type: x)}
+      UserPreference::VALID_EMAIL_TYPES.each do |type|
+        user_preferences.find_or_create_by(email_type: type).update(email_enabled: false)
+      end
       self.disable_mail = false
       self.save
     end
 
     pref_hash.keys.each do |key|
-      if pref_hash[key] == 'true'
-        self.user_preferences.find_or_create_by(email_type: key)
-      else
-        block = user_preferences.find_by(email_type: key)
-        if block
-          block.destroy
-        end
-      end
+      email_enabled = pref_hash[key]["mail"] == "false"
+      in_app_enabled = pref_hash[key]["in_app"] == "false"
+      user_preferences
+        .find_or_create_by(email_type: key)
+        .update(email_enabled: email_enabled, in_app_enabled: in_app_enabled)
     end
   end
 
@@ -354,9 +354,10 @@ def perform_export_photos!
   def mail(job, *args)
     return unless job.present?
     pref = job.to_s.gsub('Workers::Mail::', '').underscore
-    if(self.disable_mail == false && !self.user_preferences.exists?(:email_type => pref))
-      job.perform_async(*args)
-    end
+    email_enabled = (disable_mail == false) &&
+      NotificationSettingsService.new(self).email_enabled?(pref)
+
+    job.perform_async(*args) if email_enabled
   end
 
   def send_confirm_email

app/services/notification_settings_service.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class NotificationSettingsService
+  def initialize(user)
+    @user = user
+  end
+
+  def email_disabled?(notification_type)
+    !email_enabled?(notification_type)
+  end
+
+  def email_enabled?(notification_type)
+    notification_enabled?(notification_type, :email_enabled?)
+  end
+
+  def in_app_disabled?(notfication_type)
+    !in_app_enabled?(notfication_type)
+  end
+
+  def in_app_enabled?(notification_type)
+    notification_enabled?(notification_type, :in_app_enabled?)
+  end
+
+  private
+
+  attr_reader :user
+
+  delegate :user_preferences, to: :user
+
+  def notification_enabled?(notification_type, pref_method)
+    pref = user_preferences.find_by(email_type: notification_type)
+    return true if pref.nil?
+
+    pref.public_send pref_method
+  end
+end