Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-24 11:10:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove the obsolete parameter $two_way from terminateFriendship methods

Browse source 
- Follow revokation is now done independently
This commit is contained in:
Hypolite Petovan 2021-10-02 15:48:20 -04:00
parent 1047ad7bc2
commit c4a4473cd0
6 changed files with 18 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Model/Contact.php
View file

@ -830,17 +830,17 @@ class Contact
* Sends an unfriend message. Removes the contact for two-way unfriending or sharing only protocols (feed an mail)
*
* @param array $user User unfriending
* @param array $contact Contact unfriended
* @param array $contact Contact (uid != 0) unfriended
* @param boolean $two_way Revoke eventual inbound follow as well
* @return bool|null true if successful, false if not, null if no action was performed
* @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function terminateFriendship(array $user, array $contact, bool $two_way = false): bool
public static function terminateFriendship(array $user, array $contact): bool
{
$result = Protocol::terminateFriendship($user, $contact, $two_way);
$result = Protocol::terminateFriendship($user, $contact);
if ($two_way || in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) {
if ($contact['rel'] == Contact::SHARING || in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) {
self::remove($contact['id']);
} else {
self::update(['rel' => Contact::FOLLOWER], ['id' => $contact['id']]);