Merge pull request 'develop' (#3) from Hay1tsme/artemis:develop into develop

Reviewed-on: SoulGateKey/artemis#3
This commit is contained in:
2025-04-08 00:03:00 +00:00

View File

@ -728,10 +728,11 @@ class Mai2ItemData(BaseData):
# Do an anti-join with the mai2_item_item table to exclude any # Do an anti-join with the mai2_item_item table to exclude any
# items the users have already owned. # items the users have already owned.
if exclude_owned: if exclude_owned:
sql = sql.join( sql = sql.outerjoin(
item, item,
(present.c.itemKind == item.c.itemKind) (present.c.itemKind == item.c.itemKind)
& (present.c.itemId == item.c.itemId) & (present.c.itemId == item.c.itemId)
& (item.c.user == user_id)
) )
condition &= (item.c.itemKind.is_(None) & item.c.itemId.is_(None)) condition &= (item.c.itemKind.is_(None) & item.c.itemId.is_(None))