friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Move BBCode::toPlaintext to Item::getPlaintextPost

pull/591/head
Hypolite Petovan 2018-04-21 04:12:50 -04:00
parent cf5ec0df96
commit 776aae9147
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buffer/buffer.php
View File

@ -8,12 +8,12 @@
require 'addon/buffer/bufferapp.php'; require 'addon/buffer/bufferapp.php';
use Friendica\App; use Friendica\App;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\Plaintext; use Friendica\Content\Text\Plaintext;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Model\Item;
function buffer_install() { function buffer_install() {
Addon::registerHook('post_local', 'addon/buffer/buffer.php', 'buffer_post_local'); Addon::registerHook('post_local', 'addon/buffer/buffer.php', 'buffer_post_local');
@ -338,7 +338,7 @@ function buffer_send(App $a, &$b)
$item["body"] = preg_replace("(\[s\](.*?)\[\/s\])ism",'-$1-',$item["body"]); $item["body"] = preg_replace("(\[s\](.*?)\[\/s\])ism",'-$1-',$item["body"]);
} }
$post = BBCode::toPlaintext($item, $limit, $includedlinks, $htmlmode); $post = Item::getPlaintextPost($item, $limit, $includedlinks, $htmlmode);
logger("buffer_send: converted message ".$b["id"]." result: ".print_r($post, true), LOGGER_DEBUG); logger("buffer_send: converted message ".$b["id"]." result: ".print_r($post, true), LOGGER_DEBUG);
// The image proxy is used as a sanitizer. Buffer seems to be really picky about pictures // The image proxy is used as a sanitizer. Buffer seems to be really picky about pictures

4
statusnet/statusnet.php
View File

@ -550,7 +550,7 @@ function statusnet_post_hook(App $a, &$b)
PConfig::set($b['uid'], 'statusnet', 'max_char', $max_char); PConfig::set($b['uid'], 'statusnet', 'max_char', $max_char);
$tempfile = ""; $tempfile = "";
$msgarr = BBCode::toPlaintext($b, $max_char, true, 7); $msgarr = Item::getPlaintextPost($b, $max_char, true, 7);
$msg = $msgarr["text"]; $msg = $msgarr["text"];
if (($msg == "") && isset($msgarr["title"])) if (($msg == "") && isset($msgarr["title"]))
@ -709,7 +709,7 @@ function statusnet_prepare_body(App $a, &$b)
} }
} }
$msgarr = BBCode::toPlaintext($item, $max_char, true, 7); $msgarr = Item::getPlaintextPost($item, $max_char, true, 7);
$msg = $msgarr["text"]; $msg = $msgarr["text"];
if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) { if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {

4
twitter/twitter.php
View File

@ -532,7 +532,7 @@ function twitter_post_hook(App $a, &$b)
$connection->setTimeouts(10, 30); $connection->setTimeouts(10, 30);
$max_char = 280; $max_char = 280;
$msgarr = BBCode::toPlaintext($b, $max_char, true, 8); $msgarr = Item::getPlaintextPost($b, $max_char, true, 8);
$msg = $msgarr["text"]; $msg = $msgarr["text"];
if (($msg == "") && isset($msgarr["title"])) { if (($msg == "") && isset($msgarr["title"])) {
@ -766,7 +766,7 @@ function twitter_prepare_body(App $a, &$b)
} }
} }
$msgarr = BBCode::toPlaintext($item, $max_char, true, 8); $msgarr = Item::getPlaintextPost($item, $max_char, true, 8);
$msg = $msgarr["text"]; $msg = $msgarr["text"];
if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) { if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {