fix: globally pinned items rank in global (#1814)

* fix: globally pinned items rank in global; use query to filter global pinned items

* cleanup

---------

Co-authored-by: Keyan <34140557+huumn@users.noreply.github.com>
This commit is contained in:
soxa 2025-01-22 22:23:21 +01:00 committed by GitHub
parent 382714e422
commit a92215ccf6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -536,8 +536,8 @@ export default {
LEFT JOIN "Sub" ON "Sub"."name" = "Item"."subName" LEFT JOIN "Sub" ON "Sub"."name" = "Item"."subName"
${joinZapRankPersonalView(me, models)} ${joinZapRankPersonalView(me, models)}
${whereClause( ${whereClause(
// in "home" (sub undefined), we want to show pinned items (but without the pin icon) // in home (sub undefined), filter out global pinned items since we inject them later
sub ? '"Item"."pinId" IS NULL' : '', sub ? '"Item"."pinId" IS NULL' : 'NOT ("Item"."pinId" IS NOT NULL AND "Item"."subName" IS NULL)',
'"Item"."deletedAt" IS NULL', '"Item"."deletedAt" IS NULL',
'"Item"."parentId" IS NULL', '"Item"."parentId" IS NULL',
'"Item".outlawed = false', '"Item".outlawed = false',
@ -565,8 +565,8 @@ export default {
${whereClause( ${whereClause(
subClause(sub, 3, 'Item', me, showNsfw), subClause(sub, 3, 'Item', me, showNsfw),
muteClause(me), muteClause(me),
// in "home" (sub undefined), we want to show pinned items (but without the pin icon) // in home (sub undefined), filter out global pinned items since we inject them later
sub ? '"Item"."pinId" IS NULL' : '', sub ? '"Item"."pinId" IS NULL' : 'NOT ("Item"."pinId" IS NOT NULL AND "Item"."subName" IS NULL)',
'"Item"."deletedAt" IS NULL', '"Item"."deletedAt" IS NULL',
'"Item"."parentId" IS NULL', '"Item"."parentId" IS NULL',
'"Item".bio = false', '"Item".bio = false',