Add group id
This commit is contained in:
parent
be9abc341a
commit
d0174b57dd
3 changed files with 5 additions and 1 deletions
|
@ -1574,6 +1574,7 @@ CREATE VIEW `post-view` AS SELECT
|
||||||
`contact`.`avatar-date` AS `avatar-date`,
|
`contact`.`avatar-date` AS `avatar-date`,
|
||||||
`contact`.`thumb` AS `thumb`,
|
`contact`.`thumb` AS `thumb`,
|
||||||
`contact`.`dfrn-id` AS `dfrn-id`,
|
`contact`.`dfrn-id` AS `dfrn-id`,
|
||||||
|
`group_member`.`gid` AS `group-id`,
|
||||||
`item`.`author-id` AS `author-id`,
|
`item`.`author-id` AS `author-id`,
|
||||||
`author`.`url` AS `author-link`,
|
`author`.`url` AS `author-link`,
|
||||||
`author`.`addr` AS `author-addr`,
|
`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 `author` ON `author`.`id` = `item`.`author-id`
|
||||||
STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `item`.`owner-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 `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 `verb` ON `verb`.`id` = `item`.`vid`
|
||||||
LEFT JOIN `event` ON `event`.`id` = `item`.`event-id`
|
LEFT JOIN `event` ON `event`.`id` = `item`.`event-id`
|
||||||
LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `item`.`uri-id`
|
LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `item`.`uri-id`
|
||||||
|
|
|
@ -3304,7 +3304,7 @@ function api_lists_statuses($type)
|
||||||
|
|
||||||
$start = max(0, ($page - 1) * $count);
|
$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']];
|
api_user(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, $_REQUEST['list_id']];
|
||||||
|
|
||||||
if ($max_id > 0) {
|
if ($max_id > 0) {
|
||||||
|
|
|
@ -120,6 +120,7 @@
|
||||||
"avatar-date" => ["contact", "avatar-date"],
|
"avatar-date" => ["contact", "avatar-date"],
|
||||||
"thumb" => ["contact", "thumb"],
|
"thumb" => ["contact", "thumb"],
|
||||||
"dfrn-id" => ["contact", "dfrn-id"],
|
"dfrn-id" => ["contact", "dfrn-id"],
|
||||||
|
"group-id" => ["group_member", "gid"],
|
||||||
"author-id" => ["item", "author-id"],
|
"author-id" => ["item", "author-id"],
|
||||||
"author-link" => ["author", "url"],
|
"author-link" => ["author", "url"],
|
||||||
"author-addr" => ["author", "addr"],
|
"author-addr" => ["author", "addr"],
|
||||||
|
@ -182,6 +183,7 @@
|
||||||
STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `item`.`author-id`
|
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 `owner` ON `owner`.`id` = `item`.`owner-id`
|
||||||
STRAIGHT_JOIN `contact` AS `causer` ON `causer`.`id` = `item`.`causer-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 `verb` ON `verb`.`id` = `item`.`vid`
|
||||||
LEFT JOIN `event` ON `event`.`id` = `item`.`event-id`
|
LEFT JOIN `event` ON `event`.`id` = `item`.`event-id`
|
||||||
LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `item`.`uri-id`
|
LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `item`.`uri-id`
|
||||||
|
|
Loading…
Reference in a new issue