Network update does work now again
This commit is contained in:
parent
e2e87c7ad8
commit
649901f3ea
2 changed files with 8 additions and 4 deletions
|
@ -1936,7 +1936,7 @@ CREATE VIEW `tag-view` AS SELECT
|
||||||
DROP VIEW IF EXISTS `network-item-view`;
|
DROP VIEW IF EXISTS `network-item-view`;
|
||||||
CREATE VIEW `network-item-view` AS SELECT
|
CREATE VIEW `network-item-view` AS SELECT
|
||||||
`post-user`.`uri-id` AS `uri-id`,
|
`post-user`.`uri-id` AS `uri-id`,
|
||||||
`post-user`.`parent-uri-id` AS `parent`,
|
`parent-post`.`id` AS `parent`,
|
||||||
`post-user`.`received` AS `received`,
|
`post-user`.`received` AS `received`,
|
||||||
`post-thread-user`.`commented` AS `commented`,
|
`post-thread-user`.`commented` AS `commented`,
|
||||||
`post-user`.`created` AS `created`,
|
`post-user`.`created` AS `created`,
|
||||||
|
@ -1954,6 +1954,7 @@ CREATE VIEW `network-item-view` AS SELECT
|
||||||
LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id`
|
LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id`
|
||||||
LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id`
|
LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id`
|
||||||
INNER JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
|
INNER JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
|
||||||
|
LEFT JOIN `post-user` AS `parent-post` ON `parent-post`.`uri-id` = `post-user`.`parent-uri-id` AND `parent-post`.`uid` = `post-user`.`uid`
|
||||||
WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
|
WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
|
||||||
AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
|
AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
|
||||||
AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`)
|
AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`)
|
||||||
|
@ -1966,7 +1967,7 @@ CREATE VIEW `network-item-view` AS SELECT
|
||||||
DROP VIEW IF EXISTS `network-thread-view`;
|
DROP VIEW IF EXISTS `network-thread-view`;
|
||||||
CREATE VIEW `network-thread-view` AS SELECT
|
CREATE VIEW `network-thread-view` AS SELECT
|
||||||
`post-thread-user`.`uri-id` AS `uri-id`,
|
`post-thread-user`.`uri-id` AS `uri-id`,
|
||||||
`post-user`.`parent-uri-id` AS `parent`,
|
`parent-post`.`id` AS `parent`,
|
||||||
`post-thread-user`.`received` AS `received`,
|
`post-thread-user`.`received` AS `received`,
|
||||||
`post-thread-user`.`commented` AS `commented`,
|
`post-thread-user`.`commented` AS `commented`,
|
||||||
`post-thread-user`.`created` AS `created`,
|
`post-thread-user`.`created` AS `created`,
|
||||||
|
@ -1982,6 +1983,7 @@ CREATE VIEW `network-thread-view` AS SELECT
|
||||||
LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id`
|
LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id`
|
||||||
LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id`
|
LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id`
|
||||||
LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
|
LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
|
||||||
|
LEFT JOIN `post-user` AS `parent-post` ON `parent-post`.`uri-id` = `post-user`.`parent-uri-id` AND `parent-post`.`uid` = `post-user`.`uid`
|
||||||
WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
|
WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
|
||||||
AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
|
AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
|
||||||
AND (`post-thread-user`.`hidden` IS NULL OR NOT `post-thread-user`.`hidden`)
|
AND (`post-thread-user`.`hidden` IS NULL OR NOT `post-thread-user`.`hidden`)
|
||||||
|
|
|
@ -379,7 +379,7 @@
|
||||||
"network-item-view" => [
|
"network-item-view" => [
|
||||||
"fields" => [
|
"fields" => [
|
||||||
"uri-id" => ["post-user", "uri-id"],
|
"uri-id" => ["post-user", "uri-id"],
|
||||||
"parent" => ["post-user", "parent-uri-id"],
|
"parent" => ["parent-post", "id"],
|
||||||
"received" => ["post-user", "received"],
|
"received" => ["post-user", "received"],
|
||||||
"commented" => ["post-thread-user", "commented"],
|
"commented" => ["post-thread-user", "commented"],
|
||||||
"created" => ["post-user", "created"],
|
"created" => ["post-user", "created"],
|
||||||
|
@ -398,6 +398,7 @@
|
||||||
LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id`
|
LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id`
|
||||||
LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id`
|
LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id`
|
||||||
INNER JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
|
INNER JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
|
||||||
|
LEFT JOIN `post-user` AS `parent-post` ON `parent-post`.`uri-id` = `post-user`.`parent-uri-id` AND `parent-post`.`uid` = `post-user`.`uid`
|
||||||
WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
|
WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
|
||||||
AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
|
AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
|
||||||
AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`)
|
AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`)
|
||||||
|
@ -407,7 +408,7 @@
|
||||||
"network-thread-view" => [
|
"network-thread-view" => [
|
||||||
"fields" => [
|
"fields" => [
|
||||||
"uri-id" => ["post-thread-user", "uri-id"],
|
"uri-id" => ["post-thread-user", "uri-id"],
|
||||||
"parent" => ["post-user", "parent-uri-id"],
|
"parent" => ["parent-post", "id"],
|
||||||
"received" => ["post-thread-user", "received"],
|
"received" => ["post-thread-user", "received"],
|
||||||
"commented" => ["post-thread-user", "commented"],
|
"commented" => ["post-thread-user", "commented"],
|
||||||
"created" => ["post-thread-user", "created"],
|
"created" => ["post-thread-user", "created"],
|
||||||
|
@ -424,6 +425,7 @@
|
||||||
LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id`
|
LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id`
|
||||||
LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id`
|
LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id`
|
||||||
LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
|
LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
|
||||||
|
LEFT JOIN `post-user` AS `parent-post` ON `parent-post`.`uri-id` = `post-user`.`parent-uri-id` AND `parent-post`.`uid` = `post-user`.`uid`
|
||||||
WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
|
WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
|
||||||
AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
|
AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
|
||||||
AND (`post-thread-user`.`hidden` IS NULL OR NOT `post-thread-user`.`hidden`)
|
AND (`post-thread-user`.`hidden` IS NULL OR NOT `post-thread-user`.`hidden`)
|
||||||
|
|
Loading…
Reference in a new issue