summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--actions/profilesettings.php2
-rw-r--r--actions/remotesubscribe.php6
-rw-r--r--actions/showstream.php4
-rw-r--r--actions/updateprofile.php134
-rw-r--r--lib/omb.php77
-rw-r--r--lib/util.php7
6 files changed, 225 insertions, 5 deletions
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 22a7fbac1..58160a406 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -133,6 +133,8 @@ class ProfilesettingsAction extends SettingsAction {
return;
}
+ common_broadcast_profile($profile);
+
$this->show_form(_t('Settings saved.'), TRUE);
}
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index 739c92eea..b676484cd 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -41,7 +41,7 @@ class RemotesubscribeAction extends Action {
function show_form($err=NULL) {
$nickname = $this->trimmed('nickname');
- $profile = $this->trimmed('profile');
+ $profile = $this->trimmed('profile_url');
common_show_header(_t('Remote subscribe'));
if ($err) {
common_element('div', 'error', $err);
@@ -50,7 +50,7 @@ class RemotesubscribeAction extends Action {
'action' => common_local_url('remotesubscribe')));
common_input('nickname', _t('User nickname'), $nickname,
_t('Nickname of the user you want to follow'));
- common_input('profile', _t('Profile URL'), $profile,
+ common_input('profile_url', _t('Profile URL'), $profile,
_t('URL of your profile on another compatible microblogging service'));
common_submit('submit', _t('Subscribe'));
common_element_end('form');
@@ -65,7 +65,7 @@ class RemotesubscribeAction extends Action {
return;
}
- $profile = $this->trimmed('profile');
+ $profile = $this->trimmed('profile_url');
if (!$profile) {
$this->show_form(_t('No such user!'));
diff --git a/actions/showstream.php b/actions/showstream.php
index ceedc7f31..56572a8e1 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -175,9 +175,9 @@ class ShowstreamAction extends StreamAction {
'method' => 'POST',
'action' => common_local_url('remotesubscribe')));
common_hidden('nickname', $profile->nickname);
- common_element('input', array('name' => 'profile',
+ common_element('input', array('name' => 'profile_url',
'type' => 'text',
- 'id' => 'profile',
+ 'id' => 'profile_url',
'size' => '15'));
common_element('input', array('type' => 'submit',
'id' => 'submit',
diff --git a/actions/updateprofile.php b/actions/updateprofile.php
index 5e6166c5e..3fd6e90c5 100644
--- a/actions/updateprofile.php
+++ b/actions/updateprofile.php
@@ -19,6 +19,8 @@
if (!defined('LACONICA')) { exit(1); }
+require_once(INSTALLDIR.'/lib/omb.php');
+
class UpdateprofileAction extends Action {
function handle($args) {
parent::handle($args);
@@ -35,4 +37,136 @@ class UpdateprofileAction extends Action {
return;
}
}
+
+ function update_profile($req, $consumer, $token) {
+ $version = $req->get_parameter('omb_version');
+ if ($version != OMB_VERSION_01) {
+ common_user_error(_t('Unsupported OMB version'), 400);
+ return false;
+ }
+ # First, check to see if listenee exists
+ $listenee = $req->get_parameter('omb_listenee');
+ $remote = Remote_profile::staticGet('uri', $listenee);
+ if (!$remote) {
+ common_user_error(_t('Profile unknown'), 404);
+ return false;
+ }
+ # Second, check to see if they should be able to post updates!
+ # We see if there are any subscriptions to that remote user with
+ # the given token.
+
+ $sub = new Subscription();
+ $sub->subscribed = $remote->id;
+ $sub->token = $token->key;
+ if (!$sub->find(true)) {
+ common_user_error(_t('You did not send us that profile'), 403);
+ return false;
+ }
+
+ $profile = Profile::staticGet('id', $remote->id);
+ if (!$profile) {
+ # This one is our fault
+ common_server_error(_t('Remote profile with no matching profile'), 500);
+ return false;
+ }
+ $nickname = $req->get_parameter('omb_listenee_nickname');
+ if (!Validate::string($nickname, array('min_length' => 1,
+ 'max_length' => 64,
+ 'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
+ common_user_error(_t('Nickname must have only letters and numbers and no spaces.'));
+ return false;
+ }
+ $profile_url = $req->get_parameter('omb_listenee_profile');
+ if (!common_valid_http_url($profile_url)) {
+ common_user_error(_t("Invalid profile URL '$profile_url'."));
+ return false;
+ }
+ $license = $req->get_parameter('omb_listenee_license');
+ if (!common_valid_http_url($license)) {
+ common_user_error(_t("Invalid license URL '$license'."));
+ return false;
+ }
+ # optional stuff
+ $fullname = $req->get_parameter('omb_listenee_fullname');
+ if ($fullname && strlen($fullname) > 255) {
+ common_user_error(_t("Full name '$fullname' too long."));
+ return false;
+ }
+ $homepage = $req->get_parameter('omb_listenee_homepage');
+ if ($homepage && (!common_valid_http_url($homepage) || strlen($homepage) > 255)) {
+ common_user_error(_t("Invalid homepage '$homepage'"));
+ return false;
+ }
+ $bio = $req->get_parameter('omb_listenee_bio');
+ if ($bio && strlen($bio) > 140) {
+ common_user_error(_t("Bio too long '$bio'"));
+ return false;
+ }
+ $location = $req->get_parameter('omb_listenee_location');
+ if ($location && strlen($location) > 255) {
+ common_user_error(_t("Location too long '$location'"));
+ return false;
+ }
+ $avatar = $req->get_parameter('omb_listenee_avatar');
+ if ($avatar) {
+ if (!common_valid_http_url($avatar) || strlen($avatar) > 255) {
+ common_user_error(_t("Invalid avatar URL '$avatar'"));
+ return false;
+ }
+ $size = @getimagesize($avatar);
+ if (!$size) {
+ common_user_error(_t("Can't read avatar URL '$avatar'"));
+ return false;
+ }
+ if ($size[0] != AVATAR_PROFILE_SIZE || $size[1] != AVATAR_PROFILE_SIZE) {
+ common_user_error(_t("Wrong size image at '$avatar'"));
+ return false;
+ }
+ if (!in_array($size[2], array(IMAGETYPE_GIF, IMAGETYPE_JPEG,
+ IMAGETYPE_PNG))) {
+ common_user_error(_t("Wrong image type for '$avatar'"));
+ return false;
+ }
+ }
+
+ $orig_profile = clone($profile);
+
+ if ($nickname) {
+ $profile->nickname = $nickname;
+ }
+ if ($profile_url) {
+ $profile->profileurl = $profile_url;
+ }
+ if ($fullname) {
+ $profile->fullname = $fullname;
+ }
+ if ($homepage) {
+ $profile->homepage = $homepage;
+ }
+ if ($bio) {
+ $profile->bio = $bio;
+ }
+ if ($location) {
+ $profile->location = $location;
+ }
+
+ if (!$profile->update($orig_profile)) {
+ common_server_error(_t('Could not save new profile info'), 500);
+ return false;
+ } else {
+ if ($avatar) {
+ $temp_filename = tempnam(sys_get_temp_dir(), 'listenee_avatar');
+ copy($avatar, $temp_filename);
+ if (!$profile->setOriginal($temp_filename)) {
+ common_server_error(_t('Could not save avatar info'), 500);
+ return false;
+ }
+ }
+ header('HTTP/1.1 200 OK');
+ header('Content-type: text/plain');
+ print 'Updated profile';
+ print "\n";
+ return true;
+ }
+ }
}
diff --git a/lib/omb.php b/lib/omb.php
index f22879406..5f34e9e13 100644
--- a/lib/omb.php
+++ b/lib/omb.php
@@ -179,3 +179,80 @@ function omb_post_notice($notice, $remote_profile, $subscription) {
}
}
}
+
+function omb_broadcast_profile($profile) {
+ # 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()) {
+ $updated = array();
+ while ($sub->fetch()) {
+ $rp = Remote_profile::staticGet('id', $sub->subscriber);
+ if ($rp) {
+ if (!$updated[$rp->updateprofileurl]) {
+ if (omb_update_profile($profile, $rp, $sub)) {
+ $updated[$rp->updateprofileurl] = TRUE;
+ }
+ }
+ }
+ }
+ }
+}
+
+function omb_update_profile($profile, $remote_profile, $subscription) {
+ global $config; # for license URL
+ $user = User::staticGet('id', $notice->profile_id);
+ $con = omb_oauth_consumer();
+ $token = new OAuthToken($subscription->token, $subscription->secret);
+ $url = $remote_profile->postnoticeurl;
+ $parsed = parse_url($url);
+ $params = array();
+ parse_str($parsed['query'], $params);
+ $req = OAuthRequest::from_consumer_and_token($con, $token,
+ "POST", $url, $params);
+ $req->set_parameter('omb_version', OMB_VERSION_01);
+ $req->set_parameter('omb_listenee', $user->uri);
+ $req->set_parameter('omb_listenee_profile', common_profile_url($user->nickname));
+ $req->set_parameter('omb_listenee_nickname', $user->nickname);
+
+ # We use blanks to force emptying any existing values in these optional fields
+
+ $req->set_parameter('omb_listenee_fullname',
+ ($profile->fullname) ? $profile->fullname : '');
+ $req->set_parameter('omb_listenee_homepage',
+ ($profile->homepage) ? $profile->homepage : '');
+ $req->set_parameter('omb_listenee_bio',
+ ($profile->bio) ? $profile->bio : '');
+ $req->set_parameter('omb_listenee_location',
+ ($profile->location) ? $profile->location : '');
+
+ $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
+ $req->set_parameter('omb_listenee_avatar',
+ ($avatar) ? $avatar->url : '');
+
+ $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();
+
+ $result = $fetcher->post($req->get_normalized_http_url(),
+ $req->to_postdata());
+
+ if ($result->status == 403) { # not authorized, don't send again
+ common_debug('403 result, deleting subscription', __FILE__);
+ $subscription->delete();
+ return false;
+ } else if ($result->status != 200) {
+ common_debug('Error status '.$result->status, __FILE__);
+ return false;
+ } else { # success!
+ parse_str($result->body, $return);
+ if ($return['omb_version'] == OMB_VERSION_01) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+}
diff --git a/lib/util.php b/lib/util.php
index c64cd5979..d6c1a9f8b 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -569,6 +569,13 @@ function common_broadcast_notice($notice, $remote=false) {
return true;
}
+function common_broadcast_profile($profile) {
+ // XXX: optionally use a queue system like http://code.google.com/p/microapps/wiki/NQDQ
+ require_once(INSTALLDIR.'/lib/omb.php');
+ omb_broadcast_profile($profile);
+ // XXX: Other broadcasts...?
+ return true;
+}
function common_profile_url($nickname) {
return common_local_url('showstream', array('nickname' => $nickname));
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-02 08:11:59 +0000