Merge pull request 'ongeki: use the latest applicable version' (#200) from akanyan/artemis:fix/ongeki/versions into develop
Reviewed-on: https://gitea.tendokyu.moe/Hay1tsme/artemis/pulls/200develop
commit
360dfdfdc1
|
@ -277,8 +277,8 @@ class OngekiProfileData(BaseData):
|
||||||
|
|
||||||
async def get_profile_name(self, aime_id: int, version: int) -> Optional[str]:
|
async def get_profile_name(self, aime_id: int, version: int) -> Optional[str]:
|
||||||
sql = select(profile.c.userName).where(
|
sql = select(profile.c.userName).where(
|
||||||
and_(profile.c.user == aime_id, profile.c.version == version)
|
and_(profile.c.user == aime_id, profile.c.version <= version)
|
||||||
)
|
).order_by(profile.c.version.desc())
|
||||||
|
|
||||||
result = await self.execute(sql)
|
result = await self.execute(sql)
|
||||||
if result is None:
|
if result is None:
|
||||||
|
@ -294,7 +294,8 @@ class OngekiProfileData(BaseData):
|
||||||
sql = (
|
sql = (
|
||||||
select([profile, option])
|
select([profile, option])
|
||||||
.join(option, profile.c.user == option.c.user)
|
.join(option, profile.c.user == option.c.user)
|
||||||
.filter(and_(profile.c.user == aime_id, profile.c.version == version))
|
.filter(and_(profile.c.user == aime_id, profile.c.version <= version))
|
||||||
|
.order_by(profile.c.version.desc())
|
||||||
)
|
)
|
||||||
|
|
||||||
result = await self.execute(sql)
|
result = await self.execute(sql)
|
||||||
|
@ -306,9 +307,9 @@ class OngekiProfileData(BaseData):
|
||||||
sql = select(profile).where(
|
sql = select(profile).where(
|
||||||
and_(
|
and_(
|
||||||
profile.c.user == aime_id,
|
profile.c.user == aime_id,
|
||||||
profile.c.version == version,
|
profile.c.version <= version,
|
||||||
)
|
)
|
||||||
)
|
).order_by(profile.c.version.desc())
|
||||||
|
|
||||||
result = await self.execute(sql)
|
result = await self.execute(sql)
|
||||||
if result is None:
|
if result is None:
|
||||||
|
|
Loading…
Reference in New Issue