forked from friendica/friendica-addons
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
4ceb72d208
|
@ -153,8 +153,8 @@ function libertree_send(&$a,&$b) {
|
||||||
$ltree_api_token = get_pconfig($b['uid'],'libertree','libertree_api_token');
|
$ltree_api_token = get_pconfig($b['uid'],'libertree','libertree_api_token');
|
||||||
$ltree_url = get_pconfig($b['uid'],'libertree','libertree_url');
|
$ltree_url = get_pconfig($b['uid'],'libertree','libertree_url');
|
||||||
$ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token";
|
$ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token";
|
||||||
//$ltree_source = "Friendica";
|
$ltree_source = "Friendica";
|
||||||
$ltree_source = "[".$a->config['sitename']."](".$a->get_baseurl().")";
|
//$ltree_source = "[".$a->config['sitename']."](".$a->get_baseurl().")";
|
||||||
if($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) {
|
if($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) {
|
||||||
|
|
||||||
require_once('include/bb2diaspora.php');
|
require_once('include/bb2diaspora.php');
|
||||||
|
|
|
@ -1243,6 +1243,8 @@ function pumpio_fetchinbox(&$a, $uid) {
|
||||||
$url .= '?since='.urlencode($last_id);
|
$url .= '?since='.urlencode($last_id);
|
||||||
|
|
||||||
$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
|
$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
|
||||||
|
|
||||||
|
if ($user->items) {
|
||||||
$posts = array_reverse($user->items);
|
$posts = array_reverse($user->items);
|
||||||
|
|
||||||
if (count($posts))
|
if (count($posts))
|
||||||
|
@ -1250,6 +1252,7 @@ function pumpio_fetchinbox(&$a, $uid) {
|
||||||
$last_id = $post->id;
|
$last_id = $post->id;
|
||||||
pumpio_dopost($a, $client, $uid, $self, $post, $own_id);
|
pumpio_dopost($a, $client, $uid, $self, $post, $own_id);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
set_pconfig($uid,'pumpio','last_id', $last_id);
|
set_pconfig($uid,'pumpio','last_id', $last_id);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue