bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #11710 from Quix0r/fixes/type-error-send-contact-reject

Browse source 
Type-hint has to be string, instead of int
This commit is contained in:
Hypolite Petovan 2022-07-06 03:56:12 -04:00 committed by GitHub
parent 7b55f93027 bf809c9d57
commit 4f77b1e2db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Protocol/ActivityPub/Transmitter.php
View file

@ -2162,13 +2162,13 @@ class Transmitter
* Reject a contact request or terminates the contact relation * Reject a contact request or terminates the contact relation
* *
* @param string $target Target profile * @param string $target Target profile
* @param integer $id Object id * @param string $objectId Object id
* @param integer $uid User ID * @param int $uid User ID
* @return bool Operation success * @return bool Operation success
* @throws HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function sendContactReject(string $target, int $id, int $uid): bool public static function sendContactReject(string $target, string $objectId, int $uid): bool
{ {
$profile = APContact::getByURL($target); $profile = APContact::getByURL($target);
if (empty($profile['inbox'])) { if (empty($profile['inbox'])) {
@ -2183,7 +2183,7 @@ class Transmitter
'type' => 'Reject', 'type' => 'Reject',
'actor' => $owner['url'], 'actor' => $owner['url'],
'object' => [ 'object' => [
'id' => (string)$id, 'id' => $objectId,
'type' => 'Follow', 'type' => 'Follow',
'actor' => $profile['url'], 'actor' => $profile['url'],
'object' => $owner['url'] 'object' => $owner['url']
@ -2192,7 +2192,7 @@ class Transmitter
'to' => [$profile['url']], 'to' => [$profile['url']],
]; ];
Logger::debug('Sending reject to ' . $target . ' for user ' . $uid . ' with id ' . $id); Logger::debug('Sending reject to ' . $target . ' for user ' . $uid . ' with id ' . $objectId);
$signed = LDSignature::sign($data, $owner); $signed = LDSignature::sign($data, $owner);
return HTTPSignature::transmit($signed, $profile['inbox'], $uid); return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
@ -2222,12 +2222,12 @@ class Transmitter
return false; return false;
} }
$id = DI::baseUrl() . '/activity/' . System::createGUID(); $objectId = DI::baseUrl() . '/activity/' . System::createGUID();
$owner = User::getOwnerDataById($uid); $owner = User::getOwnerDataById($uid);
$data = [ $data = [
'@context' => ActivityPub::CONTEXT, '@context' => ActivityPub::CONTEXT,
'id' => $id, 'id' => $objectId,
'type' => 'Undo', 'type' => 'Undo',
'actor' => $owner['url'], 'actor' => $owner['url'],
'object' => [ 'object' => [
@ -2240,7 +2240,7 @@ class Transmitter
'to' => [$profile['url']], 'to' => [$profile['url']],
]; ];
Logger::info('Sending undo to ' . $target . ' for user ' . $uid . ' with id ' . $id); Logger::info('Sending undo to ' . $target . ' for user ' . $uid . ' with id ' . $objectId);
$signed = LDSignature::sign($data, $owner); $signed = LDSignature::sign($data, $owner);
return HTTPSignature::transmit($signed, $profile['inbox'], $uid); return HTTPSignature::transmit($signed, $profile['inbox'], $uid);