Merge pull request #10411 from annando/header-noscrape

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

diff --git a/static/dbview.config.php b/static/dbview.config.php
index 488cbceaa2662e3c07ff92ddd4c8c6f5ea3048b5..01cda59a62c0da7b849f137faf2eaf5e8cd0878e 100644 (file)
--- a/static/dbview.config.php
+++ b/static/dbview.config.php
@@ -196,6 +196,8 @@
                        "parent-author-link" => ["parent-post-author", "url"],
                        "parent-author-name" => ["parent-post-author", "name"],
                        "parent-author-network" => ["parent-post-author", "network"],
+                       "parent-author-blocked" => ["parent-post-author", "blocked"],
+                       "parent-author-hidden" => ["parent-post-author", "hidden"],
                ],
                "query" => "FROM `post-user`
                        STRAIGHT_JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-user`.`parent-uri-id` AND `post-thread-user`.`uid` = `post-user`.`uid`
@@ -354,6 +356,8 @@
                        "parent-author-link" => ["parent-post-author", "url"],
                        "parent-author-name" => ["parent-post-author", "name"],
                        "parent-author-network" => ["parent-post-author", "network"],
+                       "parent-author-blocked" => ["parent-post-author", "blocked"],
+                       "parent-author-hidden" => ["parent-post-author", "hidden"],
                ],
                "query" => "FROM `post-thread-user`
                        INNER JOIN `post-user` ON `post-user`.`id` = `post-thread-user`.`post-user-id`
@@ -415,6 +419,31 @@
                        "target-type" => ["post-content", "target-type"],
                        "target" => ["post-content", "target"],
                        "resource-id" => ["post-content", "resource-id"],
+                       "contact-id" => ["post", "author-id"],
+                       "contact-link" => ["author", "url"],
+                       "contact-addr" => ["author", "addr"],
+                       "contact-name" => ["author", "name"],
+                       "contact-nick" => ["author", "nick"],
+                       "contact-avatar" => ["author", "thumb"],
+                       "contact-network" => ["author", "network"],
+                       "contact-blocked" => ["author", "blocked"],
+                       "contact-hidden" => ["author", "hidden"],
+                       "contact-readonly" => ["author", "readonly"],
+                       "contact-archive" => ["author", "archive"],
+                       "contact-pending" => ["author", "pending"],
+                       "contact-rel" => ["author", "rel"],
+                       "contact-uid" => ["author", "uid"],
+                       "contact-contact-type" => ["author", "contact-type"],
+                       "writable" => "IF (`post`.`network` IN ('apub', 'dfrn', 'dspr', 'stat'), true, `author`.`writable`)",
+                       "self" => "false",
+                       "cid" => ["author", "id"],
+                       "alias" => ["author", "alias"],
+                       "photo" => ["author", "photo"],
+                       "name-date" => ["author", "name-date"],
+                       "uri-date" => ["author", "uri-date"],
+                       "avatar-date" => ["author", "avatar-date"],
+                       "thumb" => ["author", "thumb"],
+                       "dfrn-id" => ["author", "dfrn-id"],
                        "author-id" => ["post", "author-id"],
                        "author-link" => ["author", "url"],
                        "author-addr" => ["author", "addr"],
@@ -451,6 +480,8 @@
                        "parent-author-link" => ["parent-post-author", "url"],
                        "parent-author-name" => ["parent-post-author", "name"],
                        "parent-author-network" => ["parent-post-author", "network"],
+                       "parent-author-blocked" => ["parent-post-author", "blocked"],
+                       "parent-author-hidden" => ["parent-post-author", "hidden"],
                ],
                "query" => "FROM `post`
                        STRAIGHT_JOIN `post-thread` ON `post-thread`.`uri-id` = `post`.`parent-uri-id`
@@ -508,6 +539,31 @@
                        "target-type" => ["post-content", "target-type"],
                        "target" => ["post-content", "target"],
                        "resource-id" => ["post-content", "resource-id"],
+                       "contact-id" => ["post-thread", "author-id"],
+                       "contact-link" => ["author", "url"],
+                       "contact-addr" => ["author", "addr"],
+                       "contact-name" => ["author", "name"],
+                       "contact-nick" => ["author", "nick"],
+                       "contact-avatar" => ["author", "thumb"],
+                       "contact-network" => ["author", "network"],
+                       "contact-blocked" => ["author", "blocked"],
+                       "contact-hidden" => ["author", "hidden"],
+                       "contact-readonly" => ["author", "readonly"],
+                       "contact-archive" => ["author", "archive"],
+                       "contact-pending" => ["author", "pending"],
+                       "contact-rel" => ["author", "rel"],
+                       "contact-uid" => ["author", "uid"],
+                       "contact-contact-type" => ["author", "contact-type"],
+                       "writable" => "IF (`post`.`network` IN ('apub', 'dfrn', 'dspr', 'stat'), true, `author`.`writable`)",
+                       "self" => "false",
+                       "cid" => ["author", "id"],
+                       "alias" => ["author", "alias"],
+                       "photo" => ["author", "photo"],
+                       "name-date" => ["author", "name-date"],
+                       "uri-date" => ["author", "uri-date"],
+                       "avatar-date" => ["author", "avatar-date"],
+                       "thumb" => ["author", "thumb"],
+                       "dfrn-id" => ["author", "dfrn-id"],
                        "author-id" => ["post-thread", "author-id"],
                        "author-link" => ["author", "url"],
                        "author-addr" => ["author", "addr"],
@@ -544,6 +600,8 @@
                        "parent-author-link" => ["parent-post-author", "url"],
                        "parent-author-name" => ["parent-post-author", "name"],
                        "parent-author-network" => ["parent-post-author", "network"],
+                       "parent-author-blocked" => ["parent-post-author", "blocked"],
+                       "parent-author-hidden" => ["parent-post-author", "hidden"],
                ],
                "query" => "FROM `post-thread`
                        INNER JOIN `post` ON `post`.`uri-id` = `post-thread`.`uri-id`
@@ -665,6 +723,7 @@
                        "photo" => ["contact", "photo"],
                        "thumb" => ["contact", "thumb"],
                        "micro" => ["contact", "micro"],
+                       "header" => ["contact", "header"],
                        "site-pubkey" => ["contact", "site-pubkey"],
                        "issued-id" => ["contact", "issued-id"],
                        "dfrn-id" => ["contact", "dfrn-id"],