miaowware/qrm2
1
0
Fork 0
mirror of https://github.com/miaowware/qrm2.git synced 2025-06-25 04:55:20 -04:00
Code Issues Actions Projects Releases Wiki Activity

fix offset-naive and offset-aware datetime conflict

Browse Source 
Fixes #201
This commit is contained in:
Abigail 2020-02-20 01:32:17 -05:00
parent b281122d41
commit c57056e586
No known key found for this signature in database
GPG Key ID: CF88335E873C3FB4
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -7,6 +7,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased] ## [Unreleased]
## [2.2.1] - 2020-02-20
### Fixed
- Fixed issue where some HamStudy pools will become unselectable.
## [2.2.0] - 2020-02-15 ## [2.2.0] - 2020-02-15
### Added ### Added
- Added Trustee field to qrz command for club callsigns. - Added Trustee field to qrz command for club callsigns.

5
exts/study.py
View File

@ -14,6 +14,7 @@ from datetime import datetime
import asyncio import asyncio
import aiohttp import aiohttp
import pytz
import discord.ext.commands as commands import discord.ext.commands as commands
@ -88,8 +89,8 @@ class StudyCog(commands.Cog):
else: else:
# look at valid_from and expires dates to find the correct one # look at valid_from and expires dates to find the correct one
for p in pool_matches: for p in pool_matches:
valid_from = datetime.fromisoformat(pools[p]["valid_from"][:-1] + "+00:00") valid_from = datetime.fromisoformat(pools[p]["valid_from"][:-1])
expires = datetime.fromisoformat(pools[p]["expires"][:-1] + "+00:00") expires = datetime.fromisoformat(pools[p]["expires"][:-1])
if valid_from < datetime.utcnow() < expires: if valid_from < datetime.utcnow() < expires:
pool = p pool = p