clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9916 from MrPetovan/task/babel-twitter-url 

Babel: Support tweet URL
This commit is contained in:
Michael Vogel 2021-02-14 23:42:35 +01:00 committed by GitHub
parent 97a6a742e7 b2680bffb0
commit 6321dcc6d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Module/Debug/Babel.php
View File

@ -246,7 +246,15 @@ class Babel extends BaseModule
case 'twitter': case 'twitter':
$json = trim($_REQUEST['text']); $json = trim($_REQUEST['text']);
if (file_exists('addon/twitter/twitter.php')) {
require_once 'addon/twitter/twitter.php';
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); $status = json_decode($json);
}
$results[] = [ $results[] = [
'title' => DI::l10n()->t('Decoded post'), 'title' => DI::l10n()->t('Decoded post'),
@ -267,9 +275,6 @@ class Babel extends BaseModule
$postarray['object-type'] = Activity\ObjectType::BOOKMARK; $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); $picture = \twitter_media_entities($status, $postarray);
$results[] = [ $results[] = [
@ -307,7 +312,7 @@ class Babel extends BaseModule
'$type_markdown' => ['type', DI::l10n()->t('Markdown'), 'markdown', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'markdown'], '$type_markdown' => ['type', DI::l10n()->t('Markdown'), 'markdown', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'markdown'],
'$type_html' => ['type', DI::l10n()->t('HTML'), 'html', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'html'], '$type_html' => ['type', DI::l10n()->t('HTML'), 'html', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'html'],
'$flag_twitter' => file_exists('addon/twitter/twitter.php'), '$flag_twitter' => file_exists('addon/twitter/twitter.php'),
'$type_twitter' => ['type', DI::l10n()->t('Twitter Source'), 'twitter', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'twitter'], '$type_twitter' => ['type', DI::l10n()->t('Twitter Source / Tweet URL (requires API key)'), 'twitter', '', (($_REQUEST['type'] ?? '') ?: 'bbcode') == 'twitter'],
'$results' => $results '$results' => $results
]); ]);