X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=src%2FModule%2FDebug%2FBabel.php;h=ab68f2b4038be0c1bacd31eb7d6f6256c1b8842d;hb=da5045667527a84d6a3fd6efaee2fb97b9a49778;hp=35037f45e41254cfa1cfad4c6637eb5c0fb9e4ad;hpb=13a10b8f20ac7c5927c39d9e80e1a7d515385736;p=friendica.git
diff --git a/src/Module/Debug/Babel.php b/src/Module/Debug/Babel.php
index 35037f45e4..ab68f2b403 100644
--- a/src/Module/Debug/Babel.php
+++ b/src/Module/Debug/Babel.php
@@ -22,10 +22,15 @@
namespace Friendica\Module\Debug;
use Friendica\BaseModule;
+use Friendica\Content\PageInfo;
use Friendica\Content\Text;
+use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\DI;
+use Friendica\Model\Conversation;
use Friendica\Model\Item;
+use Friendica\Protocol\Activity;
+use Friendica\Model\Tag;
use Friendica\Util\XML;
/**
@@ -37,9 +42,7 @@ class Babel extends BaseModule
{
function visible_whitespace($s)
{
- $s = str_replace(' ', ' ', $s);
-
- return str_replace(["\r\n", "\n", "\r"], '
', $s);
+ return '
' . htmlspecialchars($s) . ''; } $results = []; @@ -61,7 +64,7 @@ class Babel extends BaseModule $html = Text\BBCode::convert($bbcode); $results[] = [ 'title' => DI::l10n()->t('BBCode::convert (raw HTML)'), - 'content' => visible_whitespace(htmlspecialchars($html)) + 'content' => visible_whitespace($html) ]; $results[] = [ @@ -78,13 +81,13 @@ class Babel extends BaseModule $markdown = Text\BBCode::toMarkdown($bbcode); $results[] = [ 'title' => DI::l10n()->t('BBCode::toMarkdown'), - 'content' => visible_whitespace(htmlspecialchars($markdown)) + 'content' => visible_whitespace($markdown) ]; $html2 = Text\Markdown::convert($markdown); $results[] = [ 'title' => DI::l10n()->t('BBCode::toMarkdown => Markdown::convert (raw HTML)'), - 'content' => visible_whitespace(htmlspecialchars($html2)) + 'content' => visible_whitespace($html2) ]; $results[] = [ 'title' => DI::l10n()->t('BBCode::toMarkdown => Markdown::convert'), @@ -103,32 +106,53 @@ class Babel extends BaseModule 'content' => visible_whitespace($bbcode4) ]; - $item = [ - 'body' => $bbcode, - 'tag' => '', - ]; + $tags = Text\BBCode::getTags($bbcode); - Item::setHashtags($item); + $body = Item::setHashtags($bbcode); $results[] = [ 'title' => DI::l10n()->t('Item Body'), - 'content' => visible_whitespace($item['body']) + 'content' => visible_whitespace($body) ]; $results[] = [ 'title' => DI::l10n()->t('Item Tags'), - 'content' => $item['tag'] + 'content' => visible_whitespace(var_export($tags, true)), + ]; + + $body2 = PageInfo::appendToBody($bbcode, true); + $results[] = [ + 'title' => DI::l10n()->t('PageInfo::appendToBody'), + 'content' => visible_whitespace($body2) + ]; + $html3 = Text\BBCode::convert($body2); + $results[] = [ + 'title' => DI::l10n()->t('PageInfo::appendToBody => BBCode::convert (raw HTML)'), + 'content' => visible_whitespace($html3) + ]; + $results[] = [ + 'title' => DI::l10n()->t('PageInfo::appendToBody => BBCode::convert'), + 'content' => $html3 ]; break; - case 'markdown': - $markdown = trim($_REQUEST['text']); + case 'diaspora': + $diaspora = trim($_REQUEST['text']); $results[] = [ 'title' => DI::l10n()->t('Source input (Diaspora format)'), - 'content' => '
' . htmlspecialchars($markdown) . '' + 'content' => visible_whitespace($diaspora), + ]; + + $markdown = XML::unescape($diaspora); + case 'markdown': + $markdown = $markdown ?? trim($_REQUEST['text']); + + $results[] = [ + 'title' => DI::l10n()->t('Source input (Markdown)'), + 'content' => visible_whitespace($markdown), ]; - $html = Text\Markdown::convert(html_entity_decode($markdown,ENT_COMPAT, 'UTF-8')); + $html = Text\Markdown::convert($markdown); $results[] = [ 'title' => DI::l10n()->t('Markdown::convert (raw HTML)'), - 'content' => visible_whitespace(htmlspecialchars($html)) + 'content' => visible_whitespace($html), ]; $results[] = [ @@ -136,17 +160,17 @@ class Babel extends BaseModule 'content' => $html ]; - $bbcode = Text\Markdown::toBBCode(XML::unescape($markdown)); + $bbcode = Text\Markdown::toBBCode($markdown); $results[] = [ 'title' => DI::l10n()->t('Markdown::toBBCode'), - 'content' => '
' . $bbcode . '' + 'content' => visible_whitespace($bbcode), ]; break; case 'html' : $html = trim($_REQUEST['text']); $results[] = [ 'title' => DI::l10n()->t('Raw HTML input'), - 'content' => htmlspecialchars($html) + 'content' => visible_whitespace($html), ]; $results[] = [ @@ -174,7 +198,7 @@ class Babel extends BaseModule $bbcode2plain = Text\BBCode::toPlaintext($bbcode); $results[] = [ 'title' => DI::l10n()->t('HTML::toBBCode => BBCode::toPlaintext'), - 'content' => '
' . $bbcode2plain . '' + 'content' => visible_whitespace($bbcode2plain), ]; $markdown = Text\HTML::toMarkdown($html); @@ -186,14 +210,68 @@ class Babel extends BaseModule $text = Text\HTML::toPlaintext($html, 0); $results[] = [ 'title' => DI::l10n()->t('HTML::toPlaintext'), - 'content' => '
' . $text . '' + 'content' => visible_whitespace($text), ]; $text = Text\HTML::toPlaintext($html, 0, true); $results[] = [ 'title' => DI::l10n()->t('HTML::toPlaintext (compact)'), - 'content' => '
' . $text . '' + 'content' => visible_whitespace($text), ]; + break; + case 'twitter': + $json = trim($_REQUEST['text']); + + $status = json_decode($json); + + $results[] = [ + 'title' => DI::l10n()->t('Decoded post'), + 'content' => visible_whitespace(var_export($status, true)), + ]; + + $postarray = []; + $postarray['object-type'] = Activity\ObjectType::NOTE; + + if (!empty($status->full_text)) { + $postarray['body'] = $status->full_text; + } else { + $postarray['body'] = $status->text; + } + + // When the post contains links then use the correct object type + if (count($status->entities->urls) > 0) { + $postarray['object-type'] = Activity\ObjectType::BOOKMARK; + } + + if (file_exists('addon/twitter/twitter.php')) { + require_once 'addon/twitter/twitter.php'; + + $picture = \twitter_media_entities($status, $postarray); + + $results[] = [ + 'title' => DI::l10n()->t('Post array before expand entities'), + 'content' => visible_whitespace(var_export($postarray, true)), + ]; + + $converted = \twitter_expand_entities($postarray['body'], $status, $picture); + + $results[] = [ + 'title' => DI::l10n()->t('Post converted'), + 'content' => visible_whitespace(var_export($converted, true)), + ]; + + $results[] = [ + 'title' => DI::l10n()->t('Converted body'), + 'content' => visible_whitespace($converted['body']), + ]; + } else { + $results[] = [ + 'title' => DI::l10n()->t('Error'), + 'content' => DI::l10n()->t('Twitter addon is absent from the addon/ folder.'), + ]; + } + + break; } } @@ -201,8 +279,11 @@ class Babel extends BaseModule $o = Renderer::replaceMacros($tpl, [ '$text' => ['text', DI::l10n()->t('Source text'), $_REQUEST['text'] ?? '', ''], '$type_bbcode' => ['type', DI::l10n()->t('BBCode'), 'bbcode', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'bbcode'], + '$type_diaspora' => ['type', DI::l10n()->t('Diaspora'), 'diaspora', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'diaspora'], '$type_markdown' => ['type', DI::l10n()->t('Markdown'), 'markdown', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'markdown'], '$type_html' => ['type', DI::l10n()->t('HTML'), 'html', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'html'], + '$flag_twitter' => file_exists('addon/twitter/twitter.php'), + '$type_twitter' => ['type', DI::l10n()->t('Twitter Source'), 'twitter', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'twitter'], '$results' => $results ]);