Типа я (zilogic) wrote in changelog,
Типа я
zilogic
changelog

[livejournal] r21265: LJSUP-11146: LJ-bot's comments when entr...

Committer: amyshkin
LJSUP-11146: LJ-bot's comments when entries take positions at rating
U   trunk/cgi-bin/LJ/PingBack.pm
Modified: trunk/cgi-bin/LJ/PingBack.pm
===================================================================
--- trunk/cgi-bin/LJ/PingBack.pm	2012-02-28 15:03:12 UTC (rev 21264)
+++ trunk/cgi-bin/LJ/PingBack.pm	2012-02-29 08:43:53 UTC (rev 21265)
@@ -15,6 +15,7 @@
 
     #
     my $target_entry = LJ::Entry->new_from_url($targetURI);
+
     unless ($target_entry){
         warn "Unknown entry: $targetURI";
         return "Unknown entry";
@@ -25,56 +26,56 @@
     my $source_entry = LJ::Entry->new_from_url($sourceURI);
 
     # can we add pingback comment to post?
-    return "pingbacks are forbidden for the target." 
+    return "pingbacks are forbidden for the target."
         unless $class->should_entry_recieve_pingback($target_entry, $source_entry);
 
-    # 
+    #
     return "no pingback notifications between posts of the same journal"
         if $source_entry and $source_entry->journalid eq $target_entry->journalid;
-    
+
     return "no pingback notifications between posts of the same user"
         if $source_entry and $source_entry->posterid eq $target_entry->posterid;
 
     my $poster_u = LJ::load_user($LJ::PINGBACK->{comments_bot_username});
+
     unless ($poster_u){
         warn "Pingback bot user does not exists";
         return "Pingback bot user does not exists";
     }
 
-
     #
     my $subject = $source_entry
                     ? ($source_entry->subject_raw || LJ::Lang::ml("pingback.sourceURI.default_title"))
                     : ($title || LJ::Lang::ml("pingback.sourceURI.default_title"));
 
     my $comment = LJ::Comment->create(
-                    state        => 'S', # this comment should be 'Screened'
-                    journal      => $target_entry->journal,
-                    ditemid      => $target_entry->ditemid,
-                    poster       => $poster_u,
+        state   => 'S', # this comment should be 'Screened'
+        journal => $target_entry->journal,
+        ditemid => $target_entry->ditemid,
+        poster  => $poster_u,
 
-                    body         => ($source_entry
-                                        ? LJ::Lang::ml("pingback.ljping.comment.text",
-                                            { context   => $context,
-                                              subject   => $subject,
-                                              sourceURI => $sourceURI,
-                                              poster    => $source_entry->poster->username,
-                                              })
-                                        : LJ::Lang::ml("pingback.public.comment.text",
-                                            { sourceURI => $sourceURI,
-                                              title     => $subject,
-                                              context   => $context
-                                              })
-                                    ),
-                    subject      => $subject,
+        body    => ($source_entry
+            ? LJ::Lang::ml("pingback.ljping.comment.text", {
+                    context   => $context,
+                    subject   => $subject,
+                    sourceURI => $sourceURI,
+                    poster    => $source_entry->poster->username,
+              })
+            : LJ::Lang::ml("pingback.public.comment.text",
+              {
+                    sourceURI => $sourceURI,
+                    title     => $subject,
+                    context   => $context
+              })
+        ),
+        subject => $subject,
+        props   => { picture_keyword => $LJ::PINGBACK->{userpic} },
+    );
 
-                    );
-
     LJ::Talk::screen_comment($target_entry->journal, $target_entry->jitemid, $comment->jtalkid)
         if ref $comment;
-        
+
     return $comment;
-    
 }
 
 sub should_entry_recieve_pingback {
@@ -85,10 +86,10 @@
     return 0 if $target_entry->is_suspended;
     # Pingback is open for all users
     # return 0 unless $target_entry->journal->get_cap('pingback');
-    
+
     # not RO?
     return 0 if $target_entry->journal->readonly; # Check "is_readonly".
-    
+
     # are comments allowed?
     return 0 unless $target_entry->posting_comments_allowed;
 
@@ -100,21 +101,21 @@
     # journal's default. We do not store "J" value in DB.
     my $entry_pb_prop = $target_entry->prop("pingback") || 'J';
     return 0 if $entry_pb_prop eq 'D';  # disabled
-    
+
     ## Option value 'L' (Livejournal only) is removed so far, it means 'O' (Open) now
-    if ($entry_pb_prop eq 'J'){             
+    if ($entry_pb_prop eq 'J'){
         my $journal_pb_prop = $target_entry->journal->prop("pingback") || 'D';
         return 0 if $journal_pb_prop eq 'D';       # pingback disabled
     }
     return 1;
 =cut
 
-    return 1; # 
+    return 1; #
 
 }
 
 
-# 
+#
 sub notify {
     my $class = shift;
     my %args  = @_;
@@ -127,16 +128,20 @@
     return unless $mode =~ m!^[LO]$!; # (L)ivejournal only, (O)pen.
 
     my $sclient = LJ::theschwartz();
-    unless ($sclient){
+
+    unless ( $sclient ) {
         warn "LJ::PingBack: Could not get TheSchwartz client";
         return;
     }
 
-    # 
+    #
     my $job = TheSchwartz::Job->new(
-                  funcname  => "TheSchwartz::Worker::NotifyPingbackServer",
-                  arg       => { uri => $uri, mode => $mode },
-                  );
+        funcname => "TheSchwartz::Worker::NotifyPingbackServer",
+        arg      => {
+            uri  => $uri,
+            mode => $mode,
+        },
+    );
     $sclient->insert($job);
 
 }

Tags: amyshkin, livejournal, pm, zilogic
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments