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

Merge pull request #11204 from annando/issue-10966

Browse source 
Issue 10966: Ignore "only sharer" setting for forum accounts
This commit is contained in:
Hypolite Petovan 2022-02-03 15:35:13 -05:00 committed by GitHub
commit 025df9816f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Model/Contact.php
View file

@ -2947,7 +2947,7 @@ class Contact
*/ */
public static function isForum($contactid) public static function isForum($contactid)
{ {
$fields = ['forum', 'prv']; $fields = ['contact-type', 'forum', 'prv'];
$condition = ['id' => $contactid]; $condition = ['id' => $contactid];
$contact = DBA::selectFirst('contact', $fields, $condition); $contact = DBA::selectFirst('contact', $fields, $condition);
if (!DBA::isResult($contact)) { if (!DBA::isResult($contact)) {
@ -2955,7 +2955,7 @@ class Contact
} }
// Is it a forum? // Is it a forum?
return ($contact['forum'] || $contact['prv']); return (($contact['contact-type'] == self::TYPE_COMMUNITY) || $contact['forum'] || $contact['prv']);
} }
/** /**

2
src/Protocol/ActivityPub/Processor.php
View file

@ -619,7 +619,7 @@ class Processor
continue; continue;
} }
if (DI::pConfig()->get($receiver, 'system', 'accept_only_sharer', false) && ($receiver != 0) && ($item['gravity'] == GRAVITY_PARENT)) { if (!Contact::isForum($receiver) && DI::pConfig()->get($receiver, 'system', 'accept_only_sharer', false) && ($receiver != 0) && ($item['gravity'] == GRAVITY_PARENT)) {
$skip = !Contact::isSharingByURL($activity['author'], $receiver); $skip = !Contact::isSharingByURL($activity['author'], $receiver);
if ($skip && (($activity['type'] == 'as:Announce') || ($item['isForum'] ?? false))) { if ($skip && (($activity['type'] == 'as:Announce') || ($item['isForum'] ?? false))) {