diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/dfrn_notify.php | 10 | ||||
| -rw-r--r-- | mod/pubsub.php | 9 |
2 files changed, 16 insertions, 3 deletions
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 23bdd7388..9e9809950 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -450,7 +450,15 @@ function dfrn_notify_post(&$a) { } if($is_reply) { - if($feed->get_item_quantity() == 1) { + + // was the top-level post for this reply written by somebody on this site? Specifically, the recipient? + + $r = q("select `id` from `item` where `uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc($parent_uri), + intval($importer['importer_uid']) + ); + if($r && count($r)) { + logger('dfrn_notify: received remote comment'); $is_like = false; // remote reply to our post. Import and then notify everybody else. diff --git a/mod/pubsub.php b/mod/pubsub.php index 0c506db00..93d50ef90 100644 --- a/mod/pubsub.php +++ b/mod/pubsub.php @@ -69,8 +69,13 @@ function pubsub_init(&$a) { // We must initiate an unsubscribe request with a verify_token. // Don't allow outsiders to unsubscribe us. - if(($hub_mode === 'unsubscribe') && (! strlen($hub_verify))) - hub_return(false, ''); + if($hub_mode === 'unsubscribe') { + if(! strlen($hub_verify)) { + logger('pubsub: bogus unsubscribe'); + hub_return(false, ''); + } + logger('pubsub: unsubscribe success'); + } $r = q("UPDATE `contact` SET `subhub` = %d WHERE `id` = %d LIMIT 1", intval($subscribe), |