use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
+use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\APContact;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\JsonLD;
use Friendica\Util\Strings;
+use Friendica\Worker\Delivery;
/**
* ActivityPub Processor Protocol class
}
}
+ /**
+ * 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'] = DateTimeFormat::utc($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
*
$item = self::processContent($activity, $item);
self::storeAttachments($activity, $item);
+ self::storeQuestion($activity, $item);
if (empty($item)) {
return;
}
+ Post\History::add($item['uri-id'], $item);
Item::update($item, ['uri' => $activity['id']]);
if ($activity['object_type'] == 'as:Event') {
$event['edited'] = DateTimeFormat::utc($activity['updated']);
$event['summary'] = HTML::toBBCode($activity['name']);
$event['desc'] = HTML::toBBCode($activity['content']);
- $event['start'] = $activity['start-time'];
- $event['finish'] = $activity['end-time'];
+ if (!empty($activity['start-time'])) {
+ $event['start'] = DateTimeFormat::utc($activity['start-time']);
+ }
+ if (!empty($activity['end-time'])) {
+ $event['finish'] = DateTimeFormat::utc($activity['end-time']);
+ }
$event['nofinish'] = empty($event['finish']);
$event['location'] = $activity['location'];
$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']);
/**
* Fetch the Uri-Id of a post for the "featured" collection
*
- * @param array $activity
- * @return null|int
+ * @param array $activity
+ * @return null|int
*/
private static function getUriIdForFeaturedCollection(array $activity)
{
/**
* Add a post to the "Featured" collection
*
- * @param array $activity
+ * @param array $activity
*/
public static function addToFeaturedCollection(array $activity)
{
Logger::debug('Add post to featured collection', ['uri-id' => $uriid]);
- // @todo Add functionality
+ Post\Collection::add($uriid, Post\Collection::FEATURED);
}
/**
* Remove a post to the "Featured" collection
*
- * @param array $activity
+ * @param array $activity
*/
public static function removeFromFeaturedCollection(array $activity)
{
Logger::debug('Remove post from featured collection', ['uri-id' => $uriid]);
- // @todo Add functionality
+ Post\Collection::remove($uriid, Post\Collection::FEATURED);
}
/**
{
$event['summary'] = HTML::toBBCode($activity['name'] ?: $activity['summary']);
$event['desc'] = HTML::toBBCode($activity['content']);
- $event['start'] = $activity['start-time'];
- $event['finish'] = $activity['end-time'];
+ if (!empty($activity['start-time'])) {
+ $event['start'] = DateTimeFormat::utc($activity['start-time']);
+ }
+ if (!empty($activity['end-time'])) {
+ $event['finish'] = DateTimeFormat::utc($activity['end-time']);
+ }
$event['nofinish'] = empty($event['finish']);
$event['location'] = $activity['location'];
$event['cid'] = $item['contact-id'];
private static function processContent($activity, $item)
{
if (!empty($activity['mediatype']) && ($activity['mediatype'] == 'text/markdown')) {
- $item['title'] = Markdown::toBBCode($activity['name']);
+ $item['title'] = strip_tags($activity['name']);
$content = Markdown::toBBCode($activity['content']);
} elseif (!empty($activity['mediatype']) && ($activity['mediatype'] == 'text/bbcode')) {
$item['title'] = $activity['name'];
$content = HTML::toBBCode($activity['content']);
}
+ $item['title'] = trim(BBCode::toPlaintext($item['title']));
+
if (!empty($activity['languages'])) {
$item['language'] = self::processLanguages($activity['languages']);
}
} else {
$name = trim(parse_url($receiver, PHP_URL_PATH), '/');
}
- Tag::store($uriid, $type, $name, $receiver);
+
+ $target = Tag::getTargetType($receiver);
+ Logger::debug('Got target type', ['type' => $target, 'url' => $receiver]);
+ Tag::store($uriid, $type, $name, $receiver, $target);
}
}
}
return Mail::insert($msg);
}
+ /**
+ * Fetch featured posts from a contact with the given url
+ *
+ * @param string $url
+ * @return void
+ */
+ public static function fetchFeaturedPosts(string $url)
+ {
+ Logger::info('Fetch featured posts', ['contact' => $url]);
+
+ $apcontact = APContact::getByURL($url);
+ if (empty($apcontact['featured'])) {
+ Logger::info('Contact does not have a featured collection', ['contact' => $url]);
+ return;
+ }
+
+ $pcid = Contact::getIdForURL($url, 0, false);
+ if (empty($pcid)) {
+ Logger::info('Contact not found', ['contact' => $url]);
+ return;
+ }
+
+ $posts = Post\Collection::selectToArrayForContact($pcid, Post\Collection::FEATURED);
+ if (!empty($posts)) {
+ $old_featured = array_column($posts, 'uri-id');
+ } else {
+ $old_featured = [];
+ }
+
+ $featured = ActivityPub::fetchItems($apcontact['featured']);
+ if (empty($featured)) {
+ Logger::info('Contact does not have featured posts', ['contact' => $url]);
+
+ foreach ($old_featured as $uri_id) {
+ Post\Collection::remove($uri_id, Post\Collection::FEATURED);
+ Logger::debug('Removed no longer featured post', ['uri-id' => $uri_id, 'contact' => $url]);
+ }
+ return;
+ }
+
+ $new = 0;
+ $old = 0;
+
+ foreach ($featured as $post) {
+ if (empty($post['id'])) {
+ continue;
+ }
+ $id = Item::fetchByLink($post['id']);
+ if (!empty($id)) {
+ $item = Post::selectFirst(['uri-id', 'featured'], ['id' => $id]);
+ if (!empty($item['uri-id'])) {
+ if (!$item['featured']) {
+ Post\Collection::add($item['uri-id'], Post\Collection::FEATURED);
+ Logger::debug('Added featured post', ['uri-id' => $item['uri-id'], 'contact' => $url]);
+ $new++;
+ } else {
+ Logger::debug('Post already had been featured', ['uri-id' => $item['uri-id'], 'contact' => $url]);
+ $old++;
+ }
+
+ $index = array_search($item['uri-id'], $old_featured);
+ if (!($index === false)) {
+ unset($old_featured[$index]);
+ }
+ }
+ }
+ }
+
+ foreach ($old_featured as $uri_id) {
+ Post\Collection::remove($uri_id, Post\Collection::FEATURED);
+ Logger::debug('Removed no longer featured post', ['uri-id' => $uri_id, 'contact' => $url]);
+ }
+
+ Logger::info('Fetched featured posts', ['new' => $new, 'old' => $old, 'contact' => $url]);
+ }
+
/**
* Fetches missing posts
*
return;
}
+ if ($result && DI::config()->get('system', 'transmit_pending_events') && ($owner['contact-type'] == Contact::TYPE_COMMUNITY)) {
+ self::transmitPendingEvents($cid, $owner['uid']);
+ }
+
if (empty($contact)) {
Contact::update(['hub-verify' => $activity['id'], 'protocol' => Protocol::ACTIVITYPUB], ['id' => $cid]);
}
Logger::notice('Follow user ' . $uid . ' from contact ' . $cid . ' with id ' . $activity['id']);
}
+ /**
+ * Transmit pending events to the new follower
+ *
+ * @param integer $cid
+ * @param integer $uid
+ * @return void
+ */
+ private static function transmitPendingEvents(int $cid, int $uid)
+ {
+ $account = DBA::selectFirst('account-user-view', ['ap-inbox', 'ap-sharedinbox'], ['id' => $cid]);
+ $inbox = $account['ap-sharedinbox'] ?: $account['ap-inbox'];
+
+ $events = DBA::select('event', ['id'], ["`uid` = ? AND `start` > ? AND `type` != ?", $uid, DateTimeFormat::utcNow(), 'birthday']);
+ while ($event = DBA::fetch($events)) {
+ $post = Post::selectFirst(['id', 'uri-id', 'created'], ['event-id' => $event['id']]);
+ if (empty($post)) {
+ continue;
+ }
+ if (DI::config()->get('system', 'bulk_delivery')) {
+ Post\Delivery::add($post['uri-id'], $uid, $inbox, $post['created'], Delivery::POST, [$cid]);
+ Worker::add(PRIORITY_HIGH, 'APDelivery', '', 0, $inbox, 0);
+ } else {
+ Worker::add(PRIORITY_HIGH, 'APDelivery', Delivery::POST, $post['id'], $inbox, $uid, [$cid], $post['uri-id']);
+ }
+ }
+ }
+
/**
* Update the given profile
*
* @param array $activity
* @throws \Exception
*/
- public static function blockPerson($activity)
+ public static function blockAccount($activity)
{
$cid = Contact::getIdForURL($activity['actor']);
if (empty($cid)) {
$uid = User::getIdForURL($activity['object_id']);
if (empty($uid)) {
- return;
+ return;
}
Contact\User::setIsBlocked($cid, $uid, true);
* @param array $activity
* @throws \Exception
*/
- public static function unblockPerson($activity)
+ public static function unblockAccount($activity)
{
$cid = Contact::getIdForURL($activity['actor']);
if (empty($cid)) {
$uid = User::getIdForURL($activity['object_object']);
if (empty($uid)) {
- return;
+ return;
}
Contact\User::setIsBlocked($cid, $uid, false);
projects / friendica.git / blobdiff