bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #9904 from annando/thread

Browse source 
Getting rid of the "thread" table - first step
This commit is contained in:
Hypolite Petovan 2021-02-05 08:57:38 -05:00 committed by GitHub
commit 0fe37b123a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 672 additions and 202 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

160
database.sql
View file

@ -1,6 +1,6 @@
-- ------------------------------------------ -- ------------------------------------------
-- Friendica 2021.03-dev (Red Hot Poker) -- Friendica 2021.03-dev (Red Hot Poker)
-- DB_UPDATE_VERSION 1397 -- DB_UPDATE_VERSION 1398
-- ------------------------------------------ -- ------------------------------------------
@ -1125,6 +1125,32 @@ CREATE TABLE IF NOT EXISTS `post-tag` (
FOREIGN KEY (`cid`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT FOREIGN KEY (`cid`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='post relation to tags'; ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='post relation to tags';
--
-- TABLE post-thread
--
CREATE TABLE IF NOT EXISTS `post-thread` (
`uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri',
`owner-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Item owner',
`author-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Item author',
`causer-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the contact that caused the item creation',
`network` char(4) NOT NULL DEFAULT '' COMMENT '',
`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
`changed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date that something in the conversation changed, indicating clients should fetch the conversation again',
`commented` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
PRIMARY KEY(`uri-id`),
INDEX `owner-id` (`owner-id`),
INDEX `author-id` (`author-id`),
INDEX `causer-id` (`causer-id`),
INDEX `received` (`received`),
INDEX `commented` (`commented`),
INDEX `changed` (`changed`),
FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
FOREIGN KEY (`owner-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT,
FOREIGN KEY (`author-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT,
FOREIGN KEY (`causer-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Thread related data';
-- --
-- TABLE post-thread-user -- TABLE post-thread-user
-- --
@ -1135,6 +1161,7 @@ CREATE TABLE IF NOT EXISTS `post-thread-user` (
`starred` boolean NOT NULL DEFAULT '0' COMMENT '', `starred` boolean NOT NULL DEFAULT '0' COMMENT '',
`ignored` boolean NOT NULL DEFAULT '0' COMMENT 'Ignore updates for this thread', `ignored` boolean NOT NULL DEFAULT '0' COMMENT 'Ignore updates for this thread',
`wall` boolean NOT NULL DEFAULT '0' COMMENT 'This item was posted to the wall of uid', `wall` boolean NOT NULL DEFAULT '0' COMMENT 'This item was posted to the wall of uid',
`mention` boolean NOT NULL DEFAULT '0' COMMENT '',
`pubmail` boolean NOT NULL DEFAULT '0' COMMENT '', `pubmail` boolean NOT NULL DEFAULT '0' COMMENT '',
`forum_mode` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '', `forum_mode` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
PRIMARY KEY(`uid`,`uri-id`), PRIMARY KEY(`uid`,`uri-id`),
@ -1641,43 +1668,43 @@ CREATE VIEW `post-view` AS SELECT
DROP VIEW IF EXISTS `post-thread-view`; DROP VIEW IF EXISTS `post-thread-view`;
CREATE VIEW `post-thread-view` AS SELECT CREATE VIEW `post-thread-view` AS SELECT
`item`.`id` AS `id`, `item`.`id` AS `id`,
`thread`.`iid` AS `iid`, `item`.`id` AS `iid`,
`item`.`id` AS `item_id`, `item`.`id` AS `item_id`,
`thread`.`uid` AS `uid`, `post-thread-user`.`uid` AS `uid`,
`item`.`parent` AS `parent`, `item`.`parent` AS `parent`,
`item`.`uri` AS `uri`, `item`.`uri` AS `uri`,
`item`.`uri-id` AS `uri-id`, `post-thread`.`uri-id` AS `uri-id`,
`item`.`parent-uri` AS `parent-uri`, `item`.`parent-uri` AS `parent-uri`,
`item`.`parent-uri-id` AS `parent-uri-id`, `item`.`parent-uri-id` AS `parent-uri-id`,
`item`.`thr-parent` AS `thr-parent`, `item`.`thr-parent` AS `thr-parent`,
`item`.`thr-parent-id` AS `thr-parent-id`, `item`.`thr-parent-id` AS `thr-parent-id`,
`item`.`guid` AS `guid`, `item`.`guid` AS `guid`,
`item`.`type` AS `type`, `item`.`type` AS `type`,
`thread`.`wall` AS `wall`, `post-thread-user`.`wall` AS `wall`,
`item`.`gravity` AS `gravity`, `item`.`gravity` AS `gravity`,
`item`.`extid` AS `extid`, `item`.`extid` AS `extid`,
`thread`.`created` AS `created`, `post-thread`.`created` AS `created`,
`item`.`edited` AS `edited`, `item`.`edited` AS `edited`,
`thread`.`commented` AS `commented`, `post-thread`.`commented` AS `commented`,
`thread`.`received` AS `received`, `post-thread`.`received` AS `received`,
`thread`.`changed` AS `changed`, `post-thread`.`changed` AS `changed`,
`thread`.`post-type` AS `post-type`, `item`.`post-type` AS `post-type`,
`thread`.`private` AS `private`, `item`.`private` AS `private`,
`thread`.`pubmail` AS `pubmail`, `post-thread-user`.`pubmail` AS `pubmail`,
`thread`.`moderated` AS `moderated`, `item`.`moderated` AS `moderated`,
`thread`.`ignored` AS `ignored`, `post-thread-user`.`ignored` AS `ignored`,
`thread`.`visible` AS `visible`, `item`.`visible` AS `visible`,
`thread`.`starred` AS `starred`, `post-thread-user`.`starred` AS `starred`,
`item`.`bookmark` AS `bookmark`, `item`.`bookmark` AS `bookmark`,
`item`.`unseen` AS `unseen`, `post-user`.`unseen` AS `unseen`,
`thread`.`deleted` AS `deleted`, `item`.`deleted` AS `deleted`,
`thread`.`origin` AS `origin`, `post-user`.`origin` AS `origin`,
`thread`.`forum_mode` AS `forum_mode`, `post-thread-user`.`forum_mode` AS `forum_mode`,
`thread`.`mention` AS `mention`, `item`.`mention` AS `mention`,
`item`.`global` AS `global`, `item`.`global` AS `global`,
`thread`.`network` AS `network`, `post-thread`.`network` AS `network`,
`item`.`vid` AS `vid`, `item`.`vid` AS `vid`,
`item`.`psid` AS `psid`, `post-user`.`psid` AS `psid`,
IF (`item`.`vid` IS NULL, '', `verb`.`name`) AS `verb`, IF (`item`.`vid` IS NULL, '', `verb`.`name`) AS `verb`,
`post-content`.`title` AS `title`, `post-content`.`title` AS `title`,
`post-content`.`content-warning` AS `content-warning`, `post-content`.`content-warning` AS `content-warning`,
@ -1695,7 +1722,7 @@ CREATE VIEW `post-thread-view` AS SELECT
`post-content`.`target-type` AS `target-type`, `post-content`.`target-type` AS `target-type`,
`post-content`.`target` AS `target`, `post-content`.`target` AS `target`,
`post-content`.`resource-id` AS `resource-id`, `post-content`.`resource-id` AS `resource-id`,
`thread`.`contact-id` AS `contact-id`, `post-user`.`contact-id` AS `contact-id`,
`contact`.`url` AS `contact-link`, `contact`.`url` AS `contact-link`,
`contact`.`addr` AS `contact-addr`, `contact`.`addr` AS `contact-addr`,
`contact`.`name` AS `contact-name`, `contact`.`name` AS `contact-name`,
@ -1720,7 +1747,7 @@ CREATE VIEW `post-thread-view` AS SELECT
`contact`.`avatar-date` AS `avatar-date`, `contact`.`avatar-date` AS `avatar-date`,
`contact`.`thumb` AS `thumb`, `contact`.`thumb` AS `thumb`,
`contact`.`dfrn-id` AS `dfrn-id`, `contact`.`dfrn-id` AS `dfrn-id`,
`thread`.`author-id` AS `author-id`, `post-thread`.`author-id` AS `author-id`,
`author`.`url` AS `author-link`, `author`.`url` AS `author-link`,
`author`.`addr` AS `author-addr`, `author`.`addr` AS `author-addr`,
IF (`contact`.`url` = `author`.`url` AND `contact`.`name` != '', `contact`.`name`, `author`.`name`) AS `author-name`, IF (`contact`.`url` = `author`.`url` AND `contact`.`name` != '', `contact`.`name`, `author`.`name`) AS `author-name`,
@ -1729,7 +1756,7 @@ CREATE VIEW `post-thread-view` AS SELECT
`author`.`network` AS `author-network`, `author`.`network` AS `author-network`,
`author`.`blocked` AS `author-blocked`, `author`.`blocked` AS `author-blocked`,
`author`.`hidden` AS `author-hidden`, `author`.`hidden` AS `author-hidden`,
`thread`.`owner-id` AS `owner-id`, `post-thread`.`owner-id` AS `owner-id`,
`owner`.`url` AS `owner-link`, `owner`.`url` AS `owner-link`,
`owner`.`addr` AS `owner-addr`, `owner`.`addr` AS `owner-addr`,
IF (`contact`.`url` = `owner`.`url` AND `contact`.`name` != '', `contact`.`name`, `owner`.`name`) AS `owner-name`, IF (`contact`.`url` = `owner`.`url` AND `contact`.`name` != '', `contact`.`name`, `owner`.`name`) AS `owner-name`,
@ -1753,10 +1780,10 @@ CREATE VIEW `post-thread-view` AS SELECT
`post-delivery-data`.`queue_count` AS `delivery_queue_count`, `post-delivery-data`.`queue_count` AS `delivery_queue_count`,
`post-delivery-data`.`queue_done` AS `delivery_queue_done`, `post-delivery-data`.`queue_done` AS `delivery_queue_done`,
`post-delivery-data`.`queue_failed` AS `delivery_queue_failed`, `post-delivery-data`.`queue_failed` AS `delivery_queue_failed`,
IF (`item`.`psid` IS NULL, '', `permissionset`.`allow_cid`) AS `allow_cid`, IF (`post-user`.`psid` IS NULL, '', `permissionset`.`allow_cid`) AS `allow_cid`,
IF (`item`.`psid` IS NULL, '', `permissionset`.`allow_gid`) AS `allow_gid`, IF (`post-user`.`psid` IS NULL, '', `permissionset`.`allow_gid`) AS `allow_gid`,
IF (`item`.`psid` IS NULL, '', `permissionset`.`deny_cid`) AS `deny_cid`, IF (`post-user`.`psid` IS NULL, '', `permissionset`.`deny_cid`) AS `deny_cid`,
IF (`item`.`psid` IS NULL, '', `permissionset`.`deny_gid`) AS `deny_gid`, IF (`post-user`.`psid` IS NULL, '', `permissionset`.`deny_gid`) AS `deny_gid`,
`item`.`event-id` AS `event-id`, `item`.`event-id` AS `event-id`,
`event`.`created` AS `event-created`, `event`.`created` AS `event-created`,
`event`.`edited` AS `event-edited`, `event`.`edited` AS `event-edited`,
@ -1776,18 +1803,20 @@ CREATE VIEW `post-thread-view` AS SELECT
`parent-item-author`.`url` AS `parent-author-link`, `parent-item-author`.`url` AS `parent-author-link`,
`parent-item-author`.`name` AS `parent-author-name`, `parent-item-author`.`name` AS `parent-author-name`,
`parent-item-author`.`network` AS `parent-author-network` `parent-item-author`.`network` AS `parent-author-network`
FROM `thread` FROM `post-thread`
STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid` STRAIGHT_JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-thread`.`uri-id`
STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id` STRAIGHT_JOIN `post-user` ON `post-user`.`uri-id` = `post-thread`.`uri-id`
STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `thread`.`author-id` STRAIGHT_JOIN `item` ON `item`.`uri-id` = `post-thread`.`uri-id` AND `item`.`uid` = `post-thread-user`.`uid`
STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `thread`.`owner-id` STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-user`.`contact-id`
STRAIGHT_JOIN `contact` AS `causer` ON `causer`.`id` = `item`.`causer-id` STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `post-thread`.`author-id`
STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `post-thread`.`owner-id`
STRAIGHT_JOIN `contact` AS `causer` ON `causer`.`id` = `post-thread`.`causer-id`
LEFT JOIN `verb` ON `verb`.`id` = `item`.`vid` LEFT JOIN `verb` ON `verb`.`id` = `item`.`vid`
LEFT JOIN `event` ON `event`.`id` = `item`.`event-id` LEFT JOIN `event` ON `event`.`id` = `item`.`event-id`
LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `thread`.`uri-id` LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `post-thread`.`uri-id`
LEFT JOIN `post-content` ON `post-content`.`uri-id` = `thread`.`uri-id` LEFT JOIN `post-content` ON `post-content`.`uri-id` = `post-thread`.`uri-id`
LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `thread`.`uri-id` AND `thread`.`origin` LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `post-thread`.`uri-id` AND `post-user`.`origin`
LEFT JOIN `permissionset` ON `permissionset`.`id` = `item`.`psid` LEFT JOIN `permissionset` ON `permissionset`.`id` = `post-user`.`psid`
STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent` STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`
STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`; STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`;
@ -1846,13 +1875,13 @@ CREATE VIEW `network-item-view` AS SELECT
`item`.`contact-id` AS `contact-id`, `item`.`contact-id` AS `contact-id`,
`ownercontact`.`contact-type` AS `contact-type` `ownercontact`.`contact-type` AS `contact-type`
FROM `item` FROM `item`
INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent` INNER JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`
STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id` STRAIGHT_JOIN `contact` ON `contact`.`id` = `parent-item`.`contact-id`
LEFT JOIN `post-user` ON `post-user`.`uri-id` = `item`.`uri-id` AND `post-user`.`uid` = `thread`.`uid` LEFT JOIN `post-user` ON `post-user`.`uri-id` = `item`.`uri-id` AND `post-user`.`uid` = `parent-item`.`uid`
LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `thread`.`uid` AND `author`.`cid` = `thread`.`author-id` LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `parent-item`.`uid` AND `author`.`cid` = `parent-item`.`author-id`
LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `thread`.`uid` AND `owner`.`cid` = `thread`.`owner-id` LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `parent-item`.`uid` AND `owner`.`cid` = `parent-item`.`owner-id`
LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `thread`.`owner-id` LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `parent-item`.`owner-id`
WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated` WHERE `parent-item`.`visible` AND NOT `parent-item`.`deleted` AND NOT `parent-item`.`moderated`
AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`) AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`) AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`)
AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`) AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
@ -1863,27 +1892,28 @@ CREATE VIEW `network-item-view` AS SELECT
-- --
DROP VIEW IF EXISTS `network-thread-view`; DROP VIEW IF EXISTS `network-thread-view`;
CREATE VIEW `network-thread-view` AS SELECT CREATE VIEW `network-thread-view` AS SELECT
`item`.`uri-id` AS `uri-id`, `post-thread`.`uri-id` AS `uri-id`,
`item`.`uri` AS `uri`, `item`.`uri` AS `uri`,
`item`.`parent-uri-id` AS `parent-uri-id`, `item`.`parent-uri-id` AS `parent-uri-id`,
`thread`.`iid` AS `parent`, `item`.`id` AS `parent`,
`thread`.`received` AS `received`, `post-thread`.`received` AS `received`,
`thread`.`commented` AS `commented`, `post-thread`.`commented` AS `commented`,
`thread`.`created` AS `created`, `post-thread`.`created` AS `created`,
`thread`.`uid` AS `uid`, `post-thread-user`.`uid` AS `uid`,
`thread`.`starred` AS `starred`, `post-thread-user`.`starred` AS `starred`,
`thread`.`mention` AS `mention`, `post-thread-user`.`mention` AS `mention`,
`thread`.`network` AS `network`, `post-thread`.`network` AS `network`,
`thread`.`contact-id` AS `contact-id`, `post-user`.`contact-id` AS `contact-id`,
`ownercontact`.`contact-type` AS `contact-type` `ownercontact`.`contact-type` AS `contact-type`
FROM `thread` FROM `post-thread`
STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id` STRAIGHT_JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-thread`.`uri-id`
STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid` STRAIGHT_JOIN `post-user` ON `post-user`.`uri-id` = `post-thread`.`uri-id` AND `post-user`.`uid` = `post-thread-user`.`uid`
LEFT JOIN `post-user` ON `post-user`.`uri-id` = `item`.`uri-id` AND `post-user`.`uid` = `thread`.`uid` STRAIGHT_JOIN `item` ON `item`.`uri-id` = `post-thread`.`uri-id` AND `item`.`uid` = `post-thread-user`.`uid`
LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `thread`.`uid` AND `author`.`cid` = `thread`.`author-id` STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-user`.`contact-id`
LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `thread`.`uid` AND `owner`.`cid` = `thread`.`owner-id` LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-user`.`uid` AND `author`.`cid` = `post-thread`.`author-id`
LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `thread`.`owner-id` LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-user`.`uid` AND `owner`.`cid` = `post-thread`.`owner-id`
WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated` LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread`.`owner-id`
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`) AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`) AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`)
AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`) AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)

26
include/api.php
View file

@ -1118,8 +1118,8 @@ function api_statuses_update($type)
if ($throttle_day > 0) { if ($throttle_day > 0) {
$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60); $datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60);
$condition = ["`uid` = ? AND `wall` AND `received` > ?", api_user(), $datefrom]; $condition = ["`gravity` = ? AND `uid` = ? AND `wall` AND `received` > ?", GRAVITY_PARENT, api_user(), $datefrom];
$posts_day = DBA::count('thread', $condition); $posts_day = Post::count($condition);
if ($posts_day > $throttle_day) { if ($posts_day > $throttle_day) {
Logger::log('Daily posting limit reached for user '.api_user(), Logger::DEBUG); Logger::log('Daily posting limit reached for user '.api_user(), Logger::DEBUG);
@ -1132,8 +1132,8 @@ function api_statuses_update($type)
if ($throttle_week > 0) { if ($throttle_week > 0) {
$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*7); $datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*7);
$condition = ["`uid` = ? AND `wall` AND `received` > ?", api_user(), $datefrom]; $condition = ["`gravity` = ? AND `uid` = ? AND `wall` AND `received` > ?", GRAVITY_PARENT, api_user(), $datefrom];
$posts_week = DBA::count('thread', $condition); $posts_week = Post::count($condition);
if ($posts_week > $throttle_week) { if ($posts_week > $throttle_week) {
Logger::log('Weekly posting limit reached for user '.api_user(), Logger::DEBUG); Logger::log('Weekly posting limit reached for user '.api_user(), Logger::DEBUG);
@ -1146,8 +1146,8 @@ function api_statuses_update($type)
if ($throttle_month > 0) { if ($throttle_month > 0) {
$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*30); $datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*30);
$condition = ["`uid` = ? AND `wall` AND `received` > ?", api_user(), $datefrom]; $condition = ["`gravity` = ? AND `uid` = ? AND `wall` AND `received` > ?", GRAVITY_PARENT, api_user(), $datefrom];
$posts_month = DBA::count('thread', $condition); $posts_month = Post::count($condition);
if ($posts_month > $throttle_month) { if ($posts_month > $throttle_month) {
Logger::log('Monthly posting limit reached for user '.api_user(), Logger::DEBUG); Logger::log('Monthly posting limit reached for user '.api_user(), Logger::DEBUG);
@ -1810,18 +1810,18 @@ function api_statuses_networkpublic_timeline($type)
$start = max(0, ($page - 1) * $count); $start = max(0, ($page - 1) * $count);
$condition = ["`uid` = 0 AND `gravity` IN (?, ?) AND `iid` > ? AND `private` = ?", $condition = ["`uid` = 0 AND `gravity` IN (?, ?) AND `id` > ? AND `private` = ?",
GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, Item::PUBLIC]; GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, Item::PUBLIC];
if ($max_id > 0) { if ($max_id > 0) {
$condition[0] .= " AND `iid` <= ?"; $condition[0] .= " AND `id` <= ?";
$condition[] = $max_id; $condition[] = $max_id;
} }
$params = ['order' => ['iid' => true], 'limit' => [$start, $count]]; $params = ['order' => ['id' => true], 'limit' => [$start, $count]];
$statuses = Post::selectThreadForUser(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params); $statuses = Post::toArray(Post::selectForUser(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params));
$ret = api_format_items(Post::toArray($statuses), $user_info, false, $type); $ret = api_format_items($statuses, $user_info, false, $type);
bindComments($ret); bindComments($ret);
@ -2931,6 +2931,10 @@ function api_format_items($items, $user_info, $filter_user = false, $type = "jso
$ret = []; $ret = [];
if (empty($items)) {
return $ret;
}
foreach ((array)$items as $item) { foreach ((array)$items as $item) {
list($status_user, $author_user, $owner_user) = api_item_get_user($a, $item); list($status_user, $author_user, $owner_user) = api_item_get_user($a, $item);

11
src/Model/Item.php
View file

@ -899,8 +899,9 @@ class Item
// If its a post that originated here then tag the thread as "mention" // If its a post that originated here then tag the thread as "mention"
if ($item['origin'] && $item['uid']) { if ($item['origin'] && $item['uid']) {
DBA::update('post-thread-user', ['mention' => true], ['uri-id' => $item['parent-uri-id'], 'uid' => $item['uid']]);
DBA::update('thread', ['mention' => true], ['iid' => $parent_id]); DBA::update('thread', ['mention' => true], ['iid' => $parent_id]);
Logger::info('tagged thread as mention', ['parent' => $parent_id, 'uid' => $item['uid']]); Logger::info('tagged thread as mention', ['parent' => $parent_id, 'parent-uri-id' => $item['parent-uri-id'], 'uid' => $item['uid']]);
} }
// Update the contact relations // Update the contact relations
@ -979,6 +980,10 @@ class Item
Post\Media::insertFromAttachment($item['uri-id'], $item['attach']); Post\Media::insertFromAttachment($item['uri-id'], $item['attach']);
} }
if ($item['gravity'] == GRAVITY_PARENT) {
Post\Thread::insert($item['uri-id'], $item);
}
if (!in_array($item['verb'], self::ACTIVITIES)) { if (!in_array($item['verb'], self::ACTIVITIES)) {
Post\Content::insert($item['uri-id'], $item); Post\Content::insert($item['uri-id'], $item);
} }
@ -2203,9 +2208,9 @@ class Item
public static function firstPostDate($uid, $wall = false) public static function firstPostDate($uid, $wall = false)
{ {
$condition = ['uid' => $uid, 'wall' => $wall, 'deleted' => false, 'visible' => true, 'moderated' => false]; $condition = ['gravity' => GRAVITY_PARENT, 'uid' => $uid, 'wall' => $wall, 'deleted' => false, 'visible' => true, 'moderated' => false];
$params = ['order' => ['received' => false]]; $params = ['order' => ['received' => false]];
$thread = DBA::selectFirst('thread', ['received'], $condition, $params); $thread = Post::selectFirst(['received'], $condition, $params);
if (DBA::isResult($thread)) { if (DBA::isResult($thread)) {
return substr(DateTimeFormat::local($thread['received']), 0, 10); return substr(DateTimeFormat::local($thread['received']), 0, 10);
} }

14
src/Model/Post.php
View file

@ -194,7 +194,7 @@ class Post
'parent-guid', 'parent-network', 'parent-author-id', 'parent-author-link', 'parent-author-name', 'parent-guid', 'parent-network', 'parent-author-id', 'parent-author-link', 'parent-author-name',
'parent-author-network', 'signed_text', 'language', 'raw-body'], Item::DISPLAY_FIELDLIST, Item::ITEM_FIELDLIST); 'parent-author-network', 'signed_text', 'language', 'raw-body'], Item::DISPLAY_FIELDLIST, Item::ITEM_FIELDLIST);
if ($view == 'post-thread-view') { if ($view != 'post-view') {
$selected = array_merge($selected, ['ignored', 'iid']); $selected = array_merge($selected, ['ignored', 'iid']);
} }
} }
@ -448,6 +448,18 @@ class Post
$affected = max($affected, DBA::affectedRows()); $affected = max($affected, DBA::affectedRows());
} }
$update_fields = DBStructure::getFieldsForTable('post-thread', $fields);
if (!empty($update_fields)) {
$rows = DBA::selectToArray('post-view', ['uri-id'], $condition, ['group_by' => ['uri-id']]);
$uriids = array_column($rows, 'uri-id');
if (!DBA::update('post-thread', $update_fields, ['uri-id' => $uriids])) {
DBA::rollback();
Logger::notice('Updating post-thread failed', ['fields' => $update_fields, 'condition' => $condition]);
return false;
}
$affected = max($affected, DBA::affectedRows());
}
$update_fields = DBStructure::getFieldsForTable('post-thread-user', $fields); $update_fields = DBStructure::getFieldsForTable('post-thread-user', $fields);
if (!empty($update_fields)) { if (!empty($update_fields)) {
$rows = DBA::selectToArray('post-view', ['post-user-id'], $thread_condition); $rows = DBA::selectToArray('post-view', ['post-user-id'], $thread_condition);

97
src/Model/Post/Thread.php Normal file
View file

@ -0,0 +1,97 @@
<?php
/**
* @copyright Copyright (C) 2020, Friendica
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
namespace Friendica\Model\Post;
use \BadMethodCallException;
use Friendica\Core\Protocol;
use Friendica\Database\Database;
use Friendica\Database\DBA;
use Friendica\Database\DBStructure;
use Friendica\Model\Post;
class Thread
{
/**
* Insert a new post-thread entry
*
* @param integer $uri_id
* @param array $fields
* @return bool success
* @throws \Exception
*/
public static function insert(int $uri_id, array $data = [])
{
if (empty($uri_id)) {
throw new BadMethodCallException('Empty URI_id');
}
$fields = DBStructure::getFieldsForTable('post-thread', $data);
// Additionally assign the key fields
$fields['uri-id'] = $uri_id;
return DBA::insert('post-thread', $fields, Database::INSERT_IGNORE);
}
/**
* Update a post-thread entry
*
* @param integer $uri_id
* @param array $data
* @param bool $insert_if_missing
* @return bool
* @throws \Exception
*/
public static function update(int $uri_id, array $data = [], bool $insert_if_missing = false)
{
if (empty($uri_id)) {
throw new BadMethodCallException('Empty URI_id');
}
$fields = DBStructure::getFieldsForTable('post-thread', $data);
// Remove the key fields
unset($fields['uri-id']);
if (empty($fields)) {
return true;
}
return DBA::update('post-thread', $fields, ['uri-id' => $uri_id], $insert_if_missing ? true : []);
}
/**
* Delete a row from the post-thread table
*
* @param array $conditions Field condition(s)
* @param array $options
* - cascade: If true we delete records in other tables that depend on the one we're deleting through
* relations (default: true)
*
* @return boolean was the delete successful?
* @throws \Exception
*/
public static function delete(array $conditions, array $options = [])
{
return DBA::delete('post-thread', $conditions, $options);
}
}

2
src/Module/Conversation/Community.php
View file

@ -336,7 +336,7 @@ class Community extends BaseModule
$condition[] = $item_id; $condition[] = $item_id;
} else { } else {
if (local_user() && !empty($_REQUEST['no_sharer'])) { if (local_user() && !empty($_REQUEST['no_sharer'])) {
$condition[0] .= " AND NOT EXISTS (SELECT `uri-id` FROM `thread` AS t1 WHERE `t1`.`uri-id` = `thread`.`uri-id` AND `t1`.`uid` = ?)"; $condition[0] .= " AND NOT EXISTS (SELECT `uri-id` FROM `post-user` WHERE `post-user`.`uri-id` = `post-thread-view`.`uri-id` AND `post-user`.`uid` = ?)";
$condition[] = local_user(); $condition[] = local_user();
} }

13
src/Worker/Expire.php
View file

@ -52,12 +52,17 @@ class Expire
} }
DBA::close($rows); DBA::close($rows);
// Normally we shouldn't have orphaned data at all. Logger::info('Deleting orphaned post-content - start');
// If we do have some, then we have to check why. /// @todo Replace "item with "post-user" in the future when "item" is removed
Logger::log('Deleting orphaned item content - start', Logger::DEBUG);
$condition = ["NOT EXISTS (SELECT `uri-id` FROM `item` WHERE `item`.`uri-id` = `post-content`.`uri-id`)"]; $condition = ["NOT EXISTS (SELECT `uri-id` FROM `item` WHERE `item`.`uri-id` = `post-content`.`uri-id`)"];
DBA::delete('post-content', $condition); DBA::delete('post-content', $condition);
Logger::log('Orphaned item content deleted: ' . DBA::affectedRows(), Logger::DEBUG); Logger::info('Orphaned post-content deleted', ['rows' => DBA::affectedRows()]);
Logger::info('Deleting orphaned post-thread - start');
/// @todo Replace "item with "post-user" in the future when "item" is removed
$condition = ["NOT EXISTS (SELECT `uri-id` FROM `item` WHERE `item`.`uri-id` = `post-thread`.`uri-id`)"];
DBA::delete('post-thread', $condition);
Logger::info('Orphaned item content deleted', ['rows' => DBA::affectedRows()]);
// make this optional as it could have a performance impact on large sites // make this optional as it could have a performance impact on large sites
if (intval(DI::config()->get('system', 'optimize_items'))) { if (intval(DI::config()->get('system', 'optimize_items'))) {

1
src/Worker/ExpirePosts.php
View file

@ -47,6 +47,7 @@ class ExpirePosts
if (!empty($expire_days)) { if (!empty($expire_days)) {
do { do {
Logger::notice('Start deleting expired threads', ['expiry_days' => $expire_days]); Logger::notice('Start deleting expired threads', ['expiry_days' => $expire_days]);
/// @todo replace that query later
$ret = DBA::e("DELETE FROM `item-uri` WHERE `id` IN $ret = DBA::e("DELETE FROM `item-uri` WHERE `id` IN
(SELECT `uri-id` FROM `thread` (SELECT `uri-id` FROM `thread`
INNER JOIN `contact` ON `id` = `contact-id` AND NOT `notify_new_posts` INNER JOIN `contact` ON `id` = `contact-id` AND NOT `notify_new_posts`

2
src/Worker/RemoveContact.php
View file

@ -52,6 +52,8 @@ class RemoveContact {
Logger::info('Delete removed contact item', ['id' => $item['id'], 'guid' => $item['guid']]); Logger::info('Delete removed contact item', ['id' => $item['id'], 'guid' => $item['guid']]);
DBA::delete('item', ['id' => $item['id']]); DBA::delete('item', ['id' => $item['id']]);
Post\User::delete(['uri-id' => $item['uri-id'], 'uid' => $item['uid']]); Post\User::delete(['uri-id' => $item['uri-id'], 'uid' => $item['uid']]);
Post\Thread::delete(['uri-id' => $item['uri-id']]);
Post\ThreadUser::delete(['uri-id' => $item['uri-id'], 'uid' => $item['uid']]);
} }
DBA::close($items); DBA::close($items);
} while (Post::exists($condition)); } while (Post::exists($condition));

9
src/Worker/RemoveUnusedContacts.php
View file

@ -24,6 +24,7 @@ namespace Friendica\Worker;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Database\DBStructure;
use Friendica\Model\Photo; use Friendica\Model\Photo;
/** /**
@ -37,8 +38,8 @@ class RemoveUnusedContacts
AND (NOT `network` IN (?, ?, ?, ?, ?, ?) OR (`archive` AND `success_update` < UTC_TIMESTAMP() - INTERVAL ? DAY)) AND (NOT `network` IN (?, ?, ?, ?, ?, ?) OR (`archive` AND `success_update` < UTC_TIMESTAMP() - INTERVAL ? DAY))
AND NOT `id` IN (SELECT `author-id` FROM `item`) AND NOT `id` IN (SELECT `owner-id` FROM `item`) AND NOT `id` IN (SELECT `author-id` FROM `item`) AND NOT `id` IN (SELECT `owner-id` FROM `item`)
AND NOT `id` IN (SELECT `causer-id` FROM `item`) AND NOT `id` IN (SELECT `cid` FROM `post-tag`) AND NOT `id` IN (SELECT `causer-id` FROM `item`) AND NOT `id` IN (SELECT `cid` FROM `post-tag`)
AND NOT `id` IN (SELECT `contact-id` FROM `item`) AND NOT `id` IN (SELECT `author-id` FROM `thread`) AND NOT `id` IN (SELECT `contact-id` FROM `item`) AND NOT `id` IN (SELECT `author-id` FROM `post-thread`)
AND NOT `id` IN (SELECT `owner-id` FROM `thread`) AND NOT `id` IN (SELECT `contact-id` FROM `thread`) AND NOT `id` IN (SELECT `owner-id` FROM `post-thread`) AND NOT `id` IN (SELECT `causer-id` FROM `post-thread`)
AND NOT `id` IN (SELECT `contact-id` FROM `post-user`) AND NOT `id` IN (SELECT `cid` FROM `user-contact`) AND NOT `id` IN (SELECT `contact-id` FROM `post-user`) AND NOT `id` IN (SELECT `cid` FROM `user-contact`)
AND NOT `id` IN (SELECT `cid` FROM `event`) AND NOT `id` IN (SELECT `contact-id` FROM `group_member`)", AND NOT `id` IN (SELECT `cid` FROM `event`) AND NOT `id` IN (SELECT `contact-id` FROM `group_member`)",
0, 0, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL, Protocol::ACTIVITYPUB, 365]; 0, 0, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL, Protocol::ACTIVITYPUB, 365];
@ -49,6 +50,10 @@ class RemoveUnusedContacts
$contacts = DBA::select('contact', ['id', 'uid'], $condition); $contacts = DBA::select('contact', ['id', 'uid'], $condition);
while ($contact = DBA::fetch($contacts)) { while ($contact = DBA::fetch($contacts)) {
if (Photo::delete(['uid' => $contact['uid'], 'contact-id' => $contact['id']])) { if (Photo::delete(['uid' => $contact['uid'], 'contact-id' => $contact['id']])) {
if (DBStructure::existsTable('thread')) {
DBA::delete('thread', ['owner-id' => $contact['id']]);
DBA::delete('thread', ['author-id' => $contact['id']]);
}
DBA::delete('contact', ['id' => $contact['id']]); DBA::delete('contact', ['id' => $contact['id']]);
if ((++$count % 1000) == 0) { if ((++$count % 1000) == 0) {
Logger::notice('In removal', ['count' => $count, 'total' => $total]); Logger::notice('In removal', ['count' => $count, 'total' => $total]);

26
static/dbstructure.config.php
View file

@ -55,7 +55,7 @@
use Friendica\Database\DBA; use Friendica\Database\DBA;
if (!defined('DB_UPDATE_VERSION')) { if (!defined('DB_UPDATE_VERSION')) {
define('DB_UPDATE_VERSION', 1397); define('DB_UPDATE_VERSION', 1398);
} }
return [ return [
@ -1181,6 +1181,29 @@ return [
"cid" => ["cid"] "cid" => ["cid"]
] ]
], ],
"post-thread" => [
"comment" => "Thread related data",
"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"],
"owner-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Item owner"],
"author-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Item author"],
"causer-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Link to the contact table with uid=0 of the contact that caused the item creation"],
"network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""],
"created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
"received" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
"changed" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date that something in the conversation changed, indicating clients should fetch the conversation again"],
"commented" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""]
],
"indexes" => [
"PRIMARY" => ["uri-id"],
"owner-id" => ["owner-id"],
"author-id" => ["author-id"],
"causer-id" => ["causer-id"],
"received" => ["received"],
"commented" => ["commented"],
"changed" => ["changed"]
]
],
"post-thread-user" => [ "post-thread-user" => [
"comment" => "Thread related data per user", "comment" => "Thread related data per user",
"fields" => [ "fields" => [
@ -1190,6 +1213,7 @@ return [
"starred" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""], "starred" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
"ignored" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Ignore updates for this thread"], "ignored" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Ignore updates for this thread"],
"wall" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "This item was posted to the wall of uid"], "wall" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "This item was posted to the wall of uid"],
"mention" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
"pubmail" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""], "pubmail" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
"forum_mode" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""] "forum_mode" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""]
], ],

131
static/dbview.config.php
View file

@ -193,43 +193,43 @@
"post-thread-view" => [ "post-thread-view" => [
"fields" => [ "fields" => [
"id" => ["item", "id"], "id" => ["item", "id"],
"iid" => ["thread", "iid"], "iid" => ["item", "id"],
"item_id" => ["item", "id"], "item_id" => ["item", "id"],
"uid" => ["thread", "uid"], "uid" => ["post-thread-user", "uid"],
"parent" => ["item", "parent"], "parent" => ["item", "parent"],
"uri" => ["item", "uri"], "uri" => ["item", "uri"],
"uri-id" => ["item", "uri-id"], "uri-id" => ["post-thread", "uri-id"],
"parent-uri" => ["item", "parent-uri"], "parent-uri" => ["item", "parent-uri"],
"parent-uri-id" => ["item", "parent-uri-id"], "parent-uri-id" => ["item", "parent-uri-id"],
"thr-parent" => ["item", "thr-parent"], "thr-parent" => ["item", "thr-parent"],
"thr-parent-id" => ["item", "thr-parent-id"], "thr-parent-id" => ["item", "thr-parent-id"],
"guid" => ["item", "guid"], "guid" => ["item", "guid"],
"type" => ["item", "type"], "type" => ["item", "type"],
"wall" => ["thread", "wall"], "wall" => ["post-thread-user", "wall"],
"gravity" => ["item", "gravity"], "gravity" => ["item", "gravity"],
"extid" => ["item", "extid"], "extid" => ["item", "extid"],
"created" => ["thread", "created"], "created" => ["post-thread", "created"],
"edited" => ["item", "edited"], "edited" => ["item", "edited"],
"commented" => ["thread", "commented"], "commented" => ["post-thread", "commented"],
"received" => ["thread", "received"], "received" => ["post-thread", "received"],
"changed" => ["thread", "changed"], "changed" => ["post-thread", "changed"],
"post-type" => ["thread", "post-type"], "post-type" => ["item", "post-type"],
"private" => ["thread", "private"], "private" => ["item", "private"],
"pubmail" => ["thread", "pubmail"], "pubmail" => ["post-thread-user", "pubmail"],
"moderated" => ["thread", "moderated"], "moderated" => ["item", "moderated"],
"ignored" => ["thread", "ignored"], "ignored" => ["post-thread-user", "ignored"],
"visible" => ["thread", "visible"], "visible" => ["item", "visible"],
"starred" => ["thread", "starred"], "starred" => ["post-thread-user", "starred"],
"bookmark" => ["item", "bookmark"], "bookmark" => ["item", "bookmark"],
"unseen" => ["item", "unseen"], "unseen" => ["post-user", "unseen"],
"deleted" => ["thread", "deleted"], "deleted" => ["item", "deleted"],
"origin" => ["thread", "origin"], "origin" => ["post-user", "origin"],
"forum_mode" => ["thread", "forum_mode"], "forum_mode" => ["post-thread-user", "forum_mode"],
"mention" => ["thread", "mention"], "mention" => ["item", "mention"],
"global" => ["item", "global"], "global" => ["item", "global"],
"network" => ["thread", "network"], "network" => ["post-thread", "network"],
"vid" => ["item", "vid"], "vid" => ["item", "vid"],
"psid" => ["item", "psid"], "psid" => ["post-user", "psid"],
"verb" => "IF (`item`.`vid` IS NULL, '', `verb`.`name`)", "verb" => "IF (`item`.`vid` IS NULL, '', `verb`.`name`)",
"title" => ["post-content", "title"], "title" => ["post-content", "title"],
"content-warning" => ["post-content", "content-warning"], "content-warning" => ["post-content", "content-warning"],
@ -247,7 +247,7 @@
"target-type" => ["post-content", "target-type"], "target-type" => ["post-content", "target-type"],
"target" => ["post-content", "target"], "target" => ["post-content", "target"],
"resource-id" => ["post-content", "resource-id"], "resource-id" => ["post-content", "resource-id"],
"contact-id" => ["thread", "contact-id"], "contact-id" => ["post-user", "contact-id"],
"contact-link" => ["contact", "url"], "contact-link" => ["contact", "url"],
"contact-addr" => ["contact", "addr"], "contact-addr" => ["contact", "addr"],
"contact-name" => ["contact", "name"], "contact-name" => ["contact", "name"],
@ -272,7 +272,7 @@
"avatar-date" => ["contact", "avatar-date"], "avatar-date" => ["contact", "avatar-date"],
"thumb" => ["contact", "thumb"], "thumb" => ["contact", "thumb"],
"dfrn-id" => ["contact", "dfrn-id"], "dfrn-id" => ["contact", "dfrn-id"],
"author-id" => ["thread", "author-id"], "author-id" => ["post-thread", "author-id"],
"author-link" => ["author", "url"], "author-link" => ["author", "url"],
"author-addr" => ["author", "addr"], "author-addr" => ["author", "addr"],
"author-name" => "IF (`contact`.`url` = `author`.`url` AND `contact`.`name` != '', `contact`.`name`, `author`.`name`)", "author-name" => "IF (`contact`.`url` = `author`.`url` AND `contact`.`name` != '', `contact`.`name`, `author`.`name`)",
@ -281,7 +281,7 @@
"author-network" => ["author", "network"], "author-network" => ["author", "network"],
"author-blocked" => ["author", "blocked"], "author-blocked" => ["author", "blocked"],
"author-hidden" => ["author", "hidden"], "author-hidden" => ["author", "hidden"],
"owner-id" => ["thread", "owner-id"], "owner-id" => ["post-thread", "owner-id"],
"owner-link" => ["owner", "url"], "owner-link" => ["owner", "url"],
"owner-addr" => ["owner", "addr"], "owner-addr" => ["owner", "addr"],
"owner-name" => "IF (`contact`.`url` = `owner`.`url` AND `contact`.`name` != '', `contact`.`name`, `owner`.`name`)", "owner-name" => "IF (`contact`.`url` = `owner`.`url` AND `contact`.`name` != '', `contact`.`name`, `owner`.`name`)",
@ -305,10 +305,10 @@
"delivery_queue_count" => ["post-delivery-data", "queue_count"], "delivery_queue_count" => ["post-delivery-data", "queue_count"],
"delivery_queue_done" => ["post-delivery-data", "queue_done"], "delivery_queue_done" => ["post-delivery-data", "queue_done"],
"delivery_queue_failed" => ["post-delivery-data", "queue_failed"], "delivery_queue_failed" => ["post-delivery-data", "queue_failed"],
"allow_cid" => "IF (`item`.`psid` IS NULL, '', `permissionset`.`allow_cid`)", "allow_cid" => "IF (`post-user`.`psid` IS NULL, '', `permissionset`.`allow_cid`)",
"allow_gid" => "IF (`item`.`psid` IS NULL, '', `permissionset`.`allow_gid`)", "allow_gid" => "IF (`post-user`.`psid` IS NULL, '', `permissionset`.`allow_gid`)",
"deny_cid" => "IF (`item`.`psid` IS NULL, '', `permissionset`.`deny_cid`)", "deny_cid" => "IF (`post-user`.`psid` IS NULL, '', `permissionset`.`deny_cid`)",
"deny_gid" => "IF (`item`.`psid` IS NULL, '', `permissionset`.`deny_gid`)", "deny_gid" => "IF (`post-user`.`psid` IS NULL, '', `permissionset`.`deny_gid`)",
"event-id" => ["item", "event-id"], "event-id" => ["item", "event-id"],
"event-created" => ["event", "created"], "event-created" => ["event", "created"],
"event-edited" => ["event", "edited"], "event-edited" => ["event", "edited"],
@ -329,18 +329,20 @@
"parent-author-name" => ["parent-item-author", "name"], "parent-author-name" => ["parent-item-author", "name"],
"parent-author-network" => ["parent-item-author", "network"], "parent-author-network" => ["parent-item-author", "network"],
], ],
"query" => "FROM `thread` "query" => "FROM `post-thread`
STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid` STRAIGHT_JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-thread`.`uri-id`
STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id` STRAIGHT_JOIN `post-user` ON `post-user`.`uri-id` = `post-thread`.`uri-id`
STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `thread`.`author-id` STRAIGHT_JOIN `item` ON `item`.`uri-id` = `post-thread`.`uri-id` AND `item`.`uid` = `post-thread-user`.`uid`
STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `thread`.`owner-id` STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-user`.`contact-id`
STRAIGHT_JOIN `contact` AS `causer` ON `causer`.`id` = `item`.`causer-id` STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `post-thread`.`author-id`
STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `post-thread`.`owner-id`
STRAIGHT_JOIN `contact` AS `causer` ON `causer`.`id` = `post-thread`.`causer-id`
LEFT JOIN `verb` ON `verb`.`id` = `item`.`vid` LEFT JOIN `verb` ON `verb`.`id` = `item`.`vid`
LEFT JOIN `event` ON `event`.`id` = `item`.`event-id` LEFT JOIN `event` ON `event`.`id` = `item`.`event-id`
LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `thread`.`uri-id` LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `post-thread`.`uri-id`
LEFT JOIN `post-content` ON `post-content`.`uri-id` = `thread`.`uri-id` LEFT JOIN `post-content` ON `post-content`.`uri-id` = `post-thread`.`uri-id`
LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `thread`.`uri-id` AND `thread`.`origin` LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `post-thread`.`uri-id` AND `post-user`.`origin`
LEFT JOIN `permissionset` ON `permissionset`.`id` = `item`.`psid` LEFT JOIN `permissionset` ON `permissionset`.`id` = `post-user`.`psid`
STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent` STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`
STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`" STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`"
], ],
@ -393,13 +395,13 @@
"contact-type" => ["ownercontact", "contact-type"], "contact-type" => ["ownercontact", "contact-type"],
], ],
"query" => "FROM `item` "query" => "FROM `item`
INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent` INNER JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`
STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id` STRAIGHT_JOIN `contact` ON `contact`.`id` = `parent-item`.`contact-id`
LEFT JOIN `post-user` ON `post-user`.`uri-id` = `item`.`uri-id` AND `post-user`.`uid` = `thread`.`uid` LEFT JOIN `post-user` ON `post-user`.`uri-id` = `item`.`uri-id` AND `post-user`.`uid` = `parent-item`.`uid`
LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `thread`.`uid` AND `author`.`cid` = `thread`.`author-id` LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `parent-item`.`uid` AND `author`.`cid` = `parent-item`.`author-id`
LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `thread`.`uid` AND `owner`.`cid` = `thread`.`owner-id` LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `parent-item`.`uid` AND `owner`.`cid` = `parent-item`.`owner-id`
LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `thread`.`owner-id` LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `parent-item`.`owner-id`
WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated` WHERE `parent-item`.`visible` AND NOT `parent-item`.`deleted` AND NOT `parent-item`.`moderated`
AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`) AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`) AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`)
AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`) AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
@ -407,28 +409,29 @@
], ],
"network-thread-view" => [ "network-thread-view" => [
"fields" => [ "fields" => [
"uri-id" => ["item", "uri-id"], "uri-id" => ["post-thread", "uri-id"],
"uri" => ["item", "uri"], "uri" => ["item", "uri"],
"parent-uri-id" => ["item", "parent-uri-id"], "parent-uri-id" => ["item", "parent-uri-id"],
"parent" => ["thread", "iid"], "parent" => ["item", "id"],
"received" => ["thread", "received"], "received" => ["post-thread", "received"],
"commented" => ["thread", "commented"], "commented" => ["post-thread", "commented"],
"created" => ["thread", "created"], "created" => ["post-thread", "created"],
"uid" => ["thread", "uid"], "uid" => ["post-thread-user", "uid"],
"starred" => ["thread", "starred"], "starred" => ["post-thread-user", "starred"],
"mention" => ["thread", "mention"], "mention" => ["post-thread-user", "mention"],
"network" => ["thread", "network"], "network" => ["post-thread", "network"],
"contact-id" => ["thread", "contact-id"], "contact-id" => ["post-user", "contact-id"],
"contact-type" => ["ownercontact", "contact-type"], "contact-type" => ["ownercontact", "contact-type"],
], ],
"query" => "FROM `thread` "query" => "FROM `post-thread`
STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id` STRAIGHT_JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-thread`.`uri-id`
STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid` STRAIGHT_JOIN `post-user` ON `post-user`.`uri-id` = `post-thread`.`uri-id` AND `post-user`.`uid` = `post-thread-user`.`uid`
LEFT JOIN `post-user` ON `post-user`.`uri-id` = `item`.`uri-id` AND `post-user`.`uid` = `thread`.`uid` STRAIGHT_JOIN `item` ON `item`.`uri-id` = `post-thread`.`uri-id` AND `item`.`uid` = `post-thread-user`.`uid`
LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `thread`.`uid` AND `author`.`cid` = `thread`.`author-id` STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-user`.`contact-id`
LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `thread`.`uid` AND `owner`.`cid` = `thread`.`owner-id` LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-user`.`uid` AND `author`.`cid` = `post-thread`.`author-id`
LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `thread`.`owner-id` LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-user`.`uid` AND `owner`.`cid` = `post-thread`.`owner-id`
WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated` LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread`.`owner-id`
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`) AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`) AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`)
AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`) AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)

346
tests/datasets/api.fixture.php
View file

@ -19,6 +19,9 @@
* *
*/ */
use Friendica\Core\Protocol;
use Friendica\Model\Contact;
use Friendica\Model\Item;
use Friendica\Model\Notification; use Friendica\Model\Notification;
return [ return [
@ -70,8 +73,8 @@ return [
'about' => 'User used in tests', 'about' => 'User used in tests',
'pending' => 0, 'pending' => 0,
'blocked' => 0, 'blocked' => 0,
'rel' => 1, 'rel' => Contact::FOLLOWER,
'network' => 'dfrn', 'network' => Protocol::DFRN,
'location' => 'DFRN', 'location' => 'DFRN',
], ],
// Having the same name and nick allows us to test // Having the same name and nick allows us to test
@ -86,8 +89,8 @@ return [
'url' => 'http://localhost/profile/othercontact', 'url' => 'http://localhost/profile/othercontact',
'pending' => 0, 'pending' => 0,
'blocked' => 0, 'blocked' => 0,
'rel' => 0, 'rel' => Contact::NOTHING,
'network' => 'dfrn', 'network' => Protocol::DFRN,
'location' => 'DFRN', 'location' => 'DFRN',
], ],
[ [
@ -100,8 +103,8 @@ return [
'url' => 'http://localhost/profile/friendcontact', 'url' => 'http://localhost/profile/friendcontact',
'pending' => 0, 'pending' => 0,
'blocked' => 0, 'blocked' => 0,
'rel' => 2, 'rel' => Contact::SHARING,
'network' => 'dfrn', 'network' => Protocol::DFRN,
'location' => 'DFRN', 'location' => 'DFRN',
], ],
[ [
@ -114,8 +117,8 @@ return [
'url' => 'http://localhost/profile/friendcontact', 'url' => 'http://localhost/profile/friendcontact',
'pending' => 0, 'pending' => 0,
'blocked' => 0, 'blocked' => 0,
'rel' => 2, 'rel' => Contact::SHARING,
'network' => 'dfrn', 'network' => Protocol::DFRN,
'location' => 'DFRN', 'location' => 'DFRN',
], ],
[ [
@ -128,8 +131,8 @@ return [
'url' => 'http://localhost/profile/mutualcontact', 'url' => 'http://localhost/profile/mutualcontact',
'pending' => 0, 'pending' => 0,
'blocked' => 0, 'blocked' => 0,
'rel' => 3, 'rel' => Contact::FRIEND,
'network' => 'dfrn', 'network' => Protocol::DFRN,
'location' => 'DFRN', 'location' => 'DFRN',
], ],
[ [
@ -142,8 +145,8 @@ return [
'url' => 'http://localhost/profile/mutualcontact', 'url' => 'http://localhost/profile/mutualcontact',
'pending' => 0, 'pending' => 0,
'blocked' => 0, 'blocked' => 0,
'rel' => 2, 'rel' => Contact::SHARING,
'network' => 'dfrn', 'network' => Protocol::DFRN,
'location' => 'DFRN', 'location' => 'DFRN',
], ],
], ],
@ -211,6 +214,61 @@ return [
'plink' => 'http://localhost/display/6', 'plink' => 'http://localhost/display/6',
], ],
], ],
'post-thread' => [
[
'uri-id' => 1,
'author-id' => 42,
'owner-id' => 42,
'causer-id' => 42,
'network' => Protocol::DFRN,
],
[
'uri-id' => 3,
'author-id' => 43,
'owner-id' => 43,
'causer-id' => 43,
'network' => Protocol::DFRN,
],
[
'uri-id' => 6,
'author-id' => 44,
'owner-id' => 44,
'causer-id' => 44,
'network' => Protocol::DFRN,
],
],
'post-thread-user' => [
[
'uri-id' => 1,
'uid' => 42,
'wall' => 1,
],
[
'uri-id' => 3,
'uid' => 42,
'wall' => 1,
],
[
'uri-id' => 6,
'uid' => 42,
'wall' => 1,
],
[
'uri-id' => 1,
'uid' => 0,
'wall' => 0,
],
[
'uri-id' => 3,
'uid' => 0,
'wall' => 0,
],
[
'uri-id' => 6,
'uid' => 0,
'wall' => 0,
],
],
'post-user' => [ 'post-user' => [
[ [
'id' => 1, 'id' => 1,
@ -260,12 +318,61 @@ return [
'unseen' => 0, 'unseen' => 0,
'origin' => 1, 'origin' => 1,
], ],
[
'id' => 7,
'uri-id' => 1,
'uid' => 0,
'contact-id' => 42,
'unseen' => 1,
'origin' => 0,
],
[
'id' => 8,
'uri-id' => 2,
'uid' => 0,
'contact-id' => 42,
'unseen' => 0,
'origin' => 0,
],
[
'id' => 9,
'uri-id' => 3,
'uid' => 0,
'contact-id' => 43,
'unseen' => 0,
'origin' => 0,
],
[
'id' => 10,
'uri-id' => 4,
'uid' => 0,
'contact-id' => 44,
'unseen' => 0,
'origin' => 0,
],
[
'id' => 11,
'uri-id' => 5,
'uid' => 0,
'contact-id' => 42,
'unseen' => 0,
'origin' => 0,
],
[
'id' => 12,
'uri-id' => 6,
'uid' => 0,
'contact-id' => 44,
'unseen' => 0,
'origin' => 0,
],
], ],
'item' => [ 'item' => [
[ [
'id' => 1, 'id' => 1,
'uri-id' => 1, 'uri-id' => 1,
'uri' => '1',
'visible' => 1, 'visible' => 1,
'contact-id' => 42, 'contact-id' => 42,
'author-id' => 42, 'author-id' => 42,
@ -276,7 +383,10 @@ return [
'unseen' => 1, 'unseen' => 1,
'parent' => 1, 'parent' => 1,
'parent-uri-id' => 1, 'parent-uri-id' => 1,
'parent-uri' => '1',
'thr-parent-id' => 1, 'thr-parent-id' => 1,
'thr-parent' => '1',
'private' => Item::PUBLIC,
'gravity' => GRAVITY_PARENT, 'gravity' => GRAVITY_PARENT,
'author-link' => 'http://localhost/profile/selfcontact', 'author-link' => 'http://localhost/profile/selfcontact',
'wall' => 1, 'wall' => 1,
@ -291,6 +401,7 @@ return [
[ [
'id' => 2, 'id' => 2,
'uri-id' => 2, 'uri-id' => 2,
'uri' => '2',
'visible' => 1, 'visible' => 1,
'contact-id' => 42, 'contact-id' => 42,
'author-id' => 42, 'author-id' => 42,
@ -301,7 +412,10 @@ return [
'unseen' => 0, 'unseen' => 0,
'parent' => 1, 'parent' => 1,
'parent-uri-id' => 1, 'parent-uri-id' => 1,
'parent-uri' => '1',
'thr-parent-id' => 1, 'thr-parent-id' => 1,
'thr-parent' => '1',
'private' => Item::PUBLIC,
'gravity' => GRAVITY_COMMENT, 'gravity' => GRAVITY_COMMENT,
'author-link' => 'http://localhost/profile/selfcontact', 'author-link' => 'http://localhost/profile/selfcontact',
'wall' => 1, 'wall' => 1,
@ -312,6 +426,7 @@ return [
[ [
'id' => 3, 'id' => 3,
'uri-id' => 3, 'uri-id' => 3,
'uri' => '3',
'visible' => 1, 'visible' => 1,
'contact-id' => 43, 'contact-id' => 43,
'author-id' => 43, 'author-id' => 43,
@ -322,7 +437,10 @@ return [
'unseen' => 0, 'unseen' => 0,
'parent' => 3, 'parent' => 3,
'parent-uri-id' => 3, 'parent-uri-id' => 3,
'parent-uri' => '3',
'thr-parent-id' => 3, 'thr-parent-id' => 3,
'thr-parent' => '3',
'private' => Item::PUBLIC,
'gravity' => GRAVITY_PARENT, 'gravity' => GRAVITY_PARENT,
'author-link' => 'http://localhost/profile/othercontact', 'author-link' => 'http://localhost/profile/othercontact',
'wall' => 1, 'wall' => 1,
@ -333,6 +451,7 @@ return [
[ [
'id' => 4, 'id' => 4,
'uri-id' => 4, 'uri-id' => 4,
'uri' => '4',
'visible' => 1, 'visible' => 1,
'contact-id' => 44, 'contact-id' => 44,
'author-id' => 44, 'author-id' => 44,
@ -344,7 +463,10 @@ return [
'body' => 'Friend user reply', 'body' => 'Friend user reply',
'parent' => 1, 'parent' => 1,
'parent-uri-id' => 1, 'parent-uri-id' => 1,
'parent-uri' => '1',
'thr-parent-id' => 1, 'thr-parent-id' => 1,
'thr-parent' => '1',
'private' => Item::PUBLIC,
'gravity' => GRAVITY_COMMENT, 'gravity' => GRAVITY_COMMENT,
'author-link' => 'http://localhost/profile/othercontact', 'author-link' => 'http://localhost/profile/othercontact',
'wall' => 1, 'wall' => 1,
@ -356,6 +478,7 @@ return [
'id' => 5, 'id' => 5,
'uri-id' => 5, 'uri-id' => 5,
'uri' => '5',
'visible' => 1, 'visible' => 1,
'contact-id' => 42, 'contact-id' => 42,
'author-id' => 42, 'author-id' => 42,
@ -366,7 +489,10 @@ return [
'unseen' => 0, 'unseen' => 0,
'parent' => 1, 'parent' => 1,
'parent-uri-id' => 1, 'parent-uri-id' => 1,
'parent-uri' => '1',
'thr-parent-id' => 1, 'thr-parent-id' => 1,
'thr-parent' => '1',
'private' => Item::PUBLIC,
'gravity' => GRAVITY_COMMENT, 'gravity' => GRAVITY_COMMENT,
'author-link' => 'http://localhost/profile/othercontact', 'author-link' => 'http://localhost/profile/othercontact',
'wall' => 1, 'wall' => 1,
@ -381,6 +507,7 @@ return [
[ [
'id' => 6, 'id' => 6,
'uri-id' => 6, 'uri-id' => 6,
'uri' => '6',
'visible' => 1, 'visible' => 1,
'contact-id' => 44, 'contact-id' => 44,
'author-id' => 44, 'author-id' => 44,
@ -391,7 +518,10 @@ return [
'unseen' => 0, 'unseen' => 0,
'parent' => 6, 'parent' => 6,
'parent-uri-id' => 6, 'parent-uri-id' => 6,
'parent-uri' => '6',
'thr-parent-id' => 6, 'thr-parent-id' => 6,
'thr-parent' => '6',
'private' => Item::PUBLIC,
'gravity' => GRAVITY_PARENT, 'gravity' => GRAVITY_PARENT,
'author-link' => 'http://localhost/profile/othercontact', 'author-link' => 'http://localhost/profile/othercontact',
'wall' => 1, 'wall' => 1,
@ -399,6 +529,166 @@ return [
'origin' => 1, 'origin' => 1,
'guid' => '6', 'guid' => '6',
], ],
[
'id' => 7,
'uri-id' => 1,
'uri' => '1',
'visible' => 1,
'contact-id' => 42,
'author-id' => 42,
'owner-id' => 42,
'causer-id' => 42,
'uid' => 0,
'verb' => 'http://activitystrea.ms/schema/1.0/post',
'unseen' => 1,
'parent' => 7,
'parent-uri-id' => 1,
'parent-uri' => '1',
'thr-parent-id' => 1,
'thr-parent' => '1',
'private' => Item::PUBLIC,
'gravity' => GRAVITY_PARENT,
'author-link' => 'http://localhost/profile/selfcontact',
'wall' => 0,
'starred' => 1,
'origin' => 0,
'allow_cid' => '',
'allow_gid' => '',
'deny_cid' => '',
'deny_gid' => '',
'guid' => '1',
],
[
'id' => 8,
'uri-id' => 2,
'uri' => '2',
'visible' => 1,
'contact-id' => 42,
'author-id' => 42,
'owner-id' => 42,
'causer-id' => 42,
'uid' => 0,
'verb' => 'http://activitystrea.ms/schema/1.0/post',
'unseen' => 0,
'parent' => 7,
'parent-uri-id' => 1,
'parent-uri' => '1',
'thr-parent-id' => 1,
'thr-parent' => '1',
'private' => Item::PUBLIC,
'gravity' => GRAVITY_COMMENT,
'author-link' => 'http://localhost/profile/selfcontact',
'wall' => 0,
'starred' => 0,
'origin' => 0,
'guid' => '2',
],
[
'id' => 9,
'uri-id' => 3,
'uri' => '3',
'visible' => 1,
'contact-id' => 43,
'author-id' => 43,
'owner-id' => 42,
'causer-id' => 43,
'uid' => 0,
'verb' => 'http://activitystrea.ms/schema/1.0/post',
'unseen' => 0,
'parent' => 9,
'parent-uri-id' => 3,
'parent-uri' => '3',
'thr-parent-id' => 3,
'thr-parent' => '3',
'private' => Item::PUBLIC,
'gravity' => GRAVITY_PARENT,
'author-link' => 'http://localhost/profile/othercontact',
'wall' => 0,
'starred' => 0,
'origin' => 0,
'guid' => '3',
],
[
'id' => 10,
'uri-id' => 4,
'uri' => '4',
'visible' => 1,
'contact-id' => 44,
'author-id' => 44,
'owner-id' => 42,
'causer-id' => 44,
'uid' => 0,
'verb' => 'http://activitystrea.ms/schema/1.0/post',
'unseen' => 0,
'body' => 'Friend user reply',
'parent' => 7,
'parent-uri-id' => 1,
'parent-uri' => '1',
'thr-parent-id' => 1,
'thr-parent' => '1',
'private' => Item::PUBLIC,
'gravity' => GRAVITY_COMMENT,
'author-link' => 'http://localhost/profile/othercontact',
'wall' => 0,
'starred' => 0,
'origin' => 0,
'guid' => '4',
],
[
'id' => 11,
'uri-id' => 5,
'uri' => '5',
'visible' => 1,
'contact-id' => 42,
'author-id' => 42,
'owner-id' => 42,
'causer-id' => 42,
'uid' => 0,
'verb' => 'http://activitystrea.ms/schema/1.0/post',
'unseen' => 0,
'parent' => 7,
'parent-uri-id' => 1,
'parent-uri' => '1',
'thr-parent-id' => 1,
'thr-parent' => '1',
'private' => Item::PUBLIC,
'gravity' => GRAVITY_COMMENT,
'author-link' => 'http://localhost/profile/othercontact',
'wall' => 0,
'starred' => 0,
'origin' => 1,
'allow_cid' => '',
'allow_gid' => '',
'deny_cid' => '',
'deny_gid' => '',
'guid' => '5',
],
[
'id' => 12,
'uri-id' => 6,
'uri' => '6',
'visible' => 1,
'contact-id' => 44,
'author-id' => 44,
'owner-id' => 42,
'causer-id' => 44,
'uid' => 0,
'verb' => 'http://activitystrea.ms/schema/1.0/post',
'unseen' => 0,
'parent' => 12,
'parent-uri-id' => 6,
'parent-uri' => '6',
'thr-parent-id' => 6,
'thr-parent' => '6',
'private' => Item::PUBLIC,
'gravity' => GRAVITY_PARENT,
'author-link' => 'http://localhost/profile/othercontact',
'wall' => 0,
'starred' => 0,
'origin' => 0,
'guid' => '6',
],
], ],
'notify' => [ 'notify' => [
[ [
@ -419,38 +709,6 @@ return [
'msg_cache' => 'A test reply from an item', 'msg_cache' => 'A test reply from an item',
], ],
], ],
'thread' => [
[
'iid' => 1,
'uri-id' => 1,
'visible' => 1,
'contact-id' => 42,
'author-id' => 42,
'owner-id' => 42,
'uid' => 42,
'wall' => 1,
],
[
'iid' => 3,
'uri-id' => 3,
'visible' => 1,
'contact-id' => 43,
'author-id' => 43,
'owner-id' => 43,
'uid' => 0,
'wall' => 1,
],
[
'iid' => 6,
'uri-id' => 6,
'visible' => 1,
'contact-id' => 44,
'author-id' => 44,
'owner-id' => 44,
'uid' => 0,
'wall' => 1,
],
],
'profile' => [ 'profile' => [
[ [
'id' => 1, 'id' => 1,

36
update.php
View file

@ -295,7 +295,7 @@ function update_1349()
function update_1351() function update_1351()
{ {
if (!DBA::e("UPDATE `thread` INNER JOIN `item` ON `thread`.`iid` = `item`.`id` SET `thread`.`uri-id` = `item`.`uri-id`")) { if (DBStructure::existsTable('thread') && !DBA::e("UPDATE `thread` INNER JOIN `item` ON `thread`.`iid` = `item`.`id` SET `thread`.`uri-id` = `item`.`uri-id`")) {
return Update::FAILED; return Update::FAILED;
} }
@ -519,7 +519,7 @@ function pre_update_1365()
return Update::FAILED; return Update::FAILED;
} }
if (!DBA::e("DELETE FROM `thread` WHERE NOT `iid` IN (SELECT `id` FROM `item`)")) { if (DBStructure::existsTable('thread') && !DBA::e("DELETE FROM `thread` WHERE NOT `iid` IN (SELECT `id` FROM `item`)")) {
return Update::FAILED; return Update::FAILED;
} }
@ -548,7 +548,7 @@ function pre_update_1376()
return Update::FAILED; return Update::FAILED;
} }
if (!DBA::e("DELETE FROM `thread` WHERE NOT `uid` IN (SELECT `uid` FROM `user`)")) { if (DBStructure::existsTable('thread') && !DBA::e("DELETE FROM `thread` WHERE NOT `uid` IN (SELECT `uid` FROM `user`)")) {
return Update::FAILED; return Update::FAILED;
} }
@ -589,15 +589,15 @@ function pre_update_1377()
return Update::FAILED; return Update::FAILED;
} }
if (!DBA::e("DELETE FROM `thread` WHERE NOT `author-id` IN (SELECT `id` FROM `contact`)")) { if (DBStructure::existsTable('thread') && !DBA::e("DELETE FROM `thread` WHERE NOT `author-id` IN (SELECT `id` FROM `contact`)")) {
return Update::FAILED; return Update::FAILED;
} }
if (!DBA::e("DELETE FROM `thread` WHERE NOT `owner-id` IN (SELECT `id` FROM `contact`)")) { if (DBStructure::existsTable('thread') && !DBA::e("DELETE FROM `thread` WHERE NOT `owner-id` IN (SELECT `id` FROM `contact`)")) {
return Update::FAILED; return Update::FAILED;
} }
if (!DBA::e("UPDATE `thread` SET `contact-id` = `owner-id` WHERE NOT `contact-id` IN (SELECT `id` FROM `contact`)")) { if (DBStructure::existsTable('thread') && !DBA::e("UPDATE `thread` SET `contact-id` = `owner-id` WHERE NOT `contact-id` IN (SELECT `id` FROM `contact`)")) {
return Update::FAILED; return Update::FAILED;
} }
@ -735,3 +735,27 @@ function update_1397()
return Update::SUCCESS; return Update::SUCCESS;
} }
function update_1398()
{
if (!DBStructure::existsTable('thread')) {
return Update::SUCCESS;
}
if (!DBA::e("INSERT IGNORE INTO `post-thread` (`uri-id`, `owner-id`, `author-id`, `network`, `created`, `received`, `changed`, `commented`)
SELECT `uri-id`, `owner-id`, `author-id`, `network`, `created`, `received`, `changed`, `commented` FROM `thread`")) {
return Update::FAILED;
}
if (!DBStructure::existsTable('thread')) {
return Update::SUCCESS;
}
if (!DBA::e("UPDATE `post-thread-user` INNER JOIN `thread` ON `thread`.`uid` = `post-thread-user`.`uid` AND `thread`.`uri-id` = `post-thread-user`.`uri-id`
SET `post-thread-user`.`mention` = `thread`.`mention`")) {
return Update::FAILED;
}
return Update::SUCCESS;
}