[dbstructure 1373] Replace contact.blocked with user.blocked in owner-view

[friendica.git] / static / dbview.config.php

diff --git a/static/dbview.config.php b/static/dbview.config.php
index 55cfd0155e8d37a553aaa0324a6af672e9c0682a..5c183642623faf7ab6a206c24c16179ca7d0deb3 100755 (executable)
--- a/static/dbview.config.php
+++ b/static/dbview.config.php
@@ -83,14 +83,17 @@ return [
                        "unseen" => ["item", "unseen"],
                        "gravity" => ["item", "gravity"],
                        "contact-id" => ["item", "contact-id"],
+                       "contact-type" => ["ownercontact", "contact-type"],
                ],
                "query" => "FROM `item`
                        INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`
-                       STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id` AND (NOT `contact`.`blocked` OR `contact`.`pending`)
+                       STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
                        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`
+                       LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `thread`.`owner-id`
                        WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
+                       AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
                        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`)"
@@ -109,14 +112,17 @@ return [
                        "mention" => ["thread", "mention"],
                        "network" => ["thread", "network"],
                        "contact-id" => ["thread", "contact-id"],
+                       "contact-type" => ["ownercontact", "contact-type"],
                ],
                "query" => "FROM `thread`
-                       STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id` AND (NOT `contact`.`blocked` OR `contact`.`pending`)
+                       STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
                        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`
+                       LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `thread`.`owner-id`
                        WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
+                       AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
                        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`)"
@@ -175,18 +181,18 @@ return [
                        "term-date" => ["contact", "term-date"],
                        "last-item" => ["contact", "last-item"],
                        "priority" => ["contact", "priority"],
-                       "blocked" => ["contact", "blocked"], /// @todo Check if "blocked" from contact or from the users table
+                       "blocked" => ["user", "blocked"],
                        "block_reason" => ["contact", "block_reason"],
                        "readonly" => ["contact", "readonly"],
                        "writable" => ["contact", "writable"],
                        "forum" => ["contact", "forum"],
                        "prv" => ["contact", "prv"],
                        "contact-type" => ["contact", "contact-type"],
+                       "manually-approve" => ["contact", "manually-approve"],
                        "hidden" => ["contact", "hidden"],
                        "archive" => ["contact", "archive"],
                        "pending" => ["contact", "pending"],
                        "deleted" => ["contact", "deleted"],
-                       "rating" => ["contact", "rating"],
                        "unsearchable" => ["contact", "unsearchable"],
                        "sensitive" => ["contact", "sensitive"],
                        "baseurl" => ["contact", "baseurl"],
@@ -230,7 +236,7 @@ return [
                        "account_removed" => ["user", "account_removed"],
                        "account_expired" => ["user", "account_expired"],
                        "account_expires_on" => ["user", "account_expires_on"],
-                       "expire_notification_sent" => ["user", "expire_notification_sent"],                     
+                       "expire_notification_sent" => ["user", "expire_notification_sent"],
                        "def_gid" => ["user", "def_gid"],
                        "allow_cid" => ["user", "allow_cid"],
                        "allow_gid" => ["user", "allow_gid"],