From 776aae91478441e13159e57dd2357c6e07232d64 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 21 Apr 2018 04:12:50 -0400 Subject: [PATCH 1/4] Move BBCode::toPlaintext to Item::getPlaintextPost --- buffer/buffer.php | 4 ++-- statusnet/statusnet.php | 4 ++-- twitter/twitter.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/buffer/buffer.php b/buffer/buffer.php index bb1d8482..27e54f55 100644 --- a/buffer/buffer.php +++ b/buffer/buffer.php @@ -8,12 +8,12 @@ require 'addon/buffer/bufferapp.php'; use Friendica\App; -use Friendica\Content\Text\BBCode; use Friendica\Content\Text\Plaintext; use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\PConfig; +use Friendica\Model\Item; function buffer_install() { 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"]); } - $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); // The image proxy is used as a sanitizer. Buffer seems to be really picky about pictures diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index ad2da322..09254f7f 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -550,7 +550,7 @@ function statusnet_post_hook(App $a, &$b) PConfig::set($b['uid'], 'statusnet', 'max_char', $max_char); $tempfile = ""; - $msgarr = BBCode::toPlaintext($b, $max_char, true, 7); + $msgarr = Item::getPlaintextPost($b, $max_char, true, 7); $msg = $msgarr["text"]; 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"]; if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) { diff --git a/twitter/twitter.php b/twitter/twitter.php index 5036f515..c76ecf0c 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -532,7 +532,7 @@ function twitter_post_hook(App $a, &$b) $connection->setTimeouts(10, 30); $max_char = 280; - $msgarr = BBCode::toPlaintext($b, $max_char, true, 8); + $msgarr = Item::getPlaintextPost($b, $max_char, true, 8); $msg = $msgarr["text"]; 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"]; if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) { From eafe9d68b09b9f8fe6339f5be925f4797f18b26f Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 21 Apr 2018 04:13:53 -0400 Subject: [PATCH 2/4] [langfilter] Use new Text\BBCode::toPlaintext to calculate minimum body size --- langfilter/langfilter.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php index f6a6ce21..38b2e117 100644 --- a/langfilter/langfilter.php +++ b/langfilter/langfilter.php @@ -134,12 +134,15 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data) return; } + $naked_body = Text\BBCode::toPlaintext($hook_data['item']['body'], false); + // Don't filter if body lenght is below minimum - $minlen = PConfig::get(local_user(), 'langfilter', 'minlength'); + $minlen = PConfig::get(local_user(), 'langfilter', 'minlength', 32); if (!$minlen) { $minlen = 32; } - if (strlen($hook_data['item']['body']) < $minlen) { + + if (strlen($naked_body) < $minlen) { return; } From 8e8bb8e918b54080ad309fedc25494cd14e7fc64 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 21 Apr 2018 18:47:18 -0400 Subject: [PATCH 3/4] [langfilter] Fix namespacing to refer to Text\BBCode --- langfilter/langfilter.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php index 38b2e117..64226144 100644 --- a/langfilter/langfilter.php +++ b/langfilter/langfilter.php @@ -8,6 +8,7 @@ */ use Friendica\App; +use Friendica\Content\Text\BBCode; use Friendica\Core\Addon; use Friendica\Core\L10n; use Friendica\Core\PConfig; @@ -134,7 +135,7 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data) return; } - $naked_body = Text\BBCode::toPlaintext($hook_data['item']['body'], false); + $naked_body = BBCode::toPlaintext($hook_data['item']['body'], false); // Don't filter if body lenght is below minimum $minlen = PConfig::get(local_user(), 'langfilter', 'minlength', 32); From aaf031258fc2829b3ed63d1f2b19b0d4c1c9eec2 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 21 Apr 2018 20:50:58 -0400 Subject: [PATCH 4/4] Move Model\Item::getPlaintextPost to Model\ItemContent::getPlaintextPost --- buffer/buffer.php | 4 ++-- statusnet/statusnet.php | 6 +++--- twitter/twitter.php | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/buffer/buffer.php b/buffer/buffer.php index 27e54f55..f41ecf97 100644 --- a/buffer/buffer.php +++ b/buffer/buffer.php @@ -13,7 +13,7 @@ use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\PConfig; -use Friendica\Model\Item; +use Friendica\Model\ItemContent; function buffer_install() { 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"]); } - $post = Item::getPlaintextPost($item, $limit, $includedlinks, $htmlmode); + $post = ItemContent::getPlaintextPost($item, $limit, $includedlinks, $htmlmode); 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 diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 09254f7f..8cc5caa8 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -41,7 +41,6 @@ require_once 'include/enotify.php'; use CodebirdSN\CodebirdSN; use Friendica\App; use Friendica\Content\OEmbed; -use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; use Friendica\Content\Text\Plaintext; use Friendica\Core\Addon; @@ -51,6 +50,7 @@ use Friendica\Core\PConfig; use Friendica\Model\GContact; use Friendica\Model\Group; use Friendica\Model\Item; +use Friendica\Model\ItemContent; use Friendica\Model\Photo; use Friendica\Model\User; use Friendica\Util\DateTimeFormat; @@ -550,7 +550,7 @@ function statusnet_post_hook(App $a, &$b) PConfig::set($b['uid'], 'statusnet', 'max_char', $max_char); $tempfile = ""; - $msgarr = Item::getPlaintextPost($b, $max_char, true, 7); + $msgarr = ItemContent::getPlaintextPost($b, $max_char, true, 7); $msg = $msgarr["text"]; if (($msg == "") && isset($msgarr["title"])) @@ -709,7 +709,7 @@ function statusnet_prepare_body(App $a, &$b) } } - $msgarr = Item::getPlaintextPost($item, $max_char, true, 7); + $msgarr = ItemContent::getPlaintextPost($item, $max_char, true, 7); $msg = $msgarr["text"]; if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) { diff --git a/twitter/twitter.php b/twitter/twitter.php index c76ecf0c..5474fa5e 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -63,7 +63,6 @@ use Abraham\TwitterOAuth\TwitterOAuth; use Friendica\App; use Friendica\Content\OEmbed; -use Friendica\Content\Text\BBCode; use Friendica\Content\Text\Plaintext; use Friendica\Core\Addon; use Friendica\Core\Config; @@ -73,6 +72,7 @@ use Friendica\Core\Worker; use Friendica\Model\GContact; use Friendica\Model\Group; use Friendica\Model\Item; +use Friendica\Model\ItemContent; use Friendica\Model\Photo; use Friendica\Model\Queue; use Friendica\Model\User; @@ -532,7 +532,7 @@ function twitter_post_hook(App $a, &$b) $connection->setTimeouts(10, 30); $max_char = 280; - $msgarr = Item::getPlaintextPost($b, $max_char, true, 8); + $msgarr = ItemContent::getPlaintextPost($b, $max_char, true, 8); $msg = $msgarr["text"]; if (($msg == "") && isset($msgarr["title"])) { @@ -766,7 +766,7 @@ function twitter_prepare_body(App $a, &$b) } } - $msgarr = Item::getPlaintextPost($item, $max_char, true, 8); + $msgarr = ItemContent::getPlaintextPost($item, $max_char, true, 8); $msg = $msgarr["text"]; if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {