mirror of
https://github.com/samsonjs/immich.git
synced 2026-04-27 15:07:45 +00:00
fix: exclude assets from excluded albumbs on main timeline (#20425)
Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
This commit is contained in:
parent
9f20522df5
commit
da5deffd03
2 changed files with 18 additions and 10 deletions
|
|
@ -64,6 +64,11 @@ AND EXISTS (
|
||||||
INNER JOIN local_album_entity la on laa.album_id = la.id
|
INNER JOIN local_album_entity la on laa.album_id = la.id
|
||||||
WHERE laa.asset_id = lae.id AND la.backup_selection = 0 -- selected
|
WHERE laa.asset_id = lae.id AND la.backup_selection = 0 -- selected
|
||||||
)
|
)
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM local_album_asset_entity laa
|
||||||
|
INNER JOIN local_album_entity la on laa.album_id = la.id
|
||||||
|
WHERE laa.asset_id = lae.id AND la.backup_selection = 2 -- excluded
|
||||||
|
)
|
||||||
ORDER BY created_at DESC
|
ORDER BY created_at DESC
|
||||||
LIMIT $limit;
|
LIMIT $limit;
|
||||||
|
|
||||||
|
|
@ -95,16 +100,19 @@ FROM
|
||||||
lae.created_at
|
lae.created_at
|
||||||
FROM
|
FROM
|
||||||
local_asset_entity lae
|
local_asset_entity lae
|
||||||
LEFT JOIN
|
WHERE NOT EXISTS (
|
||||||
remote_asset_entity rae ON rae.checksum = lae.checksum
|
SELECT 1 FROM remote_asset_entity rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN :user_ids
|
||||||
LEFT JOIN
|
)
|
||||||
local_album_asset_entity laa ON laa.asset_id = lae.id
|
AND EXISTS (
|
||||||
LEFT JOIN
|
SELECT 1 FROM local_album_asset_entity laa
|
||||||
local_album_entity la ON la.id = laa.album_id
|
INNER JOIN local_album_entity la on laa.album_id = la.id
|
||||||
WHERE
|
WHERE laa.asset_id = lae.id AND la.backup_selection = 0 -- selected
|
||||||
rae.id IS NULL
|
)
|
||||||
AND rae.owner_id IN :user_ids
|
AND NOT EXISTS (
|
||||||
AND la.backup_selection = 0 -- selected
|
SELECT 1 FROM local_album_asset_entity laa
|
||||||
|
INNER JOIN local_album_entity la on laa.album_id = la.id
|
||||||
|
WHERE laa.asset_id = lae.id AND la.backup_selection = 2 -- excluded
|
||||||
|
)
|
||||||
)
|
)
|
||||||
GROUP BY bucket_date
|
GROUP BY bucket_date
|
||||||
ORDER BY bucket_date DESC;
|
ORDER BY bucket_date DESC;
|
||||||
|
|
|
||||||
Binary file not shown.
Loading…
Reference in a new issue