friendica
/
friendica-addons
7
2
Fork 13
Code Issues 3 Pull Requests 3 Releases 16 Wiki Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Michael Vogel 2013-10-02 22:20:32 +02:00
parent bcf5b407c5 99b75283e7
commit 4ceb72d208
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libertree/libertree.php
View File

@ -153,8 +153,8 @@ function libertree_send(&$a,&$b) {
$ltree_api_token = get_pconfig($b['uid'],'libertree','libertree_api_token');
$ltree_url = get_pconfig($b['uid'],'libertree','libertree_url');
$ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token";
//$ltree_source = "Friendica";
$ltree_source = "[".$a->config['sitename']."](".$a->get_baseurl().")";
$ltree_source = "Friendica";
//$ltree_source = "[".$a->config['sitename']."](".$a->get_baseurl().")";
if($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) {
require_once('include/bb2diaspora.php');

15
pumpio/pumpio.php
View File

@ -1243,13 +1243,16 @@ function pumpio_fetchinbox(&$a, $uid) {
$url .= '?since='.urlencode($last_id);
$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
$posts = array_reverse($user->items);
if (count($posts))
foreach ($posts as $post) {
$last_id = $post->id;
pumpio_dopost($a, $client, $uid, $self, $post, $own_id);
}
if ($user->items) {
$posts = array_reverse($user->items);
if (count($posts))
foreach ($posts as $post) {
$last_id = $post->id;
pumpio_dopost($a, $client, $uid, $self, $post, $own_id);
}
}
set_pconfig($uid,'pumpio','last_id', $last_id);
}