Revert "DEV: move post flags into database (#26951)" (#27102)

This reverts commit 7aff980.

app/assets/javascripts/discourse/app/components/flag-action-type.js

@@ -14,19 +14,15 @@ export default Component.extend({
 
   @discourseComputed("flag.name_key")
   customPlaceholder(nameKey) {
-    return I18n.t("flagging.custom_placeholder_" + nameKey, {
-      defaultValue: I18n.t("flagging.custom_placeholder_notify_moderators"),
-    });
+    return I18n.t("flagging.custom_placeholder_" + nameKey);
   },
 
   @discourseComputed("flag.name", "flag.name_key", "username")
   formattedName(name, nameKey, username) {
     if (["notify_user", "notify_moderators"].includes(nameKey)) {
       return name.replace(/{{username}}|%{username}/, username);
     } else {
-      return I18n.t("flagging.formatted_name." + nameKey, {
-        defaultValue: name,
-      });
+      return I18n.t("flagging.formatted_name." + nameKey);
     }
   },
 

app/assets/javascripts/discourse/app/lib/transform-post.js

@@ -254,11 +254,7 @@ export default function transformPost(
           postId: post.id,
           action,
           canUndo: a.can_undo,
-          description: I18n.t(`post.actions.by_you.${action}`, {
-            defaultValue: I18n.t(`post.actions.by_you.custom`, {
-              custom: a.actionType.name,
-            }),
-          }),
+          description: I18n.t(`post.actions.by_you.${action}`),
         };
       });
   }

app/models/post_action_type.rb

@@ -18,7 +18,7 @@ def replace_flag_settings(settings)
       if settings
         @flag_settings = settings
       else
-        reload_types
+        initialize_flag_settings
       end
       @types = nil
     end
@@ -79,27 +79,34 @@ def is_flag?(sym)
       flag_types.valid?(sym)
     end
 
-    def reload_types
-      @types = nil
+    private
+
+    def initialize_flag_settings
       @flag_settings = FlagSettings.new
-      Flag
-        .enabled
-        .order(:position)
-        .each do |flag|
-          @flag_settings.add(
-            flag.id,
-            flag.name_key.to_sym,
-            topic_type: flag.applies_to?("Topic"),
-            notify_type: flag.notify_type,
-            auto_action_type: flag.auto_action_type,
-            custom_type: flag.custom_type,
-            name: flag.name,
-          )
-        end
+      @flag_settings.add(3, :off_topic, notify_type: true, auto_action_type: true)
+      @flag_settings.add(
+        4,
+        :inappropriate,
+        topic_type: true,
+        notify_type: true,
+        auto_action_type: true,
+      )
+      @flag_settings.add(8, :spam, topic_type: true, notify_type: true, auto_action_type: true)
+      @flag_settings.add(6, :notify_user, topic_type: false, notify_type: false, custom_type: true)
+      @flag_settings.add(
+        7,
+        :notify_moderators,
+        topic_type: true,
+        notify_type: true,
+        custom_type: true,
+      )
+      @flag_settings.add(10, :illegal, topic_type: true, notify_type: true, custom_type: true)
+      # When adding a new ID here, check that it doesn't clash with any added in
+      # `ReviewableScore.types`. You can thank me later.
     end
   end
 
-  reload_types
+  initialize_flag_settings
 end
 
 # == Schema Information

app/serializers/post_action_type_serializer.rb

@@ -14,25 +14,25 @@ def is_flag
   end
 
   def name
-    i18n("title", default: object.class.flag_settings.names[object.id])
+    i18n("title")
   end
 
   def description
-    i18n("description", vars: { tos_url: tos_url, base_path: Discourse.base_path })
+    i18n("description", tos_url: tos_url, base_path: Discourse.base_path)
   end
 
   def short_description
-    i18n("short_description", vars: { tos_url: tos_url, base_path: Discourse.base_path })
+    i18n("short_description", tos_url: tos_url, base_path: Discourse.base_path)
   end
 
   def name_key
-    PostActionType.types[object.id].to_s
+    PostActionType.types[object.id]
   end
 
   protected
 
-  def i18n(field, default: nil, vars: nil)
+  def i18n(field, vars = nil)
     key = "post_action_types.#{name_key}.#{field}"
-    vars ? I18n.t(key, vars, default: default) : I18n.t(key, default: default)
+    vars ? I18n.t(key, vars) : I18n.t(key)
   end
 end

app/serializers/reviewable_score_type_serializer.rb

@@ -9,9 +9,8 @@ def type
 
   # Allow us to share post action type translations for backwards compatibility
   def title
-    I18n.t("post_action_types.#{type}.title", default: nil) ||
-      I18n.t("reviewable_score_types.#{type}.title", default: nil) ||
-      PostActionType.flag_settings.names[id]
+    I18n.t("post_action_types.#{ReviewableScore.types[id]}.title", default: nil) ||
+      I18n.t("reviewable_score_types.#{ReviewableScore.types[id]}.title")
   end
 
   def reviewable_priority

app/serializers/site_serializer.rb

@@ -350,6 +350,13 @@ def include_lazy_load_categories?
   private
 
   def ordered_flags(flags)
-    flags.map { |id| PostActionType.new(id: id) }
+    notify_moderators_type = PostActionType.flag_types[:notify_moderators]
+    types = flags
+
+    if notify_moderators_flag = types.index(notify_moderators_type)
+      types.insert(types.length, types.delete_at(notify_moderators_flag))
+    end
+
+    types.map { |id| PostActionType.new(id: id) }
   end
 end

app/serializers/topic_flag_type_serializer.rb

@@ -3,8 +3,8 @@
 class TopicFlagTypeSerializer < PostActionTypeSerializer
   protected
 
-  def i18n(field, default: nil, vars: nil)
+  def i18n(field, vars = nil)
     key = "topic_flag_types.#{name_key}.#{field}"
-    vars ? I18n.t(key, vars, default: default) : I18n.t(key, default: default)
+    vars ? I18n.t(key, vars) : I18n.t(key)
   end
 end

config/locales/client.en.yml

@@ -3748,7 +3748,6 @@ en:
           illegal: "You flagged this as illegal"
           notify_moderators: "You flagged this for moderation"
           notify_user: "You sent a message to this user"
-          custom: "You flagged this topic as %{custom}"
 
       delete:
         confirm:

db/migrate/20181031165343_add_flag_stats_to_user.rb

@@ -18,7 +18,7 @@ def up
           SUM(CASE WHEN pa.deferred_at IS NOT NULL THEN 1 ELSE 0 END) as flags_ignored
         FROM post_actions AS pa
         INNER JOIN users AS u ON u.id = pa.user_id
-        WHERE pa.post_action_type_id IN (3, 4, 8, 7, 10)
+        WHERE pa.post_action_type_id IN (#{PostActionType.notify_flag_types.values.join(", ")})
         AND pa.user_id > 0
         GROUP BY u.id
       ) AS x

lib/flag_settings.rb

@@ -7,7 +7,6 @@ class FlagSettings
     :topic_flag_types,
     :auto_action_types,
     :custom_types,
-    :names,
   )
 
   def initialize
@@ -17,28 +16,18 @@ def initialize
     @auto_action_types = Enum.new
     @custom_types = Enum.new
     @without_custom_types = Enum.new
-    @names = Enum.new
   end
 
-  def add(
-    id,
-    name_key,
-    topic_type: nil,
-    notify_type: nil,
-    auto_action_type: nil,
-    custom_type: nil,
-    name: nil
-  )
-    @all_flag_types[name_key] = id
-    @topic_flag_types[name_key] = id if !!topic_type
-    @notify_types[name_key] = id if !!notify_type
-    @auto_action_types[name_key] = id if !!auto_action_type
-    @names[id] = name if name
+  def add(id, name, topic_type: nil, notify_type: nil, auto_action_type: nil, custom_type: nil)
+    @all_flag_types[name] = id
+    @topic_flag_types[name] = id if !!topic_type
+    @notify_types[name] = id if !!notify_type
+    @auto_action_types[name] = id if !!auto_action_type
 
     if !!custom_type
-      @custom_types[name_key] = id
+      @custom_types[name] = id
     else
-      @without_custom_types[name_key] = id
+      @without_custom_types[name] = id
     end
   end
 

lib/guardian.rb

@@ -4,7 +4,6 @@
 require "guardian/category_guardian"
 require "guardian/ensure_magic"
 require "guardian/group_guardian"
-require "guardian/flag_guardian"
 require "guardian/post_guardian"
 require "guardian/post_revision_guardian"
 require "guardian/sidebar_guardian"
@@ -17,7 +16,6 @@ class Guardian
   include BookmarkGuardian
   include CategoryGuardian
   include EnsureMagic
-  include FlagGuardian
   include GroupGuardian
   include PostGuardian
   include PostRevisionGuardian