Avoid multiple lines in post-view, added thread view
This commit is contained in:
parent
fe373a10aa
commit
f9430175c6
5 changed files with 415 additions and 20 deletions
|
|
@ -193,7 +193,170 @@
|
|||
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 `item` AS `parent-item` ON `parent-item`.`uri-id` = `item`.`parent-uri-id` AND `parent-item`.`uid` = `item`.`uid`
|
||||
STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`"
|
||||
],
|
||||
"post-thread-view" => [
|
||||
"fields" => [
|
||||
"id" => ["item", "id"],
|
||||
"iid" => ["thread", "iid"],
|
||||
"item_id" => ["item", "id"],
|
||||
"uid" => ["thread", "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" => ["thread", "wall"],
|
||||
"gravity" => ["item", "gravity"],
|
||||
"extid" => ["item", "extid"],
|
||||
"created" => ["thread", "created"],
|
||||
"edited" => ["item", "edited"],
|
||||
"commented" => ["thread", "commented"],
|
||||
"received" => ["thread", "received"],
|
||||
"changed" => ["thread", "changed"],
|
||||
"edited" => ["thread", "edited"],
|
||||
"resource-id" => ["item", "resource-id"],
|
||||
"post-type" => ["thread", "post-type"],
|
||||
"private" => ["thread", "private"],
|
||||
"pubmail" => ["thread", "pubmail"],
|
||||
"moderated" => ["thread", "moderated"],
|
||||
"ignored" => ["thread", "ignored"],
|
||||
"visible" => ["thread", "visible"],
|
||||
"starred" => ["thread", "starred"],
|
||||
"bookmark" => ["item", "bookmark"],
|
||||
"unseen" => ["item", "unseen"],
|
||||
"deleted" => ["thread", "deleted"],
|
||||
"origin" => ["thread", "origin"],
|
||||
"forum_mode" => ["thread", "forum_mode"],
|
||||
"mention" => ["thread", "mention"],
|
||||
"global" => ["item", "global"],
|
||||
"network" => ["thread", "network"],
|
||||
"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" => ["thread", "contact-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 (`item`.`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"],
|
||||
"dfrn-id" => ["contact", "dfrn-id"],
|
||||
"group-id" => ["group_member", "gid"],
|
||||
"author-id" => ["thread", "author-id"],
|
||||
"author-link" => ["author", "url"],
|
||||
"author-addr" => ["author", "addr"],
|
||||
"author-name" => "IF (`contact`.`url` = `author`.`url`, `contact`.`name`, `author`.`name`)",
|
||||
"author-nick" => ["author", "nick"],
|
||||
"author-avatar" => "IF (`contact`.`url` = `author`.`url`, `contact`.`thumb`, `author`.`thumb`)",
|
||||
"author-network" => ["author", "network"],
|
||||
"author-blocked" => ["author", "blocked"],
|
||||
"author-hidden" => ["author", "hidden"],
|
||||
"owner-id" => ["thread", "owner-id"],
|
||||
"owner-link" => ["owner", "url"],
|
||||
"owner-addr" => ["owner", "addr"],
|
||||
"owner-name" => "IF (`contact`.`url` = `owner`.`url`, `contact`.`name`, `owner`.`name`)",
|
||||
"owner-nick" => ["owner", "nick"],
|
||||
"owner-avatar" => "IF (`contact`.`url` = `owner`.`url`, `contact`.`thumb`, `owner`.`thumb`)",
|
||||
"owner-network" => ["owner", "network"],
|
||||
"owner-blocked" => ["owner", "blocked"],
|
||||
"owner-hidden" => ["owner", "hidden"],
|
||||
"causer-id" => ["item", "causer-id"],
|
||||
"causer-link" => ["causer", "url"],
|
||||
"causer-addr" => ["causer", "addr"],
|
||||
"causer-name" => ["causer", "name"],
|
||||
"causer-nick" => ["causer", "nick"],
|
||||
"causer-avatar" => ["causer", "thumb"],
|
||||
"causer-network" => ["causer", "network"],
|
||||
"causer-blocked" => ["causer", "blocked"],
|
||||
"causer-hidden" => ["causer", "hidden"],
|
||||
"causer-contact-type" => ["causer", "contact-type"],
|
||||
"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"],
|
||||
"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-adjust" => ["event", "adjust"],
|
||||
"event-ignore" => ["event", "ignore"],
|
||||
"signed_text" => ["diaspora-interaction", "interaction"],
|
||||
"parent-guid" => ["parent-item", "guid"],
|
||||
"parent-network" => ["parent-item", "network"],
|
||||
"parent-author-id" => ["parent-item", "author-id"],
|
||||
"parent-author-link" => ["parent-item-author", "url"],
|
||||
"parent-author-name" => ["parent-item-author", "name"],
|
||||
"parent-author-network" => ["parent-item-author", "network"],
|
||||
],
|
||||
"query" => "FROM `thread`
|
||||
STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
|
||||
STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
|
||||
STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `thread`.`author-id`
|
||||
STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `thread`.`owner-id`
|
||||
STRAIGHT_JOIN `contact` AS `causer` ON `causer`.`id` = `item`.`causer-id`
|
||||
LEFT JOIN `group_member` ON `group_member`.`contact-id` = `thread`.`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` = `thread`.`uri-id`
|
||||
LEFT JOIN `item-content` ON `item-content`.`uri-id` = `thread`.`uri-id`
|
||||
LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `thread`.`uri-id` AND `thread`.`origin`
|
||||
LEFT JOIN `permissionset` ON `permissionset`.`id` = `item`.`psid`
|
||||
STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`uri-id` = `item`.`parent-uri-id` AND `parent-item`.`uid` = `item`.`uid`
|
||||
STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`"
|
||||
],
|
||||
"category-view" => [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue