Rearrangements, adding user-item
This commit is contained in:
Michael
parent
55204d26b1
commit
49d9cbb627
|
|
@ -45,54 +45,23 @@ return [
|
||||||
"internal-uid" => ["item", "uid"],
|
"internal-uid" => ["item", "uid"],
|
||||||
"parent" => ["item", "parent"],
|
"parent" => ["item", "parent"],
|
||||||
"uri" => ["item", "uri"],
|
"uri" => ["item", "uri"],
|
||||||
"parent-uri" => ["item", "parent-uri"],
|
|
||||||
"thr-parent" => ["item", "thr-parent"],
|
|
||||||
"guid" => ["item", "guid"],
|
|
||||||
"uri-id" => ["item", "uri-id"],
|
"uri-id" => ["item", "uri-id"],
|
||||||
"internal-uri-id" => ["item", "uri-id"],
|
"internal-uri-id" => ["item", "uri-id"],
|
||||||
|
"parent-uri" => ["item", "parent-uri"],
|
||||||
"parent-uri-id" => ["item", "parent-uri-id"],
|
"parent-uri-id" => ["item", "parent-uri-id"],
|
||||||
|
"thr-parent" => ["item", "thr-parent"],
|
||||||
"thr-parent-id" => ["item", "thr-parent-id"],
|
"thr-parent-id" => ["item", "thr-parent-id"],
|
||||||
"contact-id" => ["item", "contact-id"],
|
"guid" => ["item", "guid"],
|
||||||
"contact-uid" => ["contact", "uid"],
|
|
||||||
"contact-link" => ["contact", "url"],
|
|
||||||
"contact-name" => ["contact", "name"],
|
|
||||||
"contact-avatar" => ["contact", "thumb"],
|
|
||||||
"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"],
|
|
||||||
"type" => ["item", "type"],
|
"type" => ["item", "type"],
|
||||||
"wall" => ["item", "wall"],
|
"wall" => ["item", "wall"],
|
||||||
"gravity" => ["item", "gravity"],
|
"gravity" => ["item", "gravity"],
|
||||||
"extid" => ["item", "extid"],
|
"extid" => ["item", "extid"],
|
||||||
"icid" => ["item", "icid"],
|
|
||||||
"vid" => ["item", "vid"],
|
|
||||||
"psid" => ["item", "psid"],
|
|
||||||
"created" => ["item", "created"],
|
"created" => ["item", "created"],
|
||||||
"edited" => ["item", "edited"],
|
"edited" => ["item", "edited"],
|
||||||
"commented" => ["item", "commented"],
|
"commented" => ["item", "commented"],
|
||||||
"received" => ["item", "received"],
|
"received" => ["item", "received"],
|
||||||
"changed" => ["item", "changed"],
|
"changed" => ["item", "changed"],
|
||||||
"verb" => ["verb", "name"],
|
|
||||||
"plink" => ["item-content", "plink"],
|
|
||||||
"language" => ["item-content", "language"],
|
|
||||||
"raw-body" => ["item-content", "raw-body"],
|
|
||||||
"resource-id" => ["item", "resource-id"],
|
"resource-id" => ["item", "resource-id"],
|
||||||
"attach" => ["item", "attach"],
|
|
||||||
"postopts" => ["post-delivery-data", "postopts"],
|
|
||||||
"inform" => ["post-delivery-data", "inform"],
|
|
||||||
"internal-file-count" => "(SELECT COUNT(*) FROM `post-category` WHERE `post-category`.`uri-id` = `item`.`uri-id`)",
|
|
||||||
"file" => "NULL",
|
|
||||||
"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`)",
|
|
||||||
"post-type" => ["item", "post-type"],
|
"post-type" => ["item", "post-type"],
|
||||||
"private" => ["item", "private"],
|
"private" => ["item", "private"],
|
||||||
"pubmail" => ["item", "pubmail"],
|
"pubmail" => ["item", "pubmail"],
|
||||||
|
|
@ -107,18 +76,46 @@ return [
|
||||||
"mention" => ["item", "mention"],
|
"mention" => ["item", "mention"],
|
||||||
"global" => ["item", "global"],
|
"global" => ["item", "global"],
|
||||||
"network" => ["item", "network"],
|
"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"],
|
"title" => ["item-content", "title"],
|
||||||
"content-warning" => ["item-content", "content-warning"],
|
"content-warning" => ["item-content", "content-warning"],
|
||||||
|
"raw-body" => ["item-content", "raw-body"],
|
||||||
"body" => ["item-content", "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"],
|
"location" => ["item-content", "location"],
|
||||||
"coord" => ["item-content", "coord"],
|
"coord" => ["item-content", "coord"],
|
||||||
"app" => ["item-content", "app"],
|
"app" => ["item-content", "app"],
|
||||||
"rendered-hash" => ["item-content", "rendered-hash"],
|
|
||||||
"rendered-html" => ["item-content", "rendered-html"],
|
|
||||||
"object-type" => ["item-content", "object-type"],
|
"object-type" => ["item-content", "object-type"],
|
||||||
"object" => ["item-content", "object"],
|
"object" => ["item-content", "object"],
|
||||||
"target-type" => ["item-content", "target-type"],
|
"target-type" => ["item-content", "target-type"],
|
||||||
"target" => ["item-content", "target"],
|
"target" => ["item-content", "target"],
|
||||||
|
"contact-id" => ["item", "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-uid" => ["contact", "uid"],
|
||||||
|
"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"],
|
||||||
"author-id" => ["item", "author-id"],
|
"author-id" => ["item", "author-id"],
|
||||||
"author-link" => ["author", "url"],
|
"author-link" => ["author", "url"],
|
||||||
"author-addr" => ["author", "addr"],
|
"author-addr" => ["author", "addr"],
|
||||||
|
|
@ -141,6 +138,19 @@ return [
|
||||||
"causer-avatar" => ["causer", "thumb"],
|
"causer-avatar" => ["causer", "thumb"],
|
||||||
"causer-network" => ["causer", "network"],
|
"causer-network" => ["causer", "network"],
|
||||||
"causer-contact-type" => ["causer", "contact-type"],
|
"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`)",
|
||||||
|
"pinned" => ["user-item", "pinned"],
|
||||||
|
"hidden" => ["user-item", "hidden"],
|
||||||
|
"ignored" => ["user-item", "ignored"],
|
||||||
|
"notification-type" => ["user-item", "notification-type"],
|
||||||
"event-id" => ["item", "event-id"],
|
"event-id" => ["item", "event-id"],
|
||||||
"event-created" => ["event", "created"],
|
"event-created" => ["event", "created"],
|
||||||
"event-edited" => ["event", "edited"],
|
"event-edited" => ["event", "edited"],
|
||||||
|
|
@ -153,9 +163,6 @@ return [
|
||||||
"event-nofinish" => ["event", "nofinish"],
|
"event-nofinish" => ["event", "nofinish"],
|
||||||
"event-adjust" => ["event", "adjust"],
|
"event-adjust" => ["event", "adjust"],
|
||||||
"event-ignore" => ["event", "ignore"],
|
"event-ignore" => ["event", "ignore"],
|
||||||
"delivery_queue_count" => ["post-delivery-data", "queue_count"],
|
|
||||||
"delivery_queue_done" => ["post-delivery-data", "queue_done"],
|
|
||||||
"delivery_queue_failed" => ["post-delivery-data", "queue_failed"],
|
|
||||||
"signed_text" => ["diaspora-interaction", "interaction"],
|
"signed_text" => ["diaspora-interaction", "interaction"],
|
||||||
"parent-guid" => ["parent-item", "guid"],
|
"parent-guid" => ["parent-item", "guid"],
|
||||||
"parent-network" => ["parent-item", "network"],
|
"parent-network" => ["parent-item", "network"],
|
||||||
|
|
@ -170,13 +177,14 @@ return [
|
||||||
STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `item`.`owner-id`
|
STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `item`.`owner-id`
|
||||||
STRAIGHT_JOIN `contact` AS `causer` ON `causer`.`id` = `item`.`causer-id`
|
STRAIGHT_JOIN `contact` AS `causer` ON `causer`.`id` = `item`.`causer-id`
|
||||||
LEFT JOIN `verb` ON `verb`.`id` = `item`.`vid`
|
LEFT JOIN `verb` ON `verb`.`id` = `item`.`vid`
|
||||||
STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`
|
|
||||||
STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`
|
|
||||||
LEFT JOIN `event` ON `event`.`id` = `item`.`event-id`
|
LEFT JOIN `event` ON `event`.`id` = `item`.`event-id`
|
||||||
LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `item`.`uri-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 `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 `post-delivery-data` ON `post-delivery-data`.`uri-id` = `item`.`uri-id` AND `item`.`origin`
|
||||||
LEFT JOIN `permissionset` ON `permissionset`.`id` = `item`.`psid`"
|
LEFT JOIN `permissionset` ON `permissionset`.`id` = `item`.`psid`
|
||||||
|
LEFT JOIN `user-item` ON `user-item`.`iid` = `item`.`id`
|
||||||
|
STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`
|
||||||
|
STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`"
|
||||||
],
|
],
|
||||||
"category-view" => [
|
"category-view" => [
|
||||||
"fields" => [
|
"fields" => [
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user