Browse Source

Merge pull request #502 from zeroadam/feature/Plaintext

Plaintext moved to src
pull/503/head
Hypolite Petovan 4 years ago committed by GitHub
parent
commit
e0197e0e6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      buffer/buffer.php
  2. 9
      statusnet/statusnet.php
  3. 4
      tumblr/tumblr.php
  4. 14
      twitter/twitter.php
  5. 15
      wppost/wppost.php

10
buffer/buffer.php

@ -8,6 +8,7 @@
require 'addon/buffer/bufferapp.php';
use Friendica\App;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
@ -273,8 +274,7 @@ function buffer_send(App $a, &$b)
if($access_token) {
$buffer = new BufferApp($client_id, $client_secret, $callback_url, $access_token);
require_once("include/plaintext.php");
require_once("include/network.php");
require_once 'include/network.php';
$profiles = $buffer->go('/profiles');
if (is_array($profiles)) {
@ -339,7 +339,7 @@ function buffer_send(App $a, &$b)
$item["body"] = preg_replace("(\[s\](.*?)\[\/s\])ism",'-$1-',$item["body"]);
}
$post = plaintext($item, $limit, $includedlinks, $htmlmode);
$post = BBCode::toPlaintext($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
@ -365,8 +365,8 @@ function buffer_send(App $a, &$b)
if (($profile->service == "twitter") && isset($post["url"]) && ($post["type"] != "photo"))
$post["text"] .= " ".$post["url"];
elseif (($profile->service == "appdotnet") && isset($post["url"]) && isset($post["title"]) && ($post["type"] != "photo")) {
$post["title"] = shortenmsg($post["title"], 90);
$post["text"] = shortenmsg($post["text"], $limit - (24 + strlen($post["title"])));
$post["title"] = BBCode::shortenMsg($post["title"], 90);
$post["text"] = BBCode::shortenMsg($post["text"], $limit - (24 + strlen($post["title"])));
$post["text"] .= "\n[".$post["title"]."](".$post["url"].")";
} elseif (($profile->service == "appdotnet") && isset($post["url"]) && ($post["type"] != "photo"))
$post["text"] .= " ".$post["url"];

9
statusnet/statusnet.php

@ -47,6 +47,7 @@ require_once 'include/enotify.php';
use Friendica\App;
use Friendica\Content\OEmbed;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
@ -639,13 +640,12 @@ function statusnet_post_hook(App $a, &$b)
PConfig::set($b['uid'], 'statusnet', 'max_char', $max_char);
$tempfile = "";
require_once "include/plaintext.php";
require_once "include/network.php";
$msgarr = plaintext($b, $max_char, true, 7);
$msgarr = BBCode::toPlaintext($b, $max_char, true, 7);
$msg = $msgarr["text"];
if (($msg == "") && isset($msgarr["title"]))
$msg = shortenmsg($msgarr["title"], $max_char - 50);
$msg = BBCode::shortenMsg($msgarr["title"], $max_char - 50);
$image = "";
@ -785,7 +785,6 @@ function statusnet_prepare_body(App $a, &$b)
$max_char = 140;
}
require_once "include/plaintext.php";
$item = $b["item"];
$item["plink"] = $a->get_baseurl() . "/display/" . $a->user["nickname"] . "/" . $item["parent"];
@ -810,7 +809,7 @@ function statusnet_prepare_body(App $a, &$b)
}
}
$msgarr = plaintext($item, $max_char, true, 7);
$msgarr = BBCode::toPlaintext($item, $max_char, true, 7);
$msg = $msgarr["text"];
if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {

4
tumblr/tumblr.php

@ -10,6 +10,7 @@
require_once 'library/OAuth1.php';
require_once 'addon/tumblr/tumblroauth/tumblroauth.php';
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
@ -358,9 +359,8 @@ function tumblr_send(&$a,&$b) {
$tags = implode(',',$tag_arr);
$title = trim($b['title']);
require_once('include/plaintext.php');
$siteinfo = get_attached_data($b["body"]);
$siteinfo = BBCode::getAttachedData($b["body"]);
$params = [
'state' => 'published',

14
twitter/twitter.php

@ -61,6 +61,7 @@
use Friendica\App;
use Friendica\Content\OEmbed;
use Friendica\Content\Text\BBCode;
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 = BBCode::toPlaintext($b, $max_char, true, 8);
$msg = $msgarr["text"];
if (($msg == "") && isset($msgarr["title"])) {
$msg = shortenmsg($msgarr["title"], $max_char - 50);
$msg = BBCode::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 = BBCode::toPlaintext($b, $max_char, true, 8);
$msg = $msgarr["text"];
if (($msg == "") && isset($msgarr["title"])) {
$msg = shortenmsg($msgarr["title"], $max_char - 50);
$msg = BBCode::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 = BBCode::toPlaintext($item, $max_char, true, 8);
$msg = $msgarr["text"];
if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {

15
wppost/wppost.php

@ -5,6 +5,7 @@
* Version: 1.1
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
*/
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
@ -218,18 +219,16 @@ function wppost_send(&$a,&$b) {
$wp_backlink_text = L10n::t('Read the orig­i­nal post and com­ment stream on Friendica');
}
if($wp_username && $wp_password && $wp_blog) {
require_once('include/bbcode.php');
require_once('include/html2plain.php');
require_once('include/plaintext.php');
if ($wp_username && $wp_password && $wp_blog) {
require_once 'include/bbcode.php';
require_once 'include/html2plain.php';
$wptitle = trim($b['title']);
if (intval(PConfig::get($b['uid'],'wppost','shortcheck'))) {
if (intval(PConfig::get($b['uid'], 'wppost', 'shortcheck'))) {
// Checking, if its a post that is worth a blog post
$postentry = false;
$siteinfo = get_attached_data($b["body"]);
$siteinfo = BBCode::getAttachedData($b["body"]);
// Is it a link to an aricle, a video or a photo?
if (isset($siteinfo["type"])) {
@ -256,7 +255,7 @@ function wppost_send(&$a,&$b) {
// If the title is empty then try to guess
if ($wptitle == '') {
// Fetch information about the post
$siteinfo = get_attached_data($b["body"]);
$siteinfo = BBCode::getAttachedData($b["body"]);
if (isset($siteinfo["title"])) {
$wptitle = $siteinfo["title"];
}

Loading…
Cancel
Save