GarbageReminder/TelegramBot
Archived
1
0
Fork 0
Code Issues 4 Pull Requests Actions Projects Releases 4 Wiki Activity

Attempt to work around timezones

Browse Source
This commit is contained in:
Profitroll
2023-09-24 23:47:09 +02:00
parent b0f76f4c49
commit 3fa2f5a800
13 changed files with 99 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/commands/set_offset.py
View File

@@ -7,6 +7,7 @@ from pyrogram.types import ForceReply, Message, ReplyKeyboardRemove
from classes.pyroclient import PyroClient
from modules import custom_filters
from modules.utils import from_utc
logger = logging.getLogger(__name__)
@@ -17,6 +18,12 @@ logger = logging.getLogger(__name__)
async def command_set_offset(app: PyroClient, message: Message):
user = await app.find_user(message.from_user)
if user.location is None:
await message.reply_text(
app._("location_empty", "messages", locale=user.locale)
)
return
await message.reply_text(
app._("set_offset", "messages", locale=user.locale),
reply_markup=ForceReply(
@@ -58,8 +65,9 @@ async def command_set_offset(app: PyroClient, message: Message):
logger.info("User %s has set offset to %s", user.id, offset)
garbage_time = datetime(
1970, 1, 1, hour=user.time_hour, minute=user.time_minute
garbage_time = from_utc(
datetime(1970, 1, 1, user.time_hour, user.time_minute),
None if user.location is None else user.location.timezone.zone,
).strftime(app._("time", "formats"))
await answer.reply_text(

14
plugins/commands/set_time.py
View File

@@ -7,6 +7,7 @@ from pyrogram.types import ForceReply, Message, ReplyKeyboardRemove
from classes.pyroclient import PyroClient
from modules import custom_filters
from modules.utils import to_utc
logger = logging.getLogger(__name__)
@@ -17,6 +18,12 @@ logger = logging.getLogger(__name__)
async def command_set_time(app: PyroClient, message: Message):
user = await app.find_user(message.from_user)
if user.location is None:
await message.reply_text(
app._("location_empty", "messages", locale=user.locale)
)
return
await message.reply_text(
app._("set_time", "messages", locale=user.locale),
reply_markup=ForceReply(
@@ -48,7 +55,10 @@ async def command_set_time(app: PyroClient, message: Message):
break
user_time = datetime.strptime(answer.text, "%H:%M")
parsed_time = datetime.strptime(answer.text, "%H:%M").replace(
year=1970, month=1, day=1, second=0, microsecond=0
)
user_time = to_utc(parsed_time, user.location.timezone.zone)
await user.update_time(hour=user_time.hour, minute=user_time.minute)
@@ -58,7 +68,7 @@ async def command_set_time(app: PyroClient, message: Message):
user_time.strftime("%H:%M"),
)
garbage_time = user_time.strftime(app._("time", "formats"))
garbage_time = parsed_time.strftime(app._("time", "formats"))
await answer.reply_text(
app._("set_time_finished", "messages", locale=user.locale).format(

8
plugins/commands/setup.py
View File

@@ -11,6 +11,7 @@ from classes.pyroclient import PyroClient
from modules import custom_filters
from modules.search_name import search_name
from modules.search_nearby import search_nearby
from modules.utils import from_utc
logger = logging.getLogger(__name__)
@@ -73,9 +74,10 @@ async def command_setup(app: PyroClient, message: Message):
await user.update_location(location.id)
user_time = datetime(1970, 1, 1, user.time_hour, user.time_minute).strftime(
app._("time", "formats", locale=user.locale)
)
user_time = from_utc(
datetime(1970, 1, 1, user.time_hour, user.time_minute),
None if user.location is None else user.location.timezone.zone,
).strftime(app._("time", "formats", locale=user.locale))
await message.reply_text(
app._("setup_finished", "messages", locale=user.locale).format(

8
plugins/commands/start.py
View File

@@ -11,6 +11,7 @@ from pyrogram.types import (
from classes.pyroclient import PyroClient
from modules import custom_filters
from modules.utils import from_utc
@PyroClient.on_message(
@@ -85,9 +86,10 @@ async def command_start(app: PyroClient, message: Message):
await user.update_location(location.id)
user_time = datetime(1970, 1, 1, user.time_hour, user.time_minute).strftime(
app._("time", "formats", locale=user.locale)
)
user_time = from_utc(
datetime(1970, 1, 1, user.time_hour, user.time_minute),
None if user.location is None else user.location.timezone.zone,
).strftime(app._("time", "formats", locale=user.locale))
await answer.reply_text(
app._("start_selection_yes", "messages", locale=user.locale).format(
name=location.name, offset=user.offset, time=user_time

6
plugins/commands/toggle.py
View File

@@ -5,6 +5,7 @@ from pyrogram.types import Message
from classes.pyroclient import PyroClient
from modules import custom_filters
from modules.utils import from_utc
@PyroClient.on_message(
@@ -21,7 +22,10 @@ async def command_toggle(app: PyroClient, message: Message):
)
return
user_time = datetime(1970, 1, 1, user.time_hour, user.time_minute).strftime("%H:%M")
user_time = from_utc(
datetime(1970, 1, 1, user.time_hour, user.time_minute),
None if user.location is None else user.location.timezone.zone,
).strftime(app._("time", "formats"))
if user.location is None:
await message.reply_text(

11
plugins/commands/upcoming.py
View File

@@ -2,7 +2,6 @@ from datetime import datetime, timedelta, timezone
from pyrogram import filters
from pyrogram.types import Message
from pytz import timezone as pytz_timezone
from classes.garbage_entry import GarbageEntry
from classes.pyroclient import PyroClient
@@ -18,19 +17,15 @@ async def command_upcoming(app: PyroClient, message: Message):
if user.location is None:
await message.reply_text(
app._("upcoming_empty_location", "messages", locale=user.locale)
app._("location_empty", "messages", locale=user.locale)
)
return
date_min = (
datetime.now(pytz_timezone(user.location.timezone)).replace(
second=0, microsecond=0
)
datetime.now(user.location.timezone).replace(second=0, microsecond=0)
).replace(tzinfo=timezone.utc)
date_max = (
datetime.now(pytz_timezone(user.location.timezone)).replace(
second=0, microsecond=0
)
datetime.now(user.location.timezone).replace(second=0, microsecond=0)
+ timedelta(days=30)
).replace(tzinfo=timezone.utc)