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

Merge pull request #12655 from annando/fix-communication

Browse source 
Fix: Forum posts from some contacts weren't distributed
This commit is contained in:
Hypolite Petovan 2023-01-11 17:04:41 -05:00 committed by GitHub
commit ec54b303c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Module/ActivityPub/Objects.php
View file

@ -75,9 +75,7 @@ class Objects extends BaseModule
throw new HTTPException\NotFoundException(); throw new HTTPException\NotFoundException();
} }
$owner = User::getById($item['uid'], ['hidewall']); $validated = in_array($item['private'], [Item::PUBLIC, Item::UNLISTED]);
$validated = empty($owner['hidewall']) && in_array($item['private'], [Item::PUBLIC, Item::UNLISTED]);
if (!$validated) { if (!$validated) {
$requester = HTTPSignature::getSigner('', $_SERVER); $requester = HTTPSignature::getSigner('', $_SERVER);

4
src/Module/DFRN/Poll.php
View file

@ -37,13 +37,13 @@ class Poll extends BaseModule
{ {
$owner = User::getByNickname( $owner = User::getByNickname(
$this->parameters['nickname'] ?? '', $this->parameters['nickname'] ?? '',
['nickname', 'blocked', 'account_expired', 'account_removed', 'hidewall'] ['nickname', 'blocked', 'account_expired', 'account_removed']
); );
if (!$owner || $owner['account_expired'] || $owner['account_removed']) { if (!$owner || $owner['account_expired'] || $owner['account_removed']) {
throw new HTTPException\NotFoundException($this->t('User not found.')); throw new HTTPException\NotFoundException($this->t('User not found.'));
} }
if ($owner['blocked'] || $owner['hidewall']) { if ($owner['blocked']) {
throw new HTTPException\UnauthorizedException($this->t('Access to this profile has been restricted.')); throw new HTTPException\UnauthorizedException($this->t('Access to this profile has been restricted.'));
} }

2
src/Module/Feed.php
View file

@ -65,7 +65,7 @@ class Feed extends BaseModule
throw new HTTPException\NotFoundException($this->t('User not found.')); throw new HTTPException\NotFoundException($this->t('User not found.'));
} }
if ($owner['blocked'] || $owner['hidewall']) { if ($owner['blocked']) {
throw new HTTPException\UnauthorizedException($this->t('Access to this profile has been restricted.')); throw new HTTPException\UnauthorizedException($this->t('Access to this profile has been restricted.'));
} }