Add group id

diff --git a/database.sql b/database.sql
index 28cfe4175215530053544e2796e28ce74b8e84e5..3c74646729118d282099be13c7121259333fd023 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1574,6 +1574,7 @@ CREATE VIEW `post-view` AS SELECT
        `contact`.`avatar-date` AS `avatar-date`,
        `contact`.`thumb` AS `thumb`,
        `contact`.`dfrn-id` AS `dfrn-id`,
+       `group_member`.`gid` AS `group-id`,
        `item`.`author-id` AS `author-id`,
        `author`.`url` AS `author-link`,
        `author`.`addr` AS `author-addr`,
@@ -1635,6 +1636,7 @@ CREATE VIEW `post-view` AS SELECT
                        STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `item`.`author-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 `group_member` ON `group_member`.`contact-id` = `item`.`contact-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` = `item`.`uri-id`

diff --git a/include/api.php b/include/api.php
index 1e43081070c323db407b311eb9a7c481e61dfae7..d55f7ce7ac673ed7a5e1ddff7f650db9318eed50 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -3304,7 +3304,7 @@ function api_lists_statuses($type)
 
        $start = max(0, ($page - 1) * $count);
 
-       $condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `id` > ? AND `group_member`.`gid` = ?",
+       $condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `id` > ? AND `group-id` = ?",
                api_user(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, $_REQUEST['list_id']];
 
        if ($max_id > 0) {

diff --git a/static/dbview.config.php b/static/dbview.config.php
index b9767c64ee4ea14dd0e1415d9b7df03967e19176..f5a7d7ad90bda3188d5ff54520847721c614879a 100644 (file)
--- a/static/dbview.config.php
+++ b/static/dbview.config.php
@@ -120,6 +120,7 @@
                        "avatar-date" => ["contact", "avatar-date"],
                        "thumb" => ["contact", "thumb"],
                        "dfrn-id" => ["contact", "dfrn-id"],
+                       "group-id" => ["group_member", "gid"],
                        "author-id" => ["item", "author-id"],
                        "author-link" => ["author", "url"],
                        "author-addr" => ["author", "addr"],
@@ -182,6 +183,7 @@
                        STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `item`.`author-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 `group_member` ON `group_member`.`contact-id` = `item`.`contact-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` = `item`.`uri-id`