Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'develop' of https://github.com/friendica/friendica into develop

Browse source
This commit is contained in:
Ralf Thees 2018-10-25 08:59:32 +02:00
parent dfbaa6e198 920ffab439
commit 9f152e1b43
5 changed files with 42 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Core/Addon.php
View file

@ -84,7 +84,7 @@ class Addon extends BaseObject
$func();
}
unset(self::$addons[$idx]);
unset(self::$addons[array_search($addon, self::$addons)]);
}
/**

5
src/Protocol/ActivityPub.php
View file

@ -29,6 +29,11 @@ use Friendica\Model\APContact;
*
* To-do:
* - Polling the outboxes for missing content?
*
* Missing parts from DFRN:
* - Public Forum
* - Private Forum
* - Relocation
*/
class ActivityPub
{

2
src/Protocol/ActivityPub/Receiver.php
View file

@ -37,7 +37,7 @@ class Receiver
{
const PUBLIC_COLLECTION = 'as:Public';
const ACCOUNT_TYPES = ['as:Person', 'as:Organization', 'as:Service', 'as:Group', 'as:Application'];
const CONTENT_TYPES = ['as:Note', 'as:Article', 'as:Video', 'as:Image'];
const CONTENT_TYPES = ['as:Note', 'as:Article', 'as:Video', 'as:Image', 'as:Event'];
const ACTIVITY_TYPES = ['as:Like', 'as:Dislike', 'as:Accept', 'as:Reject', 'as:TentativeAccept'];
/**

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

@ -300,10 +300,11 @@ class Transmitter
* Creates an array of permissions from an item thread
*
* @param array $item
* @param boolean $blindcopy
*
* @return array with permission data
*/
private static function createPermissionBlockForItem($item)
private static function createPermissionBlockForItem($item, $blindcopy)
{
// Will be activated in a later step
// $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS];
@ -311,7 +312,7 @@ class Transmitter
// For now only send to these contacts:
$networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS];
$data = ['to' => [], 'cc' => []];
$data = ['to' => [], 'cc' => [], 'bcc' => []];
$data = array_merge($data, self::fetchPermissionBlockFromConversation($item));
@ -349,6 +350,8 @@ class Transmitter
foreach ($receiver_list as $receiver) {
$contact = DBA::selectFirst('contact', ['url'], ['id' => $receiver, 'network' => $networks]);
if (DBA::isResult($contact) && !empty($profile = APContact::getByURL($contact['url'], false))) {
// BCC is currently deactivated, due to Pleroma and Mastodon not reacting like expected
// $data['bcc'][] = $profile['url'];
$data['cc'][] = $profile['url'];
}
}
@ -383,6 +386,7 @@ class Transmitter
$data['to'] = array_unique($data['to']);
$data['cc'] = array_unique($data['cc']);
$data['bcc'] = array_unique($data['bcc']);
if (($key = array_search($item['author-link'], $data['to'])) !== false) {
unset($data['to'][$key]);
@ -392,13 +396,33 @@ class Transmitter
unset($data['cc'][$key]);
}
if (($key = array_search($item['author-link'], $data['bcc'])) !== false) {
unset($data['bcc'][$key]);
}
foreach ($data['to'] as $to) {
if (($key = array_search($to, $data['cc'])) !== false) {
unset($data['cc'][$key]);
}
if (($key = array_search($to, $data['bcc'])) !== false) {
unset($data['bcc'][$key]);
}
}
return ['to' => array_values($data['to']), 'cc' => array_values($data['cc'])];
foreach ($data['cc'] as $cc) {
if (($key = array_search($cc, $data['bcc'])) !== false) {
unset($data['bcc'][$key]);
}
}
$receivers = ['to' => array_values($data['to']), 'cc' => array_values($data['cc']), 'bcc' => array_values($data['bcc'])];
if (!$blindcopy) {
unset($receivers['bcc']);
}
return $receivers;
}
/**
@ -453,7 +477,7 @@ class Transmitter
*/
public static function fetchTargetInboxes($item, $uid, $personal = false)
{
$permissions = self::createPermissionBlockForItem($item);
$permissions = self::createPermissionBlockForItem($item, true);
if (empty($permissions)) {
return [];
}
@ -471,13 +495,15 @@ class Transmitter
continue;
}
$blindcopy = in_array($element, ['bto', 'bcc']);
foreach ($permissions[$element] as $receiver) {
if ($receiver == $item_profile['followers']) {
$inboxes = array_merge($inboxes, self::fetchTargetInboxesforUser($uid, $personal));
} else {
$profile = APContact::getByURL($receiver, false);
if (!empty($profile)) {
if (empty($profile['sharedinbox']) || $personal) {
if (empty($profile['sharedinbox']) || $personal || $blindcopy) {
$target = $profile['inbox'];
} else {
$target = $profile['sharedinbox'];
@ -593,7 +619,7 @@ class Transmitter
$data['instrument'] = ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()];
$data = array_merge($data, self::createPermissionBlockForItem($item));
$data = array_merge($data, self::createPermissionBlockForItem($item, false));
if (in_array($data['type'], ['Create', 'Update', 'Delete'])) {
$data['object'] = self::createNote($item);
@ -905,7 +931,7 @@ class Transmitter
$data['generator'] = ['type' => 'Application', 'name' => $item['app']];
}
$data = array_merge($data, self::createPermissionBlockForItem($item));
$data = array_merge($data, self::createPermissionBlockForItem($item, false));
return $data;
}

2
src/Util/HTTPSignature.php
View file

@ -406,6 +406,8 @@ class HTTPSignature
}
}
/// @todo Check if the signed date field is in an acceptable range
// Check the content-length when it is part of the signed data
if (in_array('content-length', $sig_block['headers'])) {
if (strlen($content) != $headers['content-length']) {