[livejournal] r20875: LJSUP-10859: Happy New Year! :) XMLRPC.d...

U   trunk/cgi-bin/ljprotocol.pl

Modified: trunk/cgi-bin/ljprotocol.pl
===================================================================
--- trunk/cgi-bin/ljprotocol.pl	2011-12-30 08:29:04 UTC (rev 20874)
+++ trunk/cgi-bin/ljprotocol.pl	2011-12-30 10:10:33 UTC (rev 20875)
@@ -119,6 +119,7 @@
      "323" => [ E_PERM, "Root entry is suspended; action is prohibited"],
      "324" => [ E_PERM, "Parent comment is frozen; action is prohibited"],
      "325" => [ E_PERM, "Error editing comment."],
+     "326" => [ E_PERM, "Can't delete specified comment."],
 
 
      # Limit errors
@@ -171,7 +172,7 @@
     checksession      => \&checksession,
     getrecentcomments => \&getrecentcomments,
     getcomments       => \&getcomments,
-    delcomments       => \&delcomments,
+    deletecomments    => \&deletecomments,
     screencomments    => \&screencomments,
     unscreencomments  => \&unscreencomments,
     freezecomments    => \&unfreezecomments,
@@ -672,10 +673,10 @@
                 if $item->{'props'}->{'poster_ip'} && $u && ( $u->{'user'} eq $up->{'user'} || $u->can_manage($journal) );
 
             $item_data->{privileges} = {};
-            $item_data->{privileges}->{delete}   = LJ::Talk::can_delete($u, $journal, $up, $item->{userpost});
-            $item_data->{privileges}->{edit}     = $comment->user_can_edit($u);
-            $item_data->{privileges}->{freeze}   = (!$comment->is_frozen && LJ::Talk::can_freeze($u, $journal, $up, $item->{userpost}));
-            $item_data->{privileges}->{unfreeze} = ($comment->is_frozen && LJ::Talk::can_unfreeze($u, $journal, $up, $item->{userpost}));
+            $item_data->{privileges}->{'delete'}   = LJ::Talk::can_delete($u, $journal, $up, $item->{userpost});
+            $item_data->{privileges}->{'edit'}     = $comment->user_can_edit($u);
+            $item_data->{privileges}->{'freeze'}   = (!$comment->is_frozen && LJ::Talk::can_freeze($u, $journal, $up, $item->{userpost}));
+            $item_data->{privileges}->{'unfreeze'} = ($comment->is_frozen && LJ::Talk::can_unfreeze($u, $journal, $up, $item->{userpost}));
             my $pu = $comment->poster;
             unless ($pu && $pu->is_suspended){
                 $item_data->{privileges}->{screen}   = (!$comment->is_screened && LJ::Talk::can_screen($u, $journal, $up, $item->{userpost}));
@@ -727,33 +728,74 @@
     };
 }
 
-sub delcomments {
+=head deletecomments
+    Delete specified comment, comments or thread(s) of comments in specified journal that current use
+    Parameters:
+        journal/journalid or current user's journal
+        dtalkid/dtalkids - ids of current
+        thread  - bool
+
+=cut
+sub deletecomments {
     my ($req, $err, $flags) = @_;
     return undef unless authenticate($req, $err, $flags);
 
-    my $comment = LJ::Comment->new( $req->{journalid} || $flags->{'u'} , dtalkid => $req->{dtalkid} );
-    return fail($err, 300) unless $comment->user_can_delete($flags->{'u'});
+    my $u = $flags->{'u'};
+    my $journal;
+    if($req->{journal}) {
+        return fail($err,100) unless LJ::canonical_username($req->{journal});
+        $journal = LJ::load_user($req->{journal}) or return fail($err, 100);
+    } elsif($req->{journalid}) {
+        $journal = LJ::load_userid($req->{journalid}) or return fail($err, 100);
+    } else {
+        $journal = $u;
+    }
 
+    return fail($err, 200, "dtalkid or dtalkids") unless($req->{dtalkid} || $req->{dtalkids});
+    my @ids;
+    if ($req->{dtalkids}) {
+        foreach my $num (split(/\s*,\s*/, $req->{'dtalkids'})) {
+            return fail($err, 203, "Non-numeric dtalkid '$num'") unless $num =~ /^\d+$/;
+            push @ids, $num;
+        }
+    } else {
+        my $num = $req->{dtalkid};
+        return fail($err, 203, "Non-numeric dtalkid") unless $num =~ /^\d+$/;
+        push @ids, $num;
+    }
+
+    my @comments = map { LJ::Comment->new($journal, dtalkid => $_) } @ids;
+
+    foreach my $comm (@comments) { 
+        return fail($err, 326, 'dtalkid:'.$comm->dtalkid) unless $comm->user_can_delete($u);
+    }   
+
     my @to_delete;
-
-    if( !$req->{recursive}){
-        push @to_delete, $comment;
-    }else{
-        my @comment_tree = $comment->entry->comment_list;
-        my @children = ($comment);
-        while(my $item = shift @children){
-            return fail($err, 300) unless $item->user_can_delete($flags->{'u'});
-            push @to_delete, $item;
-            push @children, grep { $_->{parenttalkid} == $item->{jtalkid} } @comment_tree;
+    if(!$req->{thread}){
+        push @to_delete, @comments;
+    } else {
+        my %map_delete;
+        foreach my $comment (@comments) {
+            my @comment_tree = $comment->entry->comment_list;
+            my @children = ($comment);
+            while(my $item = shift @children){
+                return fail($err, 326, 'dtalkid:'.$item->dtalkid) unless $item->user_can_delete($u);
+                $map_delete{$item->dtalkid} = $item;
+                push @children, grep { $_->{parenttalkid} == $item->{jtalkid} } @comment_tree;
+            }
         }
+        push @to_delete, values %map_delete;
     }
+
+    # delete all comments
     $_->delete for @to_delete;
 
     return {
         status => 'OK',
         result => @to_delete + 0,
+        dtalkids => [ map {$_->dtalkid} @to_delete ], 
         xc3 => {
-            u => $flags->{'u'}
+            u => $u,
         }
     };
 }
@@ -844,7 +886,6 @@
     };
 }
 
-
 sub unfreezecomments {
     my ($req, $err, $flags) = @_;
     return undef unless authenticate($req, $err, $flags);
@@ -992,7 +1033,6 @@
     };
 }
 
-
 sub getfriendspage
 {
     my ($req, $err, $flags) = @_;