<?php
/**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
namespace Friendica\Core;
use Friendica\Database\DBA;
-use Friendica\DI;
+use Friendica\Model\Item;
use Friendica\Model\User;
use Friendica\Network\HTTPException;
use Friendica\Protocol\Activity;
// Supported through a connector
const DIASPORA2 = 'dspc'; // Diaspora connector
- const LINKEDIN = 'lnkd'; // LinkedIn
const PUMPIO = 'pump'; // pump.io
const STATUSNET = 'stac'; // Statusnet connector
const TWITTER = 'twit'; // Twitter
// Currently unsupported
const ICALENDAR = 'ical'; // iCalendar
const MYSPACE = 'mysp'; // MySpace
+ const LINKEDIN = 'lnkd'; // LinkedIn
const NEWS = 'nntp'; // Network News Transfer Protocol
const PNUT = 'pnut'; // pnut.io
const XMPP = 'xmpp'; // XMPP
// create a follow slap
$item = [
'verb' => Activity::FOLLOW,
- 'gravity' => GRAVITY_ACTIVITY,
+ 'gravity' => Item::GRAVITY_ACTIVITY,
'follow' => $contact['url'],
'body' => '',
'title' => '',
* Sends an unfollow message. Does not remove the contact
*
* @param array $contact Target public contact (uid = 0) array
- * @param array $user Source local user array
+ * @param array $owner Source owner-view record
* @return bool|null true if successful, false if not, null if no remote action was performed
* @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function unfollow(array $contact, array $user): ?bool
+ public static function unfollow(array $contact, array $owner): ?bool
{
if (empty($contact['network'])) {
- throw new \InvalidArgumentException('Missing network key in contact array');
+ Logger::notice('Contact has got no network, we quit here', ['id' => $contact['id']]);
+ return null;
}
$protocol = $contact['network'];
if (in_array($protocol, [Protocol::OSTATUS, Protocol::DFRN])) {
// create an unfollow slap
- $item = [];
- $item['verb'] = Activity::O_UNFOLLOW;
- $item['gravity'] = GRAVITY_ACTIVITY;
- $item['follow'] = $contact['url'];
- $item['body'] = '';
- $item['title'] = '';
- $item['guid'] = '';
- $item['uri-id'] = 0;
- $slap = OStatus::salmon($item, $user);
+ $item = [
+ 'verb' => Activity::O_UNFOLLOW,
+ 'gravity' => Item::GRAVITY_ACTIVITY,
+ 'follow' => $contact['url'],
+ 'body' => '',
+ 'title' => '',
+ 'guid' => '',
+ 'uri-id' => 0,
+ ];
+
+ $slap = OStatus::salmon($item, $owner);
if (empty($contact['notify'])) {
- throw new \InvalidArgumentException('Missing expected "notify" key in OStatus/DFRN contact');
+ Logger::notice('OStatus/DFRN Contact is missing notify, we quit here', ['id' => $contact['id']]);
+ return null;
}
- return Salmon::slapper($user, $contact['notify'], $slap) === 0;
+ return Salmon::slapper($owner, $contact['notify'], $slap) === 0;
} elseif ($protocol == Protocol::DIASPORA) {
- return Diaspora::sendUnshare($user, $contact) > 0;
+ return Diaspora::sendUnshare($owner, $contact) > 0;
} elseif ($protocol == Protocol::ACTIVITYPUB) {
- return ActivityPub\Transmitter::sendContactUndo($contact['url'], $contact['id'], $user['uid']);
+ return ActivityPub\Transmitter::sendContactUndo($contact['url'], $contact['id'], $owner);
}
// Catch-all hook for connector addons
$hook_data = [
'contact' => $contact,
- 'uid' => $user['uid'],
+ 'uid' => $owner['uid'],
'result' => null,
];
Hook::callAll('unfollow', $hook_data);
/**
* Revoke an incoming follow from the provided contact
*
- * @param array $contact Private contact (uid != 0) array
+ * @param array $contact Target public contact (uid == 0) array
+ * @param array $owner Source owner-view record
* @return bool|null true if successful, false if not, null if no action was performed
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function revokeFollow(array $contact): ?bool
+ public static function revokeFollow(array $contact, array $owner): ?bool
{
if (empty($contact['network'])) {
throw new \InvalidArgumentException('Missing network key in contact array');
}
if ($protocol == Protocol::ACTIVITYPUB) {
- return ActivityPub\Transmitter::sendContactReject($contact['url'], $contact['hub-verify'], $contact['uid']);
+ return ActivityPub\Transmitter::sendContactReject($contact['url'], $contact['hub-verify'], $owner);
}
// Catch-all hook for connector addons
$hook_data = [
'contact' => $contact,
- 'result' => null,
+ 'uid' => $owner['uid'],
+ 'result' => null,
];
Hook::callAll('revoke_follow', $hook_data);