Merge pull request #10644 from annando/issue-10640

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

diff --git a/static/dbview.config.php b/static/dbview.config.php
index 18cdc16e8762cad9eb304fcd23292fac9c469646..c9acd55ba9ad4ac8904eb8a60d5e49d8493aa32b 100644 (file)
--- a/static/dbview.config.php
+++ b/static/dbview.config.php
@@ -138,7 +138,6 @@
                        "uri-date" => ["contact", "uri-date"],
                        "avatar-date" => ["contact", "avatar-date"],
                        "thumb" => ["contact", "thumb"],
-                       "dfrn-id" => ["contact", "dfrn-id"],
                        "author-id" => ["post-user", "author-id"],
                        "author-link" => ["author", "url"],
                        "author-addr" => ["author", "addr"],
@@ -298,7 +297,6 @@
                        "uri-date" => ["contact", "uri-date"],
                        "avatar-date" => ["contact", "avatar-date"],
                        "thumb" => ["contact", "thumb"],
-                       "dfrn-id" => ["contact", "dfrn-id"],
                        "author-id" => ["post-thread-user", "author-id"],
                        "author-link" => ["author", "url"],
                        "author-addr" => ["author", "addr"],
@@ -443,7 +441,6 @@
                        "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"],
@@ -563,7 +560,6 @@
                        "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"],
@@ -708,7 +704,6 @@
                        "self" => ["contact", "self"],
                        "remote_self" => ["contact", "remote_self"],
                        "rel" => ["contact", "rel"],
-                       "duplex" => ["contact", "duplex"],
                        "network" => ["contact", "network"],
                        "protocol" => ["contact", "protocol"],
                        "name" => ["contact", "name"],
@@ -718,15 +713,13 @@
                        "keywords" => ["contact", "keywords"],
                        "gender" => ["contact", "gender"],
                        "xmpp" => ["contact", "xmpp"],
+                       "matrix" => ["contact", "matrix"],
                        "attag" => ["contact", "attag"],
                        "avatar" => ["contact", "avatar"],
                        "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"],
                        "url" => ["contact", "url"],
                        "nurl" => ["contact", "nurl"],
                        "uri-id" => ["contact", "uri-id"],
@@ -740,8 +733,6 @@
                        "poll" => ["contact", "poll"],
                        "confirm" => ["contact", "confirm"],
                        "poco" => ["contact", "poco"],
-                       "aes_allow" => ["contact", "aes_allow"],
-                       "ret-aes" => ["contact", "ret-aes"],
                        "usehub" => ["contact", "usehub"],
                        "subhub" => ["contact", "subhub"],
                        "hub-verify" => ["contact", "hub-verify"],
@@ -847,6 +838,7 @@
                        "about" => ["contact", "about"],
                        "keywords" => ["contact", "keywords"],
                        "xmpp" => ["contact", "xmpp"],
+                       "matrix" => ["contact", "matrix"],
                        "avatar" => ["contact", "avatar"],
                        "photo" => ["contact", "photo"],
                        "thumb" => ["contact", "thumb"],
@@ -916,6 +908,7 @@
        "account-user-view" => [
                "fields" => [
                        "id" => ["ucontact", "id"],
+                       "pid" => ["contact", "id"],
                        "uid" => ["ucontact", "uid"],
                        "url" => ["contact", "url"],
                        "nurl" => ["contact", "nurl"],
@@ -927,6 +920,7 @@
                        "about" => ["contact", "about"],
                        "keywords" => ["contact", "keywords"],
                        "xmpp" => ["contact", "xmpp"],
+                       "matrix" => ["contact", "matrix"],
                        "avatar" => ["contact", "avatar"],
                        "photo" => ["contact", "photo"],
                        "thumb" => ["contact", "thumb"],
@@ -980,12 +974,6 @@
                        "subhub" => ["ucontact", "subhub"],
                        "hub-verify" => ["ucontact", "hub-verify"],
                        "reason" => ["ucontact", "reason"],
-                       "dfrn-duplex" => ["ucontact", "duplex"],
-                       "dfrn-ret-aes" => ["ucontact", "ret-aes"],
-                       "dfrn-site-pubkey" => ["ucontact", "site-pubkey"],
-                       "dfrn-issued-id" => ["ucontact", "issued-id"],
-                       "dfrn-id" => ["ucontact", "dfrn-id"],
-                       "dfrn-aes_allow" => ["ucontact", "aes_allow"],
                        "dfrn-request" => ["contact", "request"],
                        "dfrn-notify" => ["contact", "notify"],
                        "dfrn-poll" => ["contact", "poll"],