Some further cleaning up

diff --git a/database.sql b/database.sql
index 3236870f3750fd1ef97d045c6c77b5d69b232a1a..5387d14c6ca9c260fe8c90d96e4549fd8906d7e3 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1388,35 +1388,6 @@ CREATE VIEW `tag-view` AS SELECT
                        LEFT JOIN `tag` ON `post-tag`.`tid` = `tag`.`id`
                        LEFT JOIN `contact` ON `post-tag`.`cid` = `contact`.`id`;
 
---
--- VIEW network-thread-view
---
-DROP VIEW IF EXISTS `network-thread-view`;
-CREATE VIEW `network-thread-view` AS SELECT 
-       `item`.`uri-id` AS `uri-id`,
-       `item`.`uri` AS `uri`,
-       `item`.`parent-uri-id` AS `parent-uri-id`,
-       `thread`.`iid` AS `parent`,
-       `thread`.`iid` AS `item_id`,
-       `thread`.`received` AS `received`,
-       `thread`.`commented` AS `commented`,
-       `thread`.`created` AS `created`,
-       `thread`.`uid` AS `uid`,
-       `thread`.`starred` AS `starred`,
-       `thread`.`mention` AS `mention`,
-       `thread`.`network` AS `network`,
-       `thread`.`contact-id` AS `contact-id`
-       FROM `thread`
-                       STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id` AND (NOT `contact`.`blocked` OR `contact`.`pending`)
-                       STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
-                       LEFT JOIN `user-item` ON `user-item`.`iid` = `item`.`id` AND `user-item`.`uid` = `thread`.`uid`
-                       LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `thread`.`uid` AND `author`.`cid` = `thread`.`author-id`
-                       LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `thread`.`uid` AND `owner`.`cid` = `thread`.`owner-id`
-                       WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
-                       AND (`user-item`.`hidden` IS NULL OR NOT `user-item`.`hidden`)
-                       AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
-                       AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`);
-
 --
 -- VIEW network-item-view
 --
@@ -1425,7 +1396,6 @@ CREATE VIEW `network-item-view` AS SELECT
        `item`.`parent-uri-id` AS `uri-id`,
        `item`.`parent-uri` AS `uri`,
        `item`.`parent` AS `parent`,
-       `item`.`parent` AS `item_id`,
        `item`.`received` AS `received`,
        `item`.`commented` AS `commented`,
        `item`.`created` AS `created`,
@@ -1447,6 +1417,34 @@ CREATE VIEW `network-item-view` AS SELECT
                        AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
                        AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`);
 
+--
+-- VIEW network-thread-view
+--
+DROP VIEW IF EXISTS `network-thread-view`;
+CREATE VIEW `network-thread-view` AS SELECT 
+       `item`.`uri-id` AS `uri-id`,
+       `item`.`uri` AS `uri`,
+       `item`.`parent-uri-id` AS `parent-uri-id`,
+       `thread`.`iid` AS `parent`,
+       `thread`.`received` AS `received`,
+       `thread`.`commented` AS `commented`,
+       `thread`.`created` AS `created`,
+       `thread`.`uid` AS `uid`,
+       `thread`.`starred` AS `starred`,
+       `thread`.`mention` AS `mention`,
+       `thread`.`network` AS `network`,
+       `thread`.`contact-id` AS `contact-id`
+       FROM `thread`
+                       STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id` AND (NOT `contact`.`blocked` OR `contact`.`pending`)
+                       STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
+                       LEFT JOIN `user-item` ON `user-item`.`iid` = `item`.`id` AND `user-item`.`uid` = `thread`.`uid`
+                       LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `thread`.`uid` AND `author`.`cid` = `thread`.`author-id`
+                       LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `thread`.`uid` AND `owner`.`cid` = `thread`.`owner-id`
+                       WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
+                       AND (`user-item`.`hidden` IS NULL OR NOT `user-item`.`hidden`)
+                       AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
+                       AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`);
+
 --
 -- VIEW owner-view
 --

diff --git a/mod/network.php b/mod/network.php
index 59597102f93a04c9f2be9f9d15beb602de3093ac..6a7b8db5f7b4afd176ecf5a4a1da7a2f92a2dcd6 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -628,8 +628,8 @@ function network_display_post($a, $pager, $mark_all, $update, $ordering, $items)
                $parents_arr = [];
 
                foreach ($items as $item) {
-                       if (!in_array($item['item_id'], $parents_arr) && ($item['item_id'] > 0)) {
-                               $parents_arr[] = $item['item_id'];
+                       if (!in_array($item['parent'], $parents_arr) && ($item['parent'] > 0)) {
+                               $parents_arr[] = $item['parent'];
                        }
                }
                $parents_str = implode(', ', $parents_arr);

diff --git a/static/dbview.config.php b/static/dbview.config.php
index 50cd2a1e5a7aa3f415b15a7569555d4e8ff7b75f..55cfd0155e8d37a553aaa0324a6af672e9c0682a 100755 (executable)
--- a/static/dbview.config.php
+++ b/static/dbview.config.php
@@ -68,39 +68,11 @@ return [
                        LEFT JOIN `tag` ON `post-tag`.`tid` = `tag`.`id`
                        LEFT JOIN `contact` ON `post-tag`.`cid` = `contact`.`id`"
        ],
-       "network-thread-view" => [
-               "fields" => [
-                       "uri-id" => ["item", "uri-id"],
-                       "uri" => ["item", "uri"],
-                       "parent-uri-id" => ["item", "parent-uri-id"],
-                       "parent" => ["thread", "iid"],
-                       "item_id" => ["thread", "iid"],
-                       "received" => ["thread", "received"],
-                       "commented" => ["thread", "commented"],
-                       "created" => ["thread", "created"],
-                       "uid" => ["thread", "uid"],
-                       "starred" => ["thread", "starred"],
-                       "mention" => ["thread", "mention"],
-                       "network" => ["thread", "network"],
-                       "contact-id" => ["thread", "contact-id"],
-               ],
-               "query" => "FROM `thread`
-                       STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id` AND (NOT `contact`.`blocked` OR `contact`.`pending`)
-                       STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
-                       LEFT JOIN `user-item` ON `user-item`.`iid` = `item`.`id` AND `user-item`.`uid` = `thread`.`uid`
-                       LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `thread`.`uid` AND `author`.`cid` = `thread`.`author-id`
-                       LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `thread`.`uid` AND `owner`.`cid` = `thread`.`owner-id`
-                       WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
-                       AND (`user-item`.`hidden` IS NULL OR NOT `user-item`.`hidden`)
-                       AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
-                       AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`)"
-       ],
        "network-item-view" => [
                "fields" => [
                        "uri-id" => ["item", "parent-uri-id"],
                        "uri" => ["item", "parent-uri"],
                        "parent" => ["item", "parent"],
-                       "item_id" => ["item", "parent"],
                        "received" => ["item", "received"],
                        "commented" => ["item", "commented"],
                        "created" => ["item", "created"],
@@ -123,6 +95,32 @@ return [
                        AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
                        AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`)"
        ],
+       "network-thread-view" => [
+               "fields" => [
+                       "uri-id" => ["item", "uri-id"],
+                       "uri" => ["item", "uri"],
+                       "parent-uri-id" => ["item", "parent-uri-id"],
+                       "parent" => ["thread", "iid"],
+                       "received" => ["thread", "received"],
+                       "commented" => ["thread", "commented"],
+                       "created" => ["thread", "created"],
+                       "uid" => ["thread", "uid"],
+                       "starred" => ["thread", "starred"],
+                       "mention" => ["thread", "mention"],
+                       "network" => ["thread", "network"],
+                       "contact-id" => ["thread", "contact-id"],
+               ],
+               "query" => "FROM `thread`
+                       STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id` AND (NOT `contact`.`blocked` OR `contact`.`pending`)
+                       STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
+                       LEFT JOIN `user-item` ON `user-item`.`iid` = `item`.`id` AND `user-item`.`uid` = `thread`.`uid`
+                       LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `thread`.`uid` AND `author`.`cid` = `thread`.`author-id`
+                       LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `thread`.`uid` AND `owner`.`cid` = `thread`.`owner-id`
+                       WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
+                       AND (`user-item`.`hidden` IS NULL OR NOT `user-item`.`hidden`)
+                       AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
+                       AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`)"
+       ],
        "owner-view" => [
                "fields" => [
                        "id" => ["contact", "id"],