Merge branch 'foolproof_file_redirection_branch' into 'nightly'

[quix0rs-gnu-social.git] / plugins / Linkback / LinkbackPlugin.php

diff --git a/plugins/Linkback/LinkbackPlugin.php b/plugins/Linkback/LinkbackPlugin.php
index 4e6214c71400bbb481a43ac8b9a080f55e3e568f..06c49b0809ae90baa503e02eec304d32f0d3ffdb 100644 (file)
--- a/plugins/Linkback/LinkbackPlugin.php
+++ b/plugins/Linkback/LinkbackPlugin.php
@@ -61,7 +61,7 @@ class LinkbackPlugin extends Plugin
 
     function onHandleQueuedNotice($notice)
     {
-        if ($notice->is_local == 1) {
+        if (intval($notice->is_local) === Notice::LOCAL_PUBLIC) {
             // Try to avoid actually mucking with the
             // notice content
             $c = $notice->content;
@@ -79,11 +79,17 @@ class LinkbackPlugin extends Plugin
                 $repeat = Notice::getByID($notice->repeat_of);
                 $this->linkbackUrl($repeat->getUrl());
             } else if(!empty($notice->reply_to)) {
-                $parent = $notice->getParent();
-                $this->linkbackUrl($parent->getUrl());
+                try {
+                    $parent = $notice->getParent();
+                    $this->linkbackUrl($parent->getUrl());
+                } catch (NoParentNoticeException $e) {
+                    // can't link back to what we don't know (apparently parent notice disappeared from our db)
+                    return true;
+                }
             }
 
-            $replyProfiles = Profile::multiGet('id', $notice->getReplies());
+            // doubling up getReplies and getAttentionProfileIDs because we're not entirely migrated yet
+            $replyProfiles = Profile::multiGet('id', array_unique(array_merge($notice->getReplies(), $notice->getAttentionProfileIDs())));
             foreach($replyProfiles->fetchAll('profileurl') as $profileurl) {
                 $this->linkbackUrl($profileurl);
             }
@@ -141,13 +147,16 @@ class LinkbackPlugin extends Plugin
     // Based on https://github.com/indieweb/mention-client-php
     // which is licensed Apache 2.0
     function getWebmention($result) {
-        // XXX: the fetcher only gives back one of each header, so this may fail on multiple Link headers
-        if(preg_match('~<((?:https?://)?[^>]+)>; rel="webmention"~', $result->headers['Link'], $match)) {
-            return $match[1];
-        } elseif(preg_match('~<((?:https?://)?[^>]+)>; rel="http://webmention.org/?"~', $result->headers['Link'], $match)) {
-            return $match[1];
+        if (isset($result->headers['Link'])) {
+            // XXX: the fetcher only gives back one of each header, so this may fail on multiple Link headers
+            if(preg_match('~<((?:https?://)?[^>]+)>; rel="webmention"~', $result->headers['Link'], $match)) {
+                return $match[1];
+            } elseif(preg_match('~<((?:https?://)?[^>]+)>; rel="http://webmention.org/?"~', $result->headers['Link'], $match)) {
+                return $match[1];
+            }
         }
 
+        // FIXME: Do proper DOM traversal
         if(preg_match('/<(?:link|a)[ ]+href="([^"]+)"[ ]+rel="[^" ]* ?webmention ?[^" ]*"[ ]*\/?>/i', $result->body, $match)
            || preg_match('/<(?:link|a)[ ]+rel="[^" ]* ?webmention ?[^" ]*"[ ]+href="([^"]+)"[ ]*\/?>/i', $result->body, $match)) {
             return $match[1];
@@ -179,9 +188,8 @@ class LinkbackPlugin extends Plugin
                 common_log(LOG_WARNING,
                            "Webmention request failed for '$url' ($endpoint)");
             }
-        } catch (HTTP_Request2_Exception $e) {
-            common_log(LOG_WARNING,
-                       "Webmention request failed for '$url' ($endpoint)");
+        } catch (Exception $e) {
+            common_log(LOG_WARNING, "Webmention request failed for '{$url}' ({$endpoint}): {$e->getMessage()}");
         }
     }
 
@@ -221,9 +229,8 @@ class LinkbackPlugin extends Plugin
                        "Pingback success for '$url' ($endpoint): ".
                        "'$response'");
             }
-        } catch (HTTP_Request2_Exception $e) {
-            common_log(LOG_WARNING,
-                   "Pingback request failed for '$url' ($endpoint)");
+        } catch (Exception $e) {
+            common_log(LOG_WARNING, "Pingback request failed for '{$url}' ({$endpoint}): {$e->getMessage()}");
         }
     }
 
@@ -330,7 +337,7 @@ class LinkbackPlugin extends Plugin
         $versions[] = array('name' => 'Linkback',
                             'version' => LINKBACKPLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
-                            'homepage' => 'http://status.net/wiki/Plugin:Linkback',
+                            'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Linkback',
                             'rawdescription' =>
                             // TRANS: Plugin description.
                             _m('Notify blog authors when their posts have been linked in '.