friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Remove the obsolete parameter $two_way from terminateFriendship methods 

- 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/Addons.md
View File

@ -510,7 +510,6 @@ Called when unfollowing a remote contact on a non-native network (like Twitter)
Hook data:
- **contact** (input): the remote contact (uid = local unfollowing user id) array.
- **two_way** (input): wether to stop sharing with the remote contact as well.
- **result** (output): wether the unfollowing is successful or not.
### revoke_follow

6
include/api.php
View File

@ -3826,10 +3826,8 @@ function api_friendships_destroy($type)
throw new HTTPException\NotFoundException('Not following Contact');
}
$dissolve = ($contact['rel'] == Contact::SHARING);
try {
$result = Contact::terminateFriendship($owner, $contact, $dissolve);
$result = Contact::terminateFriendship($owner, $contact);
if ($result === null) {
Logger::notice(API_LOG_PREFIX . 'Not supported for {network}', ['module' => 'api', 'action' => 'friendships_destroy', 'network' => $contact['network']]);
@ -3840,7 +3838,7 @@ function api_friendships_destroy($type)
throw new HTTPException\ServiceUnavailableException('Unable to unfollow this contact, please retry in a few minutes or contact your administrator.');
}
} catch (Exception $e) {
Logger::error(API_LOG_PREFIX . $e->getMessage(), ['owner' => $owner, 'contact' => $contact, 'dissolve' => $dissolve]);
Logger::error(API_LOG_PREFIX . $e->getMessage(), ['owner' => $owner, 'contact' => $contact]);
throw new HTTPException\InternalServerErrorException('Unable to unfollow this contact, please contact your administrator');
}

6
mod/unfollow.php
View File

@ -137,13 +137,11 @@ function unfollow_process(string $url)
// NOTREACHED
}
$dissolve = ($contact['rel'] == Contact::SHARING);
$notice_message = '';
$return_path = $base_return_path . '/' . $contact['id'];
try {
$result = Contact::terminateFriendship($owner, $contact, $dissolve);
$result = Contact::terminateFriendship($owner, $contact);
if ($result === null) {
$notice_message = DI::l10n()->t('Unfollowing is currently not supported by this contact\'s network.');
@ -157,7 +155,7 @@ function unfollow_process(string $url)
$notice_message = DI::l10n()->t('Contact was successfully unfollowed');
}
} catch (Exception $e) {
DI::logger()->error($e->getMessage(), ['owner' => $owner, 'contact' => $contact, 'dissolve' => $dissolve]);
DI::logger()->error($e->getMessage(), ['owner' => $owner, 'contact' => $contact]);
$notice_message = DI::l10n()->t('Unable to unfollow this contact, please contact your administrator');
}

9
src/Core/Protocol.php
View File

@ -207,12 +207,11 @@ class Protocol
*
* @param array $user User unfriending
* @param array $contact Contact 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
{
if (empty($contact['network'])) {
throw new \InvalidArgumentException('Missing network key in contact array');
@ -243,17 +242,12 @@ class Protocol
} elseif ($protocol == Protocol::DIASPORA) {
return Diaspora::sendUnshare($user, $contact) > 0;
} elseif ($protocol == Protocol::ACTIVITYPUB) {
if ($two_way) {
ActivityPub\Transmitter::sendContactReject($contact['url'], $contact['hub-verify'], $user['uid']);
}
return ActivityPub\Transmitter::sendContactUndo($contact['url'], $contact['id'], $user['uid']);
}
// Catch-all hook for connector addons
$hook_data = [
'contact' => $contact,
'two_way' => $two_way,
'result' => null
];
Hook::callAll('unfollow', $hook_data);
@ -265,6 +259,7 @@ class Protocol
* Revoke an incoming follow from the provided contact
*
* @param array $contact Private contact (uid != 0) array
* @return bool|null true if successful, false if not, null if no action was performed
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/

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']]);

14
src/Module/Contact.php
View File

@ -69,7 +69,8 @@ class Contact extends BaseModule
$count_actions = 0;
foreach ($orig_records as $orig_record) {
$cdata = Model\Contact::getPublicAndUserContactID($orig_record['id'], local_user());
if (empty($cdata)) {
if (empty($cdata) || public_contact() === $cdata['public']) {
// No action available on your own contact
continue;
}
@ -79,7 +80,7 @@ class Contact extends BaseModule
}
if (!empty($_POST['contacts_batch_block'])) {
self::toggleBlockContact($cdata['public']);
self::toggleBlockContact($cdata['public'], local_user());
$count_actions++;
}
@ -204,12 +205,13 @@ class Contact extends BaseModule
* Toggles the blocked status of a contact identified by id.
*
* @param int $contact_id Id of the contact with uid = 0
* @param int $owner_id Id of the user we want to block the contact for
* @throws \Exception
*/
private static function toggleBlockContact(int $contact_id)
private static function toggleBlockContact(int $contact_id, int $owner_id)
{
$blocked = !Model\Contact\User::isBlocked($contact_id, local_user());
Model\Contact\User::setBlocked($contact_id, local_user(), $blocked);
$blocked = !Model\Contact\User::isBlocked($contact_id, $owner_id);
Model\Contact\User::setBlocked($contact_id, $owner_id, $blocked);
}
/**
@ -373,7 +375,7 @@ class Contact extends BaseModule
throw new BadRequestException(DI::l10n()->t('You can\'t block yourself'));
}
self::toggleBlockContact($cdata['public']);
self::toggleBlockContact($cdata['public'], local_user());
$blocked = Model\Contact\User::isBlocked($contact_id, local_user());
info(($blocked ? DI::l10n()->t('Contact has been blocked') : DI::l10n()->t('Contact has been unblocked')));