Database changes, new translations #32

Merged
profitroll merged 50 commits from dev into main 2023-11-05 15:37:22 +02:00
2 changed files with 9 additions and 17 deletions
Showing only changes of commit 42ca71aa3e - Show all commits

View File

@ -39,7 +39,7 @@ async def remind(app: PyroClient) -> None:
entries = await col_entries.find( entries = await col_entries.find(
{ {
"locations": {"$in": location.id}, "locations": location.id,
"date": user_date.replace(hour=0, minute=0), "date": user_date.replace(hour=0, minute=0),
} }
).to_list() ).to_list()

View File

@ -34,23 +34,15 @@ async def command_upcoming(app: PyroClient, message: Message):
+ timedelta(days=30) + timedelta(days=30)
).replace(tzinfo=timezone.utc) ).replace(tzinfo=timezone.utc)
try:
entries = [ entries = [
await GarbageEntry.from_record(entry) await GarbageEntry.from_record(entry)
async for entry in col_entries.find( async for entry in col_entries.find(
{ {
"locations": {"$in": user.location.id}, "locations": user.location.id,
"date": {"$gte": date_min, "$lte": date_max}, "date": {"$gte": date_min, "$lte": date_max},
} }
) )
] ]
except OperationFailure:
await message.reply_text(
app._("upcoming_empty", "messages", locale=user.locale).format(
name=user.location.name
)
)
return
entries_text = "\n\n".join( entries_text = "\n\n".join(
[ [