Libertree: The source is set to the site name

[friendica-addons.git] / libertree / libertree.php

diff --git a/libertree/libertree.php b/libertree/libertree.php
index fc9dcc44d0b6af0823b505a1647bc6b28af5735e..2809adee3702856ba7aa11b410ba5e6d6022cf49 100755 (executable)
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -118,7 +118,7 @@ function libertree_post_local(&$a,&$b) {
        if($b['private'] || $b['parent'])
                return;
 
-    $ltree_post   = intval(get_pconfig(local_user(),'libertree','post'));
+       $ltree_post   = intval(get_pconfig(local_user(),'libertree','post'));
 
        $ltree_enable = (($ltree_post && x($_REQUEST,'libertree_enable')) ? intval($_REQUEST['libertree_enable']) : 0);
 
@@ -153,8 +153,9 @@ function libertree_send(&$a,&$b) {
        $ltree_api_token = get_pconfig($b['uid'],'libertree','libertree_api_token');
        $ltree_url = get_pconfig($b['uid'],'libertree','libertree_url');
        $ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token";
-
-       if($ltree_url && $ltree_api_token && $ltree_blog) {
+       //$ltree_source = "Friendica";
+       $ltree_source = "[".$a->config['sitename']."](".$a->get_baseurl().")";
+       if($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) {
 
                require_once('include/bb2diaspora.php');
                $tag_arr = array();
@@ -171,11 +172,16 @@ function libertree_send(&$a,&$b) {
 
                $title = $b['title'];
                $body = $b['body'];
-
                // Insert a newline before and after a quote
                $body = str_ireplace("[quote", "\n\n[quote", $body);
                $body = str_ireplace("[/quote]", "[/quote]\n\n", $body);
 
+               // Removal of tags and mentions
+               // #-tags
+               $body = preg_replace('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $body);
+               // @-mentions
+               $body = preg_replace('/@\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '@$2', $body);
+
                // remove multiple newlines
                do {
                        $oldbody = $body;
@@ -183,14 +189,16 @@ function libertree_send(&$a,&$b) {
                 } while ($oldbody != $body);
 
                // convert to markdown
-               $body = bb2diaspora($body);
+               $body = bb2diaspora($body, false, false);
 
                // Adding the title
                if(strlen($title))
                        $body = "## ".html_entity_decode($title)."\n\n".$body;
 
+
                $params = array(
-                       'text' => $body
+                       'text' => $body,
+                       'source' => $ltree_source
                //      'token' => $ltree_api_token
                );