clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11413 from annando/vote-preparation 

Preparation for storing incoming polls
This commit is contained in:
Hypolite Petovan 2022-04-15 10:22:41 -04:00 committed by GitHub
parent a2a5f27d76 eaa8163201
commit 627e91f209
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/Protocol/ActivityPub/Receiver.php
View File

@ -556,6 +556,9 @@ class Receiver
switch ($type) {
case 'as:Create':
if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
if ($object_data['object_type'] == 'as:Question') {
self::storeUnhandledActivity(false, $type, $object_data, $activity, $body, $uid, $trust_source, $push, $signer);
}
$item = ActivityPub\Processor::createItem($object_data);
ActivityPub\Processor::postItem($object_data, $item);
} elseif (in_array($object_data['object_type'], ['pt:CacheFile'])) {
@ -1436,6 +1439,59 @@ class Receiver
return $attachlist;
}
/**
* Convert questions from JSON-LD format into a simplified format
*
* @param array $object
*
* @return array Questions in a simplified format
*/
private static function processQuestion(array $object)
{
$question = [];
if (!empty($object['as:oneOf'])) {
$question['multiple'] = false;
$options = JsonLD::fetchElementArray($object, 'as:oneOf') ?? [];
} elseif (!empty($object['as:anyOf'])) {
$question['multiple'] = true;
$options = JsonLD::fetchElementArray($object, 'as:anyOf') ?? [];
} else {
return [];
}
// @todo Check if "closed" is a thing, see here: https://www.w3.org/TR/activitystreams-vocabulary/#dfn-closed
$question['voters'] = (int)JsonLD::fetchElement($object, 'toot:votersCount', '@value');
$question['options'] = [];
$voters = 0;
foreach ($options as $option) {
if (JsonLD::fetchElement($option, '@type') != 'as:Note') {
continue;
}
$name = JsonLD::fetchElement($option, 'as:name', '@value');
if (empty($option['as:replies'])) {
continue;
}
$replies = JsonLD::fetchElement($option['as:replies'], 'as:totalItems', '@value');
$question['options'][] = ['name' => $name, 'replies' => $replies];
$voters += (int)$replies;
}
// For single choice question we can count the number of voters if not provided (like with Misskey)
if (empty($question['voters']) && !$question['multiple']) {
$question['voters'] = $voters;
}
return $question;
}
/**
* Fetch the original source or content with the "language" Markdown or HTML
*
@ -1687,6 +1743,10 @@ class Receiver
$object_data['alternate-url'] = null;
}
if ($object_data['object_type'] == 'as:Question') {
$object_data['question'] = self::processQuestion($object);
}
$receiverdata = self::getReceivers($object, $object_data['actor'], $object_data['tags'], true);
$receivers = $reception_types = [];
foreach ($receiverdata as $key => $data) {