Friendica/friendica-addons
1
1
Fork 1
mirror of https://git.friendi.ca/friendica/friendica-addons.git synced 2024-11-25 20:43:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #681 from annando/notices-again

Browse source 
Notices again
This commit is contained in:
Tobias Diekershoff 2018-08-02 07:23:23 +02:00 committed by GitHub
commit 20e42c09b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fromgplus/fromgplus.php
View file

@ -341,10 +341,13 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
if ($images["full"] != "") if ($images["full"] != "")
$pagedata["images"][0]["src"] = $images["full"]; $pagedata["images"][0]["src"] = $images["full"];
$quote = trim(fromgplus_html2bbcode($attachment->content)); if (!empty($attachment->content)) {
$quote = trim(fromgplus_html2bbcode($attachment->content));
}
if ($quote != "") if (!empty($quote)) {
$pagedata["text"] = $quote; $pagedata["text"] = $quote;
}
// Add Keywords to page link // Add Keywords to page link
$data = parseurl_getsiteinfo_cached($pagedata["url"], true); $data = parseurl_getsiteinfo_cached($pagedata["url"], true);

5
pumpio/pumpio.php
View file

@ -778,6 +778,7 @@ function pumpio_fetchtimeline(App $a, $uid)
$success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $user); $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $user);
} else { } else {
$success = false; $success = false;
$user = [];
} }
if (!$success) { if (!$success) {
@ -1386,6 +1387,10 @@ function pumpio_getallusers(App &$a, $uid)
$success = false; $success = false;
} }
if (empty($users)) {
return;
}
if ($users->totalItems > count($users->items)) { if ($users->totalItems > count($users->items)) {
$url = 'https://'.$hostname.'/api/user/'.$username.'/following?count='.$users->totalItems; $url = 'https://'.$hostname.'/api/user/'.$username.'/following?count='.$users->totalItems;

2
tumblr/tumblr.php
View file

@ -443,7 +443,7 @@ function tumblr_send(App $a, array &$b) {
"<p>".$params['caption']."</p>"; "<p>".$params['caption']."</p>";
} }
if (empty($params['caption'])) { if (empty($params['caption']) && !empty($siteinfo["description"])) {
$params['caption'] = BBCode::convert("[quote]" . $siteinfo["description"] . "[/quote]", false, 4); $params['caption'] = BBCode::convert("[quote]" . $siteinfo["description"] . "[/quote]", false, 4);
} }

5
twitter/twitter.php
View file

@ -1514,6 +1514,11 @@ function twitter_fetchparentposts(App $a, $uid, $post, TwitterOAuth $connection,
break; break;
} }
if (empty($post->id_str)) {
logger("twitter_fetchparentposts: This is not a post " . json_encode($post), LOGGER_DEBUG);
break;
}
if (DBA::exists('item', ['uri' => 'twitter::' . $post->id_str, 'uid' => $uid])) { if (DBA::exists('item', ['uri' => 'twitter::' . $post->id_str, 'uid' => $uid])) {
break; break;
} }