FEATURE: flag dispositions normalization

All flags should end up in one of the three dispositions
  - Agree
  - Disagree
  - Defer

In the administration area, the *active* flags section displays 4 buttons
  - Agree (hide post + send PM)
  - Disagree
  - Defer
  - Delete

Clicking "Delete" will open a modal that offer to
  - Delete Post & Defer Flags
  - Delete Post & Agree with Flags
  - Delete Spammer (if available)

When the flag has a list associated, the list will now display 1
response and 1 reply and a "show more..." link if there are more in the
conversation. Replying to the conversation will NOT give a disposition.
Moderators must click the buttons that does that.

If someone clicks one buttons, this will add a default moderator message
from that moderator saying what happened.

The *old* flags section now displays the proper dispositions and is
super duper fast (no more N+9999 queries).

FIX: the old list includes deleted topics
FIX: the lists now properly display the topic states (deleted, closed,
archived, hidden, PM)
FIX: flagging a topic that you've already flagged the first post

app/assets/javascripts/admin/models/flagged_post.js

@@ -8,64 +8,69 @@
 **/
 Discourse.FlaggedPost = Discourse.Post.extend({
 
-  summary: function(){
+  summary: function () {
     return _(this.post_actions)
-      .groupBy(function(a){ return a.post_action_type_id; })
-      .map(function(v,k){
-        return I18n.t('admin.flags.summary.action_type_' + k, {count: v.length});
-      })
+      .groupBy(function (a) { return a.post_action_type_id; })
+      .map(function (v,k) { return I18n.t('admin.flags.summary.action_type_' + k, { count: v.length }); })
       .join(',');
   }.property(),
 
-  flaggers: function() {
-    var r,
-      _this = this;
-    r = [];
-    _.each(this.post_actions, function(action) {
-      var user = _this.userLookup[action.user_id];
-      var deletedBy = null;
-      if(action.deleted_by_id){
-        deletedBy = _this.userLookup[action.deleted_by_id];
-      }
+  flaggers: function () {
+    var self = this;
+    var flaggers = [];
 
-      var flagType = I18n.t('admin.flags.summary.action_type_' + action.post_action_type_id, {count: 1});
-
-      r.push({
-        user: user, flagType: flagType, flaggedAt: action.created_at, deletedBy: deletedBy,
-        tookAction: action.staff_took_action, deletedAt: action.deleted_at
+    _.each(this.post_actions, function (postAction) {
+      flaggers.push({
+        user: self.userLookup[postAction.user_id],
+        topic: self.topicLookup[postAction.topic_id],
+        flagType: I18n.t('admin.flags.summary.action_type_' + postAction.post_action_type_id, { count: 1 }),
+        flaggedAt: postAction.created_at,
+        disposedBy: postAction.disposed_by_id ? self.userLookup[postAction.disposed_by_id] : null,
+        disposedAt: postAction.disposed_at,
+        disposition: postAction.disposition ? I18n.t('admin.flags.dispositions.' + postAction.disposition) : null,
+        tookAction: postAction.staff_took_action
       });
     });
-    return r;
+
+    return flaggers;
   }.property(),
 
-  messages: function() {
-    var r,
-      _this = this;
-    r = [];
-    _.each(this.post_actions,function(action) {
-      if (action.message) {
-        r.push({
-          user: _this.userLookup[action.user_id],
-          message: action.message,
-          permalink: action.permalink,
-          bySystemUser: (action.user_id === -1 ? true : false)
-        });
+  conversations: function () {
+    var self = this;
+    var conversations = [];
+
+    _.each(this.post_actions, function (postAction) {
+      if (postAction.conversation) {
+        var conversation = {
+          permalink: postAction.permalink,
+          hasMore: postAction.conversation.has_more,
+          response: {
+            excerpt: postAction.conversation.response.excerpt,
+            user: self.userLookup[postAction.conversation.response.user_id]
+          }
+        };
+
+        if (postAction.conversation.reply) {
+          conversation["reply"] = {
+            excerpt: postAction.conversation.reply.excerpt,
+            user: self.userLookup[postAction.conversation.reply.user_id]
+          };
+        }
+
+        conversations.push(conversation);
       }
     });
-    return r;
-  }.property(),
 
-  lastFlagged: function() {
-    return this.post_actions[0].created_at;
+    return conversations;
   }.property(),
 
   user: function() {
     return this.userLookup[this.user_id];
   }.property(),
 
-  topicHidden: function() {
-    return !this.get('topic_visible');
-  }.property('topic_hidden'),
+  topic: function () {
+    return this.topicLookup[this.topic_id];
+  }.property(),
 
   flaggedForSpam: function() {
     return !_.every(this.get('post_actions'), function(action) { return action.name_key !== 'spam'; });
@@ -80,7 +85,7 @@ Discourse.FlaggedPost = Discourse.Post.extend({
   }.property('post_actions.@each.targets_topic'),
 
   canDeleteAsSpammer: function() {
-    return (Discourse.User.currentProp('staff') && this.get('flaggedForSpam') && this.get('user.can_delete_all_posts') && this.get('user.can_be_deleted'));
+    return Discourse.User.currentProp('staff') && this.get('flaggedForSpam') && this.get('user.can_delete_all_posts') && this.get('user.can_be_deleted');
   }.property('flaggedForSpam'),
 
   deletePost: function() {
@@ -91,28 +96,24 @@ Discourse.FlaggedPost = Discourse.Post.extend({
     }
   },
 
-  disagreeFlags: function() {
+  disagreeFlags: function () {
     return Discourse.ajax('/admin/flags/disagree/' + this.id, { type: 'POST', cache: false });
   },
 
-  deferFlags: function() {
-    return Discourse.ajax('/admin/flags/defer/' + this.id, { type: 'POST', cache: false });
+  deferFlags: function (deletePost) {
+    return Discourse.ajax('/admin/flags/defer/' + this.id, { type: 'POST', cache: false, data: { delete_post: deletePost } });
   },
 
-  agreeFlags: function() {
-    return Discourse.ajax('/admin/flags/agree/' + this.id, { type: 'POST', cache: false });
+  agreeFlags: function (deletePost) {
+    return Discourse.ajax('/admin/flags/agree/' + this.id, { type: 'POST', cache: false, data: { delete_post: deletePost } });
   },
 
   postHidden: Em.computed.alias('hidden'),
 
   extraClasses: function() {
     var classes = [];
-    if (this.get('hidden')) {
-      classes.push('hidden-post');
-    }
-    if (this.get('deleted')){
-      classes.push('deleted');
-    }
+    if (this.get('hidden')) { classes.push('hidden-post'); }
+    if (this.get('deleted')) { classes.push('deleted'); }
     return classes.join(' ');
   }.property(),
 
@@ -121,26 +122,36 @@ Discourse.FlaggedPost = Discourse.Post.extend({
 });
 
 Discourse.FlaggedPost.reopenClass({
-  findAll: function(filter, offset) {
-
+  findAll: function (filter, offset) {
     offset = offset || 0;
 
     var result = Em.A();
     result.set('loading', true);
-    return Discourse.ajax('/admin/flags/' + filter + '.json?offset=' + offset).then(function(data) {
+
+    return Discourse.ajax('/admin/flags/' + filter + '.json?offset=' + offset).then(function (data) {
+      // users
       var userLookup = {};
-      _.each(data.users,function(user) {
+      _.each(data.users,function (user) {
         userLookup[user.id] = Discourse.AdminUser.create(user);
       });
-      _.each(data.posts,function(post) {
+
+      // topics
+      var topicLookup = {};
+      _.each(data.topics, function (topic) {
+        topicLookup[topic.id] = Discourse.Topic.create(topic);
+      });
+
+      // posts
+      _.each(data.posts,function (post) {
         var f = Discourse.FlaggedPost.create(post);
         f.userLookup = userLookup;
+        f.topicLookup = topicLookup;
         result.pushObject(f);
       });
+
       result.set('loading', false);
+
       return result;
     });
   }
 });
-
-