use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Content\Text\Markdown;
+use Friendica\Core\Cache\Enum\Duration;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\Relay;
use Friendica\Util\DateTimeFormat;
+use Friendica\Util\HTTPSignature;
use Friendica\Util\JsonLD;
+use Friendica\Util\Network;
use Friendica\Util\Strings;
use Friendica\Worker\Delivery;
*/
class Processor
{
+ const CACHEKEY_FETCH_ACTIVITY = 'processor:fetchMissingActivity:';
+ const CACHEKEY_JUST_FETCHED = 'processor:isJustFetched:';
+
+ static $processed = [];
+
+ public static function addActivityId(string $id)
+ {
+ self::$processed[] = $id;
+ if (count(self::$processed) > 100) {
+ self::$processed = array_slice(self::$processed, 1);
+ }
+ print_r(self::$processed);
+ }
+
+ public static function isProcessed(string $id): bool
+ {
+ return in_array($id, self::$processed);
+ }
+
/**
* Extracts the tag character (#, @, !) from mention links
*
*
* @return string with replaced emojis
*/
- private static function replaceEmojis(int $uri_id, string $body, array $emojis)
+ private static function replaceEmojis(int $uri_id, string $body, array $emojis): string
{
$body = strtr($body,
array_combine(
/**
* Updates a message
*
- * @param array $activity Activity array
+ * @param array $activity Activity array
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
public static function updateItem(array $activity)
{
$item['edited'] = DateTimeFormat::utc($activity['updated']);
$item = self::processContent($activity, $item);
-
- self::storeAttachments($activity, $item);
- self::storeQuestion($activity, $item);
-
if (empty($item)) {
return;
}
+ self::storeAttachments($activity, $item);
+ self::storeQuestion($activity, $item);
+
Post\History::add($item['uri-id'], $item);
Item::update($item, ['uri' => $activity['id']]);
+ Queue::remove($activity);
+
if ($activity['object_type'] == 'as:Event') {
$posts = Post::select(['event-id', 'uid'], ["`uri` = ? AND `event-id` > ?", $activity['id'], 0]);
while ($post = DBA::fetch($posts)) {
/**
* Prepares data for a message
*
- * @param array $activity Activity array
+ * @param array $activity Activity array
+ * @param bool $fetch_parents
+ *
* @return array Internal item
+ *
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function createItem(array $activity): array
+ public static function createItem(array $activity, bool $fetch_parents = true): array
{
+ if (self::isProcessed($activity['id'])) {
+ Logger::info('Id is already processed', ['id' => $activity['id']]);
+ return [];
+ }
+
+ self::addActivityId($activity['id']);
+
$item = [];
$item['verb'] = Activity::POST;
$item['thr-parent'] = $activity['reply-to-id'];
$item['object-type'] = Activity\ObjectType::COMMENT;
}
- if (empty($activity['directmessage']) && ($activity['id'] != $activity['reply-to-id']) && !Post::exists(['uri' => $activity['reply-to-id']])) {
- Logger::notice('Parent not found. Try to refetch it.', ['parent' => $activity['reply-to-id']]);
- self::fetchMissingActivity($activity['reply-to-id'], $activity, '', Receiver::COMPLETION_AUTO);
+ if (!empty($activity['context'])) {
+ $item['conversation'] = $activity['context'];
+ } elseif (!empty($activity['conversation'])) {
+ $item['conversation'] = $activity['conversation'];
+ }
+
+ if (!empty($item['conversation'])) {
+ $conversation = Post::selectFirstThread(['uri'], ['conversation' => $item['conversation']]);
+ if (!empty($conversation)) {
+ Logger::debug('Got conversation', ['conversation' => $item['conversation'], 'parent' => $conversation]);
+ $item['parent-uri'] = $conversation['uri'];
+ }
+ } else {
+ $conversation = [];
+ }
+
+ if (empty($activity['author']) && empty($activity['actor'])) {
+ Logger::notice('Missing author and actor. We quit here.', ['activity' => $activity]);
+ return [];
+ }
+
+ if (!DI::config()->get('system', 'fetch_parents')) {
+ $fetch_parents = false;
+ }
+
+ if ($fetch_parents && empty($activity['directmessage']) && ($activity['id'] != $activity['reply-to-id']) && !Post::exists(['uri' => $activity['reply-to-id']])) {
+ $result = self::fetchParent($activity);
+ if (!empty($result)) {
+ if (($item['thr-parent'] != $result) && Post::exists(['uri' => $result])) {
+ $item['thr-parent'] = $result;
+ }
+ } elseif (empty($conversation)) {
+ return [];
+ }
}
$item['diaspora_signed_text'] = $activity['diaspora:comment'] ?? '';
- /// @todo What to do with $activity['context']?
- if (empty($activity['directmessage']) && ($item['gravity'] != GRAVITY_PARENT) && !Post::exists(['uri' => $item['thr-parent']])) {
+ if (empty($conversation) && empty($activity['directmessage']) && ($item['gravity'] != GRAVITY_PARENT) && !Post::exists(['uri' => $item['thr-parent']])) {
Logger::info('Parent not found, message will be discarded.', ['thr-parent' => $item['thr-parent']]);
return [];
}
if (!empty($activity['raw'])) {
$item['source'] = $activity['raw'];
- $item['protocol'] = Conversation::PARCEL_ACTIVITYPUB;
- $item['conversation-href'] = $activity['context'] ?? '';
- $item['conversation-uri'] = $activity['conversation'] ?? '';
+ }
- if (isset($activity['push'])) {
- $item['direction'] = $activity['push'] ? Conversation::PUSH : Conversation::PULL;
- }
+ $item['protocol'] = Conversation::PARCEL_ACTIVITYPUB;
+
+ if (isset($activity['push'])) {
+ $item['direction'] = $activity['push'] ? Conversation::PUSH : Conversation::PULL;
}
if (!empty($activity['from-relay'])) {
return $item;
}
+ /**
+ * Fetch and process parent posts for the given activity
+ *
+ * @param array $activity
+ *
+ * @return string
+ */
+ private static function fetchParent(array $activity): string
+ {
+ if (self::hasJustBeenFetched($activity['reply-to-id'])) {
+ Logger::notice('We just have tried to fetch this activity. We don\'t try it again.', ['parent' => $activity['reply-to-id']]);
+ return '';
+ }
+
+ $recursion_depth = $activity['recursion-depth'] ?? 0;
+
+ if ($recursion_depth < DI::config()->get('system', 'max_recursion_depth')) {
+ Logger::notice('Parent not found. Try to refetch it.', ['parent' => $activity['reply-to-id'], 'recursion-depth' => $recursion_depth]);
+ $result = self::fetchMissingActivity($activity['reply-to-id'], $activity, '', Receiver::COMPLETION_AUTO);
+ if (empty($result) && self::isActivityGone($activity['reply-to-id'])) {
+ Logger::notice('The activity is gone, the queue entry will be deleted', ['parent' => $activity['reply-to-id']]);
+ if (!empty($activity['entry-id'])) {
+ Queue::deleteById($activity['entry-id']);
+ }
+ return '';
+ } elseif (!empty($result)) {
+ $exists = Post::exists(['uri' => [$result, $activity['reply-to-id']]]);
+ if ($exists) {
+ Logger::notice('The activity has been fetched and created.', ['parent' => $result]);
+ return $result;
+ } elseif (DI::config()->get('system', 'fetch_by_worker') || DI::config()->get('system', 'decoupled_receiver')) {
+ Logger::notice('The activity has been fetched and will hopefully be created later.', ['parent' => $result]);
+ } else {
+ Logger::notice('The activity exists but has not been created, the queue entry will be deleted.', ['parent' => $result]);
+ if (!empty($activity['entry-id'])) {
+ Queue::deleteById($activity['entry-id']);
+ }
+ }
+ return '';
+ }
+ if (empty($result) && !DI::config()->get('system', 'fetch_by_worker')) {
+ return '';
+ }
+ } elseif (self::isActivityGone($activity['reply-to-id'])) {
+ Logger::notice('The activity is gone. We will not spawn a worker. The queue entry will be deleted', ['parent' => $activity['reply-to-id']]);
+ if (!empty($activity['entry-id'])) {
+ Queue::deleteById($activity['entry-id']);
+ }
+ return '';
+ } else {
+ Logger::notice('Recursion level is too high.', ['parent' => $activity['reply-to-id'], 'recursion-depth' => $recursion_depth]);
+ }
+
+ if (Queue::hasWorker($activity['worker-id'] ?? 0)) {
+ Logger::notice('There is already a worker task to fetch the post.', ['id' => $activity['id'], 'parent' => $activity['reply-to-id']]);
+ return '';
+ }
+
+ if (!Fetch::hasWorker($activity['reply-to-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);
+ Fetch::setWorkerId($activity['reply-to-id'], $wid);
+ } else {
+ Logger::debug('Activity will already be fetched via a worker.', ['url' => $activity['reply-to-id']]);
+ }
+
+ return '';
+ }
+
+ /**
+ * Check if a given activity has recently been fetched
+ *
+ * @param string $url
+ * @return boolean
+ */
+ private static function hasJustBeenFetched(string $url): bool
+ {
+ $cachekey = self::CACHEKEY_JUST_FETCHED . $url;
+ $time = DI::cache()->get($cachekey);
+ if (is_null($time)) {
+ DI::cache()->set($cachekey, time(), Duration::FIVE_MINUTES);
+ return false;
+ }
+ return ($time + 300) > time();
+ }
+
+ /**
+ * Check if a given activity is no longer available
+ *
+ * @param string $url
+ *
+ * @return boolean
+ */
+ public static function isActivityGone(string $url): bool
+ {
+ $curlResult = HTTPSignature::fetchRaw($url, 0);
+
+ if (Network::isUrlBlocked($url)) {
+ return true;
+ }
+
+ // @todo To ensure that the remote system is working correctly, we can check if the "Content-Type" contains JSON
+ if (in_array($curlResult->getReturnCode(), [404])) {
+ return true;
+ }
+
+ $object = json_decode($curlResult->getBody(), true);
+ if (!empty($object)) {
+ $activity = JsonLD::compact($object);
+ if (JsonLD::fetchElement($activity, '@type') == 'as:Tombstone') {
+ return true;
+ }
+ }
+
+ return false;
+ }
/**
* Delete items
*
Logger::info('Deleting item', ['object' => $activity['object_id'], 'owner' => $owner]);
Item::markForDeletion(['uri' => $activity['object_id'], 'owner-id' => $owner]);
+ Queue::remove($activity);
}
/**
/**
* Prepare the item array for an activity
*
- * @param array $activity Activity array
- * @param string $verb Activity verb
+ * @param array $activity Activity array
+ * @param string $verb Activity verb
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function createActivity(array $activity, string $verb)
{
+ $activity['reply-to-id'] = $activity['object_id'];
$item = self::createItem($activity);
if (empty($item)) {
return;
}
}
- if ($activity['target_id'] != $actor['featured']) {
- return null;
- }
-
- $id = Contact::getIdForURL($activity['actor']);
- if (empty($id)) {
- return null;
+ $parent = Post::selectFirst(['uri-id'], ['uri' => $activity['object_id']]);
+ if (empty($parent['uri-id'])) {
+ if (self::fetchMissingActivity($activity['object_id'], $activity, '', Receiver::COMPLETION_AUTO)) {
+ $parent = Post::selectFirst(['uri-id'], ['uri' => $activity['object_id']]);
+ }
}
- $parent = Post::selectFirst(['uri-id'], ['uri' => $activity['object_id'], 'author-id' => $id]);
if (!empty($parent['uri-id'])) {
return $parent['uri-id'];
}
Logger::debug('Add post to featured collection', ['uri-id' => $uriid]);
Post\Collection::add($uriid, Post\Collection::FEATURED);
+ Queue::remove($activity);
}
/**
Logger::debug('Remove post from featured collection', ['uri-id' => $uriid]);
Post\Collection::remove($uriid, Post\Collection::FEATURED);
+ Queue::remove($activity);
}
/**
$content = $activity['content'];
} else {
// By default assume "text/html"
- $item['title'] = HTML::toBBCode($activity['name'] ??: '');
- $content = HTML::toBBCode($activity['content'] ?? : '');
+ $item['title'] = HTML::toBBCode($activity['name'] ?? '');
+ $content = HTML::toBBCode($activity['content'] ?? '');
}
$item['title'] = trim(BBCode::toPlaintext($item['title']));
$item['raw-body'] = $content;
$item['body'] = Item::improveSharedDataInBody($item);
} else {
- if (empty($activity['directmessage']) && ($item['thr-parent'] != $item['uri']) && ($item['gravity'] == GRAVITY_COMMENT)) {
- $item_private = !in_array(0, $activity['item_receiver']);
- $parent = Post::selectFirst(['id', 'uri-id', 'private', 'author-link', 'alias'], ['uri' => $item['thr-parent']]);
+ $parent_uri = $item['parent-uri'] ?? $item['thr-parent'];
+ if (empty($activity['directmessage']) && ($parent_uri != $item['uri']) && ($item['gravity'] == 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' => $item['thr-parent']]);
+ Logger::warning('Unknown parent item.', ['uri' => $parent_uri]);
return false;
}
- if ($item_private && ($parent['private'] != Item::PRIVATE)) {
+ if (($item['private'] == Item::PRIVATE) && ($parent['private'] != Item::PRIVATE)) {
Logger::warning('Item is private but the parent is not. Dropping.', ['item-uri' => $item['uri'], 'thr-parent' => $item['thr-parent']]);
return false;
}
* @param string $url message URL
* @return string with GUID
*/
- private static function getGUIDByURL(string $url)
+ private static function getGUIDByURL(string $url): string
{
$parsed = parse_url($url);
* @param array $item
* @return boolean Is the message wanted?
*/
- private static function isSolicitedMessage(array $activity, array $item)
+ private static function isSolicitedMessage(array $activity, array $item): bool
{
// The checks are split to improve the support when searching why a message was accepted.
if (count($activity['receiver']) != 1) {
}
$stored = false;
+ $success = false;
ksort($activity['receiver']);
if (!self::isSolicitedMessage($activity, $item)) {
$item['post-reason'] = Item::PR_RELAY;
} elseif (!empty($activity['thread-completion'])) {
$item['post-reason'] = Item::PR_FETCHED;
+ } elseif (in_array($item['post-reason'], [Item::PR_GLOBAL, Item::PR_NONE]) && !empty($activity['push'])) {
+ $item['post-reason'] = Item::PR_PUSHED;
}
if ($item['isForum'] ?? false) {
$item_id = Item::insert($item);
if ($item_id) {
Logger::info('Item insertion successful', ['user' => $item['uid'], 'item_id' => $item_id]);
+ $success = true;
} else {
- Logger::notice('Item insertion aborted', ['user' => $item['uid']]);
+ Logger::notice('Item insertion aborted', ['uri' => $item['uri'], 'uid' => $item['uid']]);
}
if ($item['uid'] == 0) {
}
}
+ Queue::remove($activity);
+
+ if ($success && Queue::hasChildren($item['uri']) && Post::exists(['uri' => $item['uri']])) {
+ Queue::processReplyByUri($item['uri']);
+ }
+
// 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) && ($item['author-link'] != $item['owner-link'])) {
+ if ($stored && ($item['private'] != Item::PRIVATE) && ($item['gravity'] == 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') {
* @return int|bool New mail table row id or false on error
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- private static function postMail($activity, $item)
+ private static function postMail(array $activity, array $item)
{
if (($item['gravity'] != 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']]);
Logger::info('Fetched featured posts', ['new' => $new, 'old' => $old, 'contact' => $url]);
}
+ public static function fetchCachedActivity(string $url, int $uid): array
+ {
+ $cachekey = self::CACHEKEY_FETCH_ACTIVITY . $uid . ':' . $url;
+ $object = DI::cache()->get($cachekey);
+
+ if (!is_null($object)) {
+ if (!empty($object)) {
+ Logger::debug('Fetch from cache', ['url' => $url, 'uid' => $uid]);
+ } else {
+ Logger::debug('Fetch from negative cache', ['url' => $url, 'uid' => $uid]);
+ }
+ return $object;
+ }
+
+ $object = ActivityPub::fetchContent($url, $uid);
+ if (empty($object)) {
+ Logger::notice('Activity was not fetchable, aborting.', ['url' => $url, 'uid' => $uid]);
+ // We perform negative caching.
+ DI::cache()->set($cachekey, [], Duration::FIVE_MINUTES);
+ return [];
+ }
+
+ if (empty($object['id'])) {
+ Logger::notice('Activity has got not id, aborting. ', ['url' => $url, 'object' => $object]);
+ return [];
+ }
+ DI::cache()->set($cachekey, $object, Duration::FIVE_MINUTES);
+
+ Logger::debug('Activity was fetched successfully', ['url' => $url, 'uid' => $uid]);
+
+ return $object;
+ }
+
/**
* Fetches missing posts
*
- * @param string $url message URL
- * @param array $child activity array with the child of this message
- * @param string $relay_actor Relay actor
- * @param int $completion Completion mode, see Receiver::COMPLETION_*
+ * @param string $url message URL
+ * @param array $child activity array with the child of this message
+ * @param string $relay_actor Relay actor
+ * @param int $completion Completion mode, see Receiver::COMPLETION_*
* @return string fetched message URL
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
- public static function fetchMissingActivity(string $url, array $child = [], string $relay_actor = '', int $completion = Receiver::COMPLETION_MANUAL)
+ public static function fetchMissingActivity(string $url, array $child = [], string $relay_actor = '', int $completion = Receiver::COMPLETION_MANUAL): string
{
if (!empty($child['receiver'])) {
$uid = ActivityPub\Receiver::getFirstUserFromReceivers($child['receiver']);
$uid = 0;
}
- $object = ActivityPub::fetchContent($url, $uid);
+ $object = self::fetchCachedActivity($url, $uid);
if (empty($object)) {
- Logger::notice('Activity was not fetchable, aborting.', ['url' => $url]);
return '';
}
- if (empty($object['id'])) {
- Logger::notice('Activity has got not id, aborting. ', ['url' => $url, 'object' => $object]);
- return '';
+ $signer = [];
+
+ if (!empty($object['attributedTo'])) {
+ $attributed_to = $object['attributedTo'];
+ if (is_array($attributed_to)) {
+ $compacted = JsonLD::compact($object);
+ $attributed_to = JsonLD::fetchElement($compacted, 'as:attributedTo', '@id');
+ }
+ $signer[] = $attributed_to;
}
if (!empty($object['actor'])) {
$object_actor = $object['actor'];
- } elseif (!empty($object['attributedTo'])) {
- $object_actor = $object['attributedTo'];
- if (is_array($object_actor)) {
- $compacted = JsonLD::compact($object);
- $object_actor = JsonLD::fetchElement($compacted, 'as:attributedTo', '@id');
- }
+ } elseif (!empty($attributed_to)) {
+ $object_actor = $attributed_to;
} else {
// Shouldn't happen
$object_actor = '';
}
- $signer = [$object_actor];
+ $signer[] = $object_actor;
if (!empty($child['author'])) {
$actor = $child['author'];
$ldactivity = JsonLD::compact($activity);
+ $ldactivity['recursion-depth'] = !empty($child['recursion-depth']) ? $child['recursion-depth'] + 1 : 1;
+
if (!empty($relay_actor)) {
$ldactivity['thread-completion'] = $ldactivity['from-relay'] = Contact::getIdForURL($relay_actor);
$ldactivity['completion-mode'] = Receiver::COMPLETION_RELAY;
return '';
}
- ActivityPub\Receiver::processActivity($ldactivity, json_encode($activity), $uid, true, false, $signer);
-
- Logger::notice('Activity had been fetched and processed.', ['url' => $url, 'object' => $activity['id']]);
+ if (($completion == Receiver::COMPLETION_RELAY) && Queue::exists($url, 'as:Create')) {
+ Logger::notice('Activity has already been queued.', ['url' => $url, 'object' => $activity['id']]);
+ } elseif (ActivityPub\Receiver::processActivity($ldactivity, json_encode($activity), $uid, true, false, $signer, '', $completion)) {
+ Logger::notice('Activity had been fetched and processed.', ['url' => $url, 'entry' => $child['entry-id'] ?? 0, 'completion' => $completion, 'object' => $activity['id']]);
+ } else {
+ Logger::notice('Activity had been fetched and will be processed later.', ['url' => $url, 'entry' => $child['entry-id'] ?? 0, 'completion' => $completion, 'object' => $activity['id']]);
+ }
return $activity['id'];
}
* @param string $id object ID
* @return boolean true if message is accepted
*/
- private static function acceptIncomingMessage(array $activity, string $id)
+ private static function acceptIncomingMessage(array $activity, string $id): bool
{
if (empty($activity['as:object'])) {
Logger::info('No object field in activity - accepted', ['id' => $id]);
}
$replyto = JsonLD::fetchElement($activity['as:object'], 'as:inReplyTo', '@id');
- $uriid = ItemURI::getIdByURI($replyto);
+ $uriid = ItemURI::getIdByURI($replyto ?? '');
if (Post::exists(['uri-id' => $uriid])) {
Logger::info('Post is a reply to an existing post - accepted', ['id' => $id, 'uri-id' => $uriid, 'replyto' => $replyto]);
return true;
$attributed_to = JsonLD::fetchElement($activity['as:object'], 'as:attributedTo', '@id');
$authorid = Contact::getIdForURL($attributed_to);
- $value = JsonLD::fetchElement($activity['as:object'], 'as:content', '@value');
- $body = (!empty($value) ? HTML::toBBCode($value) : '');
+ $body = HTML::toBBCode(JsonLD::fetchElement($activity['as:object'], 'as:content', '@value') ?? '');
$messageTags = [];
$tags = Receiver::processTags(JsonLD::fetchElementArray($activity['as:object'], 'as:tag') ?? []);
* perform a "follow" request
*
* @param array $activity
+ * @return void
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function followUser($activity)
+ public static function followUser(array $activity)
{
$uid = User::getIdForURL($activity['object_id']);
if (empty($uid)) {
+ Queue::remove($activity);
return;
}
Contact::update(['hub-verify' => $activity['id'], 'protocol' => Protocol::ACTIVITYPUB], ['id' => $cid]);
}
- $item = ['author-id' => Contact::getIdForURL($activity['actor']),
- 'author-link' => $activity['actor']];
+ $item = [
+ 'author-id' => Contact::getIdForURL($activity['actor']),
+ 'author-link' => $activity['actor'],
+ ];
// Ensure that the contact has got the right network type
self::switchContact($item['author-id']);
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']);
+ Queue::remove($activity);
}
/**
* Transmit pending events to the new follower
*
- * @param integer $cid
- * @param integer $uid
+ * @param integer $cid Contact id
+ * @param integer $uid User id
* @return void
*/
private static function transmitPendingEvents(int $cid, int $uid)
* @param array $activity
* @throws \Exception
*/
- public static function updatePerson($activity)
+ public static function updatePerson(array $activity)
{
if (empty($activity['object_id'])) {
return;
Logger::info('Updating profile', ['object' => $activity['object_id']]);
Contact::updateFromProbeByURL($activity['object_id']);
+ Queue::remove($activity);
}
/**
* Delete the given profile
*
* @param array $activity
+ * @return void
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public static function deletePerson($activity)
+ public static function deletePerson(array $activity)
{
if (empty($activity['object_id']) || empty($activity['actor'])) {
Logger::info('Empty object id or actor.');
DBA::close($contacts);
Logger::info('Deleted contact', ['object' => $activity['object_id']]);
+ Queue::remove($activity);
}
/**
* Blocks the user by the contact
*
* @param array $activity
+ * @return void
* @throws \Exception
*/
- public static function blockAccount($activity)
+ public static function blockAccount(array $activity)
{
$cid = Contact::getIdForURL($activity['actor']);
if (empty($cid)) {
Contact\User::setIsBlocked($cid, $uid, true);
Logger::info('Contact blocked user', ['contact' => $cid, 'user' => $uid]);
+ Queue::remove($activity);
}
/**
* Unblocks the user by the contact
*
* @param array $activity
+ * @return void
* @throws \Exception
*/
- public static function unblockAccount($activity)
+ public static function unblockAccount(array $activity)
{
$cid = Contact::getIdForURL($activity['actor']);
if (empty($cid)) {
Contact\User::setIsBlocked($cid, $uid, false);
Logger::info('Contact unblocked user', ['contact' => $cid, 'user' => $uid]);
+ Queue::remove($activity);
}
/**
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function acceptFollowUser($activity)
+ public static function acceptFollowUser(array $activity)
{
$uid = User::getIdForURL($activity['object_actor']);
if (empty($uid)) {
$condition = ['id' => $cid];
Contact::update($fields, $condition);
Logger::info('Accept contact request', ['contact' => $cid, 'user' => $uid]);
+ Queue::remove($activity);
}
/**
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function rejectFollowUser($activity)
+ public static function rejectFollowUser(array $activity)
{
$uid = User::getIdForURL($activity['object_actor']);
if (empty($uid)) {
} else {
Logger::info('Rejected contact request', ['contact' => $cid, 'user' => $uid]);
}
+ Queue::remove($activity);
}
/**
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function undoActivity($activity)
+ public static function undoActivity(array $activity)
{
if (empty($activity['object_id'])) {
return;
}
Item::markForDeletion(['uri' => $activity['object_id'], 'author-id' => $author_id, 'gravity' => GRAVITY_ACTIVITY]);
+ Queue::remove($activity);
}
/**
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function undoFollowUser($activity)
+ public static function undoFollowUser(array $activity)
{
$uid = User::getIdForURL($activity['object_object']);
if (empty($uid)) {
Contact::removeFollower($contact);
Logger::info('Undo following request', ['contact' => $cid, 'user' => $uid]);
+ Queue::remove($activity);
}
/**
* Switches a contact to AP if needed
*
* @param integer $cid Contact ID
+ * @return void
* @throws \Exception
*/
- private static function switchContact($cid)
+ private static function switchContact(int $cid)
{
$contact = DBA::selectFirst('contact', ['network', 'url'], ['id' => $cid]);
if (!DBA::isResult($contact) || in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN]) || Contact::isLocal($contact['url'])) {
* @return array
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- private static function getImplicitMentionList(array $parent)
+ private static function getImplicitMentionList(array $parent): array
{
$parent_terms = Tag::getByURIId($parent['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]);
* @param array $parent
* @return string
*/
- private static function removeImplicitMentionsFromBody(string $body, array $parent)
+ private static function removeImplicitMentionsFromBody(string $body, array $parent): string
{
if (DI::config()->get('system', 'disable_implicit_mentions')) {
return $body;
projects / friendica.git / blobdiff