diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/oauthstore.php | 1 | ||||
| -rw-r--r-- | lib/omb.php | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/oauthstore.php b/lib/oauthstore.php index b04bcbb8b..e34bf8a5e 100644 --- a/lib/oauthstore.php +++ b/lib/oauthstore.php @@ -463,6 +463,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore $subscriber = $this->_getAnyProfile($subscriber_uri); if (!$subscriber->hasRight(Right::SUBSCRIBE)) { + common_log(LOG_INFO, __METHOD__ . ": remote subscriber banned ($subscriber_uri subbing to $subscribed_user_uri)"); return _('You have been banned from subscribing.'); } diff --git a/lib/omb.php b/lib/omb.php index 49496b774..e2a6d9f3f 100644 --- a/lib/omb.php +++ b/lib/omb.php @@ -67,7 +67,14 @@ function omb_hmac_sha1() function omb_broadcast_notice($notice) { - $omb_notice = notice_to_omb_notice($notice); + try { + $omb_notice = notice_to_omb_notice($notice); + } catch (Exception $e) { + // @fixme we should clean up or highlight the problem item + common_log(LOG_ERR, 'Invalid OMB outgoing notice for notice ' . $notice->id); + common_log(LOG_ERR, 'Error status '.$e); + return true; + } /* Get remote users subscribed to this profile. */ $rp = new Remote_profile(); |