friendica/friendica-addons
9
4
Fork 16
Code Issues 3 Pull requests 2 Releases 16 Wiki Activity

Picture posts for statusnet, picture posts with twitter are working again - and some "fromglus" stuff #146

Merged
annando merged 7 commits from master into master 2013-09-01 12:56:00 +02:00
Conversation 0 Commits 7 Files changed 6 +9 -7
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit e226b74b7e - Show all commits

8
fromgplus/fromgplus.php
View file

@ -239,9 +239,11 @@ function fromgplus_handleattachments($item, $displaytext) {
$post .= "\n\n[bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n";
$images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
if ($images["preview"] != "")
$post .= "\n[url=".$images["full"]."][img]".$images["preview"]."[/img][/url]\n";
elseif ($images["full"] != "")
//if ($images["preview"] != "")
// $post .= "\n[url=".$images["full"]."][img]".$images["preview"]."[/img][/url]\n";
//elseif ($images["full"] != "")
// $post .= "\n[img]".$images["full"]."[/img]\n";
if ($images["full"] != "")
$post .= "\n[img]".$images["full"]."[/img]\n";
//$post .= "[quote]".trim(fromgplus_html2bbcode($attachment->content))."[/quote]";

8
twitter/twitter.php
View file

@ -641,8 +641,8 @@ function twitter_post_hook(&$a,&$b) {
$result = $tweet->post('statuses/update_with_media', array('media[]' => "{$img_str};type=".$mime.";filename={$filename}" , 'status' => $msg));
logger('twitter_post_with_media send, result: ' . print_r($result, true), LOGGER_DEBUG);
if ($result->error) {
logger('Send to Twitter failed: "' . $result->error . '"');
if ($result->errors OR $result->error) {
logger('Send to Twitter failed: "' . $result->errors . '"');
// Workaround: Remove the picture link so that the post can be reposted without it
$image = "";
}
@ -651,8 +651,8 @@ function twitter_post_hook(&$a,&$b) {
if(strlen($msg) and ($image == "")) {
$result = $tweet->post('statuses/update', array('status' => $msg));
logger('twitter_post send, result: ' . print_r($result, true), LOGGER_DEBUG);
if ($result->error)
logger('Send to Twitter failed: "' . $result->error . '"');
if ($result->errors OR $result->error)
logger('Send to Twitter failed: "' . $result->errors . '"');
}
}
}