friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into 1612-twitter-media

pull/394/head
Michael 2016-12-13 08:57:45 +00:00
parent d48e8bd0a9 befda05c79
commit 0eb9a106df
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
twitter/twitter.php
View File

@ -750,11 +750,12 @@ function twitter_do_mirrorpost($a, $uid, $post) {
$datarray["profile_uid"] = $uid; $datarray["profile_uid"] = $uid;
$datarray["extid"] = NETWORK_TWITTER; $datarray["extid"] = NETWORK_TWITTER;
$datarray['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_TWITTER.":".$post->id); $datarray['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_TWITTER.":".$post->id);
$datarray['object'] = json_encode($post);
$datarray["title"] = ""; $datarray["title"] = "";
if (is_object($post->retweeted_status)) { if (is_object($post->retweeted_status)) {
// We don't support nested shares, so we mustn't show quotes as shares on retweets // We don't support nested shares, so we mustn't show quotes as shares on retweets
$item = twitter_createpost($a, $uid, $post, array('id' => 0), false, false, true); $item = twitter_createpost($a, $uid, $post->retweeted_status, array('id' => 0), false, false, true);
$datarray['body'] = "\n".share_header($item['author-name'], $item['author-link'], $item['author-avatar'], "", $datarray['body'] = "\n".share_header($item['author-name'], $item['author-link'], $item['author-avatar'], "",
$item['created'], $item['plink']); $item['created'], $item['plink']);
@ -1364,6 +1365,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
); );
if (count($r)) { if (count($r)) {
logger("Item with extid ".$postarray['uri']." found.", LOGGER_DEBUG);
return(array()); return(array());
} }
@ -1413,6 +1415,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
$postarray['owner-link'] = $r[0]["url"]; $postarray['owner-link'] = $r[0]["url"];
$postarray['owner-avatar'] = $r[0]["photo"]; $postarray['owner-avatar'] = $r[0]["photo"];
} else { } else {
logger("No self contact for user ".$uid, LOGGER_DEBUG);
return(array()); return(array());
} }
} }
@ -1434,6 +1437,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
if(($contactid == 0) AND !$only_existing_contact) { if(($contactid == 0) AND !$only_existing_contact) {
$contactid = $self['id']; $contactid = $self['id'];
} elseif ($contactid <= 0) { } elseif ($contactid <= 0) {
logger("Contact ID is zero or less than zero.", LOGGER_DEBUG);
return(array()); return(array());
} }