Merge pull request #1714 from annando/1506-mail-link-profile

Show preselected mail receivers

diff --git a/include/conversation.php b/include/conversation.php
index cdd3118ce0bf226af917566b8216383c619020db..4aae611804cb7f0ebdf99856554293fc3f934c05 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -597,7 +597,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
                                call_hooks('render_location',$locate);
 
-                               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
+                               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate));
 
                                localize_item($item);
                                if($mode === 'network-new')
@@ -1229,14 +1229,10 @@ function find_thread_parent_index($arr,$x) {
        return false;
 }
 
-function render_location_google($item) {
-       $location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
-       $coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
-       if($coord) {
-               if($location)
-                       $location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
-               else
-                       $location = '<span class="smalltext">' . $coord . '</span>';
-       }
-       return $location;
+function render_location_dummy($item) {
+       if ($item['location'] != "")
+               return $item['location'];
+
+       if ($item['coord'] != "")
+               return $item['coord'];
 }

diff --git a/include/items.php b/include/items.php
index 475980d2dc972584aaef409cbf64134566b53c1a..45d25e379f84713931de7ba41653b6a2c826a681 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -4403,8 +4403,9 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
                $o .= atom_author('dfrn:owner',$item['owner-name'],$item['owner-link'],80,80,$item['owner-avatar']);
 
        if(($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
+               $parent = q("SELECT `guid` FROM `item` WHERE `id` = %d", intval($item["parent"]));
                $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
-               $o .= '<thr:in-reply-to ref="' . xmlify($parent_item) . '" type="text/html" href="' .  xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['parent']) . '" />' . "\r\n";
+               $o .= '<thr:in-reply-to ref="'.xmlify($parent_item).'" type="text/html" href="'.xmlify($a->get_baseurl().'/display/'.$parent[0]['guid']).'" />'."\r\n";
        }
 
        $htmlbody = $body;
@@ -4412,7 +4413,6 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
        if ($item['title'] != "")
                $htmlbody = "[b]".$item['title']."[/b]\n\n".$htmlbody;
 
-       //$htmlbody = bbcode(bb_remove_share_information($htmlbody), false, false, 7);
        $htmlbody = bbcode($htmlbody, false, false, 7);
 
        $o .= '<id>' . xmlify($item['uri']) . '</id>' . "\r\n";
@@ -4421,8 +4421,7 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
        $o .= '<updated>' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '</updated>' . "\r\n";
        $o .= '<dfrn:env>' . base64url_encode($body, true) . '</dfrn:env>' . "\r\n";
        $o .= '<content type="' . $type . '" >' . xmlify((($type === 'html') ? $htmlbody : $body)) . '</content>' . "\r\n";
-       $o .= '<link rel="alternate" type="text/html" href="' . xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']) . '" />' . "\r\n";
-
+       $o .= '<link rel="alternate" type="text/html" href="'.xmlify($a->get_baseurl().'/display/'.$item['guid']).'" />'."\r\n";
 
        $o .= '<status_net notice_id="'.$item['id'].'"></status_net>'."\r\n";
 

diff --git a/include/ostatus.php b/include/ostatus.php
index 10361e87c8c0c71edc616ee048aa61e435b41d43..7825418474cc5385ec959443ba45b4c43960a644 100644 (file)
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -10,6 +10,7 @@ require_once("include/Photo.php");
 
 define('OSTATUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
 define('OSTATUS_DEFAULT_POLL_TIMEFRAME', 1440); // given in minutes
+define('OSTATUS_DEFAULT_POLL_TIMEFRAME_MENTIONS', 14400); // given in minutes
 
 function ostatus_fetchauthor($xpath, $context, $importer, &$contact) {
 
@@ -200,6 +201,13 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
                $item["object"] = $xml;
                $item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue;
 
+               // To-Do:
+               // Delete a message
+               if ($item["verb"] == "qvitter-delete-notice") {
+                       // ignore "Delete" messages (by now)
+                       continue;
+               }
+
                if ($item["verb"] == ACTIVITY_JOIN) {
                        // ignore "Join" messages
                        continue;
@@ -468,7 +476,7 @@ function ostatus_convert_href($href) {
        return $href;
 }
 
-function check_conversations($override = false) {
+function check_conversations($mentions = false, $override = false) {
        $last = get_config('system','ostatus_last_poll');
 
        $poll_interval = intval(get_config('system','ostatus_poll_interval'));
@@ -479,9 +487,16 @@ function check_conversations($override = false) {
        if (($poll_interval < 0) AND !$override)
                return;
 
-       $poll_timeframe = intval(get_config('system','ostatus_poll_timeframe'));
-       if (!$poll_timeframe)
-               $poll_timeframe = OSTATUS_DEFAULT_POLL_TIMEFRAME;
+       if (!$mentions) {
+               $poll_timeframe = intval(get_config('system','ostatus_poll_timeframe'));
+               if (!$poll_timeframe)
+                       $poll_timeframe = OSTATUS_DEFAULT_POLL_TIMEFRAME;
+       } else {
+               $poll_timeframe = intval(get_config('system','ostatus_poll_timeframe'));
+               if (!$poll_timeframe)
+                       $poll_timeframe = OSTATUS_DEFAULT_POLL_TIMEFRAME_MENTIONS;
+       }
+
 
        if ($last AND !$override) {
                $next = $last + ($poll_interval * 60);
@@ -494,8 +509,16 @@ function check_conversations($override = false) {
        logger('cron_start');
 
        $start = date("Y-m-d H:i:s", time() - ($poll_timeframe * 60));
-       $conversations = q("SELECT `oid`, `url`, `uid` FROM `term` WHERE `type` = 7 AND `term` > '%s' GROUP BY `url`, `uid` ORDER BY `term` DESC",
-                               dbesc($start));
+
+       if ($mentions)
+               $conversations = q("SELECT `term`.`oid`, `term`.`url`, `term`.`uid` FROM `term`
+                                       STRAIGHT_JOIN `thread` ON `thread`.`iid` = `term`.`oid` AND `thread`.`uid` = `term`.`uid`
+                                       WHERE `term`.`type` = 7 AND `term`.`term` > '%s' AND `thread`.`mention`
+                                       GROUP BY `term`.`url`, `term`.`uid` ORDER BY `term`.`term` DESC", dbesc($start));
+       else
+               $conversations = q("SELECT `oid`, `url`, `uid` FROM `term`
+                                       WHERE `type` = 7 AND `term` > '%s'
+                                       GROUP BY `url`, `uid` ORDER BY `term` DESC", dbesc($start));
 
        foreach ($conversations AS $conversation) {
                ostatus_completion($conversation['url'], $conversation['uid']);

diff --git a/include/poller.php b/include/poller.php
index 933624ecb57ef0621e3cfc4e6adac52c8b71cc8e..d971d4f00410a76cb77acac4364516c327052884 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -103,7 +103,11 @@ function poller_run(&$argv, &$argc){
                $abandon_days = 0;
 
        // Check OStatus conversations
-       check_conversations();
+       // Check only conversations with mentions (for a longer time)
+       check_conversations(true);
+
+       // Check every conversation
+       check_conversations(false);
 
        // To-Do: Regenerate usage statistics
        // q("ANALYZE TABLE `item`");

diff --git a/mod/content.php b/mod/content.php
index e20345307d9b9b74644485e7bc5d5df3dbcbef8f..cec23a91421ad4a23eaea3e78b896581878fb86e 100644 (file)
--- a/mod/content.php
+++ b/mod/content.php
@@ -425,7 +425,7 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
                                $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
                                call_hooks('render_location',$locate);
 
-                               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
+                               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate));
 
                                localize_item($item);
                                if($mode === 'network-new')
@@ -799,7 +799,7 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
                                $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
                                call_hooks('render_location',$locate);
 
-                               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
+                               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate));
 
                                $indent = (($toplevelpost) ? '' : ' comment');
 

diff --git a/object/Item.php b/object/Item.php
index aa9792b159875fbbb78691a979f29a78c7eb249e..3211048cef6745a124fb6987912fcfcfdb4ebb8a 100644 (file)
--- a/object/Item.php
+++ b/object/Item.php
@@ -155,7 +155,7 @@ class Item extends BaseObject {
 
                $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
                call_hooks('render_location',$locate);
-               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
+               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate));
 
                $searchpath = $a->get_baseurl()."/search?tag=";
                $tags=array();