Children of original movers now hidden for non-admins.

r2/r2/controllers/api.py

@@ -222,6 +222,7 @@ def POST_move(self, res, thing, destination, reason):
         for child in children:
             child.recursive_move(destination, comment)
 
+        thing.moved = True
         thing.set_body('This comment was moved by ' + c.user.name +
                        ' to [here]({0}).\n\n'.format(comment.make_anchored_permalink(destination)) +
                        (reason if reason else ''))

r2/r2/lib/comment_tree.py

@@ -88,13 +88,13 @@ def delete_comment(comment):
 def link_comments(link_id):
     key = comments_key(link_id)
     r = g.permacache.get(key)
-    #if r:
-    #    return r
-    #else:
-    with g.make_lock(lock_key(link_id)):
-        r = load_link_comments(link_id)
-        g.permacache.set(key, r)
-    return r
+    if r:
+        return r
+    else:
+        with g.make_lock(lock_key(link_id)):
+            r = load_link_comments(link_id)
+            g.permacache.set(key, r)
+        return r
 
 def load_link_comments(link_id):
     q = Comment._query(Comment.c.link_id == link_id,

r2/r2/models/link.py

@@ -186,7 +186,6 @@ def _submit(cls, title, article, author, sr, ip, tags, spam = False, date = None
         # Parse and create polls in the article
         l.set_article(article)
 
-        print l.url
         l.set_url_cache()
 
         # Add tags
@@ -874,7 +873,8 @@ class Comment(Thing, Printable):
                      banned_before_moderator = False,
                      is_html = False,
                      retracted = False,
-                     show_response_to = False)
+                     show_response_to = False,
+                     moved = False)
 
     def _markdown(self):
         pass
@@ -966,8 +966,10 @@ def recursive_move(self, destination, parent):
             for child in children:
                 child.recursive_move(destination, comment)
 
+
         self.moderator_banned = not c.user_is_admin
         self.banner = c.user.name
+        #self.moved = True
         self._commit()
         # NB: change table updated by reporting
         from r2.models.report import unreport

r2/r2/public/static/lesswrong.css

@@ -187,7 +187,7 @@ div.inline-listing a:hover {
     clear: both;
     margin: 10px 15px 30px 0;
 }
-.commentreplacement textarea, input {
+.commentreplacement textarea, .commentreplacement input {
     border-color: #e9e9e9;
     -webkit-box-shadow: inset 1px 1px 5px #dbdbdb;
     -moz-box-shadow: inset 1px 1px 5px #dbdbdb;

r2/r2/templates/comment.html

@@ -103,7 +103,7 @@
 </%def>
 
 <%def name="Child()">
-${parent.Child(not thing.collapsed)}
+${parent.Child(not (thing.collapsed or ((not c.user_is_admin) and thing.moved)), not ((not c.user_is_admin) and thing.moved))}
 </%def>
 
 <%def name="commentBody()">