X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=static%2Fdbview.config.php;h=98fe5fba76fc72c4bde4fa1819b2cfdcdbd2c6db;hb=f92816cf62a296a5cb73be9c13a7e297344c536b;hp=b0bf7ed615a96143587f5613a7c252984f204edc;hpb=3ab4e20fe6050ac72201310fdc049dc023d64d24;p=friendica.git diff --git a/static/dbview.config.php b/static/dbview.config.php index b0bf7ed615..98fe5fba76 100644 --- a/static/dbview.config.php +++ b/static/dbview.config.php @@ -41,12 +41,11 @@ "fields" => [ "id" => ["item", "id"], "item_id" => ["item", "id"], + "post-user-id" => ["post-user", "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"], @@ -61,7 +60,6 @@ "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"], @@ -76,28 +74,25 @@ "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"], + "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" => ["item", "contact-id"], "contact-link" => ["contact", "url"], "contact-addr" => ["contact", "addr"], @@ -106,10 +101,13 @@ "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"], @@ -123,19 +121,21 @@ "author-id" => ["item", "author-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-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"], "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-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"], "causer-link" => ["causer", "url"], "causer-addr" => ["causer", "addr"], @@ -144,6 +144,7 @@ "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"], @@ -175,6 +176,7 @@ "parent-author-network" => ["parent-item-author", "network"], ], "query" => "FROM `item` + LEFT JOIN `post-user` ON `post-user`.`uri-id` = `item`.`uri-id` AND `post-user`.`uid` = `item`.`uid` 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` @@ -182,9 +184,165 @@ 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-content` ON `post-content`.`uri-id` = `item`.`uri-id` LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `item`.`uri-id` AND `item`.`origin` LEFT JOIN `permissionset` ON `permissionset`.`id` = `item`.`psid` + STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`uri-id` = `item`.`parent-uri-id` AND `parent-item`.`uid` = `item`.`uid` + STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`" + ], + "post-thread-view" => [ + "fields" => [ + "id" => ["item", "id"], + "iid" => ["item", "id"], + "item_id" => ["item", "id"], + "uid" => ["post-thread-user", "uid"], + "parent" => ["item", "parent"], + "uri" => ["item", "uri"], + "uri-id" => ["post-thread", "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" => ["post-thread-user", "wall"], + "gravity" => ["item", "gravity"], + "extid" => ["item", "extid"], + "created" => ["post-thread", "created"], + "edited" => ["item", "edited"], + "commented" => ["post-thread", "commented"], + "received" => ["post-thread", "received"], + "changed" => ["post-thread", "changed"], + "post-type" => ["item", "post-type"], + "private" => ["item", "private"], + "pubmail" => ["post-thread-user", "pubmail"], + "moderated" => ["item", "moderated"], + "ignored" => ["post-thread-user", "ignored"], + "visible" => ["item", "visible"], + "starred" => ["post-thread-user", "starred"], + "bookmark" => ["item", "bookmark"], + "unseen" => ["post-user", "unseen"], + "deleted" => ["item", "deleted"], + "origin" => ["post-user", "origin"], + "forum_mode" => ["post-thread-user", "forum_mode"], + "mention" => ["item", "mention"], + "global" => ["item", "global"], + "network" => ["post-thread", "network"], + "vid" => ["item", "vid"], + "psid" => ["post-user", "psid"], + "verb" => "IF (`item`.`vid` IS NULL, '', `verb`.`name`)", + "title" => ["post-content", "title"], + "content-warning" => ["post-content", "content-warning"], + "raw-body" => ["post-content", "raw-body"], + "body" => ["post-content", "body"], + "rendered-hash" => ["post-content", "rendered-hash"], + "rendered-html" => ["post-content", "rendered-html"], + "language" => ["post-content", "language"], + "plink" => ["post-content", "plink"], + "location" => ["post-content", "location"], + "coord" => ["post-content", "coord"], + "app" => ["post-content", "app"], + "object-type" => ["post-content", "object-type"], + "object" => ["post-content", "object"], + "target-type" => ["post-content", "target-type"], + "target" => ["post-content", "target"], + "resource-id" => ["post-content", "resource-id"], + "contact-id" => ["post-user", "contact-id"], + "contact-link" => ["contact", "url"], + "contact-addr" => ["contact", "addr"], + "contact-name" => ["contact", "name"], + "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"], + "author-id" => ["post-thread", "author-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-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" => ["post-thread", "owner-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-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"], + "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 (`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" => ["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 `post-thread` + STRAIGHT_JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-thread`.`uri-id` + STRAIGHT_JOIN `post-user` ON `post-user`.`uri-id` = `post-thread`.`uri-id` + STRAIGHT_JOIN `item` ON `item`.`uri-id` = `post-thread`.`uri-id` AND `item`.`uid` = `post-thread-user`.`uid` + STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-user`.`contact-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` + STRAIGHT_JOIN `contact` AS `causer` ON `causer`.`id` = `post-thread`.`causer-id` + LEFT JOIN `verb` ON `verb`.`id` = `item`.`vid` + LEFT JOIN `event` ON `event`.`id` = `item`.`event-id` + LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `post-thread`.`uri-id` + LEFT JOIN `post-content` ON `post-content`.`uri-id` = `post-thread`.`uri-id` + LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `post-thread`.`uri-id` AND `post-user`.`origin` + LEFT JOIN `permissionset` ON `permissionset`.`id` = `post-user`.`psid` STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent` STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`" ], @@ -237,44 +395,45 @@ "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` + INNER JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent` + STRAIGHT_JOIN `contact` ON `contact`.`id` = `parent-item`.`contact-id` + LEFT JOIN `post-user` ON `post-user`.`uri-id` = `item`.`uri-id` AND `post-user`.`uid` = `parent-item`.`uid` + LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `parent-item`.`uid` AND `author`.`cid` = `parent-item`.`author-id` + LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `parent-item`.`uid` AND `owner`.`cid` = `parent-item`.`owner-id` + LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `parent-item`.`owner-id` + WHERE `parent-item`.`visible` AND NOT `parent-item`.`deleted` AND NOT `parent-item`.`moderated` AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`) - AND (`user-item`.`hidden` IS NULL OR NOT `user-item`.`hidden`) + AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`) AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`) AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`)" ], "network-thread-view" => [ "fields" => [ - "uri-id" => ["item", "uri-id"], + "uri-id" => ["post-thread", "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"], + "parent" => ["item", "id"], + "received" => ["post-thread", "received"], + "commented" => ["post-thread", "commented"], + "created" => ["post-thread", "created"], + "uid" => ["post-thread-user", "uid"], + "starred" => ["post-thread-user", "starred"], + "mention" => ["post-thread-user", "mention"], + "network" => ["post-thread", "network"], + "contact-id" => ["post-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` + STRAIGHT_JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-thread`.`uri-id` + STRAIGHT_JOIN `post-user` ON `post-user`.`uri-id` = `post-thread`.`uri-id` AND `post-user`.`uid` = `post-thread-user`.`uid` + STRAIGHT_JOIN `item` ON `item`.`uri-id` = `post-thread`.`uri-id` AND `item`.`uid` = `post-thread-user`.`uid` + STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-user`.`contact-id` + LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-user`.`uid` AND `author`.`cid` = `post-thread`.`author-id` + LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-user`.`uid` AND `owner`.`cid` = `post-thread`.`owner-id` + LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread`.`owner-id` + WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`) - AND (`user-item`.`hidden` IS NULL OR NOT `user-item`.`hidden`) + AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`) AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`) AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`)" ],