}
/**
- * Stire attachment data
+ * Store attachment data
*
* @param array $activity
* @param array $item
}
/**
- * Store attachment data
+ * Store question data
*
* @param array $activity
* @param array $item
$item['thr-parent'] = $activity['reply-to-id'];
if ($activity['reply-to-id'] == $activity['id']) {
- $item['gravity'] = GRAVITY_PARENT;
+ $item['gravity'] = Item::GRAVITY_PARENT;
$item['object-type'] = Activity\ObjectType::NOTE;
} else {
- $item['gravity'] = GRAVITY_COMMENT;
+ $item['gravity'] = Item::GRAVITY_COMMENT;
$item['object-type'] = Activity\ObjectType::COMMENT;
}
$item['diaspora_signed_text'] = $activity['diaspora:comment'] ?? '';
- if (empty($conversation) && empty($activity['directmessage']) && ($item['gravity'] != GRAVITY_PARENT) && !Post::exists(['uri' => $item['thr-parent']])) {
+ if (empty($conversation) && empty($activity['directmessage']) && ($item['gravity'] != Item::GRAVITY_PARENT) && !Post::exists(['uri' => $item['thr-parent']])) {
Logger::notice('Parent not found, message will be discarded.', ['thr-parent' => $item['thr-parent']]);
if (!$fetch_parents) {
Queue::remove($activity);
$item['owner-id'] = $item['author-id'];
} else {
$actor = APContact::getByURL($item['owner-link'], false);
- $item['isForum'] = ($actor['type'] == 'Group');
+ $item['isForum'] = ($actor['type'] ?? 'Person') == 'Group';
}
$item['uri'] = $activity['id'];
Logger::notice('Fetching is done by worker.', ['parent' => $activity['reply-to-id'], 'recursion-depth' => $recursion_depth]);
Fetch::add($activity['reply-to-id']);
$activity['recursion-depth'] = 0;
- $wid = Worker::add(PRIORITY_HIGH, 'FetchMissingActivity', $activity['reply-to-id'], $activity, '', Receiver::COMPLETION_AUTO);
+ $wid = Worker::add(Worker::PRIORITY_HIGH, 'FetchMissingActivity', $activity['reply-to-id'], $activity, '', Receiver::COMPLETION_AUTO);
Fetch::setWorkerId($activity['reply-to-id'], $wid);
} else {
Logger::debug('Activity will already be fetched via a worker.', ['url' => $activity['reply-to-id']]);
$item['verb'] = $verb;
$item['thr-parent'] = $activity['object_id'];
- $item['gravity'] = GRAVITY_ACTIVITY;
+ $item['gravity'] = Item::GRAVITY_ACTIVITY;
unset($item['post-type']);
$item['object-type'] = Activity\ObjectType::NOTE;
private static function processContent(array $activity, array $item)
{
if (!empty($activity['mediatype']) && ($activity['mediatype'] == 'text/markdown')) {
- $item['title'] = strip_tags($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 = self::addMentionLinks($content, $activity['tags']);
+ if (!empty($activity['quote-url'])) {
+ $id = Item::fetchByLink($activity['quote-url']);
+ if ($id) {
+ $shared_item = Post::selectFirst(['uri-id'], ['id' => $id]);
+ $item['quote-uri-id'] = $shared_item['uri-id'];
+ } else {
+ Logger::info('Quote was not fetched', ['guid' => $item['guid'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url']]);
+ }
+ }
+
if (!empty($activity['source'])) {
$item['body'] = $activity['source'];
$item['raw-body'] = $content;
- $item['body'] = Item::improveSharedDataInBody($item);
+
+ $quote_uri_id = Item::getQuoteUriId($item['body']);
+ if (empty($item['quote-uri-id']) && !empty($quote_uri_id)) {
+ $item['quote-uri-id'] = $quote_uri_id;
+ }
+
+ $item['body'] = BBCode::removeSharedData($item['body']);
} else {
$parent_uri = $item['parent-uri'] ?? $item['thr-parent'];
- if (empty($activity['directmessage']) && ($parent_uri != $item['uri']) && ($item['gravity'] == GRAVITY_COMMENT)) {
+ if (empty($activity['directmessage']) && ($parent_uri != $item['uri']) && ($item['gravity'] == Item::GRAVITY_COMMENT)) {
$parent = Post::selectFirst(['id', 'uri-id', 'private', 'author-link', 'alias'], ['uri' => $parent_uri]);
if (!DBA::isResult($parent)) {
Logger::warning('Unknown parent item.', ['uri' => $parent_uri]);
}
$item['content-warning'] = HTML::toBBCode($activity['summary'] ?? '');
$item['raw-body'] = $item['body'] = $content;
-
- if (!empty($activity['quote-url'])) {
- $item['body'] .= self::addSharedData($activity['quote-url']);
- }
}
self::storeFromBody($item);
return $item;
}
- /**
- * Add a share block for the given quote link
- *
- * @param string $url
- * @return string
- */
- private static function addSharedData(string $url): string
- {
- $id = Item::fetchByLink($url);
- if (empty($id)) {
- return '';
- }
-
- $shared_item = Post::selectFirst(['author-name', 'author-link', 'author-avatar', 'plink', 'created', 'guid', 'title', 'body'], ['id' => $id]);
- if (!DBA::isResult($shared_item)) {
- return '';
- }
-
- $prefix = BBCode::getShareOpeningTag(
- $shared_item['author-name'],
- $shared_item['author-link'],
- $shared_item['author-avatar'],
- $shared_item['plink'],
- $shared_item['created'],
- $shared_item['guid']
- );
-
- if (!empty($shared_item['title'])) {
- $prefix .= '[h3]' . $shared_item['title'] . "[/h3]\n";
- }
-
- return $prefix . $shared_item['body'] . '[/share]';
- }
-
/**
* Store hashtags and mentions
*
return true;
}
- if ($item['gravity'] != GRAVITY_PARENT) {
+ if ($item['gravity'] != Item::GRAVITY_PARENT) {
// We cannot reliably check at this point if a comment or activity belongs to an accepted post or needs to be fetched
// This can possibly be improved in the future.
Logger::debug('Message is no parent - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri']]);
}
$tags = array_column(Tag::getByURIId($item['uri-id'], [Tag::HASHTAG]), 'name');
- if (Relay::isSolicitedPost($tags, $item['body'], $item['author-id'], $item['uri'], Protocol::ACTIVITYPUB)) {
+ if (Relay::isSolicitedPost($tags, $item['body'], $item['author-id'], $item['uri'], Protocol::ACTIVITYPUB, $activity['thread-completion'] ?? 0)) {
Logger::debug('Post is accepted because of the relay settings', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri']]);
return true;
} else {
// When a post arrives via a relay and we follow the author, we have to override the causer.
// Otherwise the system assumes that we follow the relay. (See "addRowInformation")
Logger::debug('Relay post for follower', ['receiver' => $receiver, 'guid' => $item['guid'], 'relay' => $activity['from-relay']]);
- $item['causer-id'] = ($item['gravity'] == GRAVITY_PARENT) ? $item['owner-id'] : $item['author-id'];
+ $item['causer-id'] = ($item['gravity'] == Item::GRAVITY_PARENT) ? $item['owner-id'] : $item['author-id'];
}
if ($item['isForum'] ?? false) {
continue;
}
- if (($receiver != 0) && ($item['gravity'] == GRAVITY_PARENT) && !in_array($item['post-reason'], [Item::PR_FOLLOWER, Item::PR_TAG, item::PR_TO, Item::PR_CC])) {
+ if (($receiver != 0) && ($item['gravity'] == Item::GRAVITY_PARENT) && !in_array($item['post-reason'], [Item::PR_FOLLOWER, Item::PR_TAG, item::PR_TO, Item::PR_CC])) {
if (!($item['isForum'] ?? false)) {
if ($item['post-reason'] == Item::PR_BCC) {
Logger::info('Top level post via BCC from a non sharer, ignoring', ['uid' => $receiver, 'contact' => $item['contact-id'], 'url' => $item['uri']]);
continue;
}
- if (($item['gravity'] != GRAVITY_ACTIVITY) && ($activity['object_type'] == 'as:Event')) {
+ if (($item['gravity'] != Item::GRAVITY_ACTIVITY) && ($activity['object_type'] == 'as:Event')) {
$event_id = self::createEvent($activity, $item);
$item = Event::getItemArrayForImportedId($event_id, $item);
}
// Store send a follow request for every reshare - but only when the item had been stored
- if ($stored && ($item['private'] != Item::PRIVATE) && ($item['gravity'] == GRAVITY_PARENT) && !empty($item['author-link']) && ($item['author-link'] != $item['owner-link'])) {
+ if ($stored && ($item['private'] != Item::PRIVATE) && ($item['gravity'] == Item::GRAVITY_PARENT) && !empty($item['author-link']) && ($item['author-link'] != $item['owner-link'])) {
$author = APContact::getByURL($item['owner-link'], false);
// We send automatic follow requests for reshared messages. (We don't need though for forum posts)
if ($author['type'] != 'Group') {
*/
private static function hasParents(array $item, int $receiver)
{
- if (($receiver == 0) || ($item['gravity'] == GRAVITY_PARENT)) {
+ if (($receiver == 0) || ($item['gravity'] == Item::GRAVITY_PARENT)) {
return true;
}
if ($item['verb'] != Activity::ANNOUNCE) {
switch (DI::pConfig()->get($receiver, 'system', 'accept_only_sharer')) {
case Item::COMPLETION_COMMENT:
- $add_parent = ($item['gravity'] != GRAVITY_ACTIVITY);
+ $add_parent = ($item['gravity'] != Item::GRAVITY_ACTIVITY);
break;
case Item::COMPLETION_NONE:
if (!empty($item['parent-uri-id'])) {
if (Post::exists(['uri-id' => $item['parent-uri-id'], 'uid' => $receiver])) {
$has_parents = true;
- } elseif ($add_parent && Post::exists(['uri-id' => $item['parent-uri'], 'uid' => 0])) {
+ } elseif ($add_parent && Post::exists(['uri-id' => $item['parent-uri-id'], 'uid' => 0])) {
$stored = Item::storeForUserByUriId($item['parent-uri-id'], $receiver, $fields);
$has_parents = (bool)$stored;
if ($stored) {
foreach ($receivers[$element] as $receiver) {
if ($receiver == ActivityPub::PUBLIC_COLLECTION) {
$name = Receiver::PUBLIC_COLLECTION;
+ } elseif ($path = parse_url($receiver, PHP_URL_PATH)) {
+ $name = trim($path, '/');
} else {
- $name = trim(parse_url($receiver, PHP_URL_PATH), '/');
+ Logger::warning('Unable to coerce name from receiver', ['receiver' => $receiver]);
+ $name = '';
}
$target = Tag::getTargetType($receiver);
*/
private static function postMail(array $activity, array $item)
{
- if (($item['gravity'] != GRAVITY_PARENT) && !DBA::exists('mail', ['uri' => $item['thr-parent'], 'uid' => $item['uid']])) {
+ if (($item['gravity'] != Item::GRAVITY_PARENT) && !DBA::exists('mail', ['uri' => $item['thr-parent'], 'uid' => $item['uid']])) {
Logger::info('Parent not found, mail will be discarded.', ['uid' => $item['uid'], 'uri' => $item['thr-parent']]);
return false;
}
}
}
- return Relay::isSolicitedPost($messageTags, $body, $authorid, $id, Protocol::ACTIVITYPUB);
+ return Relay::isSolicitedPost($messageTags, $body, $authorid, $id, Protocol::ACTIVITYPUB, $activity['thread-completion'] ?? 0);
}
/**
}
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);
+ Worker::add(Worker::PRIORITY_HIGH, 'APDelivery', '', 0, $inbox, 0);
} else {
- Worker::add(PRIORITY_HIGH, 'APDelivery', Delivery::POST, $post['id'], $inbox, $uid, [$cid], $post['uri-id']);
+ Worker::add(Worker::PRIORITY_HIGH, 'APDelivery', Delivery::POST, $post['id'], $inbox, $uid, [$cid], $post['uri-id']);
}
}
}
{
if (empty($activity['object_id']) || empty($activity['actor'])) {
Logger::info('Empty object id or actor.');
+ Queue::remove($activity);
return;
}
if ($activity['object_id'] != $activity['actor']) {
Logger::info('Object id does not match actor.');
+ Queue::remove($activity);
return;
}
Queue::remove($activity);
}
+ /**
+ * Add moved contacts as followers for all subscribers of the old contact
+ *
+ * @param array $activity
+ * @return void
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ */
+ public static function movePerson(array $activity)
+ {
+ if (empty($activity['target_id']) || empty($activity['object_id'])) {
+ Queue::remove($activity);
+ return;
+ }
+
+ if ($activity['object_id'] != $activity['actor']) {
+ Logger::notice('Object is not the actor', ['activity' => $activity]);
+ Queue::remove($activity);
+ return;
+ }
+
+ $from = Contact::getByURL($activity['object_id'], false, ['uri-id']);
+ if (empty($from['uri-id'])) {
+ Logger::info('Object not found', ['activity' => $activity]);
+ Queue::remove($activity);
+ return;
+ }
+
+ $contacts = DBA::select('contact', ['uid', 'url'], ["`uri-id` = ? AND `uid` != ? AND `rel` IN (?, ?)", $from['uri-id'], 0, Contact::FRIEND, Contact::SHARING]);
+ while ($from_contact = DBA::fetch($contacts)) {
+ $result = Contact::createFromProbeForUser($from_contact['uid'], $activity['target_id']);
+ Logger::debug('Follower added', ['from' => $from_contact, 'result' => $result]);
+ }
+ DBA::close($contacts);
+ Queue::remove($activity);
+ }
+
/**
* Blocks the user by the contact
*
Queue::remove($activity);
}
+ /**
+ * Report a user
+ *
+ * @param array $activity
+ * @return void
+ * @throws \Exception
+ */
+ public static function ReportAccount(array $activity)
+ {
+ $account_id = Contact::getIdForURL($activity['object_id']);
+ if (empty($account_id)) {
+ Logger::info('Unknown account', ['activity' => $activity]);
+ Queue::remove($activity);
+ return;
+ }
+
+ $status_ids = $activity['object_ids'];
+ array_shift($status_ids);
+
+ $uri_ids = [];
+ foreach ($status_ids as $status_id) {
+ $post = Post::selectFirst(['uri-id'], ['uri' => $status_id]);
+ if (!empty($post['uri-id'])) {
+ $uri_ids[] = $post['uri-id'];
+ }
+ }
+
+ $report = DI::reportFactory()->createFromReportsRequest(0, $account_id, $activity['content'], false, $uri_ids);
+ DI::report()->save($report);
+
+ Logger::info('Stored report', ['account_id' => $account_id, 'comment' => $activity['content'], 'status_ids' => $status_ids]);
+ }
+
/**
* Accept a follow request
*
*/
public static function acceptFollowUser(array $activity)
{
- $uid = User::getIdForURL($activity['object_actor']);
+ if (!empty($activity['object_actor'])) {
+ $uid = User::getIdForURL($activity['object_actor']);
+ $check_id = false;
+ } elseif (!empty($activity['receiver']) && (count($activity['receiver']) == 1)) {
+ $uid = array_shift($activity['receiver']);
+ $check_id = true;
+ }
+
if (empty($uid)) {
+ Logger::notice('User could not be detected', ['activity' => $activity]);
+ Queue::remove($activity);
return;
}
$cid = Contact::getIdForURL($activity['actor'], $uid);
if (empty($cid)) {
- Logger::info('No contact found', ['actor' => $activity['actor']]);
+ Logger::notice('No contact found', ['actor' => $activity['actor']]);
+ Queue::remove($activity);
return;
}
+ $id = Transmitter::activityIDFromContact($cid);
+ if ($id == $activity['object_id']) {
+ Logger::info('Successful id check', ['uid' => $uid, 'cid' => $cid]);
+ } else {
+ Logger::info('Unsuccessful id check', ['uid' => $uid, 'cid' => $cid, 'id' => $id, 'object_id' => $activity['object_id']]);
+ if ($check_id) {
+ Queue::remove($activity);
+ return;
+ }
+ }
+
self::switchContact($cid);
$fields = ['pending' => false];
return;
}
- Item::markForDeletion(['uri' => $activity['object_id'], 'author-id' => $author_id, 'gravity' => GRAVITY_ACTIVITY]);
+ Item::markForDeletion(['uri' => $activity['object_id'], 'author-id' => $author_id, 'gravity' => Item::GRAVITY_ACTIVITY]);
Queue::remove($activity);
}
projects / friendica.git / blobdiff