Update function calls

update function calls and remove require_once
This commit is contained in:
Adam Magness 2018-01-26 19:26:37 -05:00
parent 7ab2479166
commit 7b95efedd1
5 changed files with 24 additions and 28 deletions

View file

@ -61,6 +61,7 @@
use Friendica\App;
use Friendica\Content\OEmbed;
use Friendica\Content\Text\Plaintext;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
@ -524,12 +525,11 @@ function twitter_post_hook(App $a, &$b)
$tweet = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
$max_char = 280;
require_once "include/plaintext.php";
$msgarr = plaintext($b, $max_char, true, 8);
$msgarr = Plaintext::toPlaintext($b, $max_char, true, 8);
$msg = $msgarr["text"];
if (($msg == "") && isset($msgarr["title"])) {
$msg = shortenmsg($msgarr["title"], $max_char - 50);
$msg = Plaintext::shortenMsg($msgarr["title"], $max_char - 50);
}
$image = "";
@ -593,12 +593,11 @@ function twitter_post_hook(App $a, &$b)
if (strlen($msg) && ($image == "")) {
// -----------------
$max_char = 280;
require_once "include/plaintext.php";
$msgarr = plaintext($b, $max_char, true, 8);
$msgarr = Plaintext::toPlaintext($b, $max_char, true, 8);
$msg = $msgarr["text"];
if (($msg == "") && isset($msgarr["title"])) {
$msg = shortenmsg($msgarr["title"], $max_char - 50);
$msg = Plaintext::shortenMsg($msgarr["title"], $max_char - 50);
}
if (isset($msgarr["url"])) {
@ -771,7 +770,6 @@ function twitter_prepare_body(App $a, &$b)
if ($b["preview"]) {
$max_char = 280;
require_once "include/plaintext.php";
$item = $b["item"];
$item["plink"] = $a->get_baseurl() . "/display/" . $a->user["nickname"] . "/" . $item["parent"];
@ -791,7 +789,7 @@ function twitter_prepare_body(App $a, &$b)
}
}
$msgarr = plaintext($item, $max_char, true, 8);
$msgarr = Plaintext::toPlaintext($item, $max_char, true, 8);
$msg = $msgarr["text"];
if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {