]> git.mxchange.org Git - friendica-addons.git/blobdiff - appnet/appnet.php
"remote self" should work now with the addons
[friendica-addons.git] / appnet / appnet.php
index 85379e5690d3ef31711f35b94e95e751c93d3b31..151a81ee495735c2ccfc6008ffc4f18ab191ce12 100644 (file)
@@ -2,9 +2,10 @@
 
 /**
  * Name: App.net Connector
- * Description: app.net postings import and export
+ * Description: Bidirectional (posting and reading) connector for app.net.
  * Version: 0.2
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
+ * Status: Unsupported
  */
 
 /*
  - Use embedded pictures for the attachment information (large attachment)
  - Sound links must be handled
  - https://alpha.app.net/sr_rolando/post/32365203 - double pictures
+ - https://alpha.app.net/opendev/post/34396399 - location data
 */
 
+require_once('include/enotify.php');
+require_once("include/socgraph.php");
+
 define('APPNET_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 
 function appnet_install() {
@@ -23,6 +28,8 @@ function appnet_install() {
        register_hook('cron',                   'addon/appnet/appnet.php', 'appnet_cron');
        register_hook('connector_settings',     'addon/appnet/appnet.php', 'appnet_settings');
        register_hook('connector_settings_post','addon/appnet/appnet.php', 'appnet_settings_post');
+       register_hook('prepare_body',           'addon/appnet/appnet.php', 'appnet_prepare_body');
+       register_hook('check_item_notification','addon/appnet/appnet.php', 'appnet_check_item_notification');
 }
 
 
@@ -31,8 +38,10 @@ function appnet_uninstall() {
        unregister_hook('notifier_normal',  'addon/appnet/appnet.php', 'appnet_send');
        unregister_hook('jot_networks',     'addon/appnet/appnet.php', 'appnet_jot_nets');
        unregister_hook('cron',                 'addon/appnet/appnet.php', 'appnet_cron');
-       unregister_hook('connector_settings',      'addon/appnet/appnet.php', 'appnet_settings');
+       unregister_hook('connector_settings',   'addon/appnet/appnet.php', 'appnet_settings');
        unregister_hook('connector_settings_post', 'addon/appnet/appnet.php', 'appnet_settings_post');
+       unregister_hook('prepare_body',         'addon/appnet/appnet.php', 'appnet_prepare_body');
+       unregister_hook('check_item_notification','addon/appnet/appnet.php', 'appnet_check_item_notification');
 }
 
 function appnet_module() {}
@@ -61,6 +70,18 @@ function appnet_content(&$a) {
        return $o;
 }
 
+function appnet_check_item_notification($a, &$notification_data) {
+        $own_id = get_pconfig($notification_data["uid"], 'appnet', 'ownid');
+
+        $own_user = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
+                        intval($notification_data["uid"]),
+                        dbesc("adn::".$own_id)
+                );
+
+        if ($own_user)
+                $notification_data["profiles"][] = $own_user[0]["url"];
+}
+
 function appnet_plugin_admin(&$a, &$o){
         $t = get_markup_template( "admin.tpl", "addon/appnet/" );
 
@@ -86,7 +107,7 @@ function appnet_connect(&$a) {
        $clientId     = get_config('appnet','clientid');
        $clientSecret = get_config('appnet','clientsecret');
 
-       if (($clientId == "") OR ($clientSecret == "")) {
+       if (($clientId == "") || ($clientSecret == "")) {
                $clientId     = get_pconfig(local_user(),'appnet','clientid');
                $clientSecret = get_pconfig(local_user(),'appnet','clientsecret');
        }
@@ -133,7 +154,7 @@ function appnet_settings(&$a,&$s) {
        $app_clientId     = get_config('appnet','clientid');
        $app_clientSecret = get_config('appnet','clientsecret');
 
-       if (($app_clientId == "") OR ($app_clientSecret == "")) {
+       if (($app_clientId == "") || ($app_clientSecret == "")) {
                $app_clientId     = get_pconfig(local_user(),'appnet','clientid');
                $app_clientSecret = get_pconfig(local_user(),'appnet','clientsecret');
        }
@@ -192,7 +213,7 @@ function appnet_settings(&$a,&$s) {
                        $s .= t("<p>Error fetching user profile. Please clear the configuration and try again.</p>");
                }
 
-       } elseif (($app_clientId == '') OR ($app_clientSecret == '')) {
+       } elseif (($app_clientId == '') || ($app_clientSecret == '')) {
                $s .= t("<p>You have two ways to connect to App.net.</p>");
                $s .= "<hr />";
                $s .= t('<p>First way: Register an application at <a href="https://account.app.net/developer/apps/">https://account.app.net/developer/apps/</a> and enter Client ID and Client Secret. ');
@@ -224,7 +245,7 @@ function appnet_settings(&$a,&$s) {
                $s .= '<a href="'.$url.'">'.t("Sign in using App.net").'</a>';
        }
 
-       if (($app_clientId != '') OR ($app_clientSecret != '') OR ($token !='')) {
+       if (($app_clientId != '') || ($app_clientSecret != '') || ($token !='')) {
                $s .= '<div id="appnet-disconnect-wrapper">';
                $s .= '<label id="appnet-disconnect-label" for="appnet-disconnect">'. t('Clear OAuth configuration') .'</label>';
 
@@ -257,7 +278,7 @@ function appnet_settings_post(&$a,&$b) {
                if (isset($_POST["clientid"]))
                        set_pconfig(local_user(),'appnet','clientid', $_POST['clientid']);
 
-               if (isset($_POST["token"]) AND ($_POST["token"] != ""))
+               if (isset($_POST["token"]) && ($_POST["token"] != ""))
                        set_pconfig(local_user(),'appnet','token', $_POST['token']);
 
                set_pconfig(local_user(), 'appnet', 'post', intval($_POST['appnet']));
@@ -275,7 +296,7 @@ function appnet_post_local(&$a,&$b) {
                $appnet_enable = (($appnet_post && x($_REQUEST,'appnet_enable')) ? intval($_REQUEST['appnet_enable']) : 0);
 
                // if API is used, default to the chosen settings
-               if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'appnet','post_by_default')))
+               if($b['api_source'] && intval(get_pconfig(local_user(),'appnet','post_by_default')))
                        $appnet_enable = 1;
 
                if(! $appnet_enable)
@@ -304,12 +325,13 @@ function appnet_create_entities($a, $b, $postdata) {
        $bbcode = preg_replace("/@\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",'@$2',$bbcode);
        $bbcode = preg_replace("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism",'[url=$1]$2[/url]',$bbcode);
        $bbcode = preg_replace("/\[video\](.*?)\[\/video\]/ism",'[url=$1]$1[/url]',$bbcode);
+       $bbcode = preg_replace("/\[youtube\]https?:\/\/(.*?)\[\/youtube\]/ism",'[url=https://$1]https://$1[/url]',$bbcode);
        $bbcode = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism",
                               '[url=https://www.youtube.com/watch?v=$1]https://www.youtube.com/watch?v=$1[/url]', $bbcode);
-       $bbcode = preg_replace("/\[youtube\](.*?)\[\/youtube\]/ism",'[url=$1]$1[/url]',$bbcode);
+       $bbcode = preg_replace("/\[vimeo\]https?:\/\/(.*?)\[\/vimeo\]/ism",'[url=https://$1]https://$1[/url]',$bbcode);
        $bbcode = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism",
                                '[url=https://vimeo.com/$1]https://vimeo.com/$1[/url]', $bbcode);
-       $bbcode = preg_replace("/\[vimeo\](.*?)\[\/vimeo\]/ism",'[url=$1]$1[/url]',$bbcode);
+       //$bbcode = preg_replace("/\[vimeo\](.*?)\[\/vimeo\]/ism",'[url=$1]$1[/url]',$bbcode);
 
        $bbcode = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $bbcode);
 
@@ -342,6 +364,7 @@ function appnet_create_entities($a, $b, $postdata) {
                $mid = $url[2];
                $html = bbcode($mid, false, false, 6);
                $mid = html2plain($html, 0, true);
+
                $mid = trim(html_entity_decode($mid,ENT_QUOTES,'UTF-8'));
 
                $text = $pre.$mid.$post;
@@ -352,20 +375,28 @@ function appnet_create_entities($a, $b, $postdata) {
                $start = $pos + 1;
        }
 
-       if (isset($postdata["url"]) AND isset($postdata["title"])) {
+       if (isset($postdata["url"]) && isset($postdata["title"]) && ($postdata["type"] != "photo")) {
                $postdata["title"] = shortenmsg($postdata["title"], 90);
-               $text = shortenmsg($text, 256 - strlen($postdata["title"]));
+               $max = 256 - strlen($postdata["title"]);
+               $text = shortenmsg($text, $max);
                $text .= "\n[".$postdata["title"]."](".$postdata["url"].")";
-       } elseif (isset($postdata["url"])) {
+       } elseif (isset($postdata["url"]) && ($postdata["type"] != "photo")) {
                $postdata["url"] = short_link($postdata["url"]);
-               $text = shortenmsg($text, 240);
+               $max = 240;
+               $text = shortenmsg($text, $max);
                $text .= " [".$postdata["url"]."](".$postdata["url"].")";
-       } else
-               $text = shortenmsg($text, 256);
+       } else {
+               $max = 256;
+               $text = shortenmsg($text, $max);
+       }
+
+       if (iconv_strlen($text, "UTF-8") < $max)
+               $max = iconv_strlen($text, "UTF-8");
 
        krsort($entities);
        foreach ($entities AS $entity) {
-               if (iconv_strlen($text, "UTF-8") >= $entity["pos"] + $entity["len"]) {
+               //if (iconv_strlen($text, "UTF-8") >= $entity["pos"] + $entity["len"]) {
+               if (($entity["pos"] + $entity["len"]) <= $max) {
                        $pre = iconv_substr($text, 0, $entity["pos"], "UTF-8");
                        $post = iconv_substr($text, $entity["pos"] + $entity["len"], 1000000, "UTF-8");
 
@@ -373,6 +404,7 @@ function appnet_create_entities($a, $b, $postdata) {
                }
        }
 
+
        return($text);
 }
 
@@ -389,7 +421,7 @@ function appnet_send(&$a,&$b) {
                logger("appnet_send: parameter ".print_r($b, true), LOGGER_DATA);
 
                // Looking if its a reply to an app.net post
-               if ((substr($b["parent-uri"], 0, 5) != "adn::") AND (substr($b["extid"], 0, 5) != "adn::") AND (substr($b["thr-parent"], 0, 5) != "adn::")) {
+               if ((substr($b["parent-uri"], 0, 5) != "adn::") && (substr($b["extid"], 0, 5) != "adn::") && (substr($b["thr-parent"], 0, 5) != "adn::")) {
                        logger("appnet_send: no app.net post ".$b["parent"]);
                        return;
                }
@@ -411,18 +443,18 @@ function appnet_send(&$a,&$b) {
                $nicknameplain = "@".$nicknameplain;
 
                logger("appnet_send: 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) && (strpos($b["body"], $nicknameplain) === false))
                        $b["body"] = $nickname." ".$b["body"];
 
                logger("appnet_send: parent found ".print_r($orig_post, true), LOGGER_DATA);
        } else {
                $iscomment = false;
 
-               if($b['private'] OR !strstr($b['postopts'],'appnet'))
+               if($b['private'] || !strstr($b['postopts'],'appnet'))
                        return;
        }
 
-       if (($b['verb'] == ACTIVITY_POST) AND $b['deleted'])
+       if (($b['verb'] == ACTIVITY_POST) && $b['deleted'])
                appnet_action($a, $b["uid"], substr($orig_post["uri"], 5), "delete");
 
        if($b['verb'] == ACTIVITY_LIKE) {
@@ -465,7 +497,7 @@ function appnet_send(&$a,&$b) {
 
                if (isset($post["image"])) {
                        $img_str = fetch_url($post['image'],true, $redirects, 10);
-                       $tempfile = tempnam(get_config("system","temppath"), "cache");
+                       $tempfile = tempnam(get_temppath(), "cache");
                        file_put_contents($tempfile, $img_str);
 
                        try {
@@ -482,7 +514,7 @@ function appnet_send(&$a,&$b) {
                                                                );
                        }
                        catch (AppDotNetException $e) {
-                               logger("appnet_send: Error creating file ".$e->getMessage());
+                               logger("appnet_send: Error creating file ".appnet_error($e->getMessage()));
                        }
 
                        unlink($tempfile);
@@ -510,7 +542,7 @@ function appnet_send(&$a,&$b) {
                                                "value" => $attached_data
                                                );
 
-               if (isset($post["url"]) AND !isset($post["title"])) {
+               if (isset($post["url"]) && !isset($post["title"]) && ($post["type"] != "photo")) {
                        $display_url = str_replace(array("http://www.", "https://www."), array("", ""), $post["url"]);
                        $display_url = str_replace(array("http://", "https://"), array("", ""), $display_url);
 
@@ -540,7 +572,7 @@ function appnet_send(&$a,&$b) {
                        }
                }
                catch (AppDotNetException $e) {
-                       logger("appnet_send: Error sending message ".$b["id"]." ".$e->getMessage());
+                       logger("appnet_send: Error sending message ".$b["id"]." ".appnet_error($e->getMessage()));
                }
        }
 }
@@ -572,7 +604,7 @@ function appnet_action($a, $uid, $pid, $action) {
                logger("appnet_action '".$action."' send, result: " . print_r($result, true), LOGGER_DEBUG);
        }
        catch (AppDotNetException $e) {
-               logger("appnet_action: Error sending action ".$action." pid ".$pid." ".$e->getMessage(), LOGGER_DEBUG);
+               logger("appnet_action: Error sending action ".$action." pid ".$pid." ".appnet_error($e->getMessage()), LOGGER_DEBUG);
        }
 }
 
@@ -623,7 +655,7 @@ function appnet_is_repost($a, $uid, $body) {
                return true;
        }
        catch (AppDotNetException $e) {
-               logger('appnet_is_repost: error doing repost '.$e->getMessage(), LOGGER_DEBUG);
+               logger('appnet_is_repost: error doing repost '.appnet_error($e->getMessage()), LOGGER_DEBUG);
                return false;
        }
 }
@@ -675,19 +707,25 @@ function appnet_fetchstream($a, $uid) {
                $stream = $app->getUserStream($param);
        }
        catch (AppDotNetException $e) {
-               logger("appnet_fetchstream: Error fetching stream for user ".$uid." ".$e->getMessage());
+               logger("appnet_fetchstream: Error fetching stream for user ".$uid." ".appnet_error($e->getMessage()));
+               return;
        }
 
+       if (!is_array($stream))
+               $stream = array();
+
        $stream = array_reverse($stream);
        foreach ($stream AS $post) {
                $postarray = appnet_createpost($a, $uid, $post, $me, $user, $ownid, true);
 
                $item = item_store($postarray);
+               $postarray["id"] = $item;
+
                logger('appnet_fetchstream: User '.$uid.' posted stream item '.$item);
 
                $lastid = $post["id"];
 
-               if (($item != 0) AND ($postarray['contact-id'] != $me["id"])) {
+               if (($item != 0) && ($postarray['contact-id'] != $me["id"]) && !function_exists("check_item_notification")) {
                        $r = q("SELECT `thread`.`iid` AS `parent` FROM `thread`
                                INNER JOIN `item` ON `thread`.`iid` = `item`.`parent` AND `thread`.`uid` = `item`.`uid`
                                WHERE `item`.`id` = %d AND `thread`.`mention` LIMIT 1", dbesc($item));
@@ -702,7 +740,7 @@ function appnet_fetchstream($a, $uid) {
                                        'to_email'     => $user['email'],
                                        'uid'          => $user['uid'],
                                        'item'         => $postarray,
-                                       'link'         => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $item,
+                                       'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)),
                                        'source_name'  => $postarray['author-name'],
                                        'source_link'  => $postarray['author-link'],
                                        'source_photo' => $postarray['author-avatar'],
@@ -729,24 +767,52 @@ function appnet_fetchstream($a, $uid) {
                $mentions = $app->getUserMentions("me", $param);
        }
        catch (AppDotNetException $e) {
-               logger("appnet_fetchstream: Error fetching mentions for user ".$uid." ".$e->getMessage());
+               logger("appnet_fetchstream: Error fetching mentions for user ".$uid." ".appnet_error($e->getMessage()));
+               return;
        }
 
+       if (!is_array($mentions))
+               $mentions = array();
+
        $mentions = array_reverse($mentions);
        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);
+                       $postarray["id"] = $item;
+
+                       $parent_id = 0;
                        logger('appnet_fetchstream: User '.$uid.' posted mention item '.$item);
-               } else
+
+                       if ($item && function_exists("check_item_notification"))
+                               check_item_notification($item, $uid, NOTIFY_TAGSELF);
+
+               } else {
                        $item = 0;
+                       $parent_id = 0;
+               }
+
+               // Fetch the parent and id
+               if (($parent_id == 0) && ($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"];
 
-               if (($item != 0) AND ($postarray['contact-id'] != $me["id"])) {
+               //if (($item != 0) && ($postarray['contact-id'] != $me["id"])) {
+               if (($item != 0) && !function_exists("check_item_notification")) {
                        require_once('include/enotify.php');
                        notification(array(
                                'type'         => NOTIFY_TAGSELF,
@@ -756,12 +822,13 @@ function appnet_fetchstream($a, $uid) {
                                'to_email'     => $user['email'],
                                'uid'          => $user['uid'],
                                'item'         => $postarray,
-                               'link'         => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $item,
+                               'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)),
                                'source_name'  => $postarray['author-name'],
                                'source_link'  => $postarray['author-link'],
                                'source_photo' => $postarray['author-avatar'],
                                'verb'         => ACTIVITY_TAG,
-                               'otype'        => 'item'
+                               'otype'        => 'item',
+                               'parent'       => $parent_id,
                        ));
                }
        }
@@ -777,7 +844,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"])
@@ -792,35 +859,45 @@ 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"] != "")) {
+       if (isset($post["reply_to"]) && ($post["reply_to"] != "")) {
                $postarray['thr-parent'] = "adn::".$post["reply_to"];
 
-               // Complete the thread if the parent doesn't exists
+               // Complete the thread (if the parent doesn't exists)
                if ($threadcompletion) {
-                       $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-                               dbesc($postarray['thr-parent']),
-                               intval($uid)
-                               );
-                       if (!count($r)) {
+                       //$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                       //      dbesc($postarray['thr-parent']),
+                       //      intval($uid)
+                       //      );
+                       //if (!count($r)) {
+                               logger("appnet_createpost: completing thread ".$post["thread_id"]." for user ".$uid, LOGGER_DEBUG);
+
                                require_once("addon/appnet/AppDotNet.php");
 
                                $token = get_pconfig($uid,'appnet','token');
@@ -836,21 +913,31 @@ function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $th
                                        $thread = $app->getPostReplies($post["thread_id"], $param);
                                }
                                catch (AppDotNetException $e) {
-                                       logger("appnet_createpost: Error fetching thread for user ".$uid." ".$e->getMessage());
+                                       logger("appnet_createpost: Error fetching thread for user ".$uid." ".appnet_error($e->getMessage()));
                                }
                                $thread = array_reverse($thread);
+
+                               logger("appnet_createpost: fetched ".count($thread)." items for thread ".$post["thread_id"]." for user ".$uid, LOGGER_DEBUG);
+
                                foreach ($thread AS $tpost) {
-                                       $threadpost = appnet_createpost($a, $uid, $tpost, $me, $user, $ownid, $createuser, false);
+                                       $threadpost = appnet_createpost($a, $uid, $tpost, $me, $user, $ownid, false, false);
                                        $item = item_store($threadpost);
+                                       $threadpost["id"] = $item;
+
+                                       logger("appnet_createpost: stored post ".$post["id"]." thread ".$post["thread_id"]." in item ".$item, LOGGER_DEBUG);
                                }
-                       }
+                       //}
                }
-       } else
-               $postarray['thr-parent'] = $postarray['uri'];
+               // Don't create accounts of people who just comment something
+               $createuser = false;
 
-       $postarray['plink'] = $post["canonical_url"];
+               $postarray['object-type'] = ACTIVITY_OBJ_COMMENT;
+       } else {
+               $postarray['thr-parent'] = $postarray['uri'];
+               $postarray['object-type'] = ACTIVITY_OBJ_NOTE;
+       }
 
-       if (($post["user"]["id"] != $ownid) OR ($postarray['thr-parent'] == $postarray['uri'])) {
+       if (($post["user"]["id"] != $ownid) || ($postarray['thr-parent'] == $postarray['uri'])) {
                $postarray['owner-name'] = $post["user"]["name"];
                $postarray['owner-link'] = $post["user"]["canonical_url"];
                $postarray['owner-avatar'] = $post["user"]["avatar_image"]["url"];
@@ -878,6 +965,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"];
@@ -891,7 +980,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"])) {
@@ -900,7 +989,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"];
@@ -921,29 +1009,34 @@ function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $th
                                        $postarray['author-avatar'] = $annotation["value"]["author-avatar"];
                        }
 
-               }
+               } */
 
        $page_info = "";
 
        if (is_array($content["annotations"])) {
                $photo = appnet_expand_annotations($a, $content["annotations"]);
-               if (($photo["large"] != "") AND ($photo["url"] != ""))
+               if (($photo["large"] != "") && ($photo["url"] != ""))
                        $page_info = "\n[url=".$photo["url"]."][img]".$photo["large"]."[/img][/url]";
                elseif ($photo["url"] != "")
                        $page_info = "\n[img]".$photo["url"]."[/img]";
+
+               if ($photo["url"] != "")
+                       $postarray['object-type'] = ACTIVITY_OBJ_IMAGE;
+
        } else
                $photo = array("url" => "", "large" => "");
 
        if (sizeof($links)) {
                $link = array_pop($links);
-               $url = "[url=".$link."]".$link."[/url]";
-
-               $removedlink = trim(str_replace($url, "", $postarray['body']));
-
-               if (($removedlink == "") OR strstr($postarray['body'], $removedlink))
-                       $postarray['body'] = $removedlink;
+               $url = str_replace(array('/', '.'), array('\/', '\.'), $link);
 
                $page_info = add_page_info($link, false, $photo["url"]);
+
+               if (trim($page_info) != "") {
+                       $removedlink = preg_replace("/\[url\=".$url."\](.*?)\[\/url\]/ism", '', $postarray['body']);
+                       if (($removedlink == "") || strstr($postarray['body'], $removedlink))
+                               $postarray['body'] = $removedlink;
+               }
        }
 
        $postarray['body'] .= $page_info;
@@ -982,7 +1075,7 @@ function appnet_expand_entities($a, $body, $entities) {
 
        foreach ($entities["links"] AS $links) {
                $url = "[url=".$links["url"]."]".$links["text"]."[/url]";
-               if (isset($links["amended_len"]) AND ($links["amended_len"] > $links["len"]))
+               if (isset($links["amended_len"]) && ($links["amended_len"] > $links["len"]))
                        $replace[$links["pos"]] = array("pos"=> $links["pos"], "len"=> $links["amended_len"], "replace"=> $url);
                else
                        $replace[$links["pos"]] = array("pos"=> $links["pos"], "len"=> $links["len"], "replace"=> $url);
@@ -1007,7 +1100,7 @@ function appnet_expand_entities($a, $body, $entities) {
 function appnet_expand_annotations($a, $annotations) {
        $photo = array("url" => "", "large" => "");
        foreach ($annotations AS $annotation) {
-               if (($annotation[type] == "net.app.core.oembed") AND
+               if (($annotation[type] == "net.app.core.oembed") &&
                        ($annotation["value"]["type"] == "photo")) {
                        if ($annotation["value"]["url"] != "")
                                $photo["url"] = $annotation["value"]["url"];
@@ -1015,7 +1108,7 @@ function appnet_expand_annotations($a, $annotations) {
                        if ($annotation["value"]["thumbnail_large_url"] != "")
                                $photo["large"] = $annotation["value"]["thumbnail_large_url"];
 
-                       //if (($annotation["value"]["thumbnail_large_url"] != "") AND ($annotation["value"]["url"] != ""))
+                       //if (($annotation["value"]["thumbnail_large_url"] != "") && ($annotation["value"]["url"] != ""))
                        //      $embedded = "\n[url=".$annotation["value"]["url"]."][img]".$annotation["value"]["thumbnail_large_url"]."[/img][/url]";
                        //elseif ($annotation["value"]["url"] != "")
                        //      $embedded = "\n[img]".$annotation["value"]["url"]."[/img]";
@@ -1025,24 +1118,40 @@ function appnet_expand_annotations($a, $annotations) {
 }
 
 function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) {
+
+       update_gcontact(array("url" => $contact["canonical_url"], "generation" => 2,
+                       "network" => NETWORK_APPNET, "photo" => $contact["avatar_image"]["url"],
+                       "name" => $contact["name"], "nick" => $contact["username"],
+                       "about" => $contact["description"]["text"], "hide" => true,
+                       "addr" => $contact["username"]."@app.net"));
+
        $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
                intval($uid), dbesc("adn::".$contact["id"]));
 
-       if(!count($r) AND !$create_user)
-               return($me);
+       if(!count($r) && !$create_user)
+               return($me["id"]);
 
+       if ($contact["canonical_url"] == "")
+               return($me["id"]);
 
-       if (count($r) AND ($r[0]["readonly"] OR $r[0]["blocked"])) {
+       if (count($r) && ($r[0]["readonly"] || $r[0]["blocked"])) {
                logger("appnet_fetchcontact: Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG);
                return(-1);
        }
 
        if(!count($r)) {
+
+               if ($contact["name"] == "")
+                       $contact["name"] = $contact["username"];
+
+               if ($contact["username"] == "")
+                       $contact["username"] = $contact["name"];
+
                // create contact record
                q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
                                        `name`, `nick`, `photo`, `network`, `rel`, `priority`,
-                                       `writable`, `blocked`, `readonly`, `pending` )
-                                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
+                                       `about`, `writable`, `blocked`, `readonly`, `pending` )
+                                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, 0, 0, 0 ) ",
                        intval($uid),
                        dbesc(datetime_convert()),
                        dbesc($contact["canonical_url"]),
@@ -1057,6 +1166,7 @@ function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) {
                        dbesc(NETWORK_APPNET),
                        intval(CONTACT_IS_FRIEND),
                        intval(1),
+                       dbesc($contact["description"]["text"]),
                        intval(1)
                );
 
@@ -1098,7 +1208,6 @@ function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) {
                        dbesc(datetime_convert()),
                        intval($contact_id)
                );
-
        } else {
                // update profile photos once every two weeks as we have no notification of when they change.
 
@@ -1125,7 +1234,8 @@ function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) {
                                                `nurl` = '%s',
                                                `addr` = '%s',
                                                `name` = '%s',
-                                               `nick` = '%s'
+                                               `nick` = '%s',
+                                               `about` = '%s'
                                        WHERE `id` = %d",
                                dbesc($photos[0]),
                                dbesc($photos[1]),
@@ -1138,6 +1248,7 @@ function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) {
                                dbesc($contact["username"]."@app.net"),
                                dbesc($contact["name"]),
                                dbesc($contact["username"]),
+                               dbesc($contact["description"]["text"]),
                                intval($r[0]['id'])
                        );
                }
@@ -1146,6 +1257,43 @@ function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) {
        return($r[0]["id"]);
 }
 
+function appnet_prepare_body(&$a,&$b) {
+        if ($b["item"]["network"] != NETWORK_APPNET)
+                return;
+
+        if ($b["preview"]) {
+                $max_char = 256;
+                require_once("include/plaintext.php");
+                $item = $b["item"];
+                $item["plink"] = $a->get_baseurl()."/display/".$a->user["nickname"]."/".$item["parent"];
+
+                $r = q("SELECT `author-link` FROM item WHERE item.uri = '%s' AND item.uid = %d LIMIT 1",
+                        dbesc($item["thr-parent"]),
+                        intval(local_user()));
+
+                if(count($r)) {
+                        $orig_post = $r[0];
+
+                       $nicknameplain = preg_replace("=https?://alpha.app.net/(.*)=ism", "$1", $orig_post["author-link"]);
+                       $nickname = "@[url=".$orig_post["author-link"]."]".$nicknameplain."[/url]";
+                       $nicknameplain = "@".$nicknameplain;
+
+                       if ((strpos($item["body"], $nickname) === false) && (strpos($item["body"], $nicknameplain) === false))
+                               $item["body"] = $nickname." ".$item["body"];
+                }
+
+
+
+                $msgarr = plaintext($a, $item, $max_char, true);
+               $msg = appnet_create_entities($a, $item, $msgarr);
+
+               require_once("library/markdown.php");
+               $msg = Markdown($msg);
+
+                $b['html'] = $msg;
+        }
+}
+
 function appnet_cron($a,$b) {
        $last = get_config('appnet','last_poll');
 
@@ -1162,9 +1310,23 @@ function appnet_cron($a,$b) {
        }
        logger('appnet_cron: cron_start');
 
+       $abandon_days = intval(get_config('system','account_abandon_days'));
+       if ($abandon_days < 1)
+               $abandon_days = 0;
+
+       $abandon_limit = date("Y-m-d H:i:s", time() - $abandon_days * 86400);
+
        $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'appnet' AND `k` = 'import' AND `v` = '1' ORDER BY RAND()");
        if(count($r)) {
                foreach($r as $rr) {
+                       if ($abandon_days != 0) {
+                               $user = q("SELECT `login_date` FROM `user` WHERE uid=%d AND `login_date` >= '%s'", $rr['uid'], $abandon_limit);
+                               if (!count($user)) {
+                                       logger('abandoned account: timeline from user '.$rr['uid'].' will not be imported');
+                                       continue;
+                               }
+                       }
+
                        logger('appnet_cron: importing timeline from user '.$rr['uid']);
                        appnet_fetchstream($a, $rr["uid"]);
                }
@@ -1174,3 +1336,23 @@ function appnet_cron($a,$b) {
 
        set_config('appnet','last_poll', time());
 }
+
+function appnet_error($msg) {
+        $msg = trim($msg);
+        $pos = strrpos($msg, "\r\n\r\n");
+
+        if (!$pos)
+                return($msg);
+
+        $msg = substr($msg, $pos + 4);
+
+        $error = json_decode($msg);
+
+        if ($error == NULL)
+                return($msg);
+
+       if (isset($error->meta->error_message))
+               return($error->meta->error_message);
+        else
+                return(print_r($error));
+}