Changed move proceedure to no longer create new comments. All calls t…

…o comment.parent_id now safed.

r2/r2/controllers/api.py

@@ -203,9 +203,10 @@ def POST_verifyemail(self, res, code):
     @validate(VModhash(),
               VSrCanBan('id'),
               thing = VByName('id'),
+              ip = ValidIP(),
               destination = VMoveURL('destination'),
               reason = VComment('comment'))
-    def POST_move(self, res, thing, destination, reason):
+    def POST_move(self, res, thing, destination, reason, ip):
         res._update('status_' + thing._fullname, innerHTML = '')
         if res._chk_errors((errors.NO_URL, errors.BAD_URL),
                            thing._fullname):
@@ -216,25 +217,34 @@ def POST_move(self, res, thing, destination, reason):
             res._focus("comment_replacement_" + thing._fullname)
             return
 
-        from r2.lib.comment_tree import lock_key
+        print Link._byID(thing.link_id).title
+        currlink = Link._byID(thing.link_id)
+        if hasattr(thing, 'parent_id'):
+            parent = Comment._byID(thing.parent_id)
+        else:
+            parent = None
+
+        from r2.lib.comment_tree import lock_key, comments_key
 
         with g.make_lock(lock_key(thing.link_id)):
-            comment, inbox_rel = Comment._new(Account._byID(thing.author_id),
-                                              destination, None, thing.body,
-                                              thing.ip)
-            children = list(Comment._query(Comment.c.parent_id == thing._id))
-            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 ''))
+            thing.recursive_move(currlink, destination, True)
 
-            if g.write_query_queue:
-                    queries.new_comment(comment, None)
+        g.permacache.delete(comments_key(currlink._id))
+        g.permacache.delete(comments_key(destination._id))
+
+        body = "A comment was moved from here to [here]({0}).\n\n".format(thing.make_anchored_permalink(destination)) + (reason if reason else '')
+
+        comment, inbox_rel = Comment._new(c.user,
+                                          currlink, parent, body,
+                                          ip)
+
+
+        if g.write_query_queue:
+            queries.new_comment(comment, None)
+
+        res._send_things([comment, thing])
 
-            res._send_things(thing)
+        print Link._byID(thing.link_id).title
 
     @Json
     @validate(VCaptcha(),

r2/r2/controllers/front.py

@@ -176,7 +176,7 @@ def GET_comments(self, article, comment, context, sort, num_comments):
                     context = context + 1 if context else 1,
                     anchor  = 'comments'
                 ),
-                has_more_comments = hasattr(comment, 'parent_id')
+                has_more_comments = hasattr(comment, 'parent_id') and comment.parent_id
             )
             displayPane.append(permamessage)
 

r2/r2/lib/jsontemplates.py

@@ -168,7 +168,10 @@ def thing_attr(self, thing, attr):
             return make_fullname(Link, thing.link_id)
         elif attr == "parent_id":
             try:
-                return make_fullname(Comment, thing.parent_id)
+                if thing.parent_id:
+                    return make_fullname(Comment, thing.parent_id)
+                else:
+                    return make_fullname(Link, thing.link_id)
             except AttributeError:
                 return make_fullname(Link, thing.link_id)
         return ThingJsonTemplate.thing_attr(self, thing, attr)
@@ -184,7 +187,10 @@ def rendered_data(self, wrapped):
         except AttributeError:
             parent_id = make_fullname(Link, wrapped.link_id)
         else:
-            parent_id = make_fullname(Comment, parent_id)
+            if parent_id:
+                parent_id = make_fullname(Comment, parent_id)
+            else:
+                parent_id = make_fullname(Link, wrapped.link_id)
         d = ThingJsonTemplate.rendered_data(self, wrapped)
         d.update(mass_part_render(wrapped, contentHTML = 'commentBody',
                                   contentTxt = 'commentText'))

r2/r2/models/builder.py

@@ -459,7 +459,10 @@ def keep_item(self, item):
         except AttributeError:
             return True
         else:
-            return False
+            if item.parent_id:
+                return False
+            else:
+                return True
 
 class ContextualCommentBuilder(CommentBuilderMixin, UnbannedCommentBuilder):
     def __init__(self, query, sr_ids, **kw):
@@ -574,7 +577,7 @@ def get_items(self, num, nested = True, starting_depth = 0):
             top = self.comment
             dont_collapse.append(top._id)
             #add parents for context
-            while self.context > 0 and hasattr(top, 'parent_id'):
+            while self.context > 0 and hasattr(top, 'parent_id') and top.parent_id:
                 self.context -= 1
                 new_top = comment_dict[top.parent_id]
                 comment_tree[new_top._id] = [top]
@@ -657,7 +660,7 @@ def sort_candidates():
             to_add = candidates.pop(0)
             direct_child = True
             #ignore top-level comments for now
-            if not hasattr(to_add, 'parent_id'):
+            if not hasattr(to_add, 'parent_id') or not to_add.parent_id:
                 p_id = None
             else:
                 #find the parent actually being displayed

r2/r2/models/link.py

@@ -923,6 +923,39 @@ def _new(cls, author, link, parent, body, ip, spam = False, date = None):
 
         return (comment, inbox_rel)
 
+    @classmethod
+    def _move(cls, comment, currlink, newlink, top=False):
+        author = Account._byID(comment.author_id)
+
+        if top:
+            if hasattr(comment, 'parent_id'):
+                comment.parent_id = None
+        comment.link_id = newlink._id
+        comment.sr_id = newlink.sr_id
+
+        comment._commit()
+
+        if not top:
+            parent = Comment._byID(comment.parent_id)
+            comment.parent_permalink = parent.make_anchored_permalink(Link._byID(parent.link_id), Subreddit._byID(parent.sr_id))
+        comment.permalink = comment.make_permalink_slow()
+        comment._commit()
+
+        currlink._incr('num_comments', -1)
+        newlink._incr('num_comments', 1)
+
+        #clear that chache
+        clear_memo('builder.link_comments2', newlink._id)
+        clear_memo('builder.link_comments2', currlink._id)
+
+        # flag search indexer that something has changed
+        tc.changed(comment)
+
+        #update last modified
+        set_last_modified(author, 'overview')
+        set_last_modified(author, 'commented')
+        set_last_modified(newlink, 'comments')
+
     def try_parent(self, func, default):
         """
         If this comment has a parent, return `func(parent)`; otherwise
@@ -956,29 +989,17 @@ def has_children(self):
         child = list(q)
         return len(child)>0
 
-    def recursive_move(self, destination, parent):
+    def recursive_move(self, origin, destination, top=False):
         q = Comment._query(Comment.c.parent_id == self._id)
         children = list(q)
-        comment, inbox_rel = Comment._new(Account._byID(self.author_id),
-                                          destination, parent, self.body,
-                                          self.ip)
+
+        Comment._move(self, origin, destination, top)
+
         if not children:
             pass
         else:
             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
-        unreport(self, correct=True, auto=False)
-
-        if g.write_query_queue:
-                queries.new_comment(comment, None)
+                child.recursive_move(origin, destination)
 
     def can_delete(self):
         if not self._loaded:
@@ -1105,7 +1126,7 @@ def add_props(cls, user, wrapped):
             item.link = links.get(item.link_id)
             if not hasattr(item, 'subreddit'):
                 item.subreddit = item.subreddit_slow
-            if hasattr(item, 'parent_id'):
+            if hasattr(item, 'parent_id') and item.parent_id:
                 parent = Comment._byID(item.parent_id, data=True)
                 parent_author = Account._byID(parent.author_id, data=True)
                 item.parent_author = parent_author

r2/r2/public/static/comments.js

@@ -186,7 +186,6 @@ Comment.prototype.cancel = function() {
 Comment.prototype.cancelmove = function() {
     var edit_box = this.cloneAndReIDNodeOnce("samplemove");
     hide(edit_box);
-    BeforeUnload.unbind(Comment.checkModified, this._id);
     this.show();
 };
 
@@ -195,7 +194,6 @@ Comment.comment = function(r, context) {
     var id = r.id;
     var parent_id = r.parent;
     new Comment(parent_id, context).cancel();
-    new Comment(parent_id, context).cancelmove();
     new Listing(parent_id, context).push(unsafe(r.content));
     new Comment(r.id, context).show();
     vl[id] = r.vl;
@@ -231,8 +229,8 @@ Comment.editcomment = function(r, context) {
     com.show();
 };
 
-Comment.move = function(r, context) {
-    var com = new Comment(r.id, context);
+Comment.move = function(r, s, context) {
+    var com = new Comment(s.id, context);
     com.get('body').innerHTML = unsafe(r.contentHTML);
     com.get('edit_body').innerHTML = unsafe(r.contentTxt);
     com.cancelmove();
@@ -393,8 +391,8 @@ function chkmove(form) {
 
         var obj = res_obj && res_obj.response && res_obj.response.object;
         if (obj && obj.length)
-            for (var o = 0, ol = obj.length; o < ol; ++o)
-                Comment[action](obj[o].data, context);
+            for (var o = 0, ol = obj.length; o < ol; o += 2)
+                Comment[action](obj[o].data, obj[o+1].data, context);
     }
 
     return post_form(form, action, null, null, true, null, {

r2/r2/templates/comment.html

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

r2/r2/templates/movebox.xml

@@ -0,0 +1,22 @@
+## The contents of this file are subject to the Common Public Attribution
+## License Version 1.0. (the "License"); you may not use this file except in
+## compliance with the License. You may obtain a copy of the License at
+## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
+## License Version 1.1, but Sections 14 and 15 have been added to cover use of
+## software over a computer network and provide for limited attribution for the
+## Original Developer. In addition, Exhibit A has been modified to be consistent
+## with Exhibit B.
+## 
+## Software distributed under the License is distributed on an "AS IS" basis,
+## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+## the specific language governing rights and limitations under the License.
+## 
+## The Original Code is Reddit.
+## 
+## The Original Developer is the Initial Developer.  The Initial Developer of
+## the Original Code is CondeNet, Inc.
+## 
+## All portions of the code written by CondeNet are Copyright (c) 2006-2008
+## CondeNet, Inc. All Rights Reserved.
+################################################################################
+