X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=static%2Fdbview.config.php;h=040a9ebc306e19500e730ff3131b38998acaaf71;hb=d2ca812647c0c06665e008354aa692d492f8857a;hp=9083185d5aac1f3eb9ff70938f00523697496cdf;hpb=75bc4eccb7789620785236d62d3b1204561a6ea4;p=friendica.git

diff --git a/static/dbview.config.php b/static/dbview.config.php
index 9083185d5a..040a9ebc30 100644
--- a/static/dbview.config.php
+++ b/static/dbview.config.php
@@ -114,6 +114,7 @@
 			"target" => ["post-content", "target"],
 			"resource-id" => ["post-content", "resource-id"],
 			"contact-id" => ["post-user", "contact-id"],
+			"contact-uri-id" => ["contact", "uri-id"],
 			"contact-link" => ["contact", "url"],
 			"contact-addr" => ["contact", "addr"],
 			"contact-name" => ["contact", "name"],
@@ -138,6 +139,7 @@
 			"avatar-date" => ["contact", "avatar-date"],
 			"thumb" => ["contact", "thumb"],
 			"author-id" => ["post-user", "author-id"],
+			"author-uri-id" => ["author", "uri-id"],
 			"author-link" => ["author", "url"],
 			"author-addr" => ["author", "addr"],
 			"author-name" => "IF (`contact`.`url` = `author`.`url` AND `contact`.`name` != '', `contact`.`name`, `author`.`name`)",
@@ -146,7 +148,11 @@
 			"author-network" => ["author", "network"],
 			"author-blocked" => ["author", "blocked"],
 			"author-hidden" => ["author", "hidden"],
+			"author-updated" => ["author", "updated"],
+			"author-gsid" => ["author", "gsid"],
+			"author-uri-id" => ["author", "uri-id"],
 			"owner-id" => ["post-user", "owner-id"],
+			"owner-uri-id" => ["owner", "uri-id"],
 			"owner-link" => ["owner", "url"],
 			"owner-addr" => ["owner", "addr"],
 			"owner-name" => "IF (`contact`.`url` = `owner`.`url` AND `contact`.`name` != '', `contact`.`name`, `owner`.`name`)",
@@ -155,8 +161,10 @@
 			"owner-network" => ["owner", "network"],
 			"owner-blocked" => ["owner", "blocked"],
 			"owner-hidden" => ["owner", "hidden"],
+			"owner-updated" => ["owner", "updated"],
 			"owner-contact-type" => ["owner", "contact-type"],
 			"causer-id" => ["post-user", "causer-id"],
+			"causer-uri-id" => ["causer", "uri-id"],
 			"causer-link" => ["causer", "url"],
 			"causer-addr" => ["causer", "addr"],
 			"causer-name" => ["causer", "name"],
@@ -186,6 +194,12 @@
 			"event-type" => ["event", "type"],
 			"event-nofinish" => ["event", "nofinish"],
 			"event-ignore" => ["event", "ignore"],
+			"question-id" => ["post-question", "id"],
+			"question-multiple" => ["post-question", "multiple"],
+			"question-voters" => ["post-question", "voters"],
+			"question-end-time" => ["post-question", "end-time"],
+			"has-categories" => "EXISTS(SELECT `uri-id` FROM `post-category` WHERE `post-category`.`uri-id` = `post-user`.`uri-id` AND `post-category`.`uid` = `post-user`.`uid`)",
+			"has-media" => "EXISTS(SELECT `id` FROM `post-media` WHERE `post-media`.`uri-id` = `post-user`.`uri-id`)",
 			"signed_text" => ["diaspora-interaction", "interaction"],
 			"parent-guid" => ["parent-item-uri", "guid"],
 			"parent-network" => ["parent-post", "network"],
@@ -212,6 +226,7 @@
 			LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `post-user`.`uri-id`
 			LEFT JOIN `post-content` ON `post-content`.`uri-id` = `post-user`.`uri-id`
 			LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `post-user`.`uri-id` AND `post-user`.`origin`
+			LEFT JOIN `post-question` ON `post-question`.`uri-id` = `post-user`.`uri-id`
 			LEFT JOIN `permissionset` ON `permissionset`.`id` = `post-user`.`psid`
 			LEFT JOIN `post-user` AS `parent-post` ON `parent-post`.`uri-id` = `post-user`.`parent-uri-id` AND `parent-post`.`uid` = `post-user`.`uid`
 			LEFT JOIN `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `parent-post`.`author-id`"
@@ -272,6 +287,7 @@
 			"target" => ["post-content", "target"],
 			"resource-id" => ["post-content", "resource-id"],
 			"contact-id" => ["post-thread-user", "contact-id"],
+			"contact-uri-id" => ["contact", "uri-id"],
 			"contact-link" => ["contact", "url"],
 			"contact-addr" => ["contact", "addr"],
 			"contact-name" => ["contact", "name"],
@@ -296,6 +312,7 @@
 			"avatar-date" => ["contact", "avatar-date"],
 			"thumb" => ["contact", "thumb"],
 			"author-id" => ["post-thread-user", "author-id"],
+			"author-uri-id" => ["author", "uri-id"],
 			"author-link" => ["author", "url"],
 			"author-addr" => ["author", "addr"],
 			"author-name" => "IF (`contact`.`url` = `author`.`url` AND `contact`.`name` != '', `contact`.`name`, `author`.`name`)",
@@ -304,7 +321,11 @@
 			"author-network" => ["author", "network"],
 			"author-blocked" => ["author", "blocked"],
 			"author-hidden" => ["author", "hidden"],
+			"author-updated" => ["author", "updated"],
+			"author-gsid" => ["author", "gsid"],
+			"author-uri-id" => ["author", "uri-id"],
 			"owner-id" => ["post-thread-user", "owner-id"],
+			"owner-uri-id" => ["owner", "uri-id"],
 			"owner-link" => ["owner", "url"],
 			"owner-addr" => ["owner", "addr"],
 			"owner-name" => "IF (`contact`.`url` = `owner`.`url` AND `contact`.`name` != '', `contact`.`name`, `owner`.`name`)",
@@ -313,8 +334,10 @@
 			"owner-network" => ["owner", "network"],
 			"owner-blocked" => ["owner", "blocked"],
 			"owner-hidden" => ["owner", "hidden"],
+			"owner-updated" => ["owner", "updated"],
 			"owner-contact-type" => ["owner", "contact-type"],
 			"causer-id" => ["post-thread-user", "causer-id"],
+			"causer-uri-id" => ["causer", "uri-id"],
 			"causer-link" => ["causer", "url"],
 			"causer-addr" => ["causer", "addr"],
 			"causer-name" => ["causer", "name"],
@@ -344,6 +367,12 @@
 			"event-type" => ["event", "type"],
 			"event-nofinish" => ["event", "nofinish"],
 			"event-ignore" => ["event", "ignore"],
+			"question-id" => ["post-question", "id"],
+			"question-multiple" => ["post-question", "multiple"],
+			"question-voters" => ["post-question", "voters"],
+			"question-end-time" => ["post-question", "end-time"],
+			"has-categories" => "EXISTS(SELECT `uri-id` FROM `post-category` WHERE `post-category`.`uri-id` = `post-thread-user`.`uri-id` AND `post-category`.`uid` = `post-thread-user`.`uid`)",
+			"has-media" => "EXISTS(SELECT `id` FROM `post-media` WHERE `post-media`.`uri-id` = `post-thread-user`.`uri-id`)",
 			"signed_text" => ["diaspora-interaction", "interaction"],
 			"parent-guid" => ["parent-item-uri", "guid"],
 			"parent-network" => ["parent-post", "network"],
@@ -369,6 +398,7 @@
 			LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `post-thread-user`.`uri-id`
 			LEFT JOIN `post-content` ON `post-content`.`uri-id` = `post-thread-user`.`uri-id`
 			LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `post-thread-user`.`uri-id` AND `post-thread-user`.`origin`
+			LEFT JOIN `post-question` ON `post-question`.`uri-id` = `post-thread-user`.`uri-id`
 			LEFT JOIN `permissionset` ON `permissionset`.`id` = `post-thread-user`.`psid`
 			LEFT JOIN `post-user` AS `parent-post` ON `parent-post`.`uri-id` = `post-user`.`parent-uri-id` AND `parent-post`.`uid` = `post-thread-user`.`uid`
 			LEFT JOIN `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `parent-post`.`author-id`"
@@ -416,6 +446,7 @@
 			"target" => ["post-content", "target"],
 			"resource-id" => ["post-content", "resource-id"],
 			"contact-id" => ["post", "author-id"],
+			"contact-uri-id" => ["author", "uri-id"],
 			"contact-link" => ["author", "url"],
 			"contact-addr" => ["author", "addr"],
 			"contact-name" => ["author", "name"],
@@ -440,6 +471,7 @@
 			"avatar-date" => ["author", "avatar-date"],
 			"thumb" => ["author", "thumb"],
 			"author-id" => ["post", "author-id"],
+			"author-uri-id" => ["author", "uri-id"],
 			"author-link" => ["author", "url"],
 			"author-addr" => ["author", "addr"],
 			"author-name" => ["author", "name"],
@@ -448,7 +480,11 @@
 			"author-network" => ["author", "network"],
 			"author-blocked" => ["author", "blocked"],
 			"author-hidden" => ["author", "hidden"],
+			"author-updated" => ["author", "updated"],
+			"author-gsid" => ["author", "gsid"],
+			"author-uri-id" => ["author", "uri-id"],
 			"owner-id" => ["post", "owner-id"],
+			"owner-uri-id" => ["owner", "uri-id"],
 			"owner-link" => ["owner", "url"],
 			"owner-addr" => ["owner", "addr"],
 			"owner-name" => ["owner", "name"],
@@ -457,8 +493,10 @@
 			"owner-network" => ["owner", "network"],
 			"owner-blocked" => ["owner", "blocked"],
 			"owner-hidden" => ["owner", "hidden"],
+			"owner-updated" => ["owner", "updated"],
 			"owner-contact-type" => ["owner", "contact-type"],
 			"causer-id" => ["post", "causer-id"],
+			"causer-uri-id" => ["causer", "uri-id"],
 			"causer-link" => ["causer", "url"],
 			"causer-addr" => ["causer", "addr"],
 			"causer-name" => ["causer", "name"],
@@ -468,6 +506,12 @@
 			"causer-blocked" => ["causer", "blocked"],
 			"causer-hidden" => ["causer", "hidden"],
 			"causer-contact-type" => ["causer", "contact-type"],
+			"question-id" => ["post-question", "id"],
+			"question-multiple" => ["post-question", "multiple"],
+			"question-voters" => ["post-question", "voters"],
+			"question-end-time" => ["post-question", "end-time"],
+			"has-categories" => "0",
+			"has-media" => "EXISTS(SELECT `id` FROM `post-media` WHERE `post-media`.`uri-id` = `post`.`uri-id`)",
 			"signed_text" => ["diaspora-interaction", "interaction"],
 			"parent-guid" => ["parent-item-uri", "guid"],
 			"parent-network" => ["parent-post", "network"],
@@ -490,6 +534,7 @@
 			LEFT JOIN `verb` ON `verb`.`id` = `post`.`vid`
 			LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `post`.`uri-id`
 			LEFT JOIN `post-content` ON `post-content`.`uri-id` = `post`.`uri-id`
+			LEFT JOIN `post-question` ON `post-question`.`uri-id` = `post`.`uri-id`
 			LEFT JOIN `post` AS `parent-post` ON `parent-post`.`uri-id` = `post`.`parent-uri-id`
 			LEFT JOIN `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `parent-post`.`author-id`"
 	],
@@ -536,6 +581,7 @@
 			"target" => ["post-content", "target"],
 			"resource-id" => ["post-content", "resource-id"],
 			"contact-id" => ["post-thread", "author-id"],
+			"contact-uri-id" => ["author", "uri-id"],
 			"contact-link" => ["author", "url"],
 			"contact-addr" => ["author", "addr"],
 			"contact-name" => ["author", "name"],
@@ -560,6 +606,7 @@
 			"avatar-date" => ["author", "avatar-date"],
 			"thumb" => ["author", "thumb"],
 			"author-id" => ["post-thread", "author-id"],
+			"author-uri-id" => ["author", "uri-id"],
 			"author-link" => ["author", "url"],
 			"author-addr" => ["author", "addr"],
 			"author-name" => ["author", "name"],
@@ -568,7 +615,11 @@
 			"author-network" => ["author", "network"],
 			"author-blocked" => ["author", "blocked"],
 			"author-hidden" => ["author", "hidden"],
+			"author-updated" => ["author", "updated"],
+			"author-gsid" => ["author", "gsid"],
+			"author-uri-id" => ["author", "uri-id"],
 			"owner-id" => ["post-thread", "owner-id"],
+			"owner-uri-id" => ["owner", "uri-id"],
 			"owner-link" => ["owner", "url"],
 			"owner-addr" => ["owner", "addr"],
 			"owner-name" => ["owner", "name"],
@@ -577,8 +628,10 @@
 			"owner-network" => ["owner", "network"],
 			"owner-blocked" => ["owner", "blocked"],
 			"owner-hidden" => ["owner", "hidden"],
+			"owner-updated" => ["owner", "updated"],
 			"owner-contact-type" => ["owner", "contact-type"],
 			"causer-id" => ["post-thread", "causer-id"],
+			"causer-uri-id" => ["causer", "uri-id"],
 			"causer-link" => ["causer", "url"],
 			"causer-addr" => ["causer", "addr"],
 			"causer-name" => ["causer", "name"],
@@ -588,6 +641,12 @@
 			"causer-blocked" => ["causer", "blocked"],
 			"causer-hidden" => ["causer", "hidden"],
 			"causer-contact-type" => ["causer", "contact-type"],
+			"question-id" => ["post-question", "id"],
+			"question-multiple" => ["post-question", "multiple"],
+			"question-voters" => ["post-question", "voters"],
+			"question-end-time" => ["post-question", "end-time"],
+			"has-categories" => "0",
+			"has-media" => "EXISTS(SELECT `id` FROM `post-media` WHERE `post-media`.`uri-id` = `post-thread`.`uri-id`)",
 			"signed_text" => ["diaspora-interaction", "interaction"],
 			"parent-guid" => ["parent-item-uri", "guid"],
 			"parent-network" => ["parent-post", "network"],
@@ -610,6 +669,7 @@
 			LEFT JOIN `verb` ON `verb`.`id` = `post`.`vid`
 			LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `post-thread`.`uri-id`
 			LEFT JOIN `post-content` ON `post-content`.`uri-id` = `post-thread`.`uri-id`
+			LEFT JOIN `post-question` ON `post-question`.`uri-id` = `post-thread`.`uri-id`
 			LEFT JOIN `post` AS `parent-post` ON `parent-post`.`uri-id` = `post`.`parent-uri-id`
 			LEFT JOIN `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `parent-post`.`author-id`"
 	],
@@ -632,9 +692,17 @@
 			"cid" => ["post", "author-id"],
 			"received" => ["post", "received"],
 			"created" => ["post", "created"],
+			"commented" => ["post-thread", "commented"],
+			"private" => ["post", "private"],
+			"visible" => ["post", "visible"],
+			"deleted" => ["post", "deleted"],
+			"thr-parent-id" => ["post", "thr-parent-id"],
+			"author-id" => ["post", "author-id"],
+			"gravity" => ["post", "gravity"],
 		],
 		"query" => "FROM `post-collection`
-			INNER JOIN `post` ON `post-collection`.`uri-id` = `post`.`uri-id`"
+			INNER JOIN `post` ON `post-collection`.`uri-id` = `post`.`uri-id`
+			INNER JOIN `post-thread` ON `post-thread`.`uri-id` = `post`.`parent-uri-id`"
 	],
 	"tag-view" => [
 		"fields" => [
@@ -644,6 +712,7 @@
 			"cid" => ["post-tag", "cid"],
 			"name" => "CASE `cid` WHEN 0 THEN `tag`.`name` ELSE `contact`.`name` END",
 			"url" => "CASE `cid` WHEN 0 THEN `tag`.`url` ELSE `contact`.`url` END",
+			"tag-type" => "CASE `cid` WHEN 0 THEN `tag`.`type` ELSE 1 END",
 		],
 		"query" => "FROM `post-tag`
 			LEFT JOIN `tag` ON `post-tag`.`tid` = `tag`.`id`
@@ -992,6 +1061,9 @@
 			"diaspora-notify" => ["fcontact", "notify"],
 			"diaspora-poll" => ["fcontact", "poll"],
 			"diaspora-alias" => ["fcontact", "alias"],
+			"diaspora-interacting_count" => ["fcontact", "interacting_count"],
+			"diaspora-interacted_count" => ["fcontact", "interacted_count"],
+			"diaspora-post_count" => ["fcontact", "post_count"],
 			"ap-uuid" => ["apcontact", "uuid"],
 			"ap-type" => ["apcontact", "type"],
 			"ap-following" => ["apcontact", "following"],