Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 13:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move Activity/Namespaces defines to constants

Browse source
This commit is contained in:
Philipp Holzer 2019-10-24 00:25:43 +02:00
parent 978262a718
commit 07cea24430
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
34 changed files with 467 additions and 403 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Protocol/ActivityPub/Processor.php
View file

@ -18,6 +18,7 @@ use Friendica\Model\Event;
use Friendica\Model\Term;
use Friendica\Model\User;
use Friendica\Model\Mail;
use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityPub;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\JsonLD;
@ -167,15 +168,15 @@ class Processor
public static function createItem($activity)
{
$item = [];
$item['verb'] = ACTIVITY_POST;
$item['verb'] = Activity::POST;
$item['thr-parent'] = $activity['reply-to-id'];
if ($activity['reply-to-id'] == $activity['id']) {
$item['gravity'] = GRAVITY_PARENT;
$item['object-type'] = ACTIVITY_OBJ_NOTE;
$item['object-type'] = Activity::OBJ_NOTE;
} else {
$item['gravity'] = GRAVITY_COMMENT;
$item['object-type'] = ACTIVITY_OBJ_COMMENT;
$item['object-type'] = Activity::OBJ_COMMENT;
}
if (empty($activity['directmessage']) && ($activity['id'] != $activity['reply-to-id']) && !Item::exists(['uri' => $activity['reply-to-id']])) {
@ -254,7 +255,7 @@ class Processor
$item['verb'] = $verb;
$item['thr-parent'] = $activity['object_id'];
$item['gravity'] = GRAVITY_ACTIVITY;
$item['object-type'] = ACTIVITY_OBJ_NOTE;
$item['object-type'] = Activity::OBJ_NOTE;
$item['diaspora_signed_text'] = $activity['diaspora:like'] ?? '';

15
src/Protocol/ActivityPub/Receiver.php
View file

@ -12,6 +12,7 @@ use Friendica\Model\APContact;
use Friendica\Model\Conversation;
use Friendica\Model\Item;
use Friendica\Model\User;
use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityPub;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\HTTPSignature;
@ -400,26 +401,26 @@ class Receiver
$announce_object_data['object_id'] = $object_data['object_id'];
$announce_object_data['object_type'] = $object_data['object_type'];
ActivityPub\Processor::createActivity($announce_object_data, ACTIVITY2_ANNOUNCE);
ActivityPub\Processor::createActivity($announce_object_data, Activity::ANNOUNCE);
}
}
break;
case 'as:Like':
if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
ActivityPub\Processor::createActivity($object_data, ACTIVITY_LIKE);
ActivityPub\Processor::createActivity($object_data, Activity::LIKE);
}
break;
case 'as:Dislike':
if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
ActivityPub\Processor::createActivity($object_data, ACTIVITY_DISLIKE);
ActivityPub\Processor::createActivity($object_data, Activity::DISLIKE);
}
break;
case 'as:TentativeAccept':
if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
ActivityPub\Processor::createActivity($object_data, ACTIVITY_ATTENDMAYBE);
ActivityPub\Processor::createActivity($object_data, Activity::ATTENDMAYBE);
}
break;
@ -444,7 +445,7 @@ class Receiver
ActivityPub\Processor::followUser($object_data);
} elseif (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
$object_data['reply-to-id'] = $object_data['object_id'];
ActivityPub\Processor::createActivity($object_data, ACTIVITY_FOLLOW);
ActivityPub\Processor::createActivity($object_data, Activity::FOLLOW);
}
break;
@ -452,7 +453,7 @@ class Receiver
if ($object_data['object_type'] == 'as:Follow') {
ActivityPub\Processor::acceptFollowUser($object_data);
} elseif (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
ActivityPub\Processor::createActivity($object_data, ACTIVITY_ATTEND);
ActivityPub\Processor::createActivity($object_data, Activity::ATTEND);
}
break;
@ -460,7 +461,7 @@ class Receiver
if ($object_data['object_type'] == 'as:Follow') {
ActivityPub\Processor::rejectFollowUser($object_data);
} elseif (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
ActivityPub\Processor::createActivity($object_data, ACTIVITY_ATTENDNO);
ActivityPub\Processor::createActivity($object_data, Activity::ATTENDNO);
}
break;

19
src/Protocol/ActivityPub/Transmitter.php
View file

@ -10,6 +10,7 @@ use Friendica\Database\DBA;
use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Protocol\Activity;
use Friendica\Util\HTTPSignature;
use Friendica\Core\Protocol;
use Friendica\Model\Conversation;
@ -761,25 +762,25 @@ class Transmitter
if ($reshared) {
$type = 'Announce';
} elseif ($item['verb'] == ACTIVITY_POST) {
} elseif ($item['verb'] == Activity::POST) {
if ($item['created'] == $item['edited']) {
$type = 'Create';
} else {
$type = 'Update';
}
} elseif ($item['verb'] == ACTIVITY_LIKE) {
} elseif ($item['verb'] == Activity::LIKE) {
$type = 'Like';
} elseif ($item['verb'] == ACTIVITY_DISLIKE) {
} elseif ($item['verb'] == Activity::DISLIKE) {
$type = 'Dislike';
} elseif ($item['verb'] == ACTIVITY_ATTEND) {
} elseif ($item['verb'] == Activity::ATTEND) {
$type = 'Accept';
} elseif ($item['verb'] == ACTIVITY_ATTENDNO) {
} elseif ($item['verb'] == Activity::ATTENDNO) {
$type = 'Reject';
} elseif ($item['verb'] == ACTIVITY_ATTENDMAYBE) {
} elseif ($item['verb'] == Activity::ATTENDMAYBE) {
$type = 'TentativeAccept';
} elseif ($item['verb'] == ACTIVITY_FOLLOW) {
} elseif ($item['verb'] == Activity::FOLLOW) {
$type = 'Follow';
} elseif ($item['verb'] == ACTIVITY_TAG) {
} elseif ($item['verb'] == Activity::TAG) {
$type = 'Add';
} else {
$type = '';
@ -1571,7 +1572,7 @@ class Transmitter
$uid = $first_user['uid'];
}
$condition = ['verb' => ACTIVITY_FOLLOW, 'uid' => 0, 'parent-uri' => $object,
$condition = ['verb' => Activity::FOLLOW, 'uid' => 0, 'parent-uri' => $object,
'author-id' => Contact::getPublicIdByUserId($uid)];
if (Item::exists($condition)) {
Logger::log('Follow for ' . $object . ' for user ' . $uid . ' does already exist.', Logger::DEBUG);