friendica/friendica-addons
7
2
Fork 14
Code Issues 3 Pull requests 3 Releases 16 Wiki Activity

Export connectors now are using the "plaintext" function, improvements to tumblr, short post detection for wordpress #194

Merged
annando merged 6 commits from master into master 2014-05-29 14:06:09 +02:00
Conversation 0 Commits 6 Files changed 12 +33 -11
1 changed files with 33 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8ce597cb4d - Show all commits

44
statusnet/statusnet.php
View file

@ -837,9 +837,29 @@ function statusnet_post_hook(&$a,&$b) {
$msg = trim($msg); $msg = trim($msg);
$postdata = array('status' => $msg); $postdata = array('status' => $msg);
} else { } else {
$msgarr = statusnet_shortenmsg($b, $max_char); /* $msgarr = statusnet_shortenmsg($b, $max_char);
$msg = $msgarr["msg"]; $msg = $msgarr["msg"];
$image = $msgarr["image"]; $image = $msgarr["image"];
*/
require_once("include/plaintext.php");
require_once("include/network.php");
$msgarr = plaintext($a, $b, $max_char, true);
$msg = $msgarr["text"];
if (($msg == "") AND isset($msgarr["title"]))
$msg = shortenmsg($msgarr["title"], $max_char - 50);
$image = "";
if (isset($msgarr["url"])) {
if ((strlen($msgarr["url"]) > 20) AND
((strlen($msg." ".$msgarr["url"]) > $max_char)))
$msg .= " ".short_link($msgarr["url"]);
else
$msg .= " ".$msgarr["url"];
} elseif (isset($msgarr["image"]))
$image = $msgarr["image"];
if ($image != "") { if ($image != "") {
$img_str = fetch_url($image); $img_str = fetch_url($image);
$tempfile = tempnam(get_config("system","temppath"), "cache"); $tempfile = tempnam(get_config("system","temppath"), "cache");
@ -1661,21 +1681,23 @@ function statusnet_complete_conversation($a, $uid, $self, $create_user, $nick, $
$parameters["count"] = 200; $parameters["count"] = 200;
$items = $connection->get('statusnet/conversation/'.$conversation, $parameters); $items = $connection->get('statusnet/conversation/'.$conversation, $parameters);
$posts = array_reverse($items); if (is_array($items)) {
$posts = array_reverse($items);
foreach($posts AS $post) { foreach($posts AS $post) {
$postarray = statusnet_createpost($a, $uid, $post, $self, $create_user, true); $postarray = statusnet_createpost($a, $uid, $post, $self, $create_user, true);
if (trim($postarray['body']) == "") if (trim($postarray['body']) == "")
continue; continue;
//print_r($postarray); //print_r($postarray);
$item = item_store($postarray); $item = item_store($postarray);
logger('statusnet_complete_conversation: User '.$self["nick"].' posted home timeline item '.$item); logger('statusnet_complete_conversation: User '.$self["nick"].' posted home timeline item '.$item);
if ($item != 0) if ($item != 0)
statusnet_checknotification($a, $uid, $nick, $item, $postarray); statusnet_checknotification($a, $uid, $nick, $item, $postarray);
}
} }
} }