From 03bae0de48e2bf52138d7b0d8a85ab65c011dc74 Mon Sep 17 00:00:00 2001
From: PotatoDumplings <predictably.defenestrated@gmail.com>
Date: Mon, 22 Jul 2013 20:56:40 -0700
Subject: [PATCH 01/15] Moderators can now move comment threads between posts.

---
 r2/r2/controllers/api.py                 | 32 +++++++++
 r2/r2/controllers/validator/validator.py | 14 ++++
 r2/r2/lib/comment_tree.py                | 14 ++--
 r2/r2/lib/pages/pages.py                 | 12 +++-
 r2/r2/models/link.py                     | 35 ++++++++++
 r2/r2/public/static/comments.js          | 89 ++++++++++++++++++++++++
 r2/r2/public/static/lesswrong.css        | 56 +++++++++++++++
 r2/r2/public/static/main.css             |  3 +-
 r2/r2/templates/comment.html             |  5 ++
 r2/r2/templates/movebox.html             | 70 +++++++++++++++++++
 10 files changed, 321 insertions(+), 9 deletions(-)
 create mode 100644 r2/r2/templates/movebox.html

diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py
index 5e1fa212..36d65165 100644
--- a/r2/r2/controllers/api.py
+++ b/r2/r2/controllers/api.py
@@ -199,6 +199,38 @@ def POST_verifyemail(self, res, code):
             c.user._commit()
             res._success()
 
+    @Json
+    @validate(VModhash(),
+              VSrCanBan('id'),
+              thing = VByName('id'),
+              destination = VMoveURL('destination'),
+              reason = VComment('comment'))
+    def POST_move(self, res, thing, destination, reason):
+        if res._chk_errors((errors.NO_URL, errors.BAD_URL),
+                           thing._fullname):
+            res._focus("destination_url_" + thing._fullname)
+            return
+        if res._chk_error(errors.COMMENT_TOO_LONG,
+                           thing._fullname):
+            res._focus("comment_replacement_" + thing._fullname)
+            return
+
+        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.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 ''))
+
+        if g.write_query_queue:
+                queries.new_comment(comment, None)
+
+        res._send_things(thing)
+
     @Json
     @validate(VCaptcha(),
               VUser(),
diff --git a/r2/r2/controllers/validator/validator.py b/r2/r2/controllers/validator/validator.py
index 0d4de246..cad46836 100644
--- a/r2/r2/controllers/validator/validator.py
+++ b/r2/r2/controllers/validator/validator.py
@@ -377,6 +377,20 @@ def run(self, name):
             except NotFound:
                 return name
 
+class VMoveURL(VRequired):
+    def __init__(self, item, *a, **kw):
+        VRequired.__init__(self, item, errors.NO_URL, *a, **kw)
+
+    def run(self, url):
+        if not url:
+            return self.error()
+        else:
+            link = Link._byURL(url)
+            if not link:
+                return self.error(errors.BAD_URL)
+            else:
+                return link
+
 class VSubredditTitle(Validator):
     def run(self, title):
         if not title:
diff --git a/r2/r2/lib/comment_tree.py b/r2/r2/lib/comment_tree.py
index 8bdd0c52..496fe5fa 100644
--- a/r2/r2/lib/comment_tree.py
+++ b/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,
diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index 64a68168..6391ef3d 100644
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -644,6 +644,7 @@ def __init__(self, link = None, comment = None,
 
         # link is a wrapped Link object
         self.link = self.link_listing.things[0]
+        self.movebox = MoveBox()
 
         link_title = ((self.link.title) if hasattr(self.link, 'title') else '')
         if comment:
@@ -665,7 +666,7 @@ def __init__(self, link = None, comment = None,
         Reddit.__init__(self, title = title, body_class = 'post', robots = self.robots, *a, **kw)
 
     def content(self):
-        return self.content_stack(self.infobar, self.link_listing, self._content)
+        return self.content_stack(self.infobar, self.link_listing, self.movebox, self._content)
 
     def build_toolbars(self):
         return []
@@ -989,6 +990,15 @@ def __init__(self, link_name='', captcha=None, action = 'comment'):
         Wrapped.__init__(self, link_name = link_name, captcha = captcha,
                          action = action)
 
+class MoveBox(Wrapped):
+    """Used on LinkInfoPage to render the comment reply form at the
+    top of the comment listing as well as the template for the forms
+    which are JS inserted when clicking on 'reply' in either a comment
+    or message listing."""
+    def __init__(self, link_name='', captcha=None, action = 'comment'):
+        Wrapped.__init__(self, link_name = link_name, captcha = captcha,
+                         action = action)
+
 class CommentListing(Wrapped):
     """Comment heading and sort, limit options"""
     def __init__(self, content, num_comments, nav_menus = []):
diff --git a/r2/r2/models/link.py b/r2/r2/models/link.py
index 284c43a5..ce6c7a40 100644
--- a/r2/r2/models/link.py
+++ b/r2/r2/models/link.py
@@ -82,6 +82,18 @@ def __init__(self, *a, **kw):
     def by_url_key(cls, url):
         return base_url(url.lower()).encode('utf8')
 
+    @classmethod
+    def _byURL(cls, url):
+        url_re = re.compile("(?:http://)?.*?(/r/.*?)?(/lw/.*?/.*)")
+        id_re = re.compile("/lw/(\w*)/.*")
+        matcher = url_re.match(url)
+        if not matcher:
+            return False
+        matcher = id_re.match(matcher.group(2))
+        link = Link._byID(int(matcher.group(1), 36))
+        if not link._loaded: link._load()
+        return link
+
     @classmethod
     def _by_url(cls, url, sr):
         from subreddit import Default
@@ -174,6 +186,7 @@ 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
@@ -941,6 +954,28 @@ def has_children(self):
         child = list(q)
         return len(child)>0
 
+    def recursive_move(self, destination, parent):
+        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)
+        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._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)
+
     def can_delete(self):
         if not self._loaded:
             self._load()
diff --git a/r2/r2/public/static/comments.js b/r2/r2/public/static/comments.js
index 1299fd8f..ce3c7ace 100644
--- a/r2/r2/public/static/comments.js
+++ b/r2/r2/public/static/comments.js
@@ -107,6 +107,29 @@ Comment.prototype.show_editor = function(listing, where, text) {
     return edit_box;
 };
 
+Comment.prototype.show_move = function(listing, where, text) {
+    var edit_box = this.cloneAndReIDNodeOnce("samplemove");
+    if (edit_box.parentNode != listing.listing) {
+        if (edit_box.parentNode) {
+            edit_box.parentNode.removeChild(edit_box);
+        }
+        listing.insert_node_before(edit_box, where);
+    }
+    else if (edit_box.parentNode.firstChild != edit_box) {
+        var p = edit_box.parentNode;
+        p.removeChild(edit_box);
+        p.insertBefore(edit_box, p.firstChild);
+    }
+    var box = this.$parent("comment_replacement");
+    clearTitle(box);
+    box.value = text;
+    box.setAttribute("data-orig-value", text);
+    show(edit_box);
+    BeforeUnload.bind(Comment.checkModified, this._id);
+    return edit_box;
+};
+
+
 Comment.prototype.edit = function() {
     this.show_editor(this.parent_listing(), this.row, this.text);
     this.$parent("commentform").replace.value = "yes";
@@ -145,6 +168,14 @@ Comment.prototype.reply = function (showFlamebaitOverlay) {
         this.$parent("comment_reply").focus();
 };
 
+
+Comment.prototype.move = function() {
+    this.show_move(this.parent_listing(), this.row, '');
+    this.$parent("moveform").replace.value = "";
+    this.$parent("destination_url").focus();
+    this.hide();
+};
+
 Comment.prototype.cancel = function() {
     var edit_box = this.cloneAndReIDNodeOnce("samplecomment");
     hide(edit_box);
@@ -152,10 +183,19 @@ Comment.prototype.cancel = function() {
     this.show();
 };
 
+Comment.prototype.cancelmove = function() {
+    var edit_box = this.cloneAndReIDNodeOnce("samplemove");
+    hide(edit_box);
+    BeforeUnload.unbind(Comment.checkModified, this._id);
+    this.show();
+};
+
+
 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;
@@ -191,6 +231,14 @@ Comment.editcomment = function(r, context) {
     com.show();
 };
 
+Comment.move = function(r, context) {
+    var com = new Comment(r.id, context);
+    com.get('body').innerHTML = unsafe(r.contentHTML);
+    com.get('edit_body').innerHTML = unsafe(r.contentTxt);
+    com.cancelmove();
+    com.show();
+};
+
 Comment.submitballot = function(r) {
     var com = new Comment(r.id);
     com.get('body').innerHTML = unsafe(r.contentHTML);
@@ -276,6 +324,9 @@ function cancelReply(canceler) {
     new Comment(_id(canceler), Thing.getThingRow(canceler)).cancel();
 };
 
+function cancelMove(canceler) {
+    new Comment(_id(canceler), Thing.getThingRow(canceler)).cancelmove();
+};
 
 function reply(id, link, showFlamebaitOverlay) {
     if (logged) {
@@ -286,6 +337,16 @@ function reply(id, link, showFlamebaitOverlay) {
     }
 };
 
+function move(id, link) {
+    if (logged) {
+        var com = new Comment(id, Thing.getThingRow(link)).move();
+    }
+    else {
+        showcover(true, 'reply_' + id);
+    }
+};
+
+
 function chkcomment(form) {
     if(checkInProgress(form)) {
         var r = confirm("Request still in progress\n(click Cancel to attempt to stop the request)");
@@ -314,6 +375,34 @@ function chkcomment(form) {
     });
 };
 
+function chkmove(form) {
+    if(checkInProgress(form)) {
+        var r = confirm("Request still in progress\n(click Cancel to attempt to stop the request)");
+        if (r==false)
+          tagInProgress(form, false);
+        return false;
+    }
+
+    var action = 'move';
+    var context = Thing.getThingRow(form);
+
+    tagInProgress(form, true);
+
+    function cleanup_func(res_obj) {
+        tagInProgress(form, false);
+
+        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);
+    }
+
+    return post_form(form, action, null, null, true, null, {
+        handle_obj: false,
+        cleanup_func: cleanup_func
+    });
+};
+
 function tagInProgress(form, inProgress) {
   if (inProgress)
     form.addClassName("inprogress");
diff --git a/r2/r2/public/static/lesswrong.css b/r2/r2/public/static/lesswrong.css
index 4b8fc211..6c3aea0a 100644
--- a/r2/r2/public/static/lesswrong.css
+++ b/r2/r2/public/static/lesswrong.css
@@ -183,6 +183,62 @@ div.inline-listing a:hover {
 	text-decoration: none;
 }
 
+.commentreplacement {
+    clear: both;
+    margin: 10px 15px 30px 0;
+}
+.commentreplacement textarea, input {
+    border-color: #e9e9e9;
+    -webkit-box-shadow: inset 1px 1px 5px #dbdbdb;
+    -moz-box-shadow: inset 1px 1px 5px #dbdbdb;
+    box-shadow: inset 1px 1px 5px #dbdbdb;
+    margin: 0 0 10px;
+    width: 100%;
+}
+.commentreplacement .buttons {
+    float: left;
+}
+.commentreplacement .buttons button, .commentreplacement .help-toggle button, .poll-voting-area button {
+	background: #f0eeee; /* Old browsers */
+	background: -moz-linear-gradient(top, #f0eeee 0%, #c1c1c1 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f0eeee), color-stop(100%,#c1c1c1)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(top, #f0eeee 0%,#c1c1c1 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(top, #f0eeee 0%,#c1c1c1 100%); /* Opera11.10+ */
+	background: -ms-linear-gradient(top, #f0eeee 0%,#c1c1c1 100%); /* IE10+ */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f0eeee', endColorstr='#c1c1c1',GradientType=0 ); /* IE6-9 */
+	background: linear-gradient(top, #f0eeee 0%,#c1c1c1 100%); /* W3C */
+	border-color: #c6c6c6;
+	color: #666666;
+	cursor: pointer;
+	font-weight: bold;
+	padding: 5px 30px;
+}
+.commentreplacement .help-toggle button {
+    margin-right: -6px;
+}
+
+.commentreplacement table.help {
+	clear: both;
+    margin: 5px 0 0 1px;
+    width: 480px;
+    border-collapse: collapse;
+}
+.commentreplacement .help,
+.commentreplacement .help td,
+.commentreplacement .help tr {
+    border: 1px solid #C0C0C0;
+    padding: 4px;
+    margin: 0px;
+}
+.commentreplacement .help-toggle {
+    float: right;
+}
+.commentreplacement .help-toggle a {
+	color: #538D4D;
+	font-weight: bold;
+	text-decoration: none;
+}
+
 #comment-controls label {
     padding-right: 5px;
     margin-left: 1em;
diff --git a/r2/r2/public/static/main.css b/r2/r2/public/static/main.css
index 812f0ff1..428dbd1f 100644
--- a/r2/r2/public/static/main.css
+++ b/r2/r2/public/static/main.css
@@ -826,7 +826,8 @@ div.comment-links ul li.retract a.yes, div.comment-links ul li.retract a.no  {
 
 /* Temporary styling for text buttons until we have icons */
 div.comment-links ul li.delete a, div.comment-links ul li.unban a,
-div.comment-links ul li.ban a, div.comment-links ul li.ignore a {
+div.comment-links ul li.ban a, div.comment-links ul li.ignore a,
+div.comment-links ul li.move a {
     height: 20px;
     padding-top: 4px;
 }
diff --git a/r2/r2/templates/comment.html b/r2/r2/templates/comment.html
index 14adc951..d4bcc4bc 100644
--- a/r2/r2/templates/comment.html
+++ b/r2/r2/templates/comment.html
@@ -164,6 +164,11 @@
         <% allow_delete = thing.can_be_deleted %>
         ${parent.delete_or_report_buttons(allow_delete,False,True)}
         ${parent.buttons()}
+        %if thing.can_ban:
+          <li class="move">
+            ${parent.simple_button("move", fullname, _("Move"), "move", tool_tip=_("Move"))}
+          </li>
+        %endif
       </ul>
     ## Each comment has a hidden status span that is used to indicate voting errors.
     <span id='${"status_"+thing._fullname}' class="error" style="display: none;"></span>
diff --git a/r2/r2/templates/movebox.html b/r2/r2/templates/movebox.html
new file mode 100644
index 00000000..1adf01a2
--- /dev/null
+++ b/r2/r2/templates/movebox.html
@@ -0,0 +1,70 @@
+## 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.
+################################################################################
+<%!
+   from r2.lib.template_helpers import get_domain, static, json
+%>
+
+<%namespace file="utils.html" import="error_field"/>
+
+%if not thing.link_name:
+<div id="samplemove_" style="display:none">
+%else:
+<div class="realmove">
+%endif
+  <form id="moveform_${thing.link_name}" 
+        onsubmit='return chkmove(this);'
+        action="/post/move" method="post" class="commentreplacement">
+    %if thing.link_name:
+    <input id="isroot_${thing.link_name}"
+           type="hidden" name="isroot" value="1" />
+    %endif
+    <input id="replace_${thing.link_name}"
+           type="hidden" name="replace" value="" />
+    ${error_field("NO_URL_" + thing.link_name)}
+    ${error_field("BAD_URL_" + thing.link_name)}
+    ${error_field("COMMENT_TOO_LONG_" + thing.link_name)}
+    ## I know we don't need this div.  You know we don't need this div.  IE
+    ## begs to differ.
+    <table>
+      <tr><th><label for="destination_url_${thing.link_name}">Destination URL:</label></th></tr>
+      <tr><td><input type="text" name="destination" size="120" id="destination_url_${thing.link_name}"\
+                   value=""/></td></tr>
+      <tr><th><label for="comment_replacement_${thing.link_name}">Reason for Moving (Optional):</label></th></tr>
+      <tr><td><textarea id="comment_replacement_${thing.link_name}" name="comment" 
+                      rows="2" onfocus="clearTitle(this);" ></td></tr>
+      </textarea>
+    </table>
+    <div class="buttons">
+      <button id="comment_submit_${thing.link_name}" 
+              type="submit" class="btn">Move
+      </button>
+      <button id="cancel_" class="btn"
+              onclick="cancelMove(this);return false">
+        ${_("Close")}</button>
+      <span id='status_${thing.link_name}' class='error'></span>
+    </div>
+    <span class="loading"><img src="${static('ajax-loader.gif')}" alt="" /></span>
+    <div class="clear"></div>
+  </form>
+</div>
+
+

From a95fa1aa59e908744d858a51fcfa445b95c21ebe Mon Sep 17 00:00:00 2001
From: PotatoDumplings <predictably.defenestrated@gmail.com>
Date: Mon, 22 Jul 2013 23:13:11 -0700
Subject: [PATCH 02/15] Children of original movers now hidden for non-admins.

---
 r2/r2/controllers/api.py          |  1 +
 r2/r2/lib/comment_tree.py         | 14 +++++++-------
 r2/r2/models/link.py              |  6 ++++--
 r2/r2/public/static/lesswrong.css |  2 +-
 r2/r2/templates/comment.html      |  2 +-
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py
index 36d65165..2c10f7b0 100644
--- a/r2/r2/controllers/api.py
+++ b/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 ''))
diff --git a/r2/r2/lib/comment_tree.py b/r2/r2/lib/comment_tree.py
index 496fe5fa..8bdd0c52 100644
--- a/r2/r2/lib/comment_tree.py
+++ b/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,
diff --git a/r2/r2/models/link.py b/r2/r2/models/link.py
index ce6c7a40..599f5d84 100644
--- a/r2/r2/models/link.py
+++ b/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
diff --git a/r2/r2/public/static/lesswrong.css b/r2/r2/public/static/lesswrong.css
index 6c3aea0a..1191b911 100644
--- a/r2/r2/public/static/lesswrong.css
+++ b/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;
diff --git a/r2/r2/templates/comment.html b/r2/r2/templates/comment.html
index d4bcc4bc..f859ec8b 100644
--- a/r2/r2/templates/comment.html
+++ b/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()">

From c7fc2466f19ad79cb2382fd3ead8af6ca72833a7 Mon Sep 17 00:00:00 2001
From: PotatoDumplings <predictably.defenestrated@gmail.com>
Date: Tue, 23 Jul 2013 14:36:30 -0700
Subject: [PATCH 03/15] Made it impossible to vote on moved items.

---
 r2/r2/models/link.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/r2/r2/models/link.py b/r2/r2/models/link.py
index 599f5d84..4afededc 100644
--- a/r2/r2/models/link.py
+++ b/r2/r2/models/link.py
@@ -1119,7 +1119,7 @@ def add_props(cls, user, wrapped):
             item.can_reply = (item.sr_id in can_reply_srs)
 
             # Don't allow users to vote on their own comments
-            item.votable = bool(c.user != item.author and not item.retracted)
+            item.votable = bool(c.user != item.author and not item.retracted and not item.moved)
             if item.votable and c.profilepage:
                 # Can only vote on profile page under certain conditions
                 item.votable = bool((c.user.safe_karma > g.karma_to_vote_in_overview) and (g.karma_percentage_to_be_voted > item.author.percent_up()))

From 2739bef0a30ac334b57aacefeff2d7f70b5d24d3 Mon Sep 17 00:00:00 2001
From: PotatoDumplings <predictably.defenestrated@gmail.com>
Date: Tue, 23 Jul 2013 14:42:30 -0700
Subject: [PATCH 04/15] Status message removed in the event of failed call.

---
 r2/r2/controllers/api.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py
index 2c10f7b0..4200a03f 100644
--- a/r2/r2/controllers/api.py
+++ b/r2/r2/controllers/api.py
@@ -206,6 +206,7 @@ def POST_verifyemail(self, res, code):
               destination = VMoveURL('destination'),
               reason = VComment('comment'))
     def POST_move(self, res, thing, destination, reason):
+        res._update('status_' + thing._fullname, innerHTML = '')
         if res._chk_errors((errors.NO_URL, errors.BAD_URL),
                            thing._fullname):
             res._focus("destination_url_" + thing._fullname)

From eefd50e5b1f08b7dbf6feb6238cef323ce8d9d3c Mon Sep 17 00:00:00 2001
From: PotatoDumplings <predictably.defenestrated@gmail.com>
Date: Tue, 23 Jul 2013 14:56:01 -0700
Subject: [PATCH 05/15] Entering an properly formatted URL that doesn't lead to
 a post sends an error message instead of crashing.

---
 r2/r2/models/link.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/r2/r2/models/link.py b/r2/r2/models/link.py
index 4afededc..a451369a 100644
--- a/r2/r2/models/link.py
+++ b/r2/r2/models/link.py
@@ -90,7 +90,9 @@ def _byURL(cls, url):
         if not matcher:
             return False
         matcher = id_re.match(matcher.group(2))
-        link = Link._byID(int(matcher.group(1), 36))
+        try:
+            link = Link._byID(int(matcher.group(1), 36))
+        except NotFound: return None
         if not link._loaded: link._load()
         return link
 

From f3721e5460bc992bf4d6e69d30e5265b4c7bfa07 Mon Sep 17 00:00:00 2001
From: PotatoDumplings <predictably.defenestrated@gmail.com>
Date: Tue, 23 Jul 2013 22:45:49 -0700
Subject: [PATCH 06/15] Changed movebox doc string, renamed Link._byURL to
 Link._move_url.

---
 r2/r2/controllers/validator/validator.py | 2 +-
 r2/r2/lib/pages/pages.py                 | 5 +----
 r2/r2/models/link.py                     | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/r2/r2/controllers/validator/validator.py b/r2/r2/controllers/validator/validator.py
index cad46836..47c27478 100644
--- a/r2/r2/controllers/validator/validator.py
+++ b/r2/r2/controllers/validator/validator.py
@@ -385,7 +385,7 @@ def run(self, url):
         if not url:
             return self.error()
         else:
-            link = Link._byURL(url)
+            link = Link._move_url(url)
             if not link:
                 return self.error(errors.BAD_URL)
             else:
diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index 6391ef3d..3e382c62 100644
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -991,10 +991,7 @@ def __init__(self, link_name='', captcha=None, action = 'comment'):
                          action = action)
 
 class MoveBox(Wrapped):
-    """Used on LinkInfoPage to render the comment reply form at the
-    top of the comment listing as well as the template for the forms
-    which are JS inserted when clicking on 'reply' in either a comment
-    or message listing."""
+    """Used on LinkInfoPage to render the move thread form."""
     def __init__(self, link_name='', captcha=None, action = 'comment'):
         Wrapped.__init__(self, link_name = link_name, captcha = captcha,
                          action = action)
diff --git a/r2/r2/models/link.py b/r2/r2/models/link.py
index a451369a..f36c462c 100644
--- a/r2/r2/models/link.py
+++ b/r2/r2/models/link.py
@@ -83,7 +83,7 @@ def by_url_key(cls, url):
         return base_url(url.lower()).encode('utf8')
 
     @classmethod
-    def _byURL(cls, url):
+    def _move_url(cls, url):
         url_re = re.compile("(?:http://)?.*?(/r/.*?)?(/lw/.*?/.*)")
         id_re = re.compile("/lw/(\w*)/.*")
         matcher = url_re.match(url)
@@ -971,7 +971,7 @@ def recursive_move(self, destination, parent):
 
         self.moderator_banned = not c.user_is_admin
         self.banner = c.user.name
-        #self.moved = True
+        self.moved = True
         self._commit()
         # NB: change table updated by reporting
         from r2.models.report import unreport

From afe23b1c3e11e50f9f6275714f0383ef4d9d955f Mon Sep 17 00:00:00 2001
From: PotatoDumplings <predictably.defenestrated@gmail.com>
Date: Tue, 23 Jul 2013 23:32:24 -0700
Subject: [PATCH 07/15] Added a lock to movement.

---
 r2/r2/controllers/api.py | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py
index 4200a03f..0f889ad5 100644
--- a/r2/r2/controllers/api.py
+++ b/r2/r2/controllers/api.py
@@ -23,7 +23,7 @@
 from reddit_base import RedditController
 
 from pylons.i18n import _
-from pylons import c, request, response
+from pylons import c, request, response, g
 from pylons.controllers.util import etag_cache
 
 import hashlib
@@ -216,22 +216,25 @@ def POST_move(self, res, thing, destination, reason):
             res._focus("comment_replacement_" + thing._fullname)
             return
 
-        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)
+        from r2.lib.comment_tree import lock_key
 
-        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 ''))
+        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)
 
-        if g.write_query_queue:
-                queries.new_comment(comment, None)
+            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 ''))
+
+            if g.write_query_queue:
+                    queries.new_comment(comment, None)
 
-        res._send_things(thing)
+            res._send_things(thing)
 
     @Json
     @validate(VCaptcha(),

From 582d9fd6b2900f99500c39abe757afe8445e4fa9 Mon Sep 17 00:00:00 2001
From: PotatoDumplings <predictably.defenestrated@gmail.com>
Date: Fri, 26 Jul 2013 20:27:05 -0700
Subject: [PATCH 08/15] Changed move proceedure to no longer create new
 comments.  All calls to comment.parent_id now safed.

---
 r2/r2/controllers/api.py        | 42 +++++++++++++++---------
 r2/r2/controllers/front.py      |  2 +-
 r2/r2/lib/jsontemplates.py      | 10 ++++--
 r2/r2/models/builder.py         |  9 ++++--
 r2/r2/models/link.py            | 57 ++++++++++++++++++++++-----------
 r2/r2/public/static/comments.js | 10 +++---
 r2/r2/templates/comment.html    |  2 +-
 r2/r2/templates/movebox.xml     | 22 +++++++++++++
 8 files changed, 107 insertions(+), 47 deletions(-)
 create mode 100644 r2/r2/templates/movebox.xml

diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py
index 0f889ad5..b2e17c60 100644
--- a/r2/r2/controllers/api.py
+++ b/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(),
diff --git a/r2/r2/controllers/front.py b/r2/r2/controllers/front.py
index d1a4adec..12cd65b9 100644
--- a/r2/r2/controllers/front.py
+++ b/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)
 
diff --git a/r2/r2/lib/jsontemplates.py b/r2/r2/lib/jsontemplates.py
index f5ed8621..f8187103 100644
--- a/r2/r2/lib/jsontemplates.py
+++ b/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'))
diff --git a/r2/r2/models/builder.py b/r2/r2/models/builder.py
index 369b5aaf..923d9568 100644
--- a/r2/r2/models/builder.py
+++ b/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
diff --git a/r2/r2/models/link.py b/r2/r2/models/link.py
index f36c462c..962cd5be 100644
--- a/r2/r2/models/link.py
+++ b/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
diff --git a/r2/r2/public/static/comments.js b/r2/r2/public/static/comments.js
index ce3c7ace..4e57499f 100644
--- a/r2/r2/public/static/comments.js
+++ b/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, {
diff --git a/r2/r2/templates/comment.html b/r2/r2/templates/comment.html
index f859ec8b..d4bcc4bc 100644
--- a/r2/r2/templates/comment.html
+++ b/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()">
diff --git a/r2/r2/templates/movebox.xml b/r2/r2/templates/movebox.xml
new file mode 100644
index 00000000..d30a2984
--- /dev/null
+++ b/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.
+################################################################################
+

From ac9ed7275c8fef108d34b824e03f0a1aa280e1e9 Mon Sep 17 00:00:00 2001
From: PotatoDumplings <predictably.defenestrated@gmail.com>
Date: Fri, 26 Jul 2013 20:37:03 -0700
Subject: [PATCH 09/15] Removed debugging statements, moved boolean.

---
 r2/r2/controllers/api.py | 3 ---
 r2/r2/models/link.py     | 5 ++---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py
index b2e17c60..24b9fe54 100644
--- a/r2/r2/controllers/api.py
+++ b/r2/r2/controllers/api.py
@@ -217,7 +217,6 @@ def POST_move(self, res, thing, destination, reason, ip):
             res._focus("comment_replacement_" + thing._fullname)
             return
 
-        print Link._byID(thing.link_id).title
         currlink = Link._byID(thing.link_id)
         if hasattr(thing, 'parent_id'):
             parent = Comment._byID(thing.parent_id)
@@ -244,8 +243,6 @@ def POST_move(self, res, thing, destination, reason, ip):
 
         res._send_things([comment, thing])
 
-        print Link._byID(thing.link_id).title
-
     @Json
     @validate(VCaptcha(),
               VUser(),
diff --git a/r2/r2/models/link.py b/r2/r2/models/link.py
index 962cd5be..400db218 100644
--- a/r2/r2/models/link.py
+++ b/r2/r2/models/link.py
@@ -875,8 +875,7 @@ class Comment(Thing, Printable):
                      banned_before_moderator = False,
                      is_html = False,
                      retracted = False,
-                     show_response_to = False,
-                     moved = False)
+                     show_response_to = False)
 
     def _markdown(self):
         pass
@@ -1142,7 +1141,7 @@ def add_props(cls, user, wrapped):
             item.can_reply = (item.sr_id in can_reply_srs)
 
             # Don't allow users to vote on their own comments
-            item.votable = bool(c.user != item.author and not item.retracted and not item.moved)
+            item.votable = bool(c.user != item.author and not item.retracted)
             if item.votable and c.profilepage:
                 # Can only vote on profile page under certain conditions
                 item.votable = bool((c.user.safe_karma > g.karma_to_vote_in_overview) and (g.karma_percentage_to_be_voted > item.author.percent_up()))

From fa13a3352b13718c73bfac84e1ab610dbf4a1fea Mon Sep 17 00:00:00 2001
From: PotatoDumplings <predictably.defenestrated@gmail.com>
Date: Sat, 27 Jul 2013 11:41:18 -0700
Subject: [PATCH 10/15] Safed movement against editor trying to move children
 of already moved comment.

---
 r2/r2/controllers/api.py     | 5 +++++
 r2/r2/lib/errors.py          | 1 +
 r2/r2/templates/movebox.html | 1 +
 3 files changed, 7 insertions(+)

diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py
index 24b9fe54..92014e44 100644
--- a/r2/r2/controllers/api.py
+++ b/r2/r2/controllers/api.py
@@ -216,6 +216,11 @@ def POST_move(self, res, thing, destination, reason, ip):
                            thing._fullname):
             res._focus("comment_replacement_" + thing._fullname)
             return
+        if destination._id == thing.link_id:
+            c.errors.add(errors.ALREADY_MOVED)
+            res._chk_error(errors.ALREADY_MOVED, thing._fullname)
+            res._focus("destination_url_" + thing._fullname)
+            return
 
         currlink = Link._byID(thing.link_id)
         if hasattr(thing, 'parent_id'):
diff --git a/r2/r2/lib/errors.py b/r2/r2/lib/errors.py
index c6868f2b..f770fa17 100644
--- a/r2/r2/lib/errors.py
+++ b/r2/r2/lib/errors.py
@@ -25,6 +25,7 @@
 
 error_list = dict((
         ('NO_URL', _('Url required')),
+        ('ALREADY_MOVED', _('This comment is already at that destination')),
         ('BAD_URL', _('You should check that url')),
         ('NO_TITLE', _('Title required')),
         ('TITLE_TOO_LONG', _('Title too long')),
diff --git a/r2/r2/templates/movebox.html b/r2/r2/templates/movebox.html
index 1adf01a2..eb227a98 100644
--- a/r2/r2/templates/movebox.html
+++ b/r2/r2/templates/movebox.html
@@ -42,6 +42,7 @@
     ${error_field("NO_URL_" + thing.link_name)}
     ${error_field("BAD_URL_" + thing.link_name)}
     ${error_field("COMMENT_TOO_LONG_" + thing.link_name)}
+    ${error_field("ALREADY_MOVED_" + thing.link_name)}
     ## I know we don't need this div.  You know we don't need this div.  IE
     ## begs to differ.
     <table>

From 91d0c4e00b451f871adf9afed542b0fe9ee6b9b8 Mon Sep 17 00:00:00 2001
From: PotatoDumplings <predictably.defenestrated@gmail.com>
Date: Tue, 1 Oct 2013 16:19:37 -0700
Subject: [PATCH 11/15] Descendant karma attribute no longer disappears off
 python objects.

---
 r2/r2/lib/db/tdb_sql.py | 86 +++++++++++++++++++++++++++--------------
 r2/r2/models/link.py    | 21 ++++++++--
 2 files changed, 74 insertions(+), 33 deletions(-)

diff --git a/r2/r2/lib/db/tdb_sql.py b/r2/r2/lib/db/tdb_sql.py
index d8ec2bbc..7e0775d6 100644
--- a/r2/r2/lib/db/tdb_sql.py
+++ b/r2/r2/lib/db/tdb_sql.py
@@ -129,30 +129,50 @@ def get_rel_type_table(metadata):
 
 
 def get_thing_table(metadata, name):
-    table = sa.Table(settings.DB_APP_NAME + '_thing_' + name, metadata,
-                     sa.Column('thing_id', BigInteger, primary_key = True),
-                     sa.Column('ups', sa.Integer, default = 0, nullable = False),
-                     sa.Column('downs',
-                               sa.Integer,
-                               default = 0,
-                               nullable = False),
-                     sa.Column('deleted',
-                               sa.Boolean,
-                               default = False,
-                               nullable = False),
-                     sa.Column('spam',
-                               sa.Boolean,
-                               default = False,
-                               nullable = False),
-                     sa.Column('date',
-                               sa.DateTime(timezone = True),
-                               default = sa.func.now(),
-                               nullable = False))
-    if name in ('comment', 'link'):
-        table.append_column(sa.Column('descendant_karma',
-                            sa.Integer,
-                            default = 0,
-                            nullable = False))
+    if name not in ('comment', 'link'):
+        table = sa.Table(settings.DB_APP_NAME + '_thing_' + name, metadata,
+                         sa.Column('thing_id', BigInteger, primary_key = True),
+                         sa.Column('ups', sa.Integer, default = 0, nullable = False),
+                         sa.Column('downs',
+                                   sa.Integer,
+                                   default = 0,
+                                   nullable = False),
+                         sa.Column('deleted',
+                                   sa.Boolean,
+                                   default = False,
+                                   nullable = False),
+                         sa.Column('spam',
+                                   sa.Boolean,
+                                   default = False,
+                                   nullable = False),
+                         sa.Column('date',
+                                   sa.DateTime(timezone = True),
+                                   default = sa.func.now(),
+                                   nullable = False))
+    else:
+        table = sa.Table(settings.DB_APP_NAME + '_thing_' + name, metadata,
+                         sa.Column('thing_id', BigInteger, primary_key = True),
+                         sa.Column('ups', sa.Integer, default = 0, nullable = False),
+                         sa.Column('downs',
+                                   sa.Integer,
+                                   default = 0,
+                                   nullable = False),
+                         sa.Column('deleted',
+                                   sa.Boolean,
+                                   default = False,
+                                   nullable = False),
+                         sa.Column('spam',
+                                   sa.Boolean,
+                                   default = False,
+                                   nullable = False),
+                         sa.Column('date',
+                                   sa.DateTime(timezone = True),
+                                   default = sa.func.now(),
+                                   nullable = False),
+                         sa.Column('descendant_karma',
+                                   sa.Integer,
+                                   default = 0,
+                                   nullable = False))
 
     return table
 
@@ -542,11 +562,19 @@ def get_thing(type_id, thing_id):
     #if single, only return one storage, otherwise make a dict
     res = {} if not single else None
     for row in r:
-        stor = storage(ups = row.ups,
-                       downs = row.downs,
-                       date = row.date,
-                       deleted = row.deleted,
-                       spam = row.spam)
+        if type_id in (1, 7):
+            stor = storage(ups = row.ups,
+                           downs = row.downs,
+                           date = row.date,
+                           deleted = row.deleted,
+                           spam = row.spam,
+                           descendant_karma = row.descendant_karma)
+        else:
+            stor = storage(ups = row.ups,
+                           downs = row.downs,
+                           date = row.date,
+                           deleted = row.deleted,
+                           spam = row.spam)
         if single:
             res = stor
         else:
diff --git a/r2/r2/models/link.py b/r2/r2/models/link.py
index c3eb31fd..e50c9663 100644
--- a/r2/r2/models/link.py
+++ b/r2/r2/models/link.py
@@ -878,8 +878,8 @@ class Comment(Thing, Printable):
                      banned_before_moderator = False,
                      is_html = False,
                      retracted = False,
-                     show_response_to = False,
-                     _descendant_karma = 0)
+                     show_response_to = False)
+                     #_descendant_karma = 0)
 
     def _markdown(self):
         pass
@@ -1054,8 +1054,7 @@ def reply_costs_karma(self):
         return self.try_parent(lambda p: p.reply_costs_karma, False)
 
     def incr_descendant_karma(self, comments, amount):
-
-        old_val = getattr(self, '_descendant_karma')
+        old_val = self._get_item(self._type_id, self._id).descendant_karma
 
         comments.append(self._id)
 
@@ -1197,6 +1196,20 @@ def add_props(cls, user, wrapped):
             item.permalink = item.make_permalink(item.link, item.subreddit)
             item.can_be_deleted = item.can_delete()
 
+    def __init__(self, ups = 0, downs = 0, date = None, deleted = False,
+                 spam = False, id = None, descendant_karma = 0, **attrs):
+
+        Thing.__init__(self, ups, downs, date, deleted, spam, id, **attrs)
+
+        with self.safe_set_attr:
+            print descendant_karma
+            self._descendant_karma = descendant_karma
+
+    @classmethod
+    def _build(cls, id, bases):
+        return cls(bases.ups, bases.downs, bases.date,
+                   bases.deleted, bases.spam, id, bases.descendant_karma)
+
     def _commit(self, *a, **kw):
         """Detect when we need to invalidate the sidebar recent comments.
 

From cf10a31e8da4f511766bb752dba22593cff42a5d Mon Sep 17 00:00:00 2001
From: PotatoDumplings <predictably.defenestrated@gmail.com>
Date: Tue, 1 Oct 2013 16:33:18 -0700
Subject: [PATCH 12/15] Thread movement now properly increments descendant
 karma.

---
 r2/r2/controllers/api.py     | 6 +++---
 r2/r2/templates/comment.html | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py
index adbb14f3..806c77ac 100644
--- a/r2/r2/controllers/api.py
+++ b/r2/r2/controllers/api.py
@@ -223,11 +223,11 @@ def POST_move(self, res, thing, destination, reason, ip):
             return
 
         currlink = Link._byID(thing.link_id)
-        currlink._incr('descendant_karma', -(thing._descendant_karma + thing._ups - things._downs))
-        destination._incr('descendant_karma', thing._descendant_karma + thing._ups - things._downs)
+        currlink._incr('_descendant_karma', -(thing._descendant_karma + thing._ups - thing._downs))
+        destination._incr('_descendant_karma', thing._descendant_karma + thing._ups - thing._downs)
         if hasattr(thing, 'parent_id'):
             parent = Comment._byID(thing.parent_id)
-            parent.incr_descendant_karma([], -(thing._descendant_karma + thing._ups - things._downs))
+            parent.incr_descendant_karma([], -(thing._descendant_karma + thing._ups - thing._downs))
         else:
             parent = None
 
diff --git a/r2/r2/templates/comment.html b/r2/r2/templates/comment.html
index 8443f245..1e534f0e 100644
--- a/r2/r2/templates/comment.html
+++ b/r2/r2/templates/comment.html
@@ -113,7 +113,6 @@
   %else:
     ${unsafe(pollsandmarkdown(thing.body, thing))}
   %endif
-  DescendantKarma:${thing._descendant_karma}
 %endif
 </%def>
 

From 2edef55207bfa1034ed159ab367a63c2f9c94589 Mon Sep 17 00:00:00 2001
From: PotatoDumplings <predictably.defenestrated@gmail.com>
Date: Tue, 1 Oct 2013 16:19:37 -0700
Subject: [PATCH 13/15] Descendant karma attribute no longer disappears off
 python objects.

---
 r2/r2/lib/db/tdb_sql.py | 86 +++++++++++++++++++++++++++--------------
 r2/r2/models/link.py    | 32 +++++++++++++--
 2 files changed, 85 insertions(+), 33 deletions(-)

diff --git a/r2/r2/lib/db/tdb_sql.py b/r2/r2/lib/db/tdb_sql.py
index d8ec2bbc..7e0775d6 100644
--- a/r2/r2/lib/db/tdb_sql.py
+++ b/r2/r2/lib/db/tdb_sql.py
@@ -129,30 +129,50 @@ def get_rel_type_table(metadata):
 
 
 def get_thing_table(metadata, name):
-    table = sa.Table(settings.DB_APP_NAME + '_thing_' + name, metadata,
-                     sa.Column('thing_id', BigInteger, primary_key = True),
-                     sa.Column('ups', sa.Integer, default = 0, nullable = False),
-                     sa.Column('downs',
-                               sa.Integer,
-                               default = 0,
-                               nullable = False),
-                     sa.Column('deleted',
-                               sa.Boolean,
-                               default = False,
-                               nullable = False),
-                     sa.Column('spam',
-                               sa.Boolean,
-                               default = False,
-                               nullable = False),
-                     sa.Column('date',
-                               sa.DateTime(timezone = True),
-                               default = sa.func.now(),
-                               nullable = False))
-    if name in ('comment', 'link'):
-        table.append_column(sa.Column('descendant_karma',
-                            sa.Integer,
-                            default = 0,
-                            nullable = False))
+    if name not in ('comment', 'link'):
+        table = sa.Table(settings.DB_APP_NAME + '_thing_' + name, metadata,
+                         sa.Column('thing_id', BigInteger, primary_key = True),
+                         sa.Column('ups', sa.Integer, default = 0, nullable = False),
+                         sa.Column('downs',
+                                   sa.Integer,
+                                   default = 0,
+                                   nullable = False),
+                         sa.Column('deleted',
+                                   sa.Boolean,
+                                   default = False,
+                                   nullable = False),
+                         sa.Column('spam',
+                                   sa.Boolean,
+                                   default = False,
+                                   nullable = False),
+                         sa.Column('date',
+                                   sa.DateTime(timezone = True),
+                                   default = sa.func.now(),
+                                   nullable = False))
+    else:
+        table = sa.Table(settings.DB_APP_NAME + '_thing_' + name, metadata,
+                         sa.Column('thing_id', BigInteger, primary_key = True),
+                         sa.Column('ups', sa.Integer, default = 0, nullable = False),
+                         sa.Column('downs',
+                                   sa.Integer,
+                                   default = 0,
+                                   nullable = False),
+                         sa.Column('deleted',
+                                   sa.Boolean,
+                                   default = False,
+                                   nullable = False),
+                         sa.Column('spam',
+                                   sa.Boolean,
+                                   default = False,
+                                   nullable = False),
+                         sa.Column('date',
+                                   sa.DateTime(timezone = True),
+                                   default = sa.func.now(),
+                                   nullable = False),
+                         sa.Column('descendant_karma',
+                                   sa.Integer,
+                                   default = 0,
+                                   nullable = False))
 
     return table
 
@@ -542,11 +562,19 @@ def get_thing(type_id, thing_id):
     #if single, only return one storage, otherwise make a dict
     res = {} if not single else None
     for row in r:
-        stor = storage(ups = row.ups,
-                       downs = row.downs,
-                       date = row.date,
-                       deleted = row.deleted,
-                       spam = row.spam)
+        if type_id in (1, 7):
+            stor = storage(ups = row.ups,
+                           downs = row.downs,
+                           date = row.date,
+                           deleted = row.deleted,
+                           spam = row.spam,
+                           descendant_karma = row.descendant_karma)
+        else:
+            stor = storage(ups = row.ups,
+                           downs = row.downs,
+                           date = row.date,
+                           deleted = row.deleted,
+                           spam = row.spam)
         if single:
             res = stor
         else:
diff --git a/r2/r2/models/link.py b/r2/r2/models/link.py
index c3eb31fd..958098f4 100644
--- a/r2/r2/models/link.py
+++ b/r2/r2/models/link.py
@@ -679,6 +679,19 @@ def prev_link(self):
       q = self._link_nav_query(sort = operators.desc('_date'))
       return self._link_for_query(q)
 
+    def __init__(self, ups = 0, downs = 0, date = None, deleted = False,
+                 spam = False, id = None, descendant_karma = 0, **attrs):
+
+        Thing.__init__(self, ups, downs, date, deleted, spam, id, **attrs)
+
+        with self.safe_set_attr:
+            self._descendant_karma = descendant_karma
+
+    @classmethod
+    def _build(cls, id, bases):
+        return cls(bases.ups, bases.downs, bases.date,
+                   bases.deleted, bases.spam, id, bases.descendant_karma)
+
     def _commit(self, *a, **kw):
         """Detect when we need to invalidate the sidebar recent posts.
 
@@ -878,8 +891,7 @@ class Comment(Thing, Printable):
                      banned_before_moderator = False,
                      is_html = False,
                      retracted = False,
-                     show_response_to = False,
-                     _descendant_karma = 0)
+                     show_response_to = False)
 
     def _markdown(self):
         pass
@@ -1054,8 +1066,7 @@ def reply_costs_karma(self):
         return self.try_parent(lambda p: p.reply_costs_karma, False)
 
     def incr_descendant_karma(self, comments, amount):
-
-        old_val = getattr(self, '_descendant_karma')
+        old_val = self._get_item(self._type_id, self._id).descendant_karma
 
         comments.append(self._id)
 
@@ -1197,6 +1208,19 @@ def add_props(cls, user, wrapped):
             item.permalink = item.make_permalink(item.link, item.subreddit)
             item.can_be_deleted = item.can_delete()
 
+    def __init__(self, ups = 0, downs = 0, date = None, deleted = False,
+                 spam = False, id = None, descendant_karma = 0, **attrs):
+
+        Thing.__init__(self, ups, downs, date, deleted, spam, id, **attrs)
+
+        with self.safe_set_attr:
+            self._descendant_karma = descendant_karma
+
+    @classmethod
+    def _build(cls, id, bases):
+        return cls(bases.ups, bases.downs, bases.date,
+                   bases.deleted, bases.spam, id, bases.descendant_karma)
+
     def _commit(self, *a, **kw):
         """Detect when we need to invalidate the sidebar recent comments.
 

From 2124bd7d57bea1b779b46075712d4324390c6d0d Mon Sep 17 00:00:00 2001
From: PotatoDumplings <predictably.defenestrated@gmail.com>
Date: Sun, 8 Dec 2013 17:22:24 -0800
Subject: [PATCH 14/15] Changed testing syntax.

---
 r2/r2/controllers/api.py |  2 +-
 r2/r2/models/builder.py  | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py
index 92014e44..0a27f0da 100644
--- a/r2/r2/controllers/api.py
+++ b/r2/r2/controllers/api.py
@@ -236,7 +236,7 @@ def POST_move(self, res, thing, destination, reason, ip):
         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 '')
+        body = "A comment was moved 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,
diff --git a/r2/r2/models/builder.py b/r2/r2/models/builder.py
index 923d9568..725a75fc 100644
--- a/r2/r2/models/builder.py
+++ b/r2/r2/models/builder.py
@@ -455,14 +455,11 @@ def keep_item(self, item):
 class ToplevelCommentBuilder(UnbannedCommentBuilder):
     def keep_item(self, item):
         try:
-            item.parent_id
+            parent_id = item.parent_id
         except AttributeError:
             return True
-        else:
-            if item.parent_id:
-                return False
-            else:
-                return True
+
+        return parent_id is not None
 
 class ContextualCommentBuilder(CommentBuilderMixin, UnbannedCommentBuilder):
     def __init__(self, query, sr_ids, **kw):
@@ -577,7 +574,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') and top.parent_id:
+            while self.context > 0 and hasattr(top, 'parent_id') and top.parent_id is not None:
                 self.context -= 1
                 new_top = comment_dict[top.parent_id]
                 comment_tree[new_top._id] = [top]
@@ -660,7 +657,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') or not to_add.parent_id:
+            if not hasattr(to_add, 'parent_id') or to_add.parent_id is not None:
                 p_id = None
             else:
                 #find the parent actually being displayed

From 5e5f092aee47a64dbbae700327b8f530ad8d7408 Mon Sep 17 00:00:00 2001
From: PotatoDumplings <predictably.defenestrated@gmail.com>
Date: Sun, 8 Dec 2013 18:58:22 -0800
Subject: [PATCH 15/15] Variety of small changes for readability.

---
 r2/r2/controllers/api.py | 2 +-
 r2/r2/lib/db/tdb_sql.py  | 2 +-
 r2/r2/lib/pages/pages.py | 5 ++---
 r2/r2/models/link.py     | 8 ++++----
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py
index 5102dd1a..16cbe7ca 100644
--- a/r2/r2/controllers/api.py
+++ b/r2/r2/controllers/api.py
@@ -228,7 +228,7 @@ def POST_move(self, res, thing, destination, reason, ip):
         currlink = Link._byID(thing.link_id)
         currlink._incr('_descendant_karma', -(thing._descendant_karma + thing._ups - thing._downs))
         destination._incr('_descendant_karma', thing._descendant_karma + thing._ups - thing._downs)
-        if hasattr(thing, 'parent_id'):
+        if hasattr(thing, 'parent_id') and thing.parent_id is not None:
             parent = Comment._byID(thing.parent_id)
             parent.incr_descendant_karma([], -(thing._descendant_karma + thing._ups - thing._downs))
         else:
diff --git a/r2/r2/lib/db/tdb_sql.py b/r2/r2/lib/db/tdb_sql.py
index b2d0500d..4eae42fe 100644
--- a/r2/r2/lib/db/tdb_sql.py
+++ b/r2/r2/lib/db/tdb_sql.py
@@ -563,7 +563,7 @@ def get_thing(type_id, thing_id):
     #if single, only return one storage, otherwise make a dict
     res = {} if not single else None
     for row in r:
-        if type_id in (1, 7):
+        if type_id in (types_name["link"].type_id, types_name["comment"].type_id):
             stor = storage(ups = row.ups,
                            downs = row.downs,
                            date = row.date,
diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index 9ff26a09..3433908a 100644
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -1045,9 +1045,8 @@ def __init__(self, link_name='', captcha=None, action = 'comment'):
 
 class MoveBox(Wrapped):
     """Used on LinkInfoPage to render the move thread form."""
-    def __init__(self, link_name='', captcha=None, action = 'comment'):
-        Wrapped.__init__(self, link_name = link_name, captcha = captcha,
-                         action = action)
+    def __init__(self, link_name='', captcha=None):
+        Wrapped.__init__(self, link_name = link_name, captcha = captcha)
 
 class CommentListing(Wrapped):
     """Comment heading and sort, limit options"""
diff --git a/r2/r2/models/link.py b/r2/r2/models/link.py
index f36ec267..eab6c472 100644
--- a/r2/r2/models/link.py
+++ b/r2/r2/models/link.py
@@ -977,8 +977,6 @@ def _move(cls, comment, currlink, newlink, top=False):
         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))
@@ -1087,8 +1085,10 @@ def has_children(self):
         return len(child)>0
 
     def recursive_move(self, origin, destination, top=False):
-        q = Comment._query(Comment.c.parent_id == self._id)
-        children = list(q)
+        """Self is the current comment.  Origin is the link we're
+        moving the comment from.  Destination is the link we're
+        moving the comment to."""
+        children = Comment._query(Comment.c.parent_id == self._id)
 
         Comment._move(self, origin, destination, top)