Merge pull request #11123 from annando/notification-dismissed

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

diff --git a/static/dbview.config.php b/static/dbview.config.php
index 6e353718d002e04434ee1a68cd830a7bfe113663..3caa7c0877c8d5a505c69310ac4a9a9683cc95bd 100644 (file)
--- a/static/dbview.config.php
+++ b/static/dbview.config.php
@@ -186,7 +186,6 @@
                        "event-location" => ["event", "location"],
                        "event-type" => ["event", "type"],
                        "event-nofinish" => ["event", "nofinish"],
-                       "event-adjust" => ["event", "adjust"],
                        "event-ignore" => ["event", "ignore"],
                        "signed_text" => ["diaspora-interaction", "interaction"],
                        "parent-guid" => ["parent-item-uri", "guid"],
@@ -194,6 +193,7 @@
                        "parent-author-id" => ["parent-post", "author-id"],
                        "parent-author-link" => ["parent-post-author", "url"],
                        "parent-author-name" => ["parent-post-author", "name"],
+                       "parent-author-nick" => ["parent-post-author", "nick"],
                        "parent-author-network" => ["parent-post-author", "network"],
                        "parent-author-blocked" => ["parent-post-author", "blocked"],
                        "parent-author-hidden" => ["parent-post-author", "hidden"],
@@ -345,7 +345,6 @@
                        "event-location" => ["event", "location"],
                        "event-type" => ["event", "type"],
                        "event-nofinish" => ["event", "nofinish"],
-                       "event-adjust" => ["event", "adjust"],
                        "event-ignore" => ["event", "ignore"],
                        "signed_text" => ["diaspora-interaction", "interaction"],
                        "parent-guid" => ["parent-item-uri", "guid"],
@@ -827,6 +826,7 @@
                        "url" => ["contact", "url"],
                        "nurl" => ["contact", "nurl"],
                        "uri-id" => ["contact", "uri-id"],
+                       "guid" => ["item-uri", "guid"],
                        "addr" => ["contact", "addr"],
                        "alias" => ["contact", "alias"],
                        "name" => ["contact", "name"],
@@ -897,6 +897,7 @@
                        "ap-statuses_count" => ["apcontact", "statuses_count"],
                ],
                "query" => "FROM `contact`
+                       LEFT JOIN `item-uri` ON `item-uri`.`id` = `contact`.`uri-id`
                        LEFT JOIN `apcontact` ON `apcontact`.`uri-id` = `contact`.`uri-id`
                        LEFT JOIN `fcontact` ON `fcontact`.`uri-id` = contact.`uri-id`
                        WHERE `contact`.`uid` = 0"                      
@@ -909,6 +910,7 @@
                        "url" => ["contact", "url"],
                        "nurl" => ["contact", "nurl"],
                        "uri-id" => ["contact", "uri-id"],
+                       "guid" => ["item-uri", "guid"],
                        "addr" => ["contact", "addr"],
                        "alias" => ["contact", "alias"],
                        "name" => ["contact", "name"],
@@ -930,7 +932,7 @@
                        "network" => ["contact", "network"],
                        "protocol" => ["ucontact", "protocol"],
                        "location" => ["contact", "location"],
-                       "attag" => ["contact", "attag"],
+                       "attag" => ["ucontact", "attag"],
                        "pubkey" => ["contact", "pubkey"],
                        "prvkey" => ["contact", "prvkey"],
                        "subscribe" => ["contact", "subscribe"],
@@ -946,7 +948,7 @@
                        "sensitive" => ["contact", "sensitive"],
                        "baseurl" => ["contact", "baseurl"],
                        "gsid" => ["contact", "gsid"],
-                       "info" => ["contact", "info"],
+                       "info" => ["ucontact", "info"],
                        "bdyear" => ["contact", "bdyear"],
                        "bd" => ["contact", "bd"],
                        "poco" => ["contact", "poco"],
@@ -993,6 +995,7 @@
                ],
                "query" => "FROM `contact` AS `ucontact`
                        INNER JOIN `contact` ON `contact`.`uri-id` = `ucontact`.`uri-id` AND `contact`.`uid` = 0
+                       LEFT JOIN `item-uri` ON `item-uri`.`id` = `ucontact`.`uri-id`
                        LEFT JOIN `apcontact` ON `apcontact`.`uri-id` = `ucontact`.`uri-id`
                        LEFT JOIN `fcontact` ON `fcontact`.`uri-id` = `ucontact`.`uri-id` AND `fcontact`.`network` = 'dspr'"
        ],
@@ -1045,5 +1048,23 @@
                        INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid`
                        WHERE NOT `workerqueue`.`done`"
        ],
+       "profile_field-view" => [
+               "fields" => [
+                       "id" => ["profile_field", "id"],
+                       "uid" => ["profile_field", "uid"],
+                       "label" => ["profile_field", "label"],
+                       "value" => ["profile_field", "value"],
+                       "order" => ["profile_field", "order"],
+                       "psid"=> ["profile_field", "psid"],
+                       "allow_cid" => ["permissionset", "allow_cid"],
+                       "allow_gid" => ["permissionset", "allow_gid"],
+                       "deny_cid" => ["permissionset", "deny_cid"],
+                       "deny_gid" => ["permissionset", "deny_gid"],
+                       "created" => ["profile_field", "created"],
+                       "edited" => ["profile_field", "edited"],
+               ],
+               "query" => "FROM `profile_field`
+                       INNER JOIN `permissionset` ON `permissionset`.`id` = `profile_field`.`psid`"
+       ],
 ];