[diaspora|libertree] Move bb2diaspora to BBCode::toMarkdown

diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index 49a9cfc471bca2e57bbd5e9366958fd1b855f8ab..04d3c7eca88d32efd30e5f743987a2402d12ce69 100644 (file)
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -9,6 +9,7 @@
 
 require_once 'addon/diaspora/Diaspora_Connection.php';
 
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -303,10 +304,8 @@ function diaspora_send(&$a,&$b) {
        $aspect = PConfig::get($b['uid'],'diaspora','aspect');
 
        if ($handle && $password) {
-
                logger('diaspora_send: all values seem to be okay', LOGGER_DEBUG);
 
-               require_once('include/bb2diaspora.php');
                $tag_arr = [];
                $tags = '';
                $x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);
@@ -338,7 +337,7 @@ function diaspora_send(&$a,&$b) {
                 } while ($oldbody != $body);
 
                // convert to markdown
-               $body = bb2diaspora($body);
+               $body = BBCode::toMarkdown($body);
 
                // Adding the title
                if(strlen($title))

diff --git a/libertree/libertree.php b/libertree/libertree.php
index 0685123842d189fb43cc336e04dee181cfdfc0cd..4d159bf08a68cec93fa78b57d171fd70e6e37438 100644 (file)
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -5,6 +5,8 @@
  * Version: 1.0
  * Author: Tony Baldwin <https://free-haven.org/u/tony>
  */
+
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -184,8 +186,6 @@ function libertree_send(&$a,&$b) {
                $ltree_source .= " (".$b['app'].")";
 
        if($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) {
-
-               require_once('include/bb2diaspora.php');
                $tag_arr = [];
                $tags = '';
                $x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);
@@ -217,7 +217,7 @@ function libertree_send(&$a,&$b) {
                 } while ($oldbody != $body);
 
                // convert to markdown
-               $body = bb2diaspora($body, false);
+               $body = BBCode::toMarkdown($body, false);
 
                // Adding the title
                if(strlen($title))