Merge pull request #539 from MrPetovan/bug/4555-remove-active-users-feature

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

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 4e518e4311ac61445eadd8461d4ba07d6a2879fc..b2dec5b544a3735c35fc74fc785f011b66abb372 100644 (file)
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -7,10 +7,9 @@
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
 
-require_once 'library/OAuth1.php';
-require_once 'addon/tumblr/tumblroauth/tumblroauth.php';
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'tumblroauth.php';
 
-use Friendica\Content\Text\Plaintext;
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -343,9 +342,6 @@ function tumblr_send(&$a,&$b) {
        $tmbl_blog = 'blog/'.$page.'/post';
 
        if($oauth_token && $oauth_token_secret && $tmbl_blog) {
-
-               require_once('include/bbcode.php');
-
                $tag_arr = [];
                $tags = '';
                $x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);
@@ -360,7 +356,7 @@ function tumblr_send(&$a,&$b) {
 
                $title = trim($b['title']);
 
-               $siteinfo = Plaintext::getAttachedData($b["body"]);
+               $siteinfo = BBCode::getAttachedData($b["body"]);
 
                $params = [
                        'state' => 'published',
@@ -377,12 +373,12 @@ function tumblr_send(&$a,&$b) {
                if (isset($siteinfo["text"]))
                        $body = $siteinfo["text"];
                else
-                       $body = bb_remove_share_information($b["body"]);
+                       $body = BBCode::removeShareInformation($b["body"]);
 
                switch ($siteinfo["type"]) {
                        case "photo":
                                $params['type'] = "photo";
-                               $params['caption'] = bbcode($body, false, false, 4);
+                               $params['caption'] = BBCode::convert($body, false, 4);
 
                                if (isset($siteinfo["url"]))
                                        $params['link'] = $siteinfo["url"];
@@ -393,22 +389,22 @@ function tumblr_send(&$a,&$b) {
                                $params['type'] = "link";
                                $params['title'] = $title;
                                $params['url'] = $siteinfo["url"];
-                               $params['description'] = bbcode($body, false, false, 4);
+                               $params['description'] = BBCode::convert($body, false, 4);
                                break;
                        case "audio":
                                $params['type'] = "audio";
                                $params['external_url'] = $siteinfo["url"];
-                               $params['caption'] = bbcode($body, false, false, 4);
+                               $params['caption'] = BBCode::convert($body, false, 4);
                                break;
                        case "video":
                                $params['type'] = "video";
                                $params['embed'] = $siteinfo["url"];
-                               $params['caption'] = bbcode($body, false, false, 4);
+                               $params['caption'] = BBCode::convert($body, false, 4);
                                break;
                        default:
                                $params['type'] = "text";
                                $params['title'] = $title;
-                               $params['body'] = bbcode($b['body'], false, false, 4);
+                               $params['body'] = BBCode::convert($b['body'], false, 4);
                                break;
                }
 
@@ -417,7 +413,7 @@ function tumblr_send(&$a,&$b) {
                                                "<p>".$params['caption']."</p>";
 
                if (trim($params['caption']) == "")
-                       $params['caption'] = bbcode("[quote]".$siteinfo["description"]."[/quote]", false, false, 4);
+                       $params['caption'] = BBCode::convert("[quote]" . $siteinfo["description"] . "[/quote]", false, 4);
 
                $consumer_key = Config::get('tumblr','consumer_key');
                $consumer_secret = Config::get('tumblr','consumer_secret');