X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=static%2Fdbview.config.php;h=94b81411b4f8707e4746674bf76e229879cec40f;hb=876b424ae355e1e94ed66abfe539fc4c62b4d091;hp=b369ee9faf29e5181db51dfb4c065fa7ae7ee5e9;hpb=215c6ecc14b799dc5359fd933275d9307ccd35ed;p=friendica.git

diff --git a/static/dbview.config.php b/static/dbview.config.php
index b369ee9faf..94b81411b4 100644
--- a/static/dbview.config.php
+++ b/static/dbview.config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -37,62 +37,63 @@
  */
 
  return [
-	"post-view" => [
+	"post-user-view" => [
 		"fields" => [
-			"id" => ["item", "id"],
-			"item_id" => ["item", "id"],
-			"uid" => ["item", "uid"],
-			"parent" => ["item", "parent"],
-			"uri" => ["item", "uri"],
-			"uri-id" => ["item", "uri-id"],
-			"parent-uri" => ["item", "parent-uri"],
-			"parent-uri-id" => ["item", "parent-uri-id"],
-			"thr-parent" => ["item", "thr-parent"],
-			"thr-parent-id" => ["item", "thr-parent-id"],
-			"guid" => ["item", "guid"],
-			"type" => ["item", "type"],
-			"wall" => ["item", "wall"],
-			"gravity" => ["item", "gravity"],
-			"extid" => ["item", "extid"],
-			"created" => ["item", "created"],
-			"edited" => ["item", "edited"],
-			"commented" => ["item", "commented"],
-			"received" => ["item", "received"],
-			"changed" => ["item", "changed"],
-			"resource-id" => ["item", "resource-id"],
-			"post-type" => ["item", "post-type"],
-			"private" => ["item", "private"],
-			"pubmail" => ["item", "pubmail"],
-			"moderated" => ["item", "moderated"],
-			"visible" => ["item", "visible"],
-			"starred" => ["item", "starred"],
-			"bookmark" => ["item", "bookmark"],
-			"unseen" => ["item", "unseen"],
-			"deleted" => ["item", "deleted"],
-			"origin" => ["item", "origin"],
-			"forum_mode" => ["item", "forum_mode"],
-			"mention" => ["item", "mention"],
-			"global" => ["item", "global"],
-			"network" => ["item", "network"],
-			"vid" => ["item", "vid"],
-			"psid" => ["item", "psid"],
-			"verb" => "IF (`item`.`vid` IS NULL, '', `verb`.`name`)",
-			"title" => ["item-content", "title"],
-			"content-warning" => ["item-content", "content-warning"],
-			"raw-body" => ["item-content", "raw-body"],
-			"body" => ["item-content", "body"],
-			"rendered-hash" => ["item-content", "rendered-hash"],
-			"rendered-html" => ["item-content", "rendered-html"],
-			"language" => ["item-content", "language"],
-			"plink" => ["item-content", "plink"],
-			"location" => ["item-content", "location"],
-			"coord" => ["item-content", "coord"],
-			"app" => ["item-content", "app"],
-			"object-type" => ["item-content", "object-type"],
-			"object" => ["item-content", "object"],
-			"target-type" => ["item-content", "target-type"],
-			"target" => ["item-content", "target"],
-			"contact-id" => ["item", "contact-id"],
+			"id" => ["post-user", "id"],
+			"post-user-id" => ["post-user", "id"],
+			"uid" => ["post-user", "uid"],
+			"parent" => ["parent-post", "id"],
+			"uri" => ["item-uri", "uri"],
+			"uri-id" => ["post-user", "uri-id"],
+			"parent-uri" => ["parent-item-uri", "uri"],
+			"parent-uri-id" => ["post-user", "parent-uri-id"],
+			"thr-parent" => ["thr-parent-item-uri", "uri"],
+			"thr-parent-id" => ["post-user", "thr-parent-id"],
+			"guid" => ["item-uri", "guid"],
+			"wall" => ["post-user", "wall"],
+			"gravity" => ["post-user", "gravity"],
+			"extid" => ["external-item-uri", "uri"],
+			"external-id" => ["post-user", "external-id"],
+			"created" => ["post-user", "created"],
+			"edited" => ["post-user", "edited"],
+			"commented" => ["post-thread-user", "commented"],
+			"received" => ["post-user", "received"],
+			"changed" => ["post-thread-user", "changed"],
+			"post-type" => ["post-user", "post-type"],
+			"post-reason" => ["post-user", "post-reason"],
+			"private" => ["post-user", "private"],
+			"pubmail" => ["post-thread-user", "pubmail"],
+			"visible" => ["post-user", "visible"],
+			"starred" => ["post-thread-user", "starred"],
+			"pinned" => ["post-thread-user", "pinned"],
+			"unseen" => ["post-user", "unseen"],
+			"deleted" => ["post-user", "deleted"],
+			"origin" => ["post-user", "origin"],
+			"parent-origin" => ["post-thread-user", "origin"],
+			"forum_mode" => ["post-thread-user", "forum_mode"],
+			"mention" => ["post-thread-user", "mention"],
+			"global" => ["post-user", "global"],
+			"network" => ["post-user", "network"],
+			"vid" => ["post-user", "vid"],
+			"psid" => ["post-user", "psid"],
+			"verb" => "IF (`post-user`.`vid` IS NULL, '', `verb`.`name`)",
+			"title" => ["post-content", "title"],
+			"content-warning" => ["post-content", "content-warning"],
+			"raw-body" => ["post-content", "raw-body"],
+			"body" => ["post-content", "body"],
+			"rendered-hash" => ["post-content", "rendered-hash"],
+			"rendered-html" => ["post-content", "rendered-html"],
+			"language" => ["post-content", "language"],
+			"plink" => ["post-content", "plink"],
+			"location" => ["post-content", "location"],
+			"coord" => ["post-content", "coord"],
+			"app" => ["post-content", "app"],
+			"object-type" => ["post-content", "object-type"],
+			"object" => ["post-content", "object"],
+			"target-type" => ["post-content", "target-type"],
+			"target" => ["post-content", "target"],
+			"resource-id" => ["post-content", "resource-id"],
+			"contact-id" => ["post-user", "contact-id"],
 			"contact-link" => ["contact", "url"],
 			"contact-addr" => ["contact", "addr"],
 			"contact-name" => ["contact", "name"],
@@ -107,7 +108,7 @@
 			"contact-rel" => ["contact", "rel"],
 			"contact-uid" => ["contact", "uid"],
 			"contact-contact-type" => ["contact", "contact-type"],
-			"writable" => "IF (`item`.`network` IN ('apub', 'dfrn', 'dspr', 'stat'), true, `contact`.`writable`)",
+			"writable" => "IF (`post-user`.`network` IN ('apub', 'dfrn', 'dspr', 'stat'), true, `contact`.`writable`)",
 			"self" => ["contact", "self"],
 			"cid" => ["contact", "id"],
 			"alias" => ["contact", "alias"],
@@ -117,7 +118,7 @@
 			"avatar-date" => ["contact", "avatar-date"],
 			"thumb" => ["contact", "thumb"],
 			"dfrn-id" => ["contact", "dfrn-id"],
-			"author-id" => ["item", "author-id"],
+			"author-id" => ["post-user", "author-id"],
 			"author-link" => ["author", "url"],
 			"author-addr" => ["author", "addr"],
 			"author-name" => "IF (`contact`.`url` = `author`.`url` AND `contact`.`name` != '', `contact`.`name`, `author`.`name`)",
@@ -126,7 +127,7 @@
 			"author-network" => ["author", "network"],
 			"author-blocked" => ["author", "blocked"],
 			"author-hidden" => ["author", "hidden"],
-			"owner-id" => ["item", "owner-id"],
+			"owner-id" => ["post-user", "owner-id"],
 			"owner-link" => ["owner", "url"],
 			"owner-addr" => ["owner", "addr"],
 			"owner-name" => "IF (`contact`.`url` = `owner`.`url` AND `contact`.`name` != '', `contact`.`name`, `owner`.`name`)",
@@ -135,11 +136,12 @@
 			"owner-network" => ["owner", "network"],
 			"owner-blocked" => ["owner", "blocked"],
 			"owner-hidden" => ["owner", "hidden"],
-			"causer-id" => ["item", "causer-id"],
+			"owner-contact-type" => ["owner", "contact-type"],
+			"causer-id" => ["post-user", "causer-id"],
 			"causer-link" => ["causer", "url"],
 			"causer-addr" => ["causer", "addr"],
 			"causer-name" => ["causer", "name"],
-			"causer-nick" => ["causer", "nick"], 
+			"causer-nick" => ["causer", "nick"],
 			"causer-avatar" => ["causer", "thumb"],
 			"causer-network" => ["causer", "network"],
 			"causer-blocked" => ["causer", "blocked"],
@@ -150,11 +152,11 @@
 			"delivery_queue_count" => ["post-delivery-data", "queue_count"],
 			"delivery_queue_done" => ["post-delivery-data", "queue_done"],
 			"delivery_queue_failed" => ["post-delivery-data", "queue_failed"],
-			"allow_cid" => "IF (`item`.`psid` IS NULL, '', `permissionset`.`allow_cid`)",
-			"allow_gid" => "IF (`item`.`psid` IS NULL, '', `permissionset`.`allow_gid`)",
-			"deny_cid" => "IF (`item`.`psid` IS NULL, '', `permissionset`.`deny_cid`)",
-			"deny_gid" => "IF (`item`.`psid` IS NULL, '', `permissionset`.`deny_gid`)",
-			"event-id" => ["item", "event-id"],
+			"allow_cid" => "IF (`post-user`.`psid` IS NULL, '', `permissionset`.`allow_cid`)",
+			"allow_gid" => "IF (`post-user`.`psid` IS NULL, '', `permissionset`.`allow_gid`)",
+			"deny_cid" => "IF (`post-user`.`psid` IS NULL, '', `permissionset`.`deny_cid`)",
+			"deny_gid" => "IF (`post-user`.`psid` IS NULL, '', `permissionset`.`deny_gid`)",
+			"event-id" => ["post-user", "event-id"],
 			"event-created" => ["event", "created"],
 			"event-edited" => ["event", "edited"],
 			"event-start" => ["event", "start"],
@@ -167,85 +169,89 @@
 			"event-adjust" => ["event", "adjust"],
 			"event-ignore" => ["event", "ignore"],
 			"signed_text" => ["diaspora-interaction", "interaction"],
-			"parent-guid" => ["parent-item", "guid"],
-			"parent-network" => ["parent-item", "network"],
-			"parent-author-id" => ["parent-item", "author-id"],
-			"parent-author-link" => ["parent-item-author", "url"],  
-			"parent-author-name" => ["parent-item-author", "name"],
-			"parent-author-network" => ["parent-item-author", "network"], 
+			"parent-guid" => ["parent-item-uri", "guid"],
+			"parent-network" => ["parent-post", "network"],
+			"parent-author-id" => ["parent-post", "author-id"],
+			"parent-author-link" => ["parent-post-author", "url"],
+			"parent-author-name" => ["parent-post-author", "name"],
+			"parent-author-network" => ["parent-post-author", "network"],
 		],
-		"query" => "FROM `item`
-			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-			STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `item`.`author-id`
-			STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `item`.`owner-id`
-			STRAIGHT_JOIN `contact` AS `causer` ON `causer`.`id` = `item`.`causer-id`
-			LEFT JOIN `verb` ON `verb`.`id` = `item`.`vid`
-			LEFT JOIN `event` ON `event`.`id` = `item`.`event-id`
-			LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `item`.`uri-id`
-			LEFT JOIN `item-content` ON `item-content`.`uri-id` = `item`.`uri-id`
-			LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `item`.`uri-id` AND `item`.`origin`
-			LEFT JOIN `permissionset` ON `permissionset`.`id` = `item`.`psid`
-			STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`uri-id` = `item`.`parent-uri-id` AND `parent-item`.`uid` = `item`.`uid`
-			STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`"
+		"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`
+			STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-user`.`contact-id`
+			STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `post-user`.`author-id`
+			STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `post-user`.`owner-id`
+			LEFT JOIN `contact` AS `causer` ON `causer`.`id` = `post-user`.`causer-id`
+			LEFT JOIN `item-uri` ON `item-uri`.`id` = `post-user`.`uri-id`
+			LEFT JOIN `item-uri` AS `thr-parent-item-uri` ON `thr-parent-item-uri`.`id` = `post-user`.`thr-parent-id`
+			LEFT JOIN `item-uri` AS `parent-item-uri` ON `parent-item-uri`.`id` = `post-user`.`parent-uri-id`
+			LEFT JOIN `item-uri` AS `external-item-uri` ON `external-item-uri`.`id` = `post-user`.`external-id`
+			LEFT JOIN `verb` ON `verb`.`id` = `post-user`.`vid`
+			LEFT JOIN `event` ON `event`.`id` = `post-user`.`event-id`
+			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 `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`"
 	],
-	"post-thread-view" => [
+	"post-thread-user-view" => [
 		"fields" => [
-			"id" => ["item", "id"],
-			"iid" => ["thread", "iid"],
-			"item_id" => ["item", "id"],
-			"uid" => ["thread", "uid"],
-			"parent" => ["item", "parent"],
-			"uri" => ["item", "uri"],
-			"uri-id" => ["item", "uri-id"],
-			"parent-uri" => ["item", "parent-uri"],
-			"parent-uri-id" => ["item", "parent-uri-id"],
-			"thr-parent" => ["item", "thr-parent"],
-			"thr-parent-id" => ["item", "thr-parent-id"],
-			"guid" => ["item", "guid"],
-			"type" => ["item", "type"],
-			"wall" => ["thread", "wall"],
-			"gravity" => ["item", "gravity"],
-			"extid" => ["item", "extid"],
-			"created" => ["thread", "created"],
-			"edited" => ["item", "edited"],
-			"commented" => ["thread", "commented"],
-			"received" => ["thread", "received"],
-			"changed" => ["thread", "changed"],
-			"resource-id" => ["item", "resource-id"],
-			"post-type" => ["thread", "post-type"],
-			"private" => ["thread", "private"],
-			"pubmail" => ["thread", "pubmail"],
-			"moderated" => ["thread", "moderated"],
-			"ignored" => ["thread", "ignored"],
-			"visible" => ["thread", "visible"],
-			"starred" => ["thread", "starred"],
-			"bookmark" => ["item", "bookmark"],
-			"unseen" => ["item", "unseen"],
-			"deleted" => ["thread", "deleted"],
-			"origin" => ["thread", "origin"],
-			"forum_mode" => ["thread", "forum_mode"],
-			"mention" => ["thread", "mention"],
-			"global" => ["item", "global"],
-			"network" => ["thread", "network"],
-			"vid" => ["item", "vid"],
-			"psid" => ["item", "psid"],
-			"verb" => "IF (`item`.`vid` IS NULL, '', `verb`.`name`)",
-			"title" => ["item-content", "title"],
-			"content-warning" => ["item-content", "content-warning"],
-			"raw-body" => ["item-content", "raw-body"],
-			"body" => ["item-content", "body"],
-			"rendered-hash" => ["item-content", "rendered-hash"],
-			"rendered-html" => ["item-content", "rendered-html"],
-			"language" => ["item-content", "language"],
-			"plink" => ["item-content", "plink"],
-			"location" => ["item-content", "location"],
-			"coord" => ["item-content", "coord"],
-			"app" => ["item-content", "app"],
-			"object-type" => ["item-content", "object-type"],
-			"object" => ["item-content", "object"],
-			"target-type" => ["item-content", "target-type"],
-			"target" => ["item-content", "target"],
-			"contact-id" => ["thread", "contact-id"],
+			"id" => ["post-user", "id"],
+			"post-user-id" => ["post-user", "id"],
+			"uid" => ["post-thread-user", "uid"],
+			"parent" => ["parent-post", "id"],
+			"uri" => ["item-uri", "uri"],
+			"uri-id" => ["post-thread-user", "uri-id"],
+			"parent-uri" => ["parent-item-uri", "uri"],
+			"parent-uri-id" => ["post-user", "parent-uri-id"],
+			"thr-parent" => ["thr-parent-item-uri", "uri"],
+			"thr-parent-id" => ["post-user", "thr-parent-id"],
+			"guid" => ["item-uri", "guid"],
+			"wall" => ["post-thread-user", "wall"],
+			"gravity" => ["post-user", "gravity"],
+			"extid" => ["external-item-uri", "uri"],
+			"external-id" => ["post-user", "external-id"],
+			"created" => ["post-thread-user", "created"],
+			"edited" => ["post-user", "edited"],
+			"commented" => ["post-thread-user", "commented"],
+			"received" => ["post-thread-user", "received"],
+			"changed" => ["post-thread-user", "changed"],
+			"post-type" => ["post-user", "post-type"],
+			"post-reason" => ["post-user", "post-reason"],
+			"private" => ["post-user", "private"],
+			"pubmail" => ["post-thread-user", "pubmail"],
+			"ignored" => ["post-thread-user", "ignored"],
+			"visible" => ["post-user", "visible"],
+			"starred" => ["post-thread-user", "starred"],
+			"pinned" => ["post-thread-user", "pinned"],
+			"unseen" => ["post-thread-user", "unseen"],
+			"deleted" => ["post-user", "deleted"],
+			"origin" => ["post-thread-user", "origin"],
+			"forum_mode" => ["post-thread-user", "forum_mode"],
+			"mention" => ["post-thread-user", "mention"],
+			"global" => ["post-user", "global"],
+			"network" => ["post-thread-user", "network"],
+			"vid" => ["post-user", "vid"],
+			"psid" => ["post-thread-user", "psid"],
+			"verb" => "IF (`post-user`.`vid` IS NULL, '', `verb`.`name`)",
+			"title" => ["post-content", "title"],
+			"content-warning" => ["post-content", "content-warning"],
+			"raw-body" => ["post-content", "raw-body"],
+			"body" => ["post-content", "body"],
+			"rendered-hash" => ["post-content", "rendered-hash"],
+			"rendered-html" => ["post-content", "rendered-html"],
+			"language" => ["post-content", "language"],
+			"plink" => ["post-content", "plink"],
+			"location" => ["post-content", "location"],
+			"coord" => ["post-content", "coord"],
+			"app" => ["post-content", "app"],
+			"object-type" => ["post-content", "object-type"],
+			"object" => ["post-content", "object"],
+			"target-type" => ["post-content", "target-type"],
+			"target" => ["post-content", "target"],
+			"resource-id" => ["post-content", "resource-id"],
+			"contact-id" => ["post-thread-user", "contact-id"],
 			"contact-link" => ["contact", "url"],
 			"contact-addr" => ["contact", "addr"],
 			"contact-name" => ["contact", "name"],
@@ -260,7 +266,7 @@
 			"contact-rel" => ["contact", "rel"],
 			"contact-uid" => ["contact", "uid"],
 			"contact-contact-type" => ["contact", "contact-type"],
-			"writable" => "IF (`item`.`network` IN ('apub', 'dfrn', 'dspr', 'stat'), true, `contact`.`writable`)",
+			"writable" => "IF (`post-user`.`network` IN ('apub', 'dfrn', 'dspr', 'stat'), true, `contact`.`writable`)",
 			"self" => ["contact", "self"],
 			"cid" => ["contact", "id"],
 			"alias" => ["contact", "alias"],
@@ -270,7 +276,7 @@
 			"avatar-date" => ["contact", "avatar-date"],
 			"thumb" => ["contact", "thumb"],
 			"dfrn-id" => ["contact", "dfrn-id"],
-			"author-id" => ["thread", "author-id"],
+			"author-id" => ["post-thread-user", "author-id"],
 			"author-link" => ["author", "url"],
 			"author-addr" => ["author", "addr"],
 			"author-name" => "IF (`contact`.`url` = `author`.`url` AND `contact`.`name` != '', `contact`.`name`, `author`.`name`)",
@@ -279,7 +285,7 @@
 			"author-network" => ["author", "network"],
 			"author-blocked" => ["author", "blocked"],
 			"author-hidden" => ["author", "hidden"],
-			"owner-id" => ["thread", "owner-id"],
+			"owner-id" => ["post-thread-user", "owner-id"],
 			"owner-link" => ["owner", "url"],
 			"owner-addr" => ["owner", "addr"],
 			"owner-name" => "IF (`contact`.`url` = `owner`.`url` AND `contact`.`name` != '', `contact`.`name`, `owner`.`name`)",
@@ -288,11 +294,12 @@
 			"owner-network" => ["owner", "network"],
 			"owner-blocked" => ["owner", "blocked"],
 			"owner-hidden" => ["owner", "hidden"],
-			"causer-id" => ["item", "causer-id"],
+			"owner-contact-type" => ["owner", "contact-type"],
+			"causer-id" => ["post-thread-user", "causer-id"],
 			"causer-link" => ["causer", "url"],
 			"causer-addr" => ["causer", "addr"],
 			"causer-name" => ["causer", "name"],
-			"causer-nick" => ["causer", "nick"], 
+			"causer-nick" => ["causer", "nick"],
 			"causer-avatar" => ["causer", "thumb"],
 			"causer-network" => ["causer", "network"],
 			"causer-blocked" => ["causer", "blocked"],
@@ -303,11 +310,11 @@
 			"delivery_queue_count" => ["post-delivery-data", "queue_count"],
 			"delivery_queue_done" => ["post-delivery-data", "queue_done"],
 			"delivery_queue_failed" => ["post-delivery-data", "queue_failed"],
-			"allow_cid" => "IF (`item`.`psid` IS NULL, '', `permissionset`.`allow_cid`)",
-			"allow_gid" => "IF (`item`.`psid` IS NULL, '', `permissionset`.`allow_gid`)",
-			"deny_cid" => "IF (`item`.`psid` IS NULL, '', `permissionset`.`deny_cid`)",
-			"deny_gid" => "IF (`item`.`psid` IS NULL, '', `permissionset`.`deny_gid`)",
-			"event-id" => ["item", "event-id"],
+			"allow_cid" => "IF (`post-thread-user`.`psid` IS NULL, '', `permissionset`.`allow_cid`)",
+			"allow_gid" => "IF (`post-thread-user`.`psid` IS NULL, '', `permissionset`.`allow_gid`)",
+			"deny_cid" => "IF (`post-thread-user`.`psid` IS NULL, '', `permissionset`.`deny_cid`)",
+			"deny_gid" => "IF (`post-thread-user`.`psid` IS NULL, '', `permissionset`.`deny_gid`)",
+			"event-id" => ["post-user", "event-id"],
 			"event-created" => ["event", "created"],
 			"event-edited" => ["event", "edited"],
 			"event-start" => ["event", "start"],
@@ -320,48 +327,233 @@
 			"event-adjust" => ["event", "adjust"],
 			"event-ignore" => ["event", "ignore"],
 			"signed_text" => ["diaspora-interaction", "interaction"],
-			"parent-guid" => ["parent-item", "guid"],
-			"parent-network" => ["parent-item", "network"],
-			"parent-author-id" => ["parent-item", "author-id"],
-			"parent-author-link" => ["parent-item-author", "url"],  
-			"parent-author-name" => ["parent-item-author", "name"],
-			"parent-author-network" => ["parent-item-author", "network"], 
+			"parent-guid" => ["parent-item-uri", "guid"],
+			"parent-network" => ["parent-post", "network"],
+			"parent-author-id" => ["parent-post", "author-id"],
+			"parent-author-link" => ["parent-post-author", "url"],
+			"parent-author-name" => ["parent-post-author", "name"],
+			"parent-author-network" => ["parent-post-author", "network"],
+		],
+		"query" => "FROM `post-thread-user`
+			INNER JOIN `post-user` ON `post-user`.`id` = `post-thread-user`.`post-user-id`
+			STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id`
+			STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `post-thread-user`.`author-id`
+			STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `post-thread-user`.`owner-id`
+			LEFT JOIN `contact` AS `causer` ON `causer`.`id` = `post-thread-user`.`causer-id`
+			LEFT JOIN `item-uri` ON `item-uri`.`id` = `post-thread-user`.`uri-id`
+			LEFT JOIN `item-uri` AS `thr-parent-item-uri` ON `thr-parent-item-uri`.`id` = `post-user`.`thr-parent-id`
+			LEFT JOIN `item-uri` AS `parent-item-uri` ON `parent-item-uri`.`id` = `post-user`.`parent-uri-id`
+			LEFT JOIN `item-uri` AS `external-item-uri` ON `external-item-uri`.`id` = `post-user`.`external-id`
+			LEFT JOIN `verb` ON `verb`.`id` = `post-user`.`vid`
+			LEFT JOIN `event` ON `event`.`id` = `post-user`.`event-id`
+			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 `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`"
+	],
+	"post-view" => [
+		"fields" => [
+			"uri" => ["item-uri", "uri"],
+			"uri-id" => ["post", "uri-id"],
+			"parent-uri" => ["parent-item-uri", "uri"],
+			"parent-uri-id" => ["post", "parent-uri-id"],
+			"thr-parent" => ["thr-parent-item-uri", "uri"],
+			"thr-parent-id" => ["post", "thr-parent-id"],
+			"guid" => ["item-uri", "guid"],
+			"gravity" => ["post", "gravity"],
+			"extid" => ["external-item-uri", "uri"],
+			"external-id" => ["post", "external-id"],
+			"created" => ["post", "created"],
+			"edited" => ["post", "edited"],
+			"commented" => ["post-thread", "commented"],
+			"received" => ["post", "received"],
+			"changed" => ["post-thread", "changed"],
+			"post-type" => ["post", "post-type"],
+			"private" => ["post", "private"],
+			"visible" => ["post", "visible"],
+			"deleted" => ["post", "deleted"],
+			"global" => ["post", "global"],
+			"network" => ["post", "network"],
+			"vid" => ["post", "vid"],
+			"verb" => "IF (`post`.`vid` IS NULL, '', `verb`.`name`)",
+			"title" => ["post-content", "title"],
+			"content-warning" => ["post-content", "content-warning"],
+			"raw-body" => ["post-content", "raw-body"],
+			"body" => ["post-content", "body"],
+			"rendered-hash" => ["post-content", "rendered-hash"],
+			"rendered-html" => ["post-content", "rendered-html"],
+			"language" => ["post-content", "language"],
+			"plink" => ["post-content", "plink"],
+			"location" => ["post-content", "location"],
+			"coord" => ["post-content", "coord"],
+			"app" => ["post-content", "app"],
+			"object-type" => ["post-content", "object-type"],
+			"object" => ["post-content", "object"],
+			"target-type" => ["post-content", "target-type"],
+			"target" => ["post-content", "target"],
+			"resource-id" => ["post-content", "resource-id"],
+			"author-id" => ["post", "author-id"],
+			"author-link" => ["author", "url"],
+			"author-addr" => ["author", "addr"],
+			"author-name" => ["author", "name"],
+			"author-nick" => ["author", "nick"],
+			"author-avatar" => ["author", "thumb"],
+			"author-network" => ["author", "network"],
+			"author-blocked" => ["author", "blocked"],
+			"author-hidden" => ["author", "hidden"],
+			"owner-id" => ["post", "owner-id"],
+			"owner-link" => ["owner", "url"],
+			"owner-addr" => ["owner", "addr"],
+			"owner-name" => ["owner", "name"],
+			"owner-nick" => ["owner", "nick"],
+			"owner-avatar" => ["owner", "thumb"],
+			"owner-network" => ["owner", "network"],
+			"owner-blocked" => ["owner", "blocked"],
+			"owner-hidden" => ["owner", "hidden"],
+			"owner-contact-type" => ["owner", "contact-type"],
+			"causer-id" => ["post", "causer-id"],
+			"causer-link" => ["causer", "url"],
+			"causer-addr" => ["causer", "addr"],
+			"causer-name" => ["causer", "name"],
+			"causer-nick" => ["causer", "nick"],
+			"causer-avatar" => ["causer", "thumb"],
+			"causer-network" => ["causer", "network"],
+			"causer-blocked" => ["causer", "blocked"],
+			"causer-hidden" => ["causer", "hidden"],
+			"causer-contact-type" => ["causer", "contact-type"],
+			"signed_text" => ["diaspora-interaction", "interaction"],
+			"parent-guid" => ["parent-item-uri", "guid"],
+			"parent-network" => ["parent-post", "network"],
+			"parent-author-id" => ["parent-post", "author-id"],
+			"parent-author-link" => ["parent-post-author", "url"],
+			"parent-author-name" => ["parent-post-author", "name"],
+			"parent-author-network" => ["parent-post-author", "network"],
+		],
+		"query" => "FROM `post`
+			STRAIGHT_JOIN `post-thread` ON `post-thread`.`uri-id` = `post`.`parent-uri-id`
+			STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `post`.`author-id`
+			STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `post`.`owner-id`
+			LEFT JOIN `contact` AS `causer` ON `causer`.`id` = `post`.`causer-id`
+			LEFT JOIN `item-uri` ON `item-uri`.`id` = `post`.`uri-id`
+			LEFT JOIN `item-uri` AS `thr-parent-item-uri` ON `thr-parent-item-uri`.`id` = `post`.`thr-parent-id`
+			LEFT JOIN `item-uri` AS `parent-item-uri` ON `parent-item-uri`.`id` = `post`.`parent-uri-id`
+			LEFT JOIN `item-uri` AS `external-item-uri` ON `external-item-uri`.`id` = `post`.`external-id`
+			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` 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`"
+	],
+	"post-thread-view" => [
+		"fields" => [
+			"uri" => ["item-uri", "uri"],
+			"uri-id" => ["post-thread", "uri-id"],
+			"parent-uri" => ["parent-item-uri", "uri"],
+			"parent-uri-id" => ["post", "parent-uri-id"],
+			"thr-parent" => ["thr-parent-item-uri", "uri"],
+			"thr-parent-id" => ["post", "thr-parent-id"],
+			"guid" => ["item-uri", "guid"],
+			"gravity" => ["post", "gravity"],
+			"extid" => ["external-item-uri", "uri"],
+			"external-id" => ["post", "external-id"],
+			"created" => ["post-thread", "created"],
+			"edited" => ["post", "edited"],
+			"commented" => ["post-thread", "commented"],
+			"received" => ["post-thread", "received"],
+			"changed" => ["post-thread", "changed"],
+			"post-type" => ["post", "post-type"],
+			"private" => ["post", "private"],
+			"visible" => ["post", "visible"],
+			"deleted" => ["post", "deleted"],
+			"global" => ["post", "global"],
+			"network" => ["post-thread", "network"],
+			"vid" => ["post", "vid"],
+			"verb" => "IF (`post`.`vid` IS NULL, '', `verb`.`name`)",
+			"title" => ["post-content", "title"],
+			"content-warning" => ["post-content", "content-warning"],
+			"raw-body" => ["post-content", "raw-body"],
+			"body" => ["post-content", "body"],
+			"rendered-hash" => ["post-content", "rendered-hash"],
+			"rendered-html" => ["post-content", "rendered-html"],
+			"language" => ["post-content", "language"],
+			"plink" => ["post-content", "plink"],
+			"location" => ["post-content", "location"],
+			"coord" => ["post-content", "coord"],
+			"app" => ["post-content", "app"],
+			"object-type" => ["post-content", "object-type"],
+			"object" => ["post-content", "object"],
+			"target-type" => ["post-content", "target-type"],
+			"target" => ["post-content", "target"],
+			"resource-id" => ["post-content", "resource-id"],
+			"author-id" => ["post-thread", "author-id"],
+			"author-link" => ["author", "url"],
+			"author-addr" => ["author", "addr"],
+			"author-name" => ["author", "name"],
+			"author-nick" => ["author", "nick"],
+			"author-avatar" => ["author", "thumb"],
+			"author-network" => ["author", "network"],
+			"author-blocked" => ["author", "blocked"],
+			"author-hidden" => ["author", "hidden"],
+			"owner-id" => ["post-thread", "owner-id"],
+			"owner-link" => ["owner", "url"],
+			"owner-addr" => ["owner", "addr"],
+			"owner-name" => ["owner", "name"],
+			"owner-nick" => ["owner", "nick"],
+			"owner-avatar" => ["owner", "thumb"],
+			"owner-network" => ["owner", "network"],
+			"owner-blocked" => ["owner", "blocked"],
+			"owner-hidden" => ["owner", "hidden"],
+			"owner-contact-type" => ["owner", "contact-type"],
+			"causer-id" => ["post-thread", "causer-id"],
+			"causer-link" => ["causer", "url"],
+			"causer-addr" => ["causer", "addr"],
+			"causer-name" => ["causer", "name"],
+			"causer-nick" => ["causer", "nick"],
+			"causer-avatar" => ["causer", "thumb"],
+			"causer-network" => ["causer", "network"],
+			"causer-blocked" => ["causer", "blocked"],
+			"causer-hidden" => ["causer", "hidden"],
+			"causer-contact-type" => ["causer", "contact-type"],
+			"signed_text" => ["diaspora-interaction", "interaction"],
+			"parent-guid" => ["parent-item-uri", "guid"],
+			"parent-network" => ["parent-post", "network"],
+			"parent-author-id" => ["parent-post", "author-id"],
+			"parent-author-link" => ["parent-post-author", "url"],
+			"parent-author-name" => ["parent-post-author", "name"],
+			"parent-author-network" => ["parent-post-author", "network"],
 		],
-		"query" => "FROM `thread`
-			STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
-			STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
-			STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `thread`.`author-id`
-			STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `thread`.`owner-id`
-			STRAIGHT_JOIN `contact` AS `causer` ON `causer`.`id` = `item`.`causer-id`
-			LEFT JOIN `verb` ON `verb`.`id` = `item`.`vid`
-			LEFT JOIN `event` ON `event`.`id` = `item`.`event-id`
-			LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `thread`.`uri-id`
-			LEFT JOIN `item-content` ON `item-content`.`uri-id` = `thread`.`uri-id`
-			LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `thread`.`uri-id` AND `thread`.`origin`
-			LEFT JOIN `permissionset` ON `permissionset`.`id` = `item`.`psid`
-			STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`
-			STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`"
+		"query" => "FROM `post-thread`
+			INNER JOIN `post` ON `post`.`uri-id` = `post-thread`.`uri-id`
+			STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `post-thread`.`author-id`
+			STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `post-thread`.`owner-id`
+			LEFT JOIN `contact` AS `causer` ON `causer`.`id` = `post-thread`.`causer-id`
+			LEFT JOIN `item-uri` ON `item-uri`.`id` = `post-thread`.`uri-id`
+			LEFT JOIN `item-uri` AS `thr-parent-item-uri` ON `thr-parent-item-uri`.`id` = `post`.`thr-parent-id`
+			LEFT JOIN `item-uri` AS `parent-item-uri` ON `parent-item-uri`.`id` = `post`.`parent-uri-id`
+			LEFT JOIN `item-uri` AS `external-item-uri` ON `external-item-uri`.`id` = `post`.`external-id`
+			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` 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`"
 	],
 	"category-view" => [
 		"fields" => [
 			"uri-id" => ["post-category", "uri-id"],
 			"uid" => ["post-category", "uid"],
-			"uri" => ["item-uri", "uri"],
-			"guid" => ["item-uri", "guid"],
 			"type" => ["post-category", "type"],
 			"tid" => ["post-category", "tid"],
 			"name" => ["tag", "name"],
 			"url" => ["tag", "url"],
 		],
 		"query" => "FROM `post-category`
-			INNER JOIN `item-uri` ON `item-uri`.id = `post-category`.`uri-id`
 			LEFT JOIN `tag` ON `post-category`.`tid` = `tag`.`id`"
 	],
 	"tag-view" => [
 		"fields" => [
 			"uri-id" => ["post-tag", "uri-id"],
-			"uri" => ["item-uri", "uri"],
-			"guid" => ["item-uri", "guid"],
 			"type" => ["post-tag", "type"],
 			"tid" => ["post-tag", "tid"],
 			"cid" => ["post-tag", "cid"],
@@ -369,66 +561,62 @@
 			"url" => "CASE `cid` WHEN 0 THEN `tag`.`url` ELSE `contact`.`url` END",
 		],
 		"query" => "FROM `post-tag`
-			INNER JOIN `item-uri` ON `item-uri`.id = `post-tag`.`uri-id`
 			LEFT JOIN `tag` ON `post-tag`.`tid` = `tag`.`id`
 			LEFT JOIN `contact` ON `post-tag`.`cid` = `contact`.`id`"
 	],
 	"network-item-view" => [
 		"fields" => [
-			"uri-id" => ["item", "parent-uri-id"],
-			"uri" => ["item", "parent-uri"],
-			"parent" => ["item", "parent"],
-			"received" => ["item", "received"],
-			"commented" => ["item", "commented"],
-			"created" => ["item", "created"],
-			"uid" => ["item", "uid"],
-			"starred" => ["item", "starred"],
-			"mention" => ["item", "mention"],
-			"network" => ["item", "network"],
-			"unseen" => ["item", "unseen"],
-			"gravity" => ["item", "gravity"],
-			"contact-id" => ["item", "contact-id"],
+			"uri-id" => ["post-user", "uri-id"],
+			"parent" => ["parent-post", "id"],
+			"received" => ["post-user", "received"],
+			"commented" => ["post-thread-user", "commented"],
+			"created" => ["post-user", "created"],
+			"uid" => ["post-user", "uid"],
+			"starred" => ["post-thread-user", "starred"],
+			"mention" => ["post-thread-user", "mention"],
+			"network" => ["post-user", "network"],
+			"unseen" => ["post-user", "unseen"],
+			"gravity" => ["post-user", "gravity"],
+			"contact-id" => ["post-user", "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`
-			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`
+		"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`			
+			INNER JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id`
+			LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id`
+			LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id`
+			INNER JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
+			LEFT JOIN `post-user` AS `parent-post` ON `parent-post`.`uri-id` = `post-user`.`parent-uri-id` AND `parent-post`.`uid` = `post-user`.`uid`
+			WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
 			AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
-			AND (`user-item`.`hidden` IS NULL OR NOT `user-item`.`hidden`)
+			AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`)
 			AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
 			AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`)"
 	],
 	"network-thread-view" => [
 		"fields" => [
-			"uri-id" => ["item", "uri-id"],
-			"uri" => ["item", "uri"],
-			"parent-uri-id" => ["item", "parent-uri-id"],
-			"parent" => ["thread", "iid"],
-			"received" => ["thread", "received"],
-			"commented" => ["thread", "commented"],
-			"created" => ["thread", "created"],
-			"uid" => ["thread", "uid"],
-			"starred" => ["thread", "starred"],
-			"mention" => ["thread", "mention"],
-			"network" => ["thread", "network"],
-			"contact-id" => ["thread", "contact-id"],
+			"uri-id" => ["post-thread-user", "uri-id"],
+			"parent" => ["parent-post", "id"],
+			"received" => ["post-thread-user", "received"],
+			"commented" => ["post-thread-user", "commented"],
+			"created" => ["post-thread-user", "created"],
+			"uid" => ["post-thread-user", "uid"],
+			"starred" => ["post-thread-user", "starred"],
+			"mention" => ["post-thread-user", "mention"],
+			"network" => ["post-thread-user", "network"],
+			"contact-id" => ["post-thread-user", "contact-id"],
 			"contact-type" => ["ownercontact", "contact-type"],
 		],
-		"query" => "FROM `thread`
-			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`
+		"query" => "FROM `post-thread-user`
+			INNER JOIN `post-user` ON `post-user`.`id` = `post-thread-user`.`post-user-id`
+			STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id`
+			LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id`
+			LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id`
+			LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
+			LEFT JOIN `post-user` AS `parent-post` ON `parent-post`.`uri-id` = `post-user`.`parent-uri-id` AND `parent-post`.`uid` = `post-user`.`uid`
+			WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
 			AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
-			AND (`user-item`.`hidden` IS NULL OR NOT `user-item`.`hidden`)
+			AND (`post-thread-user`.`hidden` IS NULL OR NOT `post-thread-user`.`hidden`)
 			AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
 			AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`)"
 	],
@@ -588,20 +776,21 @@
 	"tag-search-view" => [
 		"fields" => [
 			"uri-id" => ["post-tag", "uri-id"],
-			"iid" => ["item", "id"],
-			"uri" => ["item", "uri"],
-			"guid" => ["item", "guid"],
-			"uid" => ["item", "uid"],
-			"private" => ["item", "private"],
-			"wall" => ["item", "wall"],
-			"origin" => ["item", "origin"],
-			"gravity" => ["item", "gravity"],
-			"received" => ["item", "received"],			
+			"uid" => ["post-user", "uid"],
+			"iid" => ["post-user", "id"],
+			"private" => ["post-user", "private"],
+			"wall" => ["post-user", "wall"],
+			"origin" => ["post-user", "origin"],
+			"global" => ["post-user", "global"],
+			"gravity" => ["post-user", "gravity"],
+			"received" => ["post-user", "received"],
+			"network" => ["post-user", "network"],
+			"author-id" => ["post-user", "author-id"],
 			"name" => ["tag", "name"],
 		],
 		"query" => "FROM `post-tag`
 			INNER JOIN `tag` ON `tag`.`id` = `post-tag`.`tid`
-			INNER JOIN `item` ON `item`.`uri-id` = `post-tag`.`uri-id`
+			STRAIGHT_JOIN `post-user` ON `post-user`.`uri-id` = `post-tag`.`uri-id`
 			WHERE `post-tag`.`type` = 1"
 	],
 	"workerqueue-view" => [