eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

Browse Source 
Conflicts:
	plugins/OStatus/extlib/hkit/hkit.class.php
	plugins/OStatus/lib/discoveryhints.php
This commit is contained in:
Brion Vibber
2010-03-19 15:51:22 -07:00
parent 5a0125691b c84c4c6839
commit 7e2af3dcae
11 changed files with 516 additions and 747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/OStatus/classes/Ostatus_profile.php
View File

@@ -204,12 +204,13 @@ class Ostatus_profile extends Memcached_DataObject
public function subscribe()
{
$feedsub = FeedSub::ensureFeed($this->feeduri);
if ($feedsub->sub_state == 'active' || $feedsub->sub_state == 'subscribe') {
if ($feedsub->sub_state == 'active') {
// Active subscription, we don't need to do anything.
return true;
} else if ($feedsub->sub_state == '' || $feedsub->sub_state == 'inactive') {
} else {
// Inactive or we got left in an inconsistent state.
// Run a subscription request to make sure we're current!
return $feedsub->subscribe();
} else if ('unsubscribe') {
throw new FeedSubException("Unsub is pending, can't subscribe...");
}
}
@@ -222,15 +223,13 @@ class Ostatus_profile extends Memcached_DataObject
*/
public function unsubscribe() {
$feedsub = FeedSub::staticGet('uri', $this->feeduri);
if (!$feedsub) {
if (!$feedsub || $feedsub->sub_state == '' || $feedsub->sub_state == 'inactive') {
// No active PuSH subscription, we can just leave it be.
return true;
}
if ($feedsub->sub_state == 'active') {
} else {
// PuSH subscription is either active or in an indeterminate state.
// Send an unsubscribe.
return $feedsub->unsubscribe();
} else if ($feedsub->sub_state == '' || $feedsub->sub_state == 'inactive' || $feedsub->sub_state == 'unsubscribe') {
return true;
} else if ($feedsub->sub_state == 'subscribe') {
throw new FeedSubException("Feed is awaiting subscription, can't unsub...");
}
}
@@ -847,8 +846,8 @@ class Ostatus_profile extends Memcached_DataObject
}
/**
*
* Download and update given avatar image
*
* @param string $url
* @throws Exception in various failure cases
*/
@@ -858,6 +857,9 @@ class Ostatus_profile extends Memcached_DataObject
// We've already got this one.
return;
}
if (!common_valid_http_url($url)) {
throw new ServerException(_m("Invalid avatar URL %s"), $url);
}
if ($this->isGroup()) {
$self = $this->localGroup();