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

Merge pull request #7388 from annando/issue-7315

Browse source 
Issue 7315: Changed handling of "Group" posts
This commit is contained in:
Hypolite Petovan 2019-07-15 16:32:42 -04:00 committed by GitHub
commit e9511b4f34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -386,15 +386,14 @@ class Receiver
case 'as:Announce': case 'as:Announce':
if (in_array($object_data['object_type'], self::CONTENT_TYPES)) { if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
$profile = APContact::getByURL($object_data['actor']); $profile = APContact::getByURL($object_data['actor']);
if ($profile['type'] == 'Person') {
// Reshared posts from persons appear as summary at the bottom // Reshared posts from persons appear as summary at the bottom
// If this isn't set, then a single reshare appears on top. This is used for groups. // If this isn't set, then a single reshare appears on top. This is used for groups.
$object_data['thread-completion'] = true; $object_data['thread-completion'] = ($profile['type'] != 'Group');
}
ActivityPub\Processor::createItem($object_data); ActivityPub\Processor::createItem($object_data);
// Add the bottom reshare information only for persons // Add the bottom reshare information only for persons
if ($profile['type'] == 'Person') { if ($profile['type'] != 'Group') {
$announce_object_data = self::processObject($activity); $announce_object_data = self::processObject($activity);
$announce_object_data['name'] = $type; $announce_object_data['name'] = $type;
$announce_object_data['author'] = JsonLD::fetchElement($activity, 'as:actor', '@id'); $announce_object_data['author'] = JsonLD::fetchElement($activity, 'as:actor', '@id');