spacenerdmo/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

statusnet: Bugfixes: Repeated messages weren't always displayed correctly. When answering to posts, sometimes wrong nicknames were used.

Browse source
This commit is contained in:
Michael Vogel 2014-08-25 14:19:41 +02:00
parent 1766a42b1a
commit 9c16c8e5f9
1 changed files with 43 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
statusnet/statusnet.php
View file

@ -496,8 +496,13 @@ function statusnet_post_hook(&$a,&$b) {
$orig_post = $r[0]; $orig_post = $r[0];
} }
$nickname = "@[url=".$orig_post["author-link"]."]".$orig_post["contact_nick"]."[/url]"; //$nickname = "@[url=".$orig_post["author-link"]."]".$orig_post["contact_nick"]."[/url]";
$nicknameplain = "@".$orig_post["contact_nick"]; //$nicknameplain = "@".$orig_post["contact_nick"];
$nick = preg_replace("=https?://(.*)/(.*)=ism", "$2", $orig_post["author-link"]);
$nickname = "@[url=".$orig_post["author-link"]."]".$nick."[/url]";
$nicknameplain = "@".$nick;
logger("statusnet_post_hook: comparing ".$nickname." and ".$nicknameplain." with ".$b["body"], LOGGER_DEBUG); logger("statusnet_post_hook: comparing ".$nickname." and ".$nicknameplain." with ".$b["body"], LOGGER_DEBUG);
if ((strpos($b["body"], $nickname) === false) AND (strpos($b["body"], $nicknameplain) === false)) if ((strpos($b["body"], $nickname) === false) AND (strpos($b["body"], $nicknameplain) === false))
@ -700,9 +705,13 @@ function statusnet_prepare_body(&$a,&$b) {
if(count($r)) { if(count($r)) {
$orig_post = $r[0]; $orig_post = $r[0];
//$nickname = "@[url=".$orig_post["author-link"]."]".$orig_post["contact_nick"]."[/url]";
//$nicknameplain = "@".$orig_post["contact_nick"];
$nickname = "@[url=".$orig_post["author-link"]."]".$orig_post["contact_nick"]."[/url]"; $nick = preg_replace("=https?://(.*)/(.*)=ism", "$2", $orig_post["author-link"]);
$nicknameplain = "@".$orig_post["contact_nick"];
$nickname = "@[url=".$orig_post["author-link"]."]".$nick."[/url]";
$nicknameplain = "@".$nick;
if ((strpos($item["body"], $nickname) === false) AND (strpos($item["body"], $nicknameplain) === false)) if ((strpos($item["body"], $nickname) === false) AND (strpos($item["body"], $nicknameplain) === false))
$item["body"] = $nickname." ".$item["body"]; $item["body"] = $nickname." ".$item["body"];
@ -1055,7 +1064,14 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
$postarray['gravity'] = 0; $postarray['gravity'] = 0;
$postarray['uid'] = $uid; $postarray['uid'] = $uid;
$postarray['wall'] = 0; $postarray['wall'] = 0;
$postarray['uri'] = $hostname."::".$post->id;
if (is_object($post->retweeted_status)) {
$content = $post->retweeted_status;
statusnet_fetch_contact($uid, $content->user, false);
} else
$content = $post;
$postarray['uri'] = $hostname."::".$content->id;
$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
dbesc($postarray['uri']), dbesc($postarray['uri']),
@ -1067,9 +1083,9 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
$contactid = 0; $contactid = 0;
if ($post->in_reply_to_status_id != "") { if ($content->in_reply_to_status_id != "") {
$parent = $hostname."::".$post->in_reply_to_status_id; $parent = $hostname."::".$content->in_reply_to_status_id;
$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($parent), dbesc($parent),
@ -1100,7 +1116,7 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
// Is it me? // Is it me?
$own_url = get_pconfig($uid, 'statusnet', 'own_url'); $own_url = get_pconfig($uid, 'statusnet', 'own_url');
if ($post->user->id == $own_url) { if ($content->user->id == $own_url) {
$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
intval($uid)); intval($uid));
@ -1135,43 +1151,43 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
$postarray['verb'] = ACTIVITY_POST; $postarray['verb'] = ACTIVITY_POST;
$postarray['author-name'] = $postarray['owner-name']; $postarray['author-name'] = $content->user->name;
$postarray['author-link'] = $postarray['owner-link']; $postarray['author-link'] = $content->user->statusnet_profile_url;
$postarray['author-avatar'] = $postarray['owner-avatar']; $postarray['author-avatar'] = $content->user->profile_image_url;
// To-Do: Maybe unreliable? Can the api be entered without trailing "/"? // To-Do: Maybe unreliable? Can the api be entered without trailing "/"?
$hostname = str_replace("/api/", "/notice/", get_pconfig($uid, 'statusnet', 'baseapi')); $hostname = str_replace("/api/", "/notice/", get_pconfig($uid, 'statusnet', 'baseapi'));
$postarray['plink'] = $hostname.$post->id; $postarray['plink'] = $hostname.$content->id;
$postarray['app'] = strip_tags($post->source); $postarray['app'] = strip_tags($content->source);
if ($post->user->protected) { if ($content->user->protected) {
$postarray['private'] = 1; $postarray['private'] = 1;
$postarray['allow_cid'] = '<' . $self['id'] . '>'; $postarray['allow_cid'] = '<' . $self['id'] . '>';
} }
$postarray['body'] = html2bbcode($post->statusnet_html); $postarray['body'] = html2bbcode($content->statusnet_html);
$converted = statusnet_convertmsg($a, $postarray['body'], false); $converted = statusnet_convertmsg($a, $postarray['body'], false);
$postarray['body'] = $converted["body"]; $postarray['body'] = $converted["body"];
$postarray['tag'] = $converted["tags"]; $postarray['tag'] = $converted["tags"];
$postarray['created'] = datetime_convert('UTC','UTC',$post->created_at); $postarray['created'] = datetime_convert('UTC','UTC',$content->created_at);
$postarray['edited'] = datetime_convert('UTC','UTC',$post->created_at); $postarray['edited'] = datetime_convert('UTC','UTC',$content->created_at);
if (is_string($post->place->name)) if (is_string($content->place->name))
$postarray["location"] = $post->place->name; $postarray["location"] = $content->place->name;
if (is_string($post->place->full_name)) if (is_string($content->place->full_name))
$postarray["location"] = $post->place->full_name; $postarray["location"] = $content->place->full_name;
if (is_array($post->geo->coordinates)) if (is_array($content->geo->coordinates))
$postarray["coord"] = $post->geo->coordinates[0]." ".$post->geo->coordinates[1]; $postarray["coord"] = $content->geo->coordinates[0]." ".$content->geo->coordinates[1];
if (is_array($post->coordinates->coordinates)) if (is_array($content->coordinates->coordinates))
$postarray["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0]; $postarray["coord"] = $content->coordinates->coordinates[1]." ".$content->coordinates->coordinates[0];
if (is_object($post->retweeted_status)) { /*if (is_object($post->retweeted_status)) {
$postarray['body'] = html2bbcode($post->retweeted_status->statusnet_html); $postarray['body'] = html2bbcode($post->retweeted_status->statusnet_html);
$converted = statusnet_convertmsg($a, $postarray['body'], false); $converted = statusnet_convertmsg($a, $postarray['body'], false);
@ -1184,7 +1200,7 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
$postarray['author-name'] = $post->retweeted_status->user->name; $postarray['author-name'] = $post->retweeted_status->user->name;
$postarray['author-link'] = $post->retweeted_status->user->statusnet_profile_url; $postarray['author-link'] = $post->retweeted_status->user->statusnet_profile_url;
$postarray['author-avatar'] = $post->retweeted_status->user->profile_image_url; $postarray['author-avatar'] = $post->retweeted_status->user->profile_image_url;
} }*/
logger("statusnet_createpost: end", LOGGER_DEBUG); logger("statusnet_createpost: end", LOGGER_DEBUG);
return($postarray); return($postarray);
} }