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

use a join for omb broadcast 

darcs-hash:20080905004701-84dde-c8b27c6b3b4ad634cd954ec51d45a92d2ad32389.gz
This commit is contained in:
Evan Prodromou 2008-09-04 20:47:01 -04:00
parent f72b12c7b8
commit d17cb8eedc
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/omb.php
View File

@ -113,32 +113,39 @@ function omb_local_id($service) {
} }
function omb_broadcast_remote_subscribers($notice) { function omb_broadcast_remote_subscribers($notice) {
# First, get remote users subscribed to this profile # First, get remote users subscribed to this profile
# XXX: use a join here rather than looping through results $rp = new Remote_profile();
$sub = new Subscription();
$sub->subscribed = $notice->profile_id; $rp->query('SELECT postnoticeurl, token, secret ' .
if ($sub->find()) { 'FROM subscription JOIN remote_profile ' .
$posted = array(); 'ON subscription.subscriber = remote_profile.id ' .
while ($sub->fetch()) { 'WHERE subscription.subscribed = ' . $notice->profile_id . ' ');
$rp = Remote_profile::staticGet('id', $sub->subscriber);
if ($rp) { $posted = array();
if (!$posted[$rp->postnoticeurl]) {
if (omb_post_notice($notice, $rp, $sub)) { while ($rp->fetch()) {
$posted[$rp->postnoticeurl] = TRUE; if (!$posted[$rp->postnoticeurl]) {
} if (omb_post_notice_keys($notice, $rp->postnoticeurl, $rp->token, $rp->secret)) {
} $posted[$rp->postnoticeurl] = TRUE;
} }
} }
} }
return true; return true;
} }
function omb_post_notice($notice, $remote_profile, $subscription) { 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) {
$user = User::staticGet('id', $notice->profile_id); $user = User::staticGet('id', $notice->profile_id);
$con = omb_oauth_consumer(); $con = omb_oauth_consumer();
$token = new OAuthToken($subscription->token, $subscription->secret); $token = new OAuthToken($tk, $secret);
$url = $remote_profile->postnoticeurl; $url = $postnoticeurl;
$parsed = parse_url($url); $parsed = parse_url($url);
$params = array(); $params = array();
parse_str($parsed['query'], $params); parse_str($parsed['query'], $params);
@ -151,7 +158,7 @@ function omb_post_notice($notice, $remote_profile, $subscription) {
$req->set_parameter('omb_notice_url', common_local_url('shownotice', $req->set_parameter('omb_notice_url', common_local_url('shownotice',
array('notice' => array('notice' =>
$notice->id))); $notice->id)));
$req->set_parameter('omb_notice_license', $config['license']['url']); $req->set_parameter('omb_notice_license', common_config('license', 'url'));
$req->sign_request(omb_hmac_sha1(), $con, $token); $req->sign_request(omb_hmac_sha1(), $con, $token);
@ -166,7 +173,8 @@ function omb_post_notice($notice, $remote_profile, $subscription) {
if ($result->status == 403) { # not authorized, don't send again if ($result->status == 403) { # not authorized, don't send again
common_debug('403 result, deleting subscription', __FILE__); common_debug('403 result, deleting subscription', __FILE__);
$subscription->delete(); # FIXME: figure out how to delete this
# $subscription->delete();
return false; return false;
} else if ($result->status != 200) { } else if ($result->status != 200) {
common_debug('Error status '.$result->status, __FILE__); common_debug('Error status '.$result->status, __FILE__);