Store the "EmojiReact" activity
This commit is contained in:
parent
1475f53e21
commit
aa2a32d16f
4 changed files with 36 additions and 8 deletions
|
@ -176,6 +176,13 @@ final class Activity
|
||||||
const O_UNFOLLOW = ActivityNamespace::OSTATUS . '/unfollow';
|
const O_UNFOLLOW = ActivityNamespace::OSTATUS . '/unfollow';
|
||||||
const O_UNFAVOURITE = ActivityNamespace::OSTATUS . '/unfavorite';
|
const O_UNFAVOURITE = ActivityNamespace::OSTATUS . '/unfavorite';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* React to a post via an emoji
|
||||||
|
*
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
const EMOJIREACT = ActivityNamespace::LITEPUB . '/emojireact';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* likes (etc.) can apply to other things besides posts. Check if they are post children,
|
* likes (etc.) can apply to other things besides posts. Check if they are post children,
|
||||||
* in which case we handle them specially
|
* in which case we handle them specially
|
||||||
|
@ -183,10 +190,11 @@ final class Activity
|
||||||
* Hidden activities, which doesn't need to be shown
|
* Hidden activities, which doesn't need to be shown
|
||||||
*/
|
*/
|
||||||
const HIDDEN_ACTIVITIES = [
|
const HIDDEN_ACTIVITIES = [
|
||||||
Activity::LIKE, Activity::DISLIKE,
|
self::LIKE, self::DISLIKE,
|
||||||
Activity::ATTEND, Activity::ATTENDNO, Activity::ATTENDMAYBE,
|
self::ATTEND, self::ATTENDNO, self::ATTENDMAYBE,
|
||||||
Activity::FOLLOW,
|
self::FOLLOW,
|
||||||
Activity::ANNOUNCE,
|
self::ANNOUNCE,
|
||||||
|
self::EMOJIREACT,
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -148,4 +148,8 @@ final class ActivityNamespace
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
const MASTODON = 'http://mastodon.social/schema/1.0';
|
const MASTODON = 'http://mastodon.social/schema/1.0';
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
const LITEPUB = 'http://litepub.social';
|
||||||
}
|
}
|
||||||
|
|
|
@ -430,6 +430,10 @@ class Processor
|
||||||
unset($item['post-type']);
|
unset($item['post-type']);
|
||||||
$item['object-type'] = Activity\ObjectType::NOTE;
|
$item['object-type'] = Activity\ObjectType::NOTE;
|
||||||
|
|
||||||
|
if (!empty($activity['content'])) {
|
||||||
|
$item['body'] = HTML::toBBCode($activity['content']);
|
||||||
|
}
|
||||||
|
|
||||||
$item['diaspora_signed_text'] = $activity['diaspora:like'] ?? '';
|
$item['diaspora_signed_text'] = $activity['diaspora:like'] ?? '';
|
||||||
|
|
||||||
self::postItem($activity, $item);
|
self::postItem($activity, $item);
|
||||||
|
|
|
@ -384,7 +384,7 @@ class Receiver
|
||||||
} else {
|
} else {
|
||||||
$object_data['directmessage'] = JsonLD::fetchElement($activity, 'litepub:directMessage');
|
$object_data['directmessage'] = JsonLD::fetchElement($activity, 'litepub:directMessage');
|
||||||
}
|
}
|
||||||
} elseif (in_array($type, array_merge(self::ACTIVITY_TYPES, ['as:Follow'])) && in_array($object_type, self::CONTENT_TYPES)) {
|
} elseif (in_array($type, array_merge(self::ACTIVITY_TYPES, ['as:Follow', 'litepub:EmojiReact'])) && in_array($object_type, self::CONTENT_TYPES)) {
|
||||||
// Create a mostly empty array out of the activity data (instead of the object).
|
// Create a mostly empty array out of the activity data (instead of the object).
|
||||||
// This way we later don't have to check for the existence of each individual array element.
|
// This way we later don't have to check for the existence of each individual array element.
|
||||||
$object_data = self::processObject($activity);
|
$object_data = self::processObject($activity);
|
||||||
|
@ -752,8 +752,10 @@ class Receiver
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'litepub:EmojiReact':
|
case 'litepub:EmojiReact':
|
||||||
if (in_array($object_data['object_type'], array_merge([''], self::CONTENT_TYPES))) {
|
if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
|
||||||
// Unhandled Pleroma activity to react to a post via an emoji
|
ActivityPub\Processor::createActivity($object_data, Activity::EMOJIREACT);
|
||||||
|
} elseif ($object_data['object_type'] == '') {
|
||||||
|
// The object type couldn't be determined. We don't have it and we can't fetch it. We ignore this activity.
|
||||||
} else {
|
} else {
|
||||||
self::storeUnhandledActivity(true, $type, $object_data, $activity, $body, $uid, $trust_source, $push, $signer);
|
self::storeUnhandledActivity(true, $type, $object_data, $activity, $body, $uid, $trust_source, $push, $signer);
|
||||||
}
|
}
|
||||||
|
@ -786,7 +788,17 @@ class Receiver
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$tempfile = tempnam(System::getTempPath(), ($unknown ? 'unknown-' : 'unhandled-') . str_replace(':', '-', $type) . '-' . str_replace(':', '-', $object_data['object_type']) . '-' . str_replace(':', '-', $object_data['object_object_type'] ?? '') . '-');
|
$file = ($unknown ? 'unknown-' : 'unhandled-') . str_replace(':', '-', $type) . '-';
|
||||||
|
|
||||||
|
if (!empty($object_data['object_type'])) {
|
||||||
|
$file .= str_replace(':', '-', $object_data['object_type']) . '-';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!empty($object_data['object_object_type'])) {
|
||||||
|
$file .= str_replace(':', '-', $object_data['object_object_type']) . '-';
|
||||||
|
}
|
||||||
|
|
||||||
|
$tempfile = tempnam(System::getTempPath(), $file);
|
||||||
file_put_contents($tempfile, json_encode(['activity' => $activity, 'body' => $body, 'uid' => $uid, 'trust_source' => $trust_source, 'push' => $push, 'signer' => $signer, 'object_data' => $object_data], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
|
file_put_contents($tempfile, json_encode(['activity' => $activity, 'body' => $body, 'uid' => $uid, 'trust_source' => $trust_source, 'push' => $push, 'signer' => $signer, 'object_data' => $object_data], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
|
||||||
Logger::notice('Unknown activity stored', ['type' => $type, 'object_type' => $object_data['object_type'], $object_data['object_object_type'] ?? '', 'file' => $tempfile]);
|
Logger::notice('Unknown activity stored', ['type' => $type, 'object_type' => $object_data['object_type'], $object_data['object_object_type'] ?? '', 'file' => $tempfile]);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue