tobias/friendica
1
0
Fork 0
Code Pull requests Activity

We now store the conversation as well

Browse source
This commit is contained in:
Michael 2022-07-23 13:58:14 +00:00
parent abf39ff9cf
commit 5d6eb4670a
5 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
database.sql
View file

@ -732,6 +732,7 @@ CREATE TABLE IF NOT EXISTS `inbox-entry` (
`activity-id` varbinary(255) COMMENT 'id of the incoming activity', `activity-id` varbinary(255) COMMENT 'id of the incoming activity',
`object-id` varbinary(255) COMMENT '', `object-id` varbinary(255) COMMENT '',
`in-reply-to-id` varbinary(255) COMMENT '', `in-reply-to-id` varbinary(255) COMMENT '',
`conversation` varbinary(255) COMMENT '',
`type` varchar(64) COMMENT 'Type of the activity', `type` varchar(64) COMMENT 'Type of the activity',
`object-type` varchar(64) COMMENT 'Type of the object activity', `object-type` varchar(64) COMMENT 'Type of the object activity',
`object-object-type` varchar(64) COMMENT 'Type of the object\'s object activity', `object-object-type` varchar(64) COMMENT 'Type of the object\'s object activity',

1
doc/database/db_inbox-entry.md
View file

@ -12,6 +12,7 @@ Fields
| activity-id | id of the incoming activity | varbinary(255) | YES | | NULL | | | activity-id | id of the incoming activity | varbinary(255) | YES | | NULL | |
| object-id | | varbinary(255) | YES | | NULL | | | object-id | | varbinary(255) | YES | | NULL | |
| in-reply-to-id | | varbinary(255) | YES | | NULL | | | in-reply-to-id | | varbinary(255) | YES | | NULL | |
| conversation | | varbinary(255) | YES | | NULL | |
| type | Type of the activity | varchar(64) | YES | | NULL | | | type | Type of the activity | varchar(64) | YES | | NULL | |
| object-type | Type of the object activity | varchar(64) | YES | | NULL | | | object-type | Type of the object activity | varchar(64) | YES | | NULL | |
| object-object-type | Type of the object's object activity | varchar(64) | YES | | NULL | | | object-object-type | Type of the object's object activity | varchar(64) | YES | | NULL | |

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

@ -695,7 +695,7 @@ class Processor
Logger::warning('Unknown parent item.', ['uri' => $parent_uri]); Logger::warning('Unknown parent item.', ['uri' => $parent_uri]);
return false; return false;
} }
if (($parent['private'] == Item::PRIVATE) && ($parent['private'] != Item::PRIVATE)) { if (($item['private'] == Item::PRIVATE) && ($parent['private'] != Item::PRIVATE)) {
Logger::warning('Item is private but the parent is not. Dropping.', ['item-uri' => $item['uri'], 'thr-parent' => $item['thr-parent']]); Logger::warning('Item is private but the parent is not. Dropping.', ['item-uri' => $item['uri'], 'thr-parent' => $item['thr-parent']]);
return false; return false;
} }

6
src/Protocol/ActivityPub/Queue.php
View file

@ -57,6 +57,12 @@ class Queue
$fields['in-reply-to-id'] = $activity['reply-to-id']; $fields['in-reply-to-id'] = $activity['reply-to-id'];
} }
if (!empty($activity['context'])) {
$fields['conversation'] = $activity['context'];
} elseif(!empty($activity['conversation'])) {
$fields['conversation'] = $activity['conversation'];
}
if (!empty($activity['object_object_type'])) { if (!empty($activity['object_object_type'])) {
$fields['object-object-type'] = $activity['object_object_type']; $fields['object-object-type'] = $activity['object_object_type'];
} }

1
static/dbstructure.config.php
View file

@ -791,6 +791,7 @@ return [
"activity-id" => ["type" => "varbinary(255)", "comment" => "id of the incoming activity"], "activity-id" => ["type" => "varbinary(255)", "comment" => "id of the incoming activity"],
"object-id" => ["type" => "varbinary(255)", "comment" => ""], "object-id" => ["type" => "varbinary(255)", "comment" => ""],
"in-reply-to-id" => ["type" => "varbinary(255)", "comment" => ""], "in-reply-to-id" => ["type" => "varbinary(255)", "comment" => ""],
"conversation" => ["type" => "varbinary(255)", "comment" => ""],
"type" => ["type" => "varchar(64)", "comment" => "Type of the activity"], "type" => ["type" => "varchar(64)", "comment" => "Type of the activity"],
"object-type" => ["type" => "varchar(64)", "comment" => "Type of the object activity"], "object-type" => ["type" => "varchar(64)", "comment" => "Type of the object activity"],
"object-object-type" => ["type" => "varchar(64)", "comment" => "Type of the object's object activity"], "object-object-type" => ["type" => "varchar(64)", "comment" => "Type of the object's object activity"],