diff --git a/database.sql b/database.sql index 417eddfcde..40abb7f056 100644 --- a/database.sql +++ b/database.sql @@ -1159,7 +1159,7 @@ CREATE TABLE IF NOT EXISTS `post-collection` ( INDEX `type` (`type`), INDEX `author-id` (`author-id`), FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE, - FOREIGN KEY (`author-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT + FOREIGN KEY (`author-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Collection of posts'; -- diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php index 5413e32841..61f625f597 100644 --- a/src/Protocol/ActivityPub/Processor.php +++ b/src/Protocol/ActivityPub/Processor.php @@ -759,7 +759,7 @@ class Processor public static function createEvent(array $activity, array $item): int { $event['summary'] = HTML::toBBCode($activity['name'] ?: $activity['summary']); - $event['desc'] = HTML::toBBCode($activity['content']); + $event['desc'] = HTML::toBBCode($activity['content'] ?? ''); if (!empty($activity['start-time'])) { $event['start'] = DateTimeFormat::utc($activity['start-time']); } diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index fc5be58dd8..81f03fbf31 100644 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -1188,7 +1188,7 @@ return [ "fields" => [ "uri-id" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"], "type" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "primary" => "1", "comment" => "0 - Featured"], - "author-id" => ["type" => "int unsigned", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Author of the featured post"], + "author-id" => ["type" => "int unsigned", "foreign" => ["contact" => "id"], "comment" => "Author of the featured post"], ], "indexes" => [ "PRIMARY" => ["uri-id", "type"],