mirror of
https://github.com/friendica/friendica
synced 2025-04-22 08:30:10 +00:00
We can now store incoming questions
This commit is contained in:
parent
8dbd1d0e52
commit
834844573b
10 changed files with 318 additions and 6 deletions
|
@ -152,6 +152,37 @@ class Processor
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Store attachment data
|
||||
*
|
||||
* @param array $activity
|
||||
* @param array $item
|
||||
*/
|
||||
private static function storeQuestion($activity, $item)
|
||||
{
|
||||
if (empty($activity['question'])) {
|
||||
return;
|
||||
}
|
||||
$question = ['multiple' => $activity['question']['multiple']];
|
||||
|
||||
if (!empty($activity['question']['voters'])) {
|
||||
$question['voters'] = $activity['question']['voters'];
|
||||
}
|
||||
|
||||
if (!empty($activity['question']['end-time'])) {
|
||||
$question['end-time'] = $activity['question']['end-time'];
|
||||
}
|
||||
|
||||
Post\Question::update($item['uri-id'], $question);
|
||||
|
||||
foreach ($activity['question']['options'] as $key => $option) {
|
||||
$option = ['name' => $option['name'], 'replies' => $option['replies']];
|
||||
Post\QuestionOption::update($item['uri-id'], $key, $option);
|
||||
}
|
||||
|
||||
Logger::debug('Storing incoming question', ['type' => $activity['type'], 'uri-id' => $item['uri-id'], 'question' => $activity['question']]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates a message
|
||||
*
|
||||
|
@ -178,6 +209,7 @@ class Processor
|
|||
$item = self::processContent($activity, $item);
|
||||
|
||||
self::storeAttachments($activity, $item);
|
||||
self::storeQuestion($activity, $item);
|
||||
|
||||
if (empty($item)) {
|
||||
return;
|
||||
|
@ -347,6 +379,7 @@ class Processor
|
|||
$item['plink'] = $activity['alternate-url'] ?? $item['uri'];
|
||||
|
||||
self::storeAttachments($activity, $item);
|
||||
self::storeQuestion($activity, $item);
|
||||
|
||||
// We received the post via AP, so we set the protocol of the server to AP
|
||||
$contact = Contact::getById($item['author-id'], ['gsid']);
|
||||
|
|
|
@ -553,12 +553,13 @@ class Receiver
|
|||
$object_data['from-relay'] = $activity['from-relay'];
|
||||
}
|
||||
|
||||
if (in_array('as:Question', [$object_data['object_type'] ?? '', $object_data['object_object_type'] ?? ''])) {
|
||||
self::storeUnhandledActivity(false, $type, $object_data, $activity, $body, $uid, $trust_source, $push, $signer);
|
||||
}
|
||||
|
||||
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'])) {
|
||||
|
@ -1460,7 +1461,13 @@ class Receiver
|
|||
return [];
|
||||
}
|
||||
|
||||
// @todo Check if "closed" is a thing, see here: https://www.w3.org/TR/activitystreams-vocabulary/#dfn-closed
|
||||
$closed = JsonLD::fetchElement($object, 'as:closed', '@value');
|
||||
if (!empty($closed)) {
|
||||
$question['end-time'] = $closed;
|
||||
} else {
|
||||
$question['end-time'] = JsonLD::fetchElement($object, 'as:endTime', '@value');
|
||||
}
|
||||
|
||||
$question['voters'] = (int)JsonLD::fetchElement($object, 'toot:votersCount', '@value');
|
||||
$question['options'] = [];
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue