tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #8599 from MrPetovan/task/8593-ensure-location-plaintext

Browse source 
Account for missing location value in ActivityPub\Receiver
This commit is contained in:
Michael Vogel 2020-05-07 16:29:03 +02:00 committed by GitHub
commit fbf846accb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Protocol/ActivityPub/Receiver.php
View file

@ -1059,12 +1059,13 @@ class Receiver
$location = JsonLD::fetchElement($object, 'as:location', 'as:name', '@type', 'as:Place'); $location = JsonLD::fetchElement($object, 'as:location', 'as:name', '@type', 'as:Place');
$location = JsonLD::fetchElement($location, 'location', '@value'); $location = JsonLD::fetchElement($location, 'location', '@value');
if ($location) {
// Some AP software allow formatted text in post location, so we run all the text converters we have to boil // Some AP software allow formatted text in post location, so we run all the text converters we have to boil
// down to HTML and then finally format to plaintext. // down to HTML and then finally format to plaintext.
$location = Markdown::convert($location); $location = Markdown::convert($location);
$location = BBCode::convert($location); $location = BBCode::convert($location);
$location = HTML::toPlaintext($location); $location = HTML::toPlaintext($location);
}
$object_data['sc:identifier'] = JsonLD::fetchElement($object, 'sc:identifier', '@value'); $object_data['sc:identifier'] = JsonLD::fetchElement($object, 'sc:identifier', '@value');
$object_data['diaspora:guid'] = JsonLD::fetchElement($object, 'diaspora:guid', '@value'); $object_data['diaspora:guid'] = JsonLD::fetchElement($object, 'diaspora:guid', '@value');