X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FDebug%2FBabel.php;h=649c12cecdf5b6da8f65481933982154abd77048;hb=7921766c59c1050737ff7fed7c242257e866d149;hp=e33f03214fb3367eed414612045b47ec2ee57829;hpb=a382798999c2b0ab6667d8d7c8e187b7b4c5b5b0;p=friendica.git

diff --git a/src/Module/Debug/Babel.php b/src/Module/Debug/Babel.php
index e33f03214f..649c12cecd 100644
--- a/src/Module/Debug/Babel.php
+++ b/src/Module/Debug/Babel.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -24,13 +24,10 @@ 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;
 
 /**
@@ -38,7 +35,7 @@ use Friendica\Util\XML;
  */
 class Babel extends BaseModule
 {
-	public static function content(array $parameters = [])
+	protected function content(array $request = []): string
 	{
 		function visible_whitespace($s)
 		{
@@ -183,9 +180,7 @@ class Babel extends BaseModule
 						'content' => $html
 					];
 
-					$config = \HTMLPurifier_Config::createDefault();
-					$HTMLPurifier = new \HTMLPurifier($config);
-					$purified = $HTMLPurifier->purify($html);
+					$purified = Text\HTML::purify($html);
 
 					$results[] = [
 						'title'   => DI::l10n()->t('HTML Purified (raw)'),
@@ -246,29 +241,34 @@ class Babel extends BaseModule
 				case 'twitter':
 					$json = trim($_REQUEST['text']);
 
-					$status = json_decode($json);
+					if (file_exists('addon/twitter/twitter.php')) {
+						require_once 'addon/twitter/twitter.php';
 
-					$results[] = [
-						'title'   => DI::l10n()->t('Decoded post'),
-						'content' => visible_whitespace(var_export($status, true)),
-					];
+						if (parse_url($json) !== false) {
+							preg_match('#^https?://(?:mobile\.|www\.)?twitter.com/[^/]+/status/(\d+).*#', $json, $matches);
+							$status = twitter_statuses_show($matches[1]);
+						} else {
+							$status = json_decode($json);
+						}
 
-					$postarray = [];
-					$postarray['object-type'] = Activity\ObjectType::NOTE;
+						$results[] = [
+							'title'   => DI::l10n()->t('Decoded post'),
+							'content' => visible_whitespace(var_export($status, true)),
+						];
 
-					if (!empty($status->full_text)) {
-						$postarray['body'] = $status->full_text;
-					} else {
-						$postarray['body'] = $status->text;
-					}
+						$postarray = [];
+						$postarray['object-type'] = Activity\ObjectType::NOTE;
 
-					// When the post contains links then use the correct object type
-					if (count($status->entities->urls) > 0) {
-						$postarray['object-type'] = Activity\ObjectType::BOOKMARK;
-					}
+						if (!empty($status->full_text)) {
+							$postarray['body'] = $status->full_text;
+						} else {
+							$postarray['body'] = $status->text;
+						}
 
-					if (file_exists('addon/twitter/twitter.php')) {
-						require_once 'addon/twitter/twitter.php';
+						// When the post contains links then use the correct object type
+						if (count($status->entities->urls) > 0) {
+							$postarray['object-type'] = Activity\ObjectType::BOOKMARK;
+						}
 
 						$picture = \twitter_media_entities($status, $postarray);
 
@@ -301,14 +301,16 @@ class Babel extends BaseModule
 
 		$tpl = Renderer::getMarkupTemplate('babel.tpl');
 		$o = Renderer::replaceMacros($tpl, [
+			'$title'         => DI::l10n()->t('Babel Diagnostic'),
 			'$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
+			'$type_twitter'  => ['type', DI::l10n()->t('Twitter Source / Tweet URL (requires API key)'), 'twitter', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'twitter'],
+			'$results'       => $results,
+			'$submit'        => DI::l10n()->t('Submit'),
 		]);
 
 		return $o;