GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Use getByID nistead of getKV for Feedsub in PushInQueueHandler

This commit is contained in:
Mikael Nordfeldth 2017-04-25 20:42:10 +02:00
parent 956cfaf844
commit a53284fe4f
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/OStatus/lib/pushinqueuehandler.php
View File

@ -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;
}