Quoted posts from Twitter now contain media again

[friendica.git] / static / dbview.config.php

diff --git a/static/dbview.config.php b/static/dbview.config.php
index 040a9ebc306e19500e730ff3131b38998acaaf71..2a7cb54feb67de92ef8985fb977e11fe1f6507ee 100644 (file)
--- a/static/dbview.config.php
+++ b/static/dbview.config.php
@@ -70,6 +70,8 @@
                        "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"],
                        "guid" => ["item-uri", "guid"],
                        "wall" => ["post-user", "wall"],
                        "gravity" => ["post-user", "gravity"],
@@ -94,6 +96,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`)",
@@ -220,6 +223,7 @@
                        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`
@@ -243,6 +247,8 @@
                        "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"],
                        "guid" => ["item-uri", "guid"],
                        "wall" => ["post-thread-user", "wall"],
                        "gravity" => ["post-user", "gravity"],
@@ -392,6 +398,7 @@
                        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`
@@ -411,6 +418,8 @@
                        "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"],
                        "guid" => ["item-uri", "guid"],
                        "gravity" => ["post", "gravity"],
                        "extid" => ["external-item-uri", "uri"],
@@ -530,6 +539,7 @@
                        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`
@@ -546,6 +556,8 @@
                        "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"],
                        "guid" => ["item-uri", "guid"],
                        "gravity" => ["post", "gravity"],
                        "extid" => ["external-item-uri", "uri"],
@@ -665,6 +677,7 @@
                        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`
@@ -689,7 +702,7 @@
                "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"],
@@ -697,7 +710,7 @@
                        "visible" => ["post", "visible"],
                        "deleted" => ["post", "deleted"],
                        "thr-parent-id" => ["post", "thr-parent-id"],
-                       "author-id" => ["post", "author-id"],
+                       "author-id" => ["post-collection", "author-id"],
                        "gravity" => ["post", "gravity"],
                ],
                "query" => "FROM `post-collection`