const TARGET_BCC = 4;
const TARGET_FOLLOWER = 5;
const TARGET_ANSWER = 6;
+ const TARGET_GLOBAL = 7;
/**
* Checks if the web request is done for the AP protocol
*/
public static function processInbox($body, $header, $uid)
{
- $http_signer = HTTPSignature::getSigner($body, $header);
- if (empty($http_signer)) {
- Logger::warning('Invalid HTTP signature, message will be discarded.');
- return;
- } else {
- Logger::info('Valid HTTP signature', ['signer' => $http_signer]);
- }
-
- $signer = [$http_signer];
$activity = json_decode($body, true);
-
if (empty($activity)) {
Logger::warning('Invalid body.');
return;
$actor = JsonLD::fetchElement($ldactivity, 'as:actor', '@id');
+ $apcontact = APContact::getByURL($actor);
+ if (!empty($apcontact) && ($apcontact['type'] == 'Application') && ($apcontact['nick'] == 'relay')) {
+ self::processRelayPost($ldactivity);
+ return;
+ }
+
+ $http_signer = HTTPSignature::getSigner($body, $header);
+ if (empty($http_signer)) {
+ Logger::warning('Invalid HTTP signature, message will be discarded.');
+ return;
+ } else {
+ Logger::info('Valid HTTP signature', ['signer' => $http_signer]);
+ }
+
+ $signer = [$http_signer];
+
Logger::info('Message for user ' . $uid . ' is from actor ' . $actor);
if (LDSignature::isSigned($activity)) {
self::processActivity($ldactivity, $body, $uid, $trust_source, true, $signer);
}
+ /**
+ * Process incoming posts from relays
+ *
+ * @param array $activity
+ * @return void
+ */
+ private static function processRelayPost(array $activity)
+ {
+ $type = JsonLD::fetchElement($activity, '@type');
+ if (!$type) {
+ Logger::info('Empty type', ['activity' => $activity]);
+ return;
+ }
+
+ if ($type != 'as:Announce') {
+ Logger::info('Not an announcement', ['activity' => $activity]);
+ return;
+ }
+
+ $object_id = JsonLD::fetchElement($activity, 'as:object', '@id');
+ if (empty($object_id)) {
+ Logger::info('No object id found', ['activity' => $activity]);
+ return;
+ }
+
+ Logger::info('Got relayed message id', ['id' => $object_id]);
+
+ $item_id = Item::searchByLink($object_id);
+ if ($item_id) {
+ Logger::info('Relayed message already exists', ['id' => $object_id, 'item' => $item_id]);
+ return;
+ }
+
+ Processor::fetchMissingActivity($object_id);
+
+ $item_id = Item::searchByLink($object_id);
+ if ($item_id) {
+ Logger::info('Relayed message had been fetched and stored', ['id' => $object_id, 'item' => $item_id]);
+ } else {
+ Logger::notice('Relayed message had not been stored', ['id' => $object_id]);
+ }
+ }
+
/**
* Fetches the object type for a given object id
*
if (!empty($uid)) {
$additional = ['uid:' . $uid => $uid];
$receivers = array_merge($receivers, $additional);
- if (empty($reception_types[$uid]) || in_array($reception_types[$uid], [self::TARGET_UNKNOWN, self::TARGET_FOLLOWER, self::TARGET_ANSWER])) {
+ if (empty($reception_types[$uid]) || in_array($reception_types[$uid], [self::TARGET_UNKNOWN, self::TARGET_FOLLOWER, self::TARGET_ANSWER, self::TARGET_GLOBAL])) {
$reception_types[$uid] = self::TARGET_BCC;
}
} else {
$object_data['thread-completion'] = true;
$item = ActivityPub\Processor::createItem($object_data);
+ if (empty($item)) {
+ return;
+ }
+
+ $item['post-type'] = Item::PT_ANNOUNCEMENT;
ActivityPub\Processor::postItem($object_data, $item);
$announce_object_data = self::processObject($activity);
foreach ($receiver_list as $receiver) {
if ($receiver == self::PUBLIC_COLLECTION) {
- $receivers['uid:0'] = ['uid' => 0, 'type' => self::TARGET_UNKNOWN];
+ $receivers['uid:0'] = ['uid' => 0, 'type' => self::TARGET_GLOBAL];
}
// Add receiver "-1" for unlisted posts
if ($fetch_unlisted && ($receiver == self::PUBLIC_COLLECTION) && ($element == 'as:cc')) {
- $receivers['uid:-1'] = ['uid' => -1, 'type' => self::TARGET_UNKNOWN];
+ $receivers['uid:-1'] = ['uid' => -1, 'type' => self::TARGET_GLOBAL];
}
// Fetch the receivers for the public and the followers collection
}
$type = $receivers['uid:' . $contact['uid']]['type'] ?? self::TARGET_UNKNOWN;
- if (in_array($type, [self::TARGET_UNKNOWN, self::TARGET_FOLLOWER, self::TARGET_ANSWER])) {
+ if (in_array($type, [self::TARGET_UNKNOWN, self::TARGET_FOLLOWER, self::TARGET_ANSWER, self::TARGET_GLOBAL])) {
switch ($element) {
case 'as:to':
$type = self::TARGET_TO;