keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #9448 from MrPetovan/bug/9447-restore-twitter-link-preview

Browse source 
Add new format parameter to parse_link hook data
This commit is contained in:
Michael Vogel 2020-10-23 08:20:51 +02:00 committed by GitHub
commit 3bcf467ded
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
mod/parse_url.php
View file

@ -88,16 +88,8 @@ function parse_url_content(App $a)
$curlResponse = DI::httpRequest()->head($url); $curlResponse = DI::httpRequest()->head($url);
if ($curlResponse->isSuccess()) { if ($curlResponse->isSuccess()) {
// Convert the header fields into an array $hdrs = $curlResponse->getHeaderArray();
$hdrs = [];
$h = explode("\n", $curlResponse->getHeader());
foreach ($h as $l) {
$header = array_map('trim', explode(':', trim($l), 2));
if (count($header) == 2) {
list($k, $v) = $header;
$hdrs[$k] = $v;
}
}
$type = null; $type = null;
$content_type = ''; $content_type = '';
$bbcode = ''; $bbcode = '';
@ -134,13 +126,17 @@ function parse_url_content(App $a)
$template = '[bookmark=%s]%s[/bookmark]%s'; $template = '[bookmark=%s]%s[/bookmark]%s';
$arr = ['url' => $url, 'text' => '']; $arr = ['url' => $url, 'format' => $format, 'text' => null];
Hook::callAll('parse_link', $arr); Hook::callAll('parse_link', $arr);
if (strlen($arr['text'])) { if ($arr['text']) {
echo $arr['text']; if ($format == 'json') {
exit(); System::jsonExit($arr['text']);
} else {
echo $arr['text'];
exit();
}
} }
// If there is already some content information submitted we don't // If there is already some content information submitted we don't