clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix confirm parameter

This commit is contained in:
Philipp 2021-10-21 21:41:26 +02:00
parent 3153e098b0
commit d67b676ce5
No known key found for this signature in database
GPG Key ID: 24A7501396EB5432
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Model/Contact/Introduction.php
View File

@ -37,12 +37,14 @@ class Introduction
* Confirms a follow request and sends a notice to the remote contact. * Confirms a follow request and sends a notice to the remote contact.
* *
* @param Entity\Introduction $introduction * @param Entity\Introduction $introduction
* @param bool $duplex
* @param bool $hidden
* *
* @throws HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws HTTPException\NotFoundException * @throws HTTPException\NotFoundException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function confirm(Entity\Introduction $introduction): void public static function confirm(Entity\Introduction $introduction, bool $duplex = false, bool $hidden = false): void
{ {
DI::logger()->info('Confirming follower', ['cid' => $introduction->cid]); DI::logger()->info('Confirming follower', ['cid' => $introduction->cid]);
@ -66,7 +68,7 @@ class Introduction
} }
if (in_array($protocol, [Protocol::DIASPORA, Protocol::ACTIVITYPUB])) { if (in_array($protocol, [Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
if ($introduction->duplex) { if ($duplex) {
$newRelation = Contact::FRIEND; $newRelation = Contact::FRIEND;
} else { } else {
$newRelation = Contact::FOLLOWER; $newRelation = Contact::FOLLOWER;

3
src/Module/FollowConfirm.php
View File

@ -3,6 +3,7 @@ namespace Friendica\Module;
use Friendica\BaseModule; use Friendica\BaseModule;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact;
/** /**
* Process follow request confirmations * Process follow request confirmations
@ -23,7 +24,7 @@ class FollowConfirm extends BaseModule
$intro = DI::intro()->selectOneById($intro_id, local_user()); $intro = DI::intro()->selectOneById($intro_id, local_user());
$intro->confirm($duplex, $hidden); Contact\Introduction::confirm($intro, $duplex, $hidden);
DI::baseUrl()->redirect('contact/' . $intro->cid); DI::baseUrl()->redirect('contact/' . $intro->cid);
} }