Merge remote-tracking branch 'upstream/develop' into item-view
authorMichael <heluecht@pirati.ca>
Tue, 12 Jan 2021 21:14:28 +0000 (21:14 +0000)
committerMichael <heluecht@pirati.ca>
Tue, 12 Jan 2021 21:14:28 +0000 (21:14 +0000)
1  2 
static/dbview.config.php

diff --combined static/dbview.config.php
index cb41d06,5c18364..cd835dd
mode 100755,100644..100644
   */
  
  return [
 +      "item-view" => [
 +              "fields" => [
 +                      "id" => ["item", "id"], 
 +                      "item_id" => ["item", "id"], 
 +                      "uid" => ["item", "uid"], 
 +                      "parent" => ["item", "parent"], 
 +                      "uri" => ["item", "uri"], 
 +                      "parent-uri" => ["item", "parent-uri"], 
 +                      "thr-parent" => ["item", "thr-parent"],
 +                      "guid" => ["item", "guid"], 
 +                      "uri-id" => ["item", "uri-id"], 
 +                      "parent-uri-id" => ["item", "parent-uri-id"], 
 +                      "thr-parent-id" => ["item", "thr-parent-id"],
 +                      "contact-id" => ["item", "contact-id"], 
 +                      "type" => ["item", "type"], 
 +                      "wall" => ["item", "wall"], 
 +                      "gravity" => ["item", "gravity"], 
 +                      "extid" => ["item", "extid"], 
 +                      "iaid" => ["item", "iaid"],
 +                      "icid" => ["item", "icid"],
 +                      "psid" => ["item", "psid"],
 +                      "created" => ["item", "created"], 
 +                      "edited" => ["item", "edited"], 
 +                      "commented" => ["item", "commented"], 
 +                      "received" => ["item", "received"], 
 +                      "changed" => ["item", "changed"], 
 +                      "verb" => ["item-content", "verb"], 
 +                      "plink" => ["item-content", "plink"], 
 +                      "language" => ["item-content", "language"],
 +                      "resource-id" => ["item", "resource-id"], 
 +                      "event-id" => ["item", "event-id"], 
 +                      "attach" => ["item", "attach"], 
 +                      "postopts" => ["post-delivery-data", "postopts"], 
 +                      "inform" => ["post-delivery-data", "inform"], 
 +                      "file" => "NULL", 
 +                      "allow_cid" => ["permissionset", "allow_cid"], 
 +                      "allow_gid" => ["permissionset", "allow_gid"], 
 +                      "deny_cid" => ["permissionset", "deny_cid"], 
 +                      "deny_gid" => ["permissionset", "deny_gid"], 
 +                      "post-type" => ["item", "post-type"], 
 +                      "private" => ["item", "private"], 
 +                      "pubmail" => ["item", "pubmail"], 
 +                      "moderated" => ["item", "moderated"], 
 +                      "visible" => ["item", "visible"], 
 +                      "starred" => ["item", "starred"], 
 +                      "bookmark" => ["thread", "bookmark"], 
 +                      "unseen" => ["item", "unseen"], 
 +                      "deleted" => ["item", "deleted"], 
 +                      "origin" => ["item", "origin"], 
 +                      "forum_mode" => ["item", "forum_mode"], 
 +                      "mention" => ["item", "mention"], 
 +                      "global" => ["item", "global"], 
 +                      "network" => ["item", "network"], 
 +                      "title" => ["item-content", "title"], 
 +                      "content-warning" => ["item-content", "content-warning"], 
 +                      "body" => ["item-content", "body"], 
 +                      "location" => ["item-content", "location"], 
 +                      "coord" => ["item-content", "coord"], 
 +                      "app" => ["item-content", "app"], 
 +                      "rendered-hash" => ["item-content", "rendered-hash"], 
 +                      "rendered-html" => ["item-content", "rendered-html"], 
 +                      "object-type" => ["item-content", "object-type"], 
 +                      "object" => ["item-content", "object"], 
 +                      "target-type" => ["item-content", "target-type"], 
 +                      "target" => ["item-content", "target"], 
 +                      "author-id" => ["item", "author-id"], 
 +                      "author-link" => ["author", "url"], 
 +                      "author-name" => ["author", "name"], 
 +                      "author-avatar" => ["author", "thumb"], 
 +                      "author-network" => ["author", "network"], 
 +                      "owner-id" => ["item", "owner-id"], 
 +                      "owner-link" => ["owner", "url"], 
 +                      "owner-addr" => ["owner", "addr"], 
 +                      "owner-avatar"  => ["owner", "thumb"],
 +                      "owner-nick" => ["owner", "nick"], 
 +                      "owner-name" => ["owner", "name"], 
 +                      "owner-network" => ["owner", "network"],
 +                      "contact-uid" => ["contact", "uid"],
 +                      "parent-guid" => ["parent-item", "guid"],
 +                      "parent-network" => ["parent-item", "network"],
 +                      "signed_text" => ["diaspora-interaction", "interaction"],
 +                      "signature" => "NULL",
 +                      "signer" => "NULL"
 +              ],
 +              "query" => "FROM `item`
 +                      LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 +                      LEFT JOIN `contact` AS `author` ON `author`.`id` = `item`.`author-id`
 +                      LEFT JOIN `contact` AS `owner` ON `owner`.`id` = `item`.`owner-id`
 +                      LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `item`.`uri-id`
 +                      LEFT JOIN `item-activity` ON `item-activity`.`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`
 +                      LEFT JOIN `thread` ON `thread`.`iid` = `item`.`parent`
 +                      STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`"
 +      ],
        "category-view" => [
                "fields" => [
                        "uri-id" => ["post-category", "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"],
+                       "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`
+                       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`)"
+       ],
+       "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"],
+                       "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`
+                       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`)"
+       ],
        "owner-view" => [
                "fields" => [
                        "id" => ["contact", "id"],
                        "term-date" => ["contact", "term-date"],
                        "last-item" => ["contact", "last-item"],
                        "priority" => ["contact", "priority"],
-                       "blocked" => ["contact", "blocked"], /// @todo Check if "blocked" from contact or from the users table
+                       "blocked" => ["user", "blocked"],
                        "block_reason" => ["contact", "block_reason"],
                        "readonly" => ["contact", "readonly"],
                        "writable" => ["contact", "writable"],
                        "forum" => ["contact", "forum"],
                        "prv" => ["contact", "prv"],
                        "contact-type" => ["contact", "contact-type"],
+                       "manually-approve" => ["contact", "manually-approve"],
                        "hidden" => ["contact", "hidden"],
                        "archive" => ["contact", "archive"],
                        "pending" => ["contact", "pending"],
                        "deleted" => ["contact", "deleted"],
-                       "rating" => ["contact", "rating"],
                        "unsearchable" => ["contact", "unsearchable"],
                        "sensitive" => ["contact", "sensitive"],
                        "baseurl" => ["contact", "baseurl"],
                        "bd" => ["contact", "bd"],
                        "notify_new_posts" => ["contact", "notify_new_posts"],
                        "fetch_further_information" => ["contact", "fetch_further_information"],
-                       "ffi_keyword_blacklist" => ["contact", "ffi_keyword_blacklist"],
+                       "ffi_keyword_denylist" => ["contact", "ffi_keyword_denylist"],
                        "parent-uid" => ["user", "parent-uid"],
                        "guid" => ["user", "guid"],
                        "nickname" => ["user", "nickname"], /// @todo Replaces all uses of "nickname" with "nick"
                        "account_removed" => ["user", "account_removed"],
                        "account_expired" => ["user", "account_expired"],
                        "account_expires_on" => ["user", "account_expires_on"],
-                       "expire_notification_sent" => ["user", "expire_notification_sent"],                     
+                       "expire_notification_sent" => ["user", "expire_notification_sent"],
                        "def_gid" => ["user", "def_gid"],
                        "allow_cid" => ["user", "allow_cid"],
                        "allow_gid" => ["user", "allow_gid"],