From 6243e55e526ae602d1ebffff8d8201d15c70a2e4 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 11 Aug 2014 09:07:25 +0200 Subject: [PATCH 1/5] updating the tracking code generated by the Piwik addon --- piwik.tgz | Bin 8336 -> 8240 bytes piwik/piwik.php | 10 ++++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/piwik.tgz b/piwik.tgz index aaaf43758066a539b8e9241df5ae8c176b0a5081..4099e2de1931ec72fceffb1c7713f5bc1e97911a 100755 GIT binary patch literal 8240 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 literal 8336 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 a|J#kzhwI^bxE`)Q`Snlyq{({#$N&H|hdZJG diff --git a/piwik/piwik.php b/piwik/piwik.php index 8b19863d..7a1cb581 100755 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -2,7 +2,7 @@ /** * Name: Piwik Analytics * Description: Piwik Analytics Plugin for Friendica - * Version: 1.1 + * Version: 1.2 * Author: Tobias Diekershoff * Author: Klaus Weidenbach */ @@ -15,7 +15,9 @@ * License: 3-clause BSD license * * Configuration: - * Add the following lines to your .htconfig.php file: + * Use the administration panel to configure the Piwik tracking addon, or + * in case you don't use this add the following lines to your .htconfig.php + * file: * * $a->config['piwik']['baseurl'] = 'www.example.com/piwik/'; * $a->config['piwik']['siteid'] = '1'; @@ -62,10 +64,10 @@ function piwik_analytics($a,&$b) { * If async is set to true use asynchronous tracking */ if ($async) { - $a->page['htmlhead'] .= " \r\n\r\n"; + $b .= " \r\n"; $b .= "
\r\n\r\n
"; } else { - $b .= "
\r\n \r\n\r\n\r\n
"; + $b .= " \r\n"; } /* -- 2.45.2 From 23490bda0a5ec9889afca89189db9c59f76fbcc5 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 21 Aug 2014 01:02:13 +0200 Subject: [PATCH 2/5] appnet, fbsync, statusnet and twitter: Now a parent is provided in the notifications so threading of the mails will work. --- appnet/appnet.php | 78 ++++++++++++++++++++++++++++------------- fbsync/fbsync.php | 7 ++++ statusnet/statusnet.php | 11 ++++-- twitter/twitter.php | 17 +++++++-- 4 files changed, 83 insertions(+), 30 deletions(-) diff --git a/appnet/appnet.php b/appnet/appnet.php index a8335d7b..b647c545 100644 --- a/appnet/appnet.php +++ b/appnet/appnet.php @@ -750,13 +750,30 @@ function appnet_fetchstream($a, $uid) { foreach ($mentions AS $post) { $postarray = appnet_createpost($a, $uid, $post, $me, $user, $ownid, false); - if (isset($postarray["id"])) + if (isset($postarray["id"])) { $item = $postarray["id"]; - elseif (isset($postarray["body"])) { + $parent_id = $postarray['parent']; + } elseif (isset($postarray["body"])) { $item = item_store($postarray); + $parent_id = 0; logger('appnet_fetchstream: User '.$uid.' posted mention item '.$item); - } else + } else { $item = 0; + $parent_id = 0; + } + + // Fetch the parent and id + if (($parent_id == 0) AND ($postarray['uri'] != "")) { + $r = q("SELECT `id`, `parent` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc($postarray['uri']), + intval($uid) + ); + + if (count($r)) { + $item = $r[0]['id']; + $parent_id = $r[0]['parent']; + } + } $lastid = $post["id"]; @@ -776,7 +793,8 @@ function appnet_fetchstream($a, $uid) { 'source_link' => $postarray['author-link'], 'source_photo' => $postarray['author-avatar'], 'verb' => ACTIVITY_TAG, - 'otype' => 'item' + 'otype' => 'item', + 'parent' => $parent_id, )); } } @@ -792,7 +810,7 @@ function appnet_fetchstream($a, $uid) { */ } -function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $threadcompletion = true) { +function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $threadcompletion = true, $nodupcheck = false) { require_once('include/items.php'); if ($post["machine_only"]) @@ -807,25 +825,33 @@ function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $th $postarray['wall'] = 0; $postarray['verb'] = ACTIVITY_POST; $postarray['network'] = dbesc(NETWORK_APPNET); - $postarray['uri'] = "adn::".$post["id"]; + if (is_array($post["repost_of"])) { + // You can't reply to reposts. So use the original id and thread-id + $postarray['uri'] = "adn::".$post["repost_of"]["id"]; + $postarray['parent-uri'] = "adn::".$post["repost_of"]["thread_id"]; + } else { + $postarray['uri'] = "adn::".$post["id"]; + $postarray['parent-uri'] = "adn::".$post["thread_id"]; + } - $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", - dbesc($postarray['uri']), - intval($uid) - ); + if (!$nodupcheck) { + $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc($postarray['uri']), + intval($uid) + ); - if (count($r)) - return($r[0]); + if (count($r)) + return($r[0]); - $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", - dbesc($postarray['uri']), - intval($uid) - ); + $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", + dbesc($postarray['uri']), + intval($uid) + ); - if (count($r)) - return($r[0]); + if (count($r)) + return($r[0]); + } - $postarray['parent-uri'] = "adn::".$post["thread_id"]; if (isset($post["reply_to"]) AND ($post["reply_to"] != "")) { $postarray['thr-parent'] = "adn::".$post["reply_to"]; @@ -875,8 +901,6 @@ function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $th $postarray['object-type'] = ACTIVITY_OBJ_NOTE; } - $postarray['plink'] = $post["canonical_url"]; - if (($post["user"]["id"] != $ownid) OR ($postarray['thr-parent'] == $postarray['uri'])) { $postarray['owner-name'] = $post["user"]["name"]; $postarray['owner-link'] = $post["user"]["canonical_url"]; @@ -905,6 +929,8 @@ function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $th $content = $post; } + $postarray['plink'] = $content["canonical_url"]; + if (is_array($content["entities"])) { $converted = appnet_expand_entities($a, $content["text"], $content["entities"]); $postarray['body'] = $converted["body"]; @@ -969,11 +995,13 @@ function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $th $link = array_pop($links); $url = str_replace(array('/', '.'), array('\/', '\.'), $link); - $removedlink = preg_replace("/\[url\=".$url."\](.*?)\[\/url\]/ism", '', $postarray['body']); - if (($removedlink == "") OR strstr($postarray['body'], $removedlink)) - $postarray['body'] = $removedlink; - $page_info = add_page_info($link, false, $photo["url"]); + + if (trim($page_info) != "") { + $removedlink = preg_replace("/\[url\=".$url."\](.*?)\[\/url\]/ism", '', $postarray['body']); + if (($removedlink == "") OR strstr($postarray['body'], $removedlink)) + $postarray['body'] = $removedlink; + } } $postarray['body'] .= $page_info; diff --git a/fbsync/fbsync.php b/fbsync/fbsync.php index 78ecea1d..51d2747f 100644 --- a/fbsync/fbsync.php +++ b/fbsync/fbsync.php @@ -345,6 +345,13 @@ function fbsync_createpost($a, $uid, $self, $contacts, $applications, $post, $cr $type = "link"; $content = "[bookmark=".$post->attachment->href."]".$post->attachment->name."[/bookmark]"; + + // If a link is not only attached but also added in the body, look if it can be removed in the body. + $removedlink = trim(str_replace($post->attachment->href, "", $postarray["body"])); + + if (($removedlink == "") OR strstr($postarray["body"], $removedlink)) + $postarray["body"] = $removedlink; + } elseif (isset($post->attachment->name) AND ($post->attachment->name != "")) $content = "[b]" . $post->attachment->name."[/b]"; diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index f941531e..9aa2fdfc 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -1078,6 +1078,7 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi if (count($r)) { $postarray['thr-parent'] = $r[0]["uri"]; $postarray['parent-uri'] = $r[0]["parent-uri"]; + $postarray['parent'] = $r[0]["parent"]; $postarray['object-type'] = ACTIVITY_OBJ_COMMENT; } else { $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", @@ -1087,6 +1088,7 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi if (count($r)) { $postarray['thr-parent'] = $r[0]['uri']; $postarray['parent-uri'] = $r[0]['parent-uri']; + $postarray['parent'] = $r[0]['parent']; $postarray['object-type'] = ACTIVITY_OBJ_COMMENT; } else { $postarray['thr-parent'] = $postarray['uri']; @@ -1189,6 +1191,8 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi function statusnet_checknotification($a, $uid, $own_url, $top_item, $postarray) { + // This function necer worked and need cleanup + $user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", intval($uid) ); @@ -1405,8 +1409,10 @@ function statusnet_fetchhometimeline($a, $uid) { dbesc($postarray['uri']), intval($uid) ); - if (count($r)) + if (count($r)) { $item = $r[0]['id']; + $parent_id = $r[0]['parent']; + } if ($item != 0) { require_once('include/enotify.php'); @@ -1423,7 +1429,8 @@ function statusnet_fetchhometimeline($a, $uid) { 'source_link' => $postarray['author-link'], 'source_photo' => $postarray['author-avatar'], 'verb' => ACTIVITY_TAG, - 'otype' => 'item' + 'otype' => 'item', + 'parent' => $parent_id, )); } } diff --git a/twitter/twitter.php b/twitter/twitter.php index 6731e324..b2003445 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -1243,6 +1243,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing if (count($r)) { $postarray['thr-parent'] = $r[0]["uri"]; $postarray['parent-uri'] = $r[0]["parent-uri"]; + $postarray['parent'] = $r[0]["parent"]; $postarray['object-type'] = ACTIVITY_OBJ_COMMENT; } else { $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", @@ -1252,6 +1253,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing if (count($r)) { $postarray['thr-parent'] = $r[0]['uri']; $postarray['parent-uri'] = $r[0]['parent-uri']; + $postarray['parent'] = $r[0]['parent']; $postarray['object-type'] = ACTIVITY_OBJ_COMMENT; } else { $postarray['thr-parent'] = $postarray['uri']; @@ -1404,6 +1406,8 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing function twitter_checknotification($a, $uid, $own_id, $top_item, $postarray) { + // this whole function doesn't seem to work. Needs complete check + $user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", intval($uid) ); @@ -1592,6 +1596,9 @@ function twitter_fetchhometimeline($a, $uid) { $item = item_store($postarray); + if (!isset($postarray["parent"]) OR ($postarray["parent"] == 0)) + $postarray["parent"] = $item; + logger('twitter_fetchhometimeline: User '.$self["nick"].' posted mention timeline item '.$item); if ($item == 0) { @@ -1599,9 +1606,12 @@ function twitter_fetchhometimeline($a, $uid) { dbesc($postarray['uri']), intval($uid) ); - if (count($r)) + if (count($r)) { $item = $r[0]['id']; - } + $parent_id = $r[0]['parent']; + } + } else + $parent_id = $postarray['parent']; if ($item != 0) { require_once('include/enotify.php'); @@ -1618,7 +1628,8 @@ function twitter_fetchhometimeline($a, $uid) { 'source_link' => $postarray['author-link'], 'source_photo' => $postarray['author-avatar'], 'verb' => ACTIVITY_TAG, - 'otype' => 'item' + 'otype' => 'item', + 'parent' => $parent_id )); } } -- 2.45.2 From a0d67d8b445f52e95bfe6a416b0d735fe8c25980 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 25 Aug 2014 14:17:53 +0200 Subject: [PATCH 3/5] appnet: This should mostly prevent picture posts with two links to the same picture --- appnet/appnet.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/appnet/appnet.php b/appnet/appnet.php index b647c545..7e80c6ab 100644 --- a/appnet/appnet.php +++ b/appnet/appnet.php @@ -944,7 +944,7 @@ function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $th $links[$url] = $link["url"]; } - if (sizeof($content["annotations"])) + /* if (sizeof($content["annotations"])) foreach($content["annotations"] AS $annotation) { if ($annotation[type] == "net.app.core.oembed") { if (isset($annotation["value"]["embeddable_url"])) { @@ -953,7 +953,6 @@ function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $th unset($links[$url]); } } elseif ($annotation[type] == "com.friendica.post") { - // Nur zum Testen deaktiviert //$links = array(); //if (isset($annotation["value"]["post-title"])) // $postarray['title'] = $annotation["value"]["post-title"]; @@ -974,7 +973,7 @@ function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $th $postarray['author-avatar'] = $annotation["value"]["author-avatar"]; } - } + } */ $page_info = ""; -- 2.45.2 From 1766a42b1a9972b3279ea0342937f6fabcb2dfaf Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 25 Aug 2014 14:19:09 +0200 Subject: [PATCH 4/5] pumpio: prevent a warning message because of a missing parameter --- pumpio/pumpio.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 0d7786c1..55d0433a 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -521,7 +521,7 @@ function pumpio_send(&$a,&$b) { } } -function pumpio_action(&$a, $uid, $uri, $action, $content) { +function pumpio_action(&$a, $uid, $uri, $action, $content = "") { // Don't do likes and other stuff if you don't import the timeline if (!get_pconfig($uid,'pumpio','import')) -- 2.45.2 From 9c16c8e5f9b266ca90ac0df45e9a18eaa0ea3011 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 25 Aug 2014 14:19:41 +0200 Subject: [PATCH 5/5] statusnet: Bugfixes: Repeated messages weren't always displayed correctly. When answering to posts, sometimes wrong nicknames were used. --- statusnet/statusnet.php | 70 +++++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 27 deletions(-) diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 9aa2fdfc..c3591356 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -496,8 +496,13 @@ function statusnet_post_hook(&$a,&$b) { $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]"; + //$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); 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)) { $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]"; - $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; if ((strpos($item["body"], $nickname) === false) AND (strpos($item["body"], $nicknameplain) === false)) $item["body"] = $nickname." ".$item["body"]; @@ -1055,7 +1064,14 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi $postarray['gravity'] = 0; $postarray['uid'] = $uid; $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", dbesc($postarray['uri']), @@ -1067,9 +1083,9 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi $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", dbesc($parent), @@ -1100,7 +1116,7 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi // Is it me? $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", intval($uid)); @@ -1135,43 +1151,43 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi $postarray['verb'] = ACTIVITY_POST; - $postarray['author-name'] = $postarray['owner-name']; - $postarray['author-link'] = $postarray['owner-link']; - $postarray['author-avatar'] = $postarray['owner-avatar']; + $postarray['author-name'] = $content->user->name; + $postarray['author-link'] = $content->user->statusnet_profile_url; + $postarray['author-avatar'] = $content->user->profile_image_url; // To-Do: Maybe unreliable? Can the api be entered without trailing "/"? $hostname = str_replace("/api/", "/notice/", get_pconfig($uid, 'statusnet', 'baseapi')); - $postarray['plink'] = $hostname.$post->id; - $postarray['app'] = strip_tags($post->source); + $postarray['plink'] = $hostname.$content->id; + $postarray['app'] = strip_tags($content->source); - if ($post->user->protected) { + if ($content->user->protected) { $postarray['private'] = 1; $postarray['allow_cid'] = '<' . $self['id'] . '>'; } - $postarray['body'] = html2bbcode($post->statusnet_html); + $postarray['body'] = html2bbcode($content->statusnet_html); $converted = statusnet_convertmsg($a, $postarray['body'], false); $postarray['body'] = $converted["body"]; $postarray['tag'] = $converted["tags"]; - $postarray['created'] = datetime_convert('UTC','UTC',$post->created_at); - $postarray['edited'] = datetime_convert('UTC','UTC',$post->created_at); + $postarray['created'] = datetime_convert('UTC','UTC',$content->created_at); + $postarray['edited'] = datetime_convert('UTC','UTC',$content->created_at); - if (is_string($post->place->name)) - $postarray["location"] = $post->place->name; + if (is_string($content->place->name)) + $postarray["location"] = $content->place->name; - if (is_string($post->place->full_name)) - $postarray["location"] = $post->place->full_name; + if (is_string($content->place->full_name)) + $postarray["location"] = $content->place->full_name; - if (is_array($post->geo->coordinates)) - $postarray["coord"] = $post->geo->coordinates[0]." ".$post->geo->coordinates[1]; + if (is_array($content->geo->coordinates)) + $postarray["coord"] = $content->geo->coordinates[0]." ".$content->geo->coordinates[1]; - if (is_array($post->coordinates->coordinates)) - $postarray["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0]; + if (is_array($content->coordinates->coordinates)) + $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); $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-link'] = $post->retweeted_status->user->statusnet_profile_url; $postarray['author-avatar'] = $post->retweeted_status->user->profile_image_url; - } + }*/ logger("statusnet_createpost: end", LOGGER_DEBUG); return($postarray); } -- 2.45.2