Use getByID nistead of getKV for Feedsub in PushInQueueHandler

diff --git a/plugins/OStatus/lib/pushinqueuehandler.php b/plugins/OStatus/lib/pushinqueuehandler.php
index ac8a6c84298a7423c94bad50c16576d4f650da48..961b848211c25a9c82740a5f5a64db4bb708eeb5 100644 (file)
--- a/plugins/OStatus/lib/pushinqueuehandler.php
+++ b/plugins/OStatus/lib/pushinqueuehandler.php
@@ -17,9 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Process a feed distribution POST from a PuSH hub.
@@ -41,15 +39,13 @@ class PushInQueueHandler extends QueueHandler
         $post = $data['post'];
         $hmac = $data['hmac'];
 
-        $feedsub = FeedSub::getKV('id', $feedsub_id);
-        if ($feedsub instanceof FeedSub) {
-            try {
-                $feedsub->receive($post, $hmac);
-            } catch(Exception $e) {
-                common_log(LOG_ERR, "Exception during PuSH input processing for $feedsub->uri: " . $e->getMessage());
-            }
-        } else {
-            common_log(LOG_ERR, "Discarding POST to unknown feed subscription id $feedsub_id");
+        try {
+            $feedsub = FeedSub::getByID($feedsub_id);
+            $feedsub->receive($post, $hmac);
+        } catch(NoResultException $e) {
+            common_log(LOG_INFO, "Discarding POST to unknown feed subscription id {$feedsub_id}");
+        } catch(Exception $e) {
+            common_log(LOG_ERR, "Exception during PuSH input processing for {$feedsub->getUri()}: " . $e->getMessage());
         }
         return true;
     }