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

Store the push/pull direction in the conversation table

Browse source
This commit is contained in:
Michael 2020-03-03 08:01:04 +00:00
parent 6f0d40c6c0
commit af6db65961
5 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -490,12 +490,7 @@ class Processor
}
if (isset($activity['push'])) {
$push_app = $activity['push'] ? '📨' : '🚜';
if (!empty($item['app'])) {
$item['app'] .= ' (' . $push_app . ')';
} else {
$item['app'] .= $push_app;
}
$item['direction'] = $activity['push'] ? Conversation::PUSH : Conversation::PULL;
}
$item['plink'] = $activity['alternate-url'] ?? $item['uri'];

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

@ -174,9 +174,10 @@ class Receiver
/**
* Prepare the object array
*
* @param array $activity
* @param integer $uid User ID
* @param $trust_source
* @param array $activity Array with activity data
* @param integer $uid User ID
* @param boolean $push Message had been pushed to our system
* @param boolean $trust_source Do we trust the source?
*
* @return array with object data
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
@ -312,6 +313,7 @@ class Receiver
* @param string $body
* @param integer $uid User ID
* @param boolean $trust_source Do we trust the source?
* @param boolean $push Message had been pushed to our system
* @throws \Exception
*/
public static function processActivity($activity, $body = '', $uid = null, $trust_source = false, $push = false)