]> git.mxchange.org Git - friendica.git/blobdiff - static/dbview.config.php
Fixes the score calculation concerning the relation-cid / cid interaction
[friendica.git] / static / dbview.config.php
index 1a9f194b810abf48802d021acfa811d1ffb93840..a7a1eed364fad121b93fbf282b672b12118edffc 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
  */
 
  return [
-       "post-view" => [
+       "application-view" => [
+               "fields" => [
+                       "id" => ["application", "id"],
+                       "uid" => ["application-token", "uid"],
+                       "name" => ["application", "name"],
+                       "redirect_uri" => ["application", "redirect_uri"],
+                       "website" => ["application", "website"],
+                       "client_id" => ["application", "client_id"],
+                       "client_secret" => ["application", "client_secret"],
+                       "code" => ["application-token", "code"],
+                       "access_token" => ["application-token", "access_token"],
+                       "created_at" => ["application-token", "created_at"],
+                       "scopes" => ["application-token", "scopes"],
+                       "read" => ["application-token", "read"],
+                       "write" => ["application-token", "write"],
+                       "follow" => ["application-token", "follow"],
+                       "push" => ["application-token", "push"],
+               ],
+               "query" => "FROM `application-token`
+                       INNER JOIN `application` ON `application-token`.`application-id` = `application`.`id`"
+       ],
+       "circle-member-view" => [
+               "fields" => [
+                       "id" => ["group_member", "id"],
+                       "uid" => ["group", "uid"],
+                       "contact-id" => ["group_member", "contact-id"],
+                       "contact-uri-id" => ["contact", "uri-id"],
+                       "contact-link" => ["contact", "url"],
+                       "contact-addr" => ["contact", "addr"],
+                       "contact-name" => ["contact", "name"],
+                       "contact-nick" => ["contact", "nick"],
+                       "contact-avatar" => ["contact", "thumb"],
+                       "contact-network" => ["contact", "network"],
+                       "contact-blocked" => ["contact", "blocked"],
+                       "contact-hidden" => ["contact", "hidden"],
+                       "contact-readonly" => ["contact", "readonly"],
+                       "contact-archive" => ["contact", "archive"],
+                       "contact-pending" => ["contact", "pending"],
+                       "contact-self" => ["contact", "self"],
+                       "contact-rel" => ["contact", "rel"],
+                       "contact-contact-type" => ["contact", "contact-type"],
+                       "circle-id" => ["group_member", "gid"],
+                       "circle-visible" => ["group", "visible"],
+                       "circle-deleted" => ["group", "deleted"],
+                       "circle-name" => ["group", "name"],
+               ],
+               "query" => "FROM `group_member`
+                       INNER JOIN `contact` ON `group_member`.`contact-id` = `contact`.`id`
+                       INNER JOIN `group` ON `group_member`.`gid` = `group`.`id`"
+       ],
+       "post-counts-view" => [
+               "fields" => [
+                       "uri-id" => ["post-counts", "uri-id"],
+                       "vid" => ["post-counts", "vid"],
+                       "verb" => ["verb", "name"],
+                       "reaction" => ["post-counts", "reaction"],
+                       "parent-uri-id" => ["post-counts", "parent-uri-id"],
+                       "count" => ["post-counts", "count"],
+               ],
+               "query" => "FROM `post-counts`
+                       INNER JOIN `verb` ON `verb`.`id` = `post-counts`.`vid`"
+       ],
+       "post-timeline-view" => [
+               "fields" => [
+                       "uid" => ["post-user", "uid"],
+                       "uri-id" => ["post-user", "uri-id"],
+                       "gravity" => ["post-user", "gravity"],
+                       "created" => ["post-user", "created"],
+                       "edited" => ["post-user", "edited"],
+                       "commented" => ["post-thread-user", "commented"],
+                       "received" => ["post-user", "received"],
+                       "changed" => ["post-thread-user", "changed"],
+                       "private" => ["post-user", "private"],
+                       "visible" => ["post-user", "visible"],
+                       "deleted" => ["post-user", "deleted"],
+                       "origin" => ["post-user", "origin"],
+                       "global" => ["post-user", "global"],
+                       "network" => ["post-user", "network"],
+                       "protocol" => ["post-user", "protocol"],
+                       "vid" => ["post-user", "vid"],
+                       "contact-id" => ["post-user", "contact-id"],
+                       "contact-blocked" => ["contact", "blocked"],
+                       "contact-readonly" => ["contact", "readonly"],
+                       "contact-pending" => ["contact", "pending"],
+                       "contact-rel" => ["contact", "rel"],
+                       "contact-uid" => ["contact", "uid"],
+                       "self" => ["contact", "self"],
+                       "author-id" => ["post-user", "author-id"],
+                       "author-blocked" => ["author", "blocked"],
+                       "author-hidden" => ["author", "hidden"],
+                       "author-gsid" => ["author", "gsid"],
+                       "owner-id" => ["post-user", "owner-id"],
+                       "owner-blocked" => ["owner", "blocked"],
+                       "owner-gsid" => ["owner", "gsid"],
+                       "causer-id" => ["post-user", "causer-id"],
+                       "causer-blocked" => ["causer", "blocked"],
+                       "causer-gsid" => ["causer", "gsid"],
+               ],
+               "query" => "FROM `post-user`
+                       LEFT 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`"
+       ],
+       "post-user-view" => [
+               "fields" => [
+                       "id" => ["post-user", "id"],
+                       "post-user-id" => ["post-user", "id"],
+                       "uid" => ["post-user", "uid"],
+                       "parent" => ["post-thread-user", "post-user-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"],
+                       "conversation" => ["conversation-item-uri", "uri"],
+                       "conversation-id" => ["post-thread-user", "conversation-id"],
+                       "quote-uri" => ["quote-item-uri", "uri"],
+                       "quote-uri-id" => ["post-content", "quote-uri-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"],
+                       "unseen" => ["post-user", "unseen"],
+                       "deleted" => ["post-user", "deleted"],
+                       "origin" => ["post-user", "origin"],
+                       "parent-origin" => ["post-thread-user", "origin"],
+                       "mention" => ["post-thread-user", "mention"],
+                       "global" => ["post-user", "global"],
+                       "featured" => "EXISTS(SELECT `type` FROM `post-collection` WHERE `type` = 0 AND `uri-id` = `post-user`.`uri-id`)",
+                       "network" => ["post-user", "network"],
+                       "protocol" => ["post-user", "protocol"],
+                       "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" => "IFNULL (`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-uri-id" => ["contact", "uri-id"],
+                       "contact-link" => ["contact", "url"],
+                       "contact-addr" => ["contact", "addr"],
+                       "contact-name" => ["contact", "name"],
+                       "contact-nick" => ["contact", "nick"],
+                       "contact-avatar" => ["contact", "thumb"],
+                       "contact-network" => ["contact", "network"],
+                       "contact-blocked" => ["contact", "blocked"],
+                       "contact-hidden" => ["contact", "hidden"],
+                       "contact-readonly" => ["contact", "readonly"],
+                       "contact-archive" => ["contact", "archive"],
+                       "contact-pending" => ["contact", "pending"],
+                       "contact-rel" => ["contact", "rel"],
+                       "contact-uid" => ["contact", "uid"],
+                       "contact-contact-type" => ["contact", "contact-type"],
+                       "writable" => "IF (`post-user`.`network` IN ('apub', 'dfrn', 'dspr', 'stat'), true, `contact`.`writable`)",
+                       "self" => ["contact", "self"],
+                       "cid" => ["contact", "id"],
+                       "alias" => ["contact", "alias"],
+                       "photo" => ["contact", "photo"],
+                       "name-date" => ["contact", "name-date"],
+                       "uri-date" => ["contact", "uri-date"],
+                       "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`)",
+                       "author-nick" => ["author", "nick"],
+                       "author-alias" => ["author", "alias"],
+                       "author-avatar" => "IF (`contact`.`url` = `author`.`url` AND `contact`.`thumb` != '', `contact`.`thumb`, `author`.`thumb`)",
+                       "author-network" => ["author", "network"],
+                       "author-blocked" => ["author", "blocked"],
+                       "author-hidden" => ["author", "hidden"],
+                       "author-updated" => ["author", "updated"],
+                       "author-contact-type" => ["author", "contact-type"],
+                       "author-gsid" => ["author", "gsid"],
+                       "author-baseurl" => ["author", "baseurl"],
+                       "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`)",
+                       "owner-nick" => ["owner", "nick"],
+                       "owner-alias" => ["owner", "alias"],
+                       "owner-avatar" => "IF (`contact`.`url` = `owner`.`url` AND `contact`.`thumb` != '', `contact`.`thumb`, `owner`.`thumb`)",
+                       "owner-network" => ["owner", "network"],
+                       "owner-blocked" => ["owner", "blocked"],
+                       "owner-hidden" => ["owner", "hidden"],
+                       "owner-updated" => ["owner", "updated"],
+                       "owner-gsid" => ["owner", "gsid"],
+                       "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"],
+                       "causer-nick" => ["causer", "nick"],
+                       "causer-alias" => ["causer", "alias"],
+                       "causer-avatar" => ["causer", "thumb"],
+                       "causer-network" => ["causer", "network"],
+                       "causer-blocked" => ["causer", "blocked"],
+                       "causer-hidden" => ["causer", "hidden"],
+                       "causer-gsid" => ["causer", "gsid"],
+                       "causer-contact-type" => ["causer", "contact-type"],
+                       "postopts" => ["post-delivery-data", "postopts"],
+                       "inform" => ["post-delivery-data", "inform"],
+                       "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 (`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"],
+                       "event-finish" => ["event", "finish"],
+                       "event-summary" => ["event", "summary"],
+                       "event-desc" => ["event", "desc"],
+                       "event-location" => ["event", "location"],
+                       "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" => ["post-thread-user", "network"],
+                       "parent-author-id" => ["post-thread-user", "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"],
+               ],
+               "query" => "FROM `post-user`
+                       INNER 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 `conversation-item-uri` ON `conversation-item-uri`.`id` = `post-thread-user`.`conversation-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 `item-uri` AS `quote-item-uri` ON `quote-item-uri`.`id` = `post-content`.`quote-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 `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `post-thread-user`.`author-id`"
+       ],
+       "post-thread-user-view" => [
                "fields" => [
-                       "id" => ["item", "id"],
-                       "item_id" => ["item", "id"],
-                       "uid" => ["item", "uid"],
-                       "internal-uid" => ["item", "uid"],
-                       "parent" => ["item", "parent"],
-                       "uri" => ["item", "uri"],
-                       "uri-id" => ["item", "uri-id"],
-                       "internal-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"],
-                       "icid" => ["item", "icid"],
-                       "vid" => ["item", "vid"],
-                       "psid" => ["item", "psid"],
-                       "attach" => ["item", "attach"],
-                       "internal-file-count" => "(SELECT COUNT(*) FROM `post-category` WHERE `post-category`.`uri-id` = `item`.`uri-id`)",
-                       "file" => "NULL",
-                       "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-thread-user", "uid"],
+                       "parent" => ["post-thread-user", "post-user-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"],
+                       "conversation" => ["conversation-item-uri", "uri"],
+                       "conversation-id" => ["post-thread-user", "conversation-id"],
+                       "quote-uri" => ["quote-item-uri", "uri"],
+                       "quote-uri-id" => ["post-content", "quote-uri-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"],
+                       "unseen" => ["post-thread-user", "unseen"],
+                       "deleted" => ["post-user", "deleted"],
+                       "origin" => ["post-thread-user", "origin"],
+                       "mention" => ["post-thread-user", "mention"],
+                       "global" => ["post-user", "global"],
+                       "featured" => "EXISTS(SELECT `type` FROM `post-collection` WHERE `type` = 0 AND `uri-id` = `post-thread-user`.`uri-id`)",
+                       "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-uri-id" => ["contact", "uri-id"],
                        "contact-link" => ["contact", "url"],
                        "contact-addr" => ["contact", "addr"],
                        "contact-name" => ["contact", "name"],
                        "contact-avatar" => ["contact", "thumb"],
                        "contact-network" => ["contact", "network"],
                        "contact-blocked" => ["contact", "blocked"],
+                       "contact-hidden" => ["contact", "hidden"],
                        "contact-readonly" => ["contact", "readonly"],
+                       "contact-archive" => ["contact", "archive"],
                        "contact-pending" => ["contact", "pending"],
                        "contact-rel" => ["contact", "rel"],
                        "contact-uid" => ["contact", "uid"],
-                       "writable" => "IF (`item`.`network` IN ('apub', 'dfrn', 'dspr', 'stat'), true, `contact`.`writable`)",
+                       "contact-gsid" => ["contact", "gsid"],
+                       "contact-contact-type" => ["contact", "contact-type"],
+                       "writable" => "IF (`post-user`.`network` IN ('apub', 'dfrn', 'dspr', 'stat'), true, `contact`.`writable`)",
                        "self" => ["contact", "self"],
                        "cid" => ["contact", "id"],
                        "alias" => ["contact", "alias"],
                        "uri-date" => ["contact", "uri-date"],
                        "avatar-date" => ["contact", "avatar-date"],
                        "thumb" => ["contact", "thumb"],
-                       "dfrn-id" => ["contact", "dfrn-id"],
-                       "group-id" => ["group_member", "gid"],
-                       "author-id" => ["item", "author-id"],
+                       "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`, `contact`.`name`, `author`.`name`)",
+                       "author-name" => "IF (`contact`.`url` = `author`.`url` AND `contact`.`name` != '', `contact`.`name`, `author`.`name`)",
                        "author-nick" => ["author", "nick"],
-                       "author-avatar" => "IF (`contact`.`url` = `author`.`url`, `contact`.`thumb`, `author`.`thumb`)",
+                       "author-alias" => ["author", "alias"],
+                       "author-avatar" => "IF (`contact`.`url` = `author`.`url` AND `contact`.`thumb` != '', `contact`.`thumb`, `author`.`thumb`)",
                        "author-network" => ["author", "network"],
                        "author-blocked" => ["author", "blocked"],
                        "author-hidden" => ["author", "hidden"],
-                       "owner-id" => ["item", "owner-id"],
+                       "author-updated" => ["author", "updated"],
+                       "author-contact-type" => ["author", "contact-type"],
+                       "author-gsid" => ["author", "gsid"],
+                       "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`, `contact`.`name`, `owner`.`name`)",
+                       "owner-name" => "IF (`contact`.`url` = `owner`.`url` AND `contact`.`name` != '', `contact`.`name`, `owner`.`name`)",
                        "owner-nick" => ["owner", "nick"],
-                       "owner-avatar" => "IF (`contact`.`url` = `owner`.`url`, `contact`.`thumb`, `owner`.`thumb`)",
+                       "owner-alias" => ["owner", "alias"],
+                       "owner-avatar" => "IF (`contact`.`url` = `owner`.`url` AND `contact`.`thumb` != '', `contact`.`thumb`, `owner`.`thumb`)",
                        "owner-network" => ["owner", "network"],
                        "owner-blocked" => ["owner", "blocked"],
                        "owner-hidden" => ["owner", "hidden"],
-                       "causer-id" => ["item", "causer-id"],
+                       "owner-updated" => ["owner", "updated"],
+                       "owner-gsid" => ["owner", "gsid"],
+                       "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"],
-                       "causer-nick" => ["causer", "nick"], 
+                       "causer-nick" => ["causer", "nick"],
+                       "causer-alias" => ["causer", "alias"],
                        "causer-avatar" => ["causer", "thumb"],
                        "causer-network" => ["causer", "network"],
                        "causer-blocked" => ["causer", "blocked"],
                        "causer-hidden" => ["causer", "hidden"],
+                       "causer-gsid" => ["causer", "gsid"],
                        "causer-contact-type" => ["causer", "contact-type"],
                        "postopts" => ["post-delivery-data", "postopts"],
                        "inform" => ["post-delivery-data", "inform"],
                        "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"],
                        "event-location" => ["event", "location"],
                        "event-type" => ["event", "type"],
                        "event-nofinish" => ["event", "nofinish"],
-                       "event-adjust" => ["event", "adjust"],
                        "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", "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" => ["post-thread-user", "network"],
+                       "parent-author-id" => ["post-thread-user", "author-id"],
+                       "parent-author-link" => ["author", "url"],
+                       "parent-author-name" => ["author", "name"],
+                       "parent-author-nick" => ["author", "nick"],
+                       "parent-author-network" => ["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 `group_member` ON `group_member`.`contact-id` = `item`.`contact-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`
-                       STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`"
+               "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 `conversation-item-uri` ON `conversation-item-uri`.`id` = `post-thread-user`.`conversation-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 `item-uri` AS `quote-item-uri` ON `quote-item-uri`.`id` = `post-content`.`quote-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`"
+       ],
+       "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"],
+                       "conversation" => ["conversation-item-uri", "uri"],
+                       "conversation-id" => ["post-thread", "conversation-id"],
+                       "quote-uri" => ["quote-item-uri", "uri"],
+                       "quote-uri-id" => ["post-content", "quote-uri-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"],
+                       "featured" => "EXISTS(SELECT `type` FROM `post-collection` WHERE `type` = 0 AND `uri-id` = `post`.`uri-id`)",
+                       "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"],
+                       "contact-id" => ["post", "author-id"],
+                       "contact-uri-id" => ["author", "uri-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"],
+                       "author-id" => ["post", "author-id"],
+                       "author-uri-id" => ["author", "uri-id"],
+                       "author-link" => ["author", "url"],
+                       "author-addr" => ["author", "addr"],
+                       "author-name" => ["author", "name"],
+                       "author-nick" => ["author", "nick"],
+                       "author-alias" => ["author", "alias"],
+                       "author-avatar" => ["author", "thumb"],
+                       "author-network" => ["author", "network"],
+                       "author-blocked" => ["author", "blocked"],
+                       "author-hidden" => ["author", "hidden"],
+                       "author-updated" => ["author", "updated"],
+                       "author-contact-type" => ["author", "contact-type"],
+                       "author-gsid" => ["author", "gsid"],
+                       "owner-id" => ["post", "owner-id"],
+                       "owner-uri-id" => ["owner", "uri-id"],
+                       "owner-link" => ["owner", "url"],
+                       "owner-addr" => ["owner", "addr"],
+                       "owner-name" => ["owner", "name"],
+                       "owner-nick" => ["owner", "nick"],
+                       "owner-alias" => ["owner", "alias"],
+                       "owner-avatar" => ["owner", "thumb"],
+                       "owner-network" => ["owner", "network"],
+                       "owner-blocked" => ["owner", "blocked"],
+                       "owner-hidden" => ["owner", "hidden"],
+                       "owner-updated" => ["owner", "updated"],
+                       "owner-contact-type" => ["owner", "contact-type"],
+                       "owner-gsid" => ["owner", "gsid"],
+                       "causer-id" => ["post", "causer-id"],
+                       "causer-uri-id" => ["causer", "uri-id"],
+                       "causer-link" => ["causer", "url"],
+                       "causer-addr" => ["causer", "addr"],
+                       "causer-name" => ["causer", "name"],
+                       "causer-nick" => ["causer", "nick"],
+                       "causer-alias" => ["causer", "alias"],
+                       "causer-avatar" => ["causer", "thumb"],
+                       "causer-network" => ["causer", "network"],
+                       "causer-blocked" => ["causer", "blocked"],
+                       "causer-hidden" => ["causer", "hidden"],
+                       "causer-contact-type" => ["causer", "contact-type"],
+                       "causer-gsid" => ["causer", "gsid"],
+                       "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" => ["post-thread", "network"],
+                       "parent-author-id" => ["post-thread", "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"],
+               ],
+               "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 `conversation-item-uri` ON `conversation-item-uri`.`id` = `post-thread`.`conversation-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 `item-uri` AS `quote-item-uri` ON `quote-item-uri`.`id` = `post-content`.`quote-uri-id`
+                       LEFT JOIN `post-question` ON `post-question`.`uri-id` = `post`.`uri-id`
+                       LEFT JOIN `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `post-thread`.`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"],
+                       "conversation" => ["conversation-item-uri", "uri"],
+                       "conversation-id" => ["post-thread", "conversation-id"],
+                       "quote-uri" => ["quote-item-uri", "uri"],
+                       "quote-uri-id" => ["post-content", "quote-uri-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"],
+                       "featured" => "EXISTS(SELECT `type` FROM `post-collection` WHERE `type` = 0 AND `uri-id` = `post-thread`.`uri-id`)",
+                       "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"],
+                       "contact-id" => ["post-thread", "author-id"],
+                       "contact-uri-id" => ["author", "uri-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"],
+                       "author-id" => ["post-thread", "author-id"],
+                       "author-uri-id" => ["author", "uri-id"],
+                       "author-link" => ["author", "url"],
+                       "author-addr" => ["author", "addr"],
+                       "author-name" => ["author", "name"],
+                       "author-nick" => ["author", "nick"],
+                       "author-alias" => ["author", "alias"],
+                       "author-avatar" => ["author", "thumb"],
+                       "author-network" => ["author", "network"],
+                       "author-blocked" => ["author", "blocked"],
+                       "author-hidden" => ["author", "hidden"],
+                       "author-updated" => ["author", "updated"],
+                       "author-contact-type" => ["author", "contact-type"],
+                       "author-gsid" => ["author", "gsid"],
+                       "owner-id" => ["post-thread", "owner-id"],
+                       "owner-uri-id" => ["owner", "uri-id"],
+                       "owner-link" => ["owner", "url"],
+                       "owner-addr" => ["owner", "addr"],
+                       "owner-name" => ["owner", "name"],
+                       "owner-nick" => ["owner", "nick"],
+                       "owner-alias" => ["owner", "alias"],
+                       "owner-avatar" => ["owner", "thumb"],
+                       "owner-network" => ["owner", "network"],
+                       "owner-blocked" => ["owner", "blocked"],
+                       "owner-hidden" => ["owner", "hidden"],
+                       "owner-updated" => ["owner", "updated"],
+                       "owner-gsid" => ["owner", "gsid"],
+                       "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"],
+                       "causer-nick" => ["causer", "nick"],
+                       "causer-alias" => ["causer", "alias"],
+                       "causer-avatar" => ["causer", "thumb"],
+                       "causer-network" => ["causer", "network"],
+                       "causer-blocked" => ["causer", "blocked"],
+                       "causer-hidden" => ["causer", "hidden"],
+                       "causer-gsid" => ["causer", "gsid"],
+                       "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`)",
+                       "total-comments" => "(SELECT COUNT(*) FROM `post` WHERE `parent-uri-id` = `post-thread`.`uri-id` AND `gravity` = 6)",
+                       "total-actors" => "(SELECT COUNT(DISTINCT(`author-id`)) FROM `post` WHERE `parent-uri-id` = `post-thread`.`uri-id` AND `gravity` = 6)",
+                       "signed_text" => ["diaspora-interaction", "interaction"],
+                       "parent-guid" => ["parent-item-uri", "guid"],
+                       "parent-network" => ["post-thread", "network"],
+                       "parent-author-id" => ["post-thread", "author-id"],
+                       "parent-author-link" => ["author", "url"],
+                       "parent-author-name" => ["author", "name"],
+                       "parent-author-nick" => ["author", "nick"],
+                       "parent-author-network" => ["author", "network"],
+               ],
+               "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 `conversation-item-uri` ON `conversation-item-uri`.`id` = `post-thread`.`conversation-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 `item-uri` AS `quote-item-uri` ON `quote-item-uri`.`id` = `post-content`.`quote-uri-id`
+                       LEFT JOIN `post-question` ON `post-question`.`uri-id` = `post-thread`.`uri-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`"
        ],
+       "collection-view" => [
+               "fields" => [
+                       "uri-id" => ["post-collection", "uri-id"],
+                       "type" => ["post-collection", "type"],
+                       "cid" => ["post-collection", "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-collection", "author-id"],
+                       "gravity" => ["post", "gravity"],
+               ],
+               "query" => "FROM `post-collection`
+                       INNER JOIN `post` ON `post-collection`.`uri-id` = `post`.`uri-id`
+                       INNER JOIN `post-thread` ON `post-thread`.`uri-id` = `post`.`parent-uri-id`"
+       ],
+       "media-view" => [
+               "fields" => [
+                       "uri-id" => ["post-media", "uri-id"],
+                       "type" => ["post-media", "type"],
+                       "received" => ["post", "received"],
+                       "created" => ["post", "created"],
+                       "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-media`
+                       INNER JOIN `post` ON `post-media`.`uri-id` = `post`.`uri-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"],
                        "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`
-                       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" => ["post-thread-user", "post-user-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`
+                       INNER 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-thread-user`.`contact-id`
+                       STRAIGHT_JOIN `contact` AS `authorcontact` ON `authorcontact`.`id` = `post-thread-user`.`author-id`
+                       STRAIGHT_JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
+                       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 (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
-                       AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`)"
+                       AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`)
+                       AND NOT `authorcontact`.`blocked` AND NOT `ownercontact`.`blocked`
+                       AND NOT EXISTS(SELECT `cid`    FROM `user-contact` WHERE `uid` = `post-thread-user`.`uid` AND `cid` IN (`authorcontact`.`id`, `ownercontact`.`id`) AND (`blocked` OR `ignored`))
+                       AND NOT EXISTS(SELECT `gsid`   FROM `user-gserver` WHERE `uid` = `post-thread-user`.`uid` AND `gsid` IN (`authorcontact`.`gsid`, `ownercontact`.`gsid`) AND `ignored`)"
        ],
        "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" => ["post-thread-user", "post-user-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`
+                       STRAIGHT_JOIN `contact` AS `authorcontact` ON `authorcontact`.`id` = `post-thread-user`.`author-id`
+                       STRAIGHT_JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
+                       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 (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
-                       AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`)"
+                       AND (`post-thread-user`.`hidden` IS NULL OR NOT `post-thread-user`.`hidden`)
+                       AND NOT `authorcontact`.`blocked` AND NOT `ownercontact`.`blocked`
+                       AND NOT EXISTS(SELECT `cid`    FROM `user-contact` WHERE `uid` = `post-thread-user`.`uid` AND `cid` IN (`authorcontact`.`id`, `ownercontact`.`id`) AND (`blocked` OR `ignored`))
+                       AND NOT EXISTS(SELECT `gsid`   FROM `user-gserver` WHERE `uid` = `post-thread-user`.`uid` AND `gsid` IN (`authorcontact`.`gsid`, `ownercontact`.`gsid`) AND `ignored`)"
        ],
        "owner-view" => [
                "fields" => [
                        "self" => ["contact", "self"],
                        "remote_self" => ["contact", "remote_self"],
                        "rel" => ["contact", "rel"],
-                       "duplex" => ["contact", "duplex"],
                        "network" => ["contact", "network"],
                        "protocol" => ["contact", "protocol"],
                        "name" => ["contact", "name"],
                        "location" => ["contact", "location"],
                        "about" => ["contact", "about"],
                        "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"],
-                       "site-pubkey" => ["contact", "site-pubkey"],
-                       "issued-id" => ["contact", "issued-id"],
-                       "dfrn-id" => ["contact", "dfrn-id"],
+                       "header" => ["contact", "header"],
                        "url" => ["contact", "url"],
                        "nurl" => ["contact", "nurl"],
+                       "uri-id" => ["contact", "uri-id"],
                        "addr" => ["contact", "addr"],
                        "alias" => ["contact", "alias"],
                        "pubkey" => ["contact", "pubkey"],
                        "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"],
                        "last-update" => ["contact", "last-update"],
                        "sensitive" => ["contact", "sensitive"],
                        "baseurl" => ["contact", "baseurl"],
                        "reason" => ["contact", "reason"],
-                       "closeness" => ["contact", "closeness"],
                        "info" => ["contact", "info"],
-                       "profile-id" => ["contact", "profile-id"],
                        "bdyear" => ["contact", "bdyear"],
                        "bd" => ["contact", "bd"],
                        "notify_new_posts" => ["contact", "notify_new_posts"],
                        "fetch_further_information" => ["contact", "fetch_further_information"],
-                       "ffi_keyword_denylist" => ["contact", "ffi_keyword_denylist"],
+                       "ffi_keyword_blacklist" => ["contact", "ffi_keyword_blacklist"],
                        "parent-uid" => ["user", "parent-uid"],
                        "guid" => ["user", "guid"],
                        "nickname" => ["user", "nickname"], /// @todo Replaces all uses of "nickname" with "nick"
                        "language" => ["user", "language"],
                        "register_date" => ["user", "register_date"],
                        "login_date" => ["user", "login_date"],
+                       "last-activity" => ["user", "last-activity"],
                        "default-location" => ["user", "default-location"],
                        "allow_location" => ["user", "allow_location"],
                        "theme" => ["user", "theme"],
                        "blockwall" => ["user", "blockwall"],
                        "hidewall" => ["user", "hidewall"],
                        "blocktags" => ["user", "blocktags"],
-                       "unkmail" => ["user", "unkmail"],
-                       "cntunkmail" => ["user", "cntunkmail"],
                        "notify-flags" => ["user", "notify-flags"],
                        "page-flags" => ["user", "page-flags"],
                        "account-type" => ["user", "account-type"],
                        "postal-code" => ["profile", "postal-code"],
                        "country-name" => ["profile", "country-name"],
                        "homepage" => ["profile", "homepage"],
+                       "homepage_verified" => ["profile", "homepage_verified"],
                        "dob" => ["profile", "dob"],
                ],
                "query" => "FROM `user`
                        INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
                        INNER JOIN `profile` ON `profile`.`uid` = `user`.`uid`"
        ],
+       "account-view" => [
+               "fields" => [
+                       "id" => ["contact", "id"],
+                       "url" => ["contact", "url"],
+                       "nurl" => ["contact", "nurl"],
+                       "uri-id" => ["contact", "uri-id"],
+                       "guid" => ["item-uri", "guid"],
+                       "addr" => ["contact", "addr"],
+                       "alias" => ["contact", "alias"],
+                       "name" => ["contact", "name"],
+                       "nick" => ["contact", "nick"],
+                       "about" => ["contact", "about"],
+                       "keywords" => ["contact", "keywords"],
+                       "xmpp" => ["contact", "xmpp"],
+                       "matrix" => ["contact", "matrix"],
+                       "avatar" => ["contact", "avatar"],
+                       "photo" => ["contact", "photo"],
+                       "thumb" => ["contact", "thumb"],
+                       "micro" => ["contact", "micro"],
+                       "header" => ["contact", "header"],
+                       "created" => ["contact", "created"],
+                       "updated" => ["contact", "updated"],
+                       "network" => ["contact", "network"],
+                       "protocol" => ["contact", "protocol"],
+                       "location" => ["contact", "location"],
+                       "attag" => ["contact", "attag"],
+                       "pubkey" => ["contact", "pubkey"],
+                       "prvkey" => ["contact", "prvkey"],
+                       "subscribe" => ["contact", "subscribe"],
+                       "last-update" => ["contact", "last-update"],
+                       "success_update" => ["contact", "success_update"],
+                       "failure_update" => ["contact", "failure_update"],
+                       "failed" => ["contact", "failed"],
+                       "last-item" => ["contact", "last-item"],
+                       "last-discovery" => ["contact", "last-discovery"],
+                       "contact-type" => ["contact", "contact-type"],
+                       "manually-approve" => ["contact", "manually-approve"],
+                       "unsearchable" => ["contact", "unsearchable"],
+                       "sensitive" => ["contact", "sensitive"],
+                       "baseurl" => ["contact", "baseurl"],
+                       "gsid" => ["contact", "gsid"],
+                       "info" => ["contact", "info"],
+                       "bdyear" => ["contact", "bdyear"],
+                       "bd" => ["contact", "bd"],
+                       "poco" => ["contact", "poco"],
+                       "name-date" => ["contact", "name-date"],
+                       "uri-date" => ["contact", "uri-date"],
+                       "avatar-date" => ["contact", "avatar-date"],
+                       "term-date" => ["contact", "term-date"],
+                       "global-ignored" => ["contact", "hidden"],
+                       "global-blocked" => ["contact", "blocked"],
+                       "hidden" => ["contact", "hidden"],
+                       "archive" => ["contact", "archive"],
+                       "deleted" => ["contact", "deleted"],
+                       "blocked" => ["contact", "blocked"],
+                       "dfrn-notify" => ["contact", "notify"],
+                       "dfrn-poll" => ["contact", "poll"],
+                       "diaspora-guid" => ["item-uri", "guid"],
+                       "diaspora-batch" => ["diaspora-contact", "batch"],
+                       "diaspora-notify" => ["diaspora-contact", "notify"],
+                       "diaspora-poll" => ["diaspora-contact", "poll"],
+                       "diaspora-alias" => ["diaspora-contact", "alias"],
+                       "ap-uuid" => ["apcontact", "uuid"],
+                       "ap-type" => ["apcontact", "type"],
+                       "ap-following" => ["apcontact", "following"],
+                       "ap-followers" => ["apcontact", "followers"],
+                       "ap-inbox" => ["apcontact", "inbox"],
+                       "ap-outbox" => ["apcontact", "outbox"],
+                       "ap-sharedinbox" => ["apcontact", "sharedinbox"],
+                       "ap-generator" => ["apcontact", "generator"],
+                       "ap-following_count" => ["apcontact", "following_count"],
+                       "ap-followers_count" => ["apcontact", "followers_count"],
+                       "ap-statuses_count" => ["apcontact", "statuses_count"],
+                       "site_name" => ["gserver", "site_name"],
+                       "platform" => ["gserver", "platform"],
+                       "version" => ["gserver", "version"],
+                       "server-blocked" => ["gserver", "blocked"],
+                       "server-failed" => ["gserver", "failed"],
+               ],
+               "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 `diaspora-contact` ON `diaspora-contact`.`uri-id` = contact.`uri-id`
+                       LEFT JOIN `gserver` ON `gserver`.`id` = contact.`gsid`
+                       WHERE `contact`.`uid` = 0"
+       ],
+       "account-user-view" => [
+               "fields" => [
+                       "id" => ["ucontact", "id"],
+                       "pid" => ["contact", "id"],
+                       "uid" => ["ucontact", "uid"],
+                       "url" => ["contact", "url"],
+                       "nurl" => ["contact", "nurl"],
+                       "uri-id" => ["contact", "uri-id"],
+                       "guid" => ["item-uri", "guid"],
+                       "addr" => ["contact", "addr"],
+                       "alias" => ["contact", "alias"],
+                       "name" => ["contact", "name"],
+                       "nick" => ["contact", "nick"],
+                       "about" => ["contact", "about"],
+                       "keywords" => ["contact", "keywords"],
+                       "xmpp" => ["contact", "xmpp"],
+                       "matrix" => ["contact", "matrix"],
+                       "avatar" => ["contact", "avatar"],
+                       "photo" => ["contact", "photo"],
+                       "thumb" => ["contact", "thumb"],
+                       "micro" => ["contact", "micro"],
+                       "header" => ["contact", "header"],
+                       "created" => ["contact", "created"],
+                       "updated" => ["contact", "updated"],
+                       "self" => ["ucontact", "self"],
+                       "remote_self" => ["ucontact", "remote_self"],
+                       "rel" =>  ["ucontact", "rel"],
+                       "network" => ["contact", "network"],
+                       "protocol" => ["ucontact", "protocol"],
+                       "location" => ["contact", "location"],
+                       "attag" => ["ucontact", "attag"],
+                       "pubkey" => ["contact", "pubkey"],
+                       "prvkey" => ["contact", "prvkey"],
+                       "subscribe" => ["contact", "subscribe"],
+                       "last-update" => ["contact", "last-update"],
+                       "success_update" => ["contact", "success_update"],
+                       "failure_update" => ["contact", "failure_update"],
+                       "failed" => ["contact", "failed"],
+                       "last-item" => ["contact", "last-item"],
+                       "last-discovery" => ["contact", "last-discovery"],
+                       "contact-type" => ["contact", "contact-type"],
+                       "manually-approve" => ["contact", "manually-approve"],
+                       "unsearchable" => ["contact", "unsearchable"],
+                       "sensitive" => ["contact", "sensitive"],
+                       "baseurl" => ["contact", "baseurl"],
+                       "gsid" => ["contact", "gsid"],
+                       "info" => ["ucontact", "info"],
+                       "bdyear" => ["contact", "bdyear"],
+                       "bd" => ["contact", "bd"],
+                       "poco" => ["contact", "poco"],
+                       "name-date" => ["contact", "name-date"],
+                       "uri-date" => ["contact", "uri-date"],
+                       "avatar-date" => ["contact", "avatar-date"],
+                       "term-date" => ["contact", "term-date"],
+                       "global-ignored" => ["contact", "hidden"],
+                       "global-blocked" => ["contact", "blocked"],
+                       "hidden" => ["ucontact", "hidden"],
+                       "archive" => ["ucontact", "archive"],
+                       "pending" => ["ucontact", "pending"],
+                       "deleted" => ["ucontact", "deleted"],
+                       "notify_new_posts" => ["ucontact", "notify_new_posts"],
+                       "fetch_further_information" => ["ucontact", "fetch_further_information"],
+                       "ffi_keyword_blacklist" => ["ucontact", "ffi_keyword_blacklist"],
+                       "rating" => ["ucontact", "rating"],
+                       "readonly" => ["ucontact", "readonly"],
+                       "blocked" => ["ucontact", "blocked"],
+                       "block_reason" => ["ucontact", "block_reason"],
+                       "subhub" => ["ucontact", "subhub"],
+                       "hub-verify" => ["ucontact", "hub-verify"],
+                       "reason" => ["ucontact", "reason"],
+                       "dfrn-notify" => ["contact", "notify"],
+                       "dfrn-poll" => ["contact", "poll"],
+                       "diaspora-guid" => ["item-uri", "guid"],
+                       "diaspora-batch" => ["diaspora-contact", "batch"],
+                       "diaspora-notify" => ["diaspora-contact", "notify"],
+                       "diaspora-poll" => ["diaspora-contact", "poll"],
+                       "diaspora-alias" => ["diaspora-contact", "alias"],
+                       "diaspora-interacting_count" => ["diaspora-contact", "interacting_count"],
+                       "diaspora-interacted_count" => ["diaspora-contact", "interacted_count"],
+                       "diaspora-post_count" => ["diaspora-contact", "post_count"],
+                       "ap-uuid" => ["apcontact", "uuid"],
+                       "ap-type" => ["apcontact", "type"],
+                       "ap-following" => ["apcontact", "following"],
+                       "ap-followers" => ["apcontact", "followers"],
+                       "ap-inbox" => ["apcontact", "inbox"],
+                       "ap-outbox" => ["apcontact", "outbox"],
+                       "ap-sharedinbox" => ["apcontact", "sharedinbox"],
+                       "ap-generator" => ["apcontact", "generator"],
+                       "ap-following_count" => ["apcontact", "following_count"],
+                       "ap-followers_count" => ["apcontact", "followers_count"],
+                       "ap-statuses_count" => ["apcontact", "statuses_count"],
+                       "site_name" => ["gserver", "site_name"],
+                       "platform" => ["gserver", "platform"],
+                       "version" => ["gserver", "version"],
+                       "server-blocked" => ["gserver", "blocked"],
+                       "server-failed" => ["gserver", "failed"],
+               ],
+               "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 `diaspora-contact` ON `diaspora-contact`.`uri-id` = `ucontact`.`uri-id`
+                       LEFT JOIN `gserver` ON `gserver`.`id` = contact.`gsid`"
+       ],
        "pending-view" => [
                "fields" => [
                        "id" => ["register", "id"],
        "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" => [
                        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`"
+       ],
+       "diaspora-contact-view" => [
+               "fields" => [
+                       "uri-id" => ["diaspora-contact", "uri-id"],
+                       "url" => ["item-uri", "uri"],
+                       "guid" => ["item-uri", "guid"],
+                       "addr" => ["diaspora-contact", "addr"],
+                       "alias" => ["diaspora-contact", "alias"],
+                       "nick" => ["diaspora-contact", "nick"],
+                       "name" => ["diaspora-contact", "name"],
+                       "given-name" => ["diaspora-contact", "given-name"],
+                       "family-name" => ["diaspora-contact", "family-name"],
+                       "photo" => ["diaspora-contact", "photo"],
+                       "photo-medium" => ["diaspora-contact", "photo-medium"],
+                       "photo-small" => ["diaspora-contact", "photo-small"],
+                       "batch" => ["diaspora-contact", "batch"],
+                       "notify" => ["diaspora-contact", "notify"],
+                       "poll" => ["diaspora-contact", "poll"],
+                       "subscribe" => ["diaspora-contact", "subscribe"],
+                       "searchable" => ["diaspora-contact", "searchable"],
+                       "pubkey" => ["diaspora-contact", "pubkey"],
+                       "baseurl" => ["gserver", "url"],
+                       "gsid" => ["diaspora-contact", "gsid"],
+                       "created" => ["diaspora-contact", "created"],
+                       "updated" => ["diaspora-contact", "updated"],
+                       "interacting_count" => ["diaspora-contact", "interacting_count"],
+                       "interacted_count" => ["diaspora-contact", "interacted_count"],
+                       "post_count" => ["diaspora-contact", "post_count"],
+               ],
+               "query" => "FROM `diaspora-contact`
+                       INNER JOIN `item-uri` ON `item-uri`.`id` = `diaspora-contact`.`uri-id`
+                       LEFT JOIN `gserver` ON `gserver`.`id` = `diaspora-contact`.`gsid`"
+       ],
 ];
-