Merge branch 'kb_development' into kb_migration

app/models/concerns/has_user_settings.rb

@@ -31,6 +31,10 @@ module HasUserSettings
     settings['web.enable_login_privacy']
   end
 
+  def setting_enable_dtl_menu
+    settings['web.enable_dtl_menu']
+  end
+
   def setting_bookmark_category_needed
     settings['web.bookmark_category_needed']
   end
@@ -107,6 +111,14 @@ module HasUserSettings
     settings['link_preview']
   end
 
+  def setting_dtl_force_with_tag
+    settings['dtl_force_with_tag']&.to_sym || :none
+  end
+
+  def setting_dtl_force_subscribable
+    settings['dtl_force_subscribable']
+  end
+
   def setting_hide_statuses_count
     settings['hide_statuses_count']
   end

app/models/emoji_reaction.rb

@@ -35,6 +35,14 @@ class EmojiReaction < ApplicationRecord
   after_destroy :refresh_cache
   after_destroy :invalidate_cleanup_info
 
+  def custom_emoji?
+    custom_emoji.present?
+  end
+
+  def remote_custom_emoji?
+    custom_emoji? && !custom_emoji.local?
+  end
+
   private
 
   def refresh_cache

app/models/status.rb

@@ -290,6 +290,10 @@ class Status < ApplicationRecord
     @reported ||= Report.where(target_account: account).unresolved.where('? = ANY(status_ids)', id).exists?
   end
 
+  def dtl?
+    tags.where(name: 'kmyblue').exists?
+  end
+
   def emojis
     return @emojis if defined?(@emojis)
 

app/models/user_settings.rb

@@ -35,6 +35,8 @@ class UserSettings
   setting :stop_emoji_reaction_streaming, default: false
   setting :emoji_reaction_streaming_notify_impl2, default: false
   setting :unsafe_limited_distribution, default: false
+  setting :dtl_force_with_tag, default: :none, in: %w(full searchability none)
+  setting :dtl_force_subscribable, default: false
 
   setting_inverse_alias :indexable, :noindex
 
@@ -48,6 +50,7 @@ class UserSettings
     setting :disable_swiping, default: false
     setting :delete_modal, default: true
     setting :enable_login_privacy, default: false
+    setting :enable_dtl_menu, default: false
     setting :hide_recent_emojis, default: false
     setting :reblog_modal, default: false
     setting :unfollow_modal, default: true