X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=static%2Fdbview.config.php;h=0f2201953bfc6be7b6f939757c645bd3d5795d6c;hb=76c006d5603250b06db2c54ecdc9483af8d47b36;hp=a623e4636508c9a8f99b3973029a532001c90f2f;hpb=d3de2497bcaf8f6547b9ec14fc7e66d2b04ff97d;p=friendica.git diff --git a/static/dbview.config.php b/static/dbview.config.php index a623e46365..0f2201953b 100644 --- a/static/dbview.config.php +++ b/static/dbview.config.php @@ -1,6 +1,6 @@ ["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"], @@ -94,6 +98,7 @@ "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`)", @@ -114,6 +119,7 @@ "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"], @@ -138,6 +144,7 @@ "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`)", @@ -149,6 +156,7 @@ "author-updated" => ["author", "updated"], "author-gsid" => ["author", "gsid"], "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`)", @@ -160,6 +168,7 @@ "owner-updated" => ["owner", "updated"], "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"], @@ -193,6 +202,8 @@ "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" => ["parent-post", "network"], @@ -201,8 +212,6 @@ "parent-author-name" => ["parent-post-author", "name"], "parent-author-nick" => ["parent-post-author", "nick"], "parent-author-network" => ["parent-post-author", "network"], - "parent-author-blocked" => ["parent-post-author", "blocked"], - "parent-author-hidden" => ["parent-post-author", "hidden"], ], "query" => "FROM `post-user` STRAIGHT_JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-user`.`parent-uri-id` AND `post-thread-user`.`uid` = `post-user`.`uid` @@ -213,11 +222,13 @@ 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` @@ -236,6 +247,10 @@ "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"], @@ -280,6 +295,7 @@ "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"], @@ -304,6 +320,7 @@ "avatar-date" => ["contact", "avatar-date"], "thumb" => ["contact", "thumb"], "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` AND `contact`.`name` != '', `contact`.`name`, `author`.`name`)", @@ -315,6 +332,7 @@ "author-updated" => ["author", "updated"], "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` AND `contact`.`name` != '', `contact`.`name`, `owner`.`name`)", @@ -326,6 +344,7 @@ "owner-updated" => ["owner", "updated"], "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"], @@ -359,6 +378,8 @@ "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-uri", "guid"], "parent-network" => ["parent-post", "network"], @@ -366,8 +387,6 @@ "parent-author-link" => ["parent-post-author", "url"], "parent-author-name" => ["parent-post-author", "name"], "parent-author-network" => ["parent-post-author", "network"], - "parent-author-blocked" => ["parent-post-author", "blocked"], - "parent-author-hidden" => ["parent-post-author", "hidden"], ], "query" => "FROM `post-thread-user` INNER JOIN `post-user` ON `post-user`.`id` = `post-thread-user`.`post-user-id` @@ -378,11 +397,13 @@ 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` @@ -397,6 +418,10 @@ "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"], @@ -432,6 +457,7 @@ "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"], @@ -456,6 +482,7 @@ "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"], @@ -467,6 +494,7 @@ "author-updated" => ["author", "updated"], "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"], @@ -478,6 +506,7 @@ "owner-updated" => ["owner", "updated"], "owner-contact-type" => ["owner", "contact-type"], "causer-id" => ["post", "causer-id"], + "causer-uri-id" => ["causer", "uri-id"], "causer-link" => ["causer", "url"], "causer-addr" => ["causer", "addr"], "causer-name" => ["causer", "name"], @@ -491,6 +520,8 @@ "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" => ["parent-post", "network"], @@ -498,8 +529,6 @@ "parent-author-link" => ["parent-post-author", "url"], "parent-author-name" => ["parent-post-author", "name"], "parent-author-network" => ["parent-post-author", "network"], - "parent-author-blocked" => ["parent-post-author", "blocked"], - "parent-author-hidden" => ["parent-post-author", "hidden"], ], "query" => "FROM `post` STRAIGHT_JOIN `post-thread` ON `post-thread`.`uri-id` = `post`.`parent-uri-id` @@ -509,10 +538,12 @@ 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 `post` AS `parent-post` ON `parent-post`.`uri-id` = `post`.`parent-uri-id` LEFT JOIN `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `parent-post`.`author-id`" @@ -525,6 +556,10 @@ "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"], @@ -560,6 +595,7 @@ "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"], @@ -584,6 +620,7 @@ "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"], @@ -595,6 +632,7 @@ "author-updated" => ["author", "updated"], "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"], @@ -606,6 +644,7 @@ "owner-updated" => ["owner", "updated"], "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"], @@ -619,6 +658,10 @@ "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" => ["parent-post", "network"], @@ -626,8 +669,6 @@ "parent-author-link" => ["parent-post-author", "url"], "parent-author-name" => ["parent-post-author", "name"], "parent-author-network" => ["parent-post-author", "network"], - "parent-author-blocked" => ["parent-post-author", "blocked"], - "parent-author-hidden" => ["parent-post-author", "hidden"], ], "query" => "FROM `post-thread` INNER JOIN `post` ON `post`.`uri-id` = `post-thread`.`uri-id` @@ -637,10 +678,12 @@ 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` LEFT JOIN `post` AS `parent-post` ON `parent-post`.`uri-id` = `post`.`parent-uri-id` LEFT JOIN `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `parent-post`.`author-id`" @@ -661,12 +704,36 @@ "fields" => [ "uri-id" => ["post-collection", "uri-id"], "type" => ["post-collection", "type"], - "cid" => ["post", "author-id"], + "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` 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" => [ @@ -818,6 +885,7 @@ "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"], @@ -858,6 +926,7 @@ "postal-code" => ["profile", "postal-code"], "country-name" => ["profile", "country-name"], "homepage" => ["profile", "homepage"], + "homepage_verified" => ["profile", "homepage_verified"], "dob" => ["profile", "dob"], ], "query" => "FROM `user` @@ -921,11 +990,11 @@ "blocked" => ["contact", "blocked"], "dfrn-notify" => ["contact", "notify"], "dfrn-poll" => ["contact", "poll"], - "diaspora-guid" => ["fcontact", "guid"], - "diaspora-batch" => ["fcontact", "batch"], - "diaspora-notify" => ["fcontact", "notify"], - "diaspora-poll" => ["fcontact", "poll"], - "diaspora-alias" => ["fcontact", "alias"], + "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"], @@ -944,9 +1013,9 @@ "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 `fcontact` ON `fcontact`.`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" + WHERE `contact`.`uid` = 0" ], "account-user-view" => [ "fields" => [ @@ -1020,11 +1089,14 @@ "reason" => ["ucontact", "reason"], "dfrn-notify" => ["contact", "notify"], "dfrn-poll" => ["contact", "poll"], - "diaspora-guid" => ["fcontact", "guid"], - "diaspora-batch" => ["fcontact", "batch"], - "diaspora-notify" => ["fcontact", "notify"], - "diaspora-poll" => ["fcontact", "poll"], - "diaspora-alias" => ["fcontact", "alias"], + "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"], @@ -1044,7 +1116,7 @@ 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 `fcontact` ON `fcontact`.`uri-id` = `ucontact`.`uri-id` AND `fcontact`.`network` = 'dspr' + LEFT JOIN `diaspora-contact` ON `diaspora-contact`.`uri-id` = `ucontact`.`uri-id` LEFT JOIN `gserver` ON `gserver`.`id` = contact.`gsid`" ], "pending-view" => [ @@ -1114,5 +1186,36 @@ "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`" + ], ]; -