forked from GNUsocial/gnu-social
[AP] Support Private Messaging
ActivityPubPlugin: - Subscribe DirectMessage events Activitypub_inbox_handler: - Update handle_create_note to create private messages Activitypub_postman: - Add create_direct_note for sending private messages Activitypub_create: - Update create_to_array to support the 'directMessage' attribute - Add isPrivateNote to verify private activities Activitypub_notice: - Update create_note to support the 'directMessage' attribute - Remove isPrivateNote lib/models: - Add Activitypub_message, the model in charge of private notes
This commit is contained in:
@@ -42,15 +42,16 @@ class Activitypub_create
|
||||
* @author Diogo Cordeiro <diogo@fc.up.pt>
|
||||
* @param string $actor
|
||||
* @param array $object
|
||||
* @param bool $directMesssage whether it is a private Create activity or not
|
||||
* @return array pretty array to be used in a response
|
||||
*/
|
||||
public static function create_to_array(string $actor, array $object): array
|
||||
public static function create_to_array(string $actor, array $object, bool $directMessage = false): array
|
||||
{
|
||||
$res = [
|
||||
'@context' => 'https://www.w3.org/ns/activitystreams',
|
||||
'id' => $object['id'].'/create',
|
||||
'type' => 'Create',
|
||||
'directMessage' => false,
|
||||
'directMessage' => $directMessage,
|
||||
'to' => $object['to'],
|
||||
'cc' => $object['cc'],
|
||||
'actor' => $actor,
|
||||
@@ -89,4 +90,21 @@ class Activitypub_create
|
||||
throw new Exception('This is not a supported Object Type for Create Activity.');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Verify if received note is private (direct).
|
||||
* Note that we're conformant with the (yet) non-standard directMessage attribute:
|
||||
* https://github.com/w3c/activitypub/issues/196#issuecomment-304958984
|
||||
*
|
||||
* @param array $activity received Create-Note activity
|
||||
* @return bool true if note is private, false otherwise
|
||||
* @author Bruno casteleiro <brunoccast@fc.up.pt>
|
||||
*/
|
||||
public static function isPrivateNote(array $activity): bool {
|
||||
if (isset($activity['directMessage'])) {
|
||||
return $activity['directMessage'];
|
||||
}
|
||||
|
||||
return empty($activity['cc']) && !in_array('https://www.w3.org/ns/activitystreams#Public', $activity['to']);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user