Implement hard deletion and rename soft delete to hide

framework/core/ember/app/components/discussion/post-comment.js

@@ -21,8 +21,8 @@ export default Ember.Component.extend(FadeIn, HasItemLists, UseComposer, {
   tagName: 'article',
   classNames: ['post', 'post-comment'],
   classNameBindings: [
-    'post.isHidden:deleted',
-    'post.isEdited:edited',
+    'post.isHidden:is-hidden',
+    'post.isEdited:is-edited',
     'revealContent:reveal-content'
   ],
   itemLists: ['controls', 'header', 'footer'],
@@ -35,7 +35,7 @@ export default Ember.Component.extend(FadeIn, HasItemLists, UseComposer, {
   populateControls: function(items) {
     if (this.get('post.isHidden')) {
       this.addActionItem(items, 'restore', 'Restore', 'reply', 'post.canEdit');
-      this.addActionItem(items, 'delete', 'Delete', 'times', 'post.canDelete');
+      this.addActionItem(items, 'delete', 'Delete Forever', 'times', 'post.canDelete');
     } else {
       this.addActionItem(items, 'edit', 'Edit', 'pencil', 'post.canEdit');
       this.addActionItem(items, 'hide', 'Delete', 'times', 'post.canEdit');
@@ -88,8 +88,8 @@ export default Ember.Component.extend(FadeIn, HasItemLists, UseComposer, {
       var post = this.get('post');
       post.setProperties({
         isHidden: true,
-        deleteTime: new Date,
-        deleteUser: this.get('session.user')
+        hideTime: new Date,
+        hideUser: this.get('session.user')
       });
       post.save();
     },
@@ -98,10 +98,16 @@ export default Ember.Component.extend(FadeIn, HasItemLists, UseComposer, {
       var post = this.get('post');
       post.setProperties({
         isHidden: false,
-        deleteTime: null,
-        deleteUser: null
+        hideTime: null,
+        hideUser: null
       });
       post.save();
+    },
+
+    delete: function() {
+      var post = this.get('post');
+      post.destroyRecord();
+      this.sendAction('postRemoved', post);
     }
   }
 });

framework/core/ember/app/components/discussion/stream-content.js

@@ -288,6 +288,10 @@ export default Ember.Component.extend({
 
     loadRange: function(start, end, backwards) {
       this.get('stream').loadRange(start, end, backwards);
+    },
+
+    postRemoved: function(post) {
+      this.sendAction('postRemoved', post);
     }
   }
 });

framework/core/ember/app/controllers/discussion.js

@@ -98,6 +98,10 @@ export default Ember.Controller.extend(Ember.Evented, UseComposerMixin, {
         discussion.set('readNumber', endNumber);
         discussion.save();
       }
+    },
+
+    postRemoved: function(post) {
+      this.get('stream').removePost(post);
     }
   }
 });

framework/core/ember/app/models/post-stream.js

@@ -168,6 +168,12 @@ export default Ember.ArrayProxy.extend(Ember.Evented, {
     this.get('content').pushObject(this.makeItem(index, index, post));
   },
 
+  removePost: function(post) {
+    this.get('ids').removeObject(post.get('id'));
+    var content = this.get('content');
+    content.removeObject(content.findBy('content', post));
+  },
+
   makeItem: function(indexStart, indexEnd, post) {
     var item = Ember.Object.create({
       indexStart: indexStart,

framework/core/ember/app/models/post.js

@@ -15,9 +15,9 @@ export default DS.Model.extend({
   editUser: DS.belongsTo('user'),
   isEdited: Ember.computed.notEmpty('editTime'),
 
+  hideTime: DS.attr('date'),
+  hideUser: DS.belongsTo('user'),
   isHidden: DS.attr('boolean'),
-  deleteTime: DS.attr('date'),
-  deleteUser: DS.belongsTo('user'),
 
   canEdit: DS.attr('boolean'),
   canDelete: DS.attr('boolean')

framework/core/ember/app/serializers/post.js

@@ -0,0 +1,16 @@
+import ApplicationSerializer from 'flarum/serializers/application';
+
+export default ApplicationSerializer.extend({
+  attrs: {
+    number: {serialize: false},
+    time: {serialize: false},
+    type: {serialize: false},
+    contentHtml: {serialize: false},
+    editTime: {serialize: false},
+    editUser: {serialize: false},
+    hideTime: {serialize: false},
+    hideUser: {serialize: false},
+    canEdit: {serialize: false},
+    canDelete: {serialize: false}
+  }
+});

framework/core/ember/app/styles/flarum/discussion.less

@@ -103,7 +103,6 @@
     float: right;
     margin: -2px 0 0 10px;
     visibility: hidden;
-    z-index: 1;
   }
   &:hover .contextual-controls, & .contextual-controls.open {
     visibility: visible;
@@ -159,7 +158,7 @@
   text-align: center;
   font-size: 22px;
 }
-.post.deleted {
+.post.is-hidden {
   & .post-user, & .post-header > ul, & .post-header > ul a:not(.btn) {
     color: @fl-body-muted-more-color;
   }
@@ -173,6 +172,10 @@
       opacity: 0.5;
     }
   }
+  & .btn-more {
+    background: #eee;
+    color: @fl-body-muted-more-color;
+  }
 }
 .post-meta {
   width: 400px;

framework/core/ember/app/templates/components/discussion/stream-content.hbs

@@ -1,7 +1,7 @@
 {{#each item in stream}}
   {{#discussion/stream-item item=item stream=stream loadRange="loadRange"}}
     {{#if item.content}}
-      {{component item.component content=item.content}}
+      {{component item.component content=item.content postRemoved="postRemoved"}}
     {{/if}}
   {{/discussion/stream-item}}
 {{/each}}

framework/core/ember/app/templates/discussion.hbs

@@ -13,5 +13,6 @@
     viewName="streamContent"
     stream=stream
     class="discussion-posts posts"
-    positionChanged="positionChanged"}}
+    positionChanged="positionChanged"
+    postRemoved="postRemoved"}}
 </div>