Get correct configured language when all else fails

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

diff --git a/lib/omb.php b/lib/omb.php
index 0bc537db36417d018758069762ae9eb4cbb68ee4..8d33fee159b78ea03a344996a1d6c2059fa98231 100644 (file)
--- a/lib/omb.php
+++ b/lib/omb.php
@@ -113,37 +113,62 @@ function omb_local_id($service) {
 }
 
 function omb_broadcast_remote_subscribers($notice) {
+
        # First, get remote users subscribed to this profile
-       # XXX: use a join here rather than looping through results
-       $sub = new Subscription();
-       $sub->subscribed = $notice->profile_id;
-       if ($sub->find()) {
-               $posted = array();
-               while ($sub->fetch()) {
-                       $rp = Remote_profile::staticGet('id', $sub->subscriber);
-                       if ($rp) {
-                               if (!$posted[$rp->postnoticeurl]) {
-                                       if (omb_post_notice($notice, $rp, $sub)) {
-                                               $posted[$rp->postnoticeurl] = TRUE;
-                                       }
-                               }
+       $rp = new Remote_profile();
+
+       $rp->query('SELECT postnoticeurl, token, secret ' .
+                          'FROM subscription JOIN remote_profile ' .
+                          'ON subscription.subscriber = remote_profile.id ' .
+                          'WHERE subscription.subscribed = ' . $notice->profile_id . ' ');
+
+       $posted = array();
+
+       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);
                        }
                }
        }
+
+       $rp->free();
+       unset($rp);
+       
        return true;
 }
 
 function omb_post_notice($notice, $remote_profile, $subscription) {
-       global $config; # for license URL
+       return omb_post_notice_keys($notice, $remote_profile->postnoticeurl, $subscription->token, $subscription->secret);
+}
+
+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($subscription->token, $subscription->secret);
-       $url = $remote_profile->postnoticeurl;
+       
+       $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);
@@ -151,14 +176,22 @@ function omb_post_notice($notice, $remote_profile, $subscription) {
        $req->set_parameter('omb_notice_url', common_local_url('shownotice',
                                                                                                                   array('notice' =>
                                                                                                                                 $notice->id)));
-       $req->set_parameter('omb_notice_license', $config['license']['url']);
-
+       $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());
 
@@ -166,7 +199,8 @@ function omb_post_notice($notice, $remote_profile, $subscription) {
 
        if ($result->status == 403) { # not authorized, don't send again
                common_debug('403 result, deleting subscription', __FILE__);
-               $subscription->delete();
+               # FIXME: figure out how to delete this
+               # $subscription->delete();
                return false;
        } else if ($result->status != 200) {
                common_debug('Error status '.$result->status, __FILE__);