wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for 'nohub' sub_state in FeedSub

Browse Source 
(requires upgrade.php run)
This commit is contained in:
Mikael Nordfeldth 2014-03-09 23:02:48 +01:00
parent 4f4abca338
commit 8d655bc706
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/OStatus/classes/FeedSub.php
View File

@ -67,7 +67,7 @@ class FeedSub extends Managed_DataObject
// PuSH subscription data // PuSH subscription data
public $huburi; public $huburi;
public $secret; public $secret;
public $sub_state; // subscribe, active, unsubscribe, inactive public $sub_state; // subscribe, active, unsubscribe, inactive, nohub
public $sub_start; public $sub_start;
public $sub_end; public $sub_end;
public $last_update; public $last_update;
@ -83,7 +83,7 @@ class FeedSub extends Managed_DataObject
'uri' => array('type' => 'varchar', 'not null' => true, 'length' => 255, 'description' => 'FeedSub uri'), 'uri' => array('type' => 'varchar', 'not null' => true, 'length' => 255, 'description' => 'FeedSub uri'),
'huburi' => array('type' => 'text', 'description' => 'FeedSub hub-uri'), 'huburi' => array('type' => 'text', 'description' => 'FeedSub hub-uri'),
'secret' => array('type' => 'text', 'description' => 'FeedSub stored secret'), 'secret' => array('type' => 'text', 'description' => 'FeedSub stored secret'),
'sub_state' => array('type' => 'enum("subscribe","active","unsubscribe","inactive")', 'not null' => true, 'description' => 'subscription state'), 'sub_state' => array('type' => 'enum("subscribe","active","unsubscribe","inactive","nohub")', 'not null' => true, 'description' => 'subscription state'),
'sub_start' => array('type' => 'datetime', 'description' => 'subscription start'), 'sub_start' => array('type' => 'datetime', 'description' => 'subscription start'),
'sub_end' => array('type' => 'datetime', 'description' => 'subscription end'), 'sub_end' => array('type' => 'datetime', 'description' => 'subscription end'),
'last_update' => array('type' => 'datetime', 'not null' => true, 'description' => 'when this record was last updated'), 'last_update' => array('type' => 'datetime', 'not null' => true, 'description' => 'when this record was last updated'),
@ -112,11 +112,20 @@ class FeedSub extends Managed_DataObject
* Do we have a hub? Then we are a PuSH feed. * Do we have a hub? Then we are a PuSH feed.
* https://en.wikipedia.org/wiki/PubSubHubbub * https://en.wikipedia.org/wiki/PubSubHubbub
* *
* NOTE: does not respect if we have a fallback_hub configured * If huburi is empty, then doublecheck that we are not using
* a fallback hub. If there is a fallback hub, it is only if the
* sub_state is "nohub" that we assume it's not a PuSH feed.
*/ */
public function isPuSH() public function isPuSH()
{ {
return !empty($this->huburi); if (empty($this->huburi)
&& (!common_config('feedsub', 'fallback_hub')
|| $this->sub_state === 'nohub')) {
// Here we have no huburi set. Also, either there is no
// fallback hub configured or sub_state is "nohub".
return false;
}
return true;
} }
/** /**