Twitter-compatible API - don't strip XML-illegal chars from JSON output

[quix0rs-gnu-social.git] / lib / omb.php

diff --git a/lib/omb.php b/lib/omb.php
index d4f53c33222e77ac32d43d8868201e5ef61c99fc..8d33fee159b78ea03a344996a1d6c2059fa98231 100644 (file)
--- a/lib/omb.php
+++ b/lib/omb.php
@@ -126,8 +126,12 @@ function omb_broadcast_remote_subscribers($notice) {
 
        while ($rp->fetch()) {
                if (!$posted[$rp->postnoticeurl]) {
+                       common_log(LOG_DEBUG, 'Posting to ' . $rp->postnoticeurl);
                        if (omb_post_notice_keys($notice, $rp->postnoticeurl, $rp->token, $rp->secret)) {
+                               common_log(LOG_DEBUG, 'Finished to ' . $rp->postnoticeurl);                             
                                $posted[$rp->postnoticeurl] = TRUE;
+                       } else {
+                               common_log(LOG_DEBUG, 'Failed posting to ' . $rp->postnoticeurl);
                        }
                }
        }
@@ -144,16 +148,27 @@ function omb_post_notice($notice, $remote_profile, $subscription) {
 
 function omb_post_notice_keys($notice, $postnoticeurl, $tk, $secret) {
 
+       common_debug('Posting notice ' . $notice->id . ' to ' . $postnoticeurl, __FILE__);
+       
        $user = User::staticGet('id', $notice->profile_id);
 
+       if (!$user) {
+               common_debug('Failed to get user for notice ' . $notice->id . ', profile = ' . $notice->profile_id, __FILE__);
+               return false;
+       }
+
        $con = omb_oauth_consumer();
+       
        $token = new OAuthToken($tk, $secret);
+       
        $url = $postnoticeurl;
        $parsed = parse_url($url);
        $params = array();
        parse_str($parsed['query'], $params);
+       
        $req = OAuthRequest::from_consumer_and_token($con, $token,
-                                                                                                "POST", $url, $params);
+                                                                                                'POST', $url, $params);
+       
        $req->set_parameter('omb_version', OMB_VERSION_01);
        $req->set_parameter('omb_listenee', $user->uri);
        $req->set_parameter('omb_notice', $notice->uri);
@@ -162,16 +177,21 @@ function omb_post_notice_keys($notice, $postnoticeurl, $tk, $secret) {
                                                                                                                   array('notice' =>
                                                                                                                                 $notice->id)));
        $req->set_parameter('omb_notice_license', common_config('license', 'url'));
-
+       
        $user->free();
        unset($user);
        
        $req->sign_request(omb_hmac_sha1(), $con, $token);
 
        # We re-use this tool's fetcher, since it's pretty good
-
+       
        $fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
 
+       if (!$fetcher) {
+               common_log(LOG_WARNING, 'Failed to initialize Yadis fetcher.', __FILE__);
+               return false;
+       }
+       
        $result = $fetcher->post($req->get_normalized_http_url(),
                                                         $req->to_postdata());