From c020558bf85b26f9d968acbf5d294d4ec283210c Mon Sep 17 00:00:00 2001 From: Mike Lang Date: Fri, 15 Sep 2023 10:17:17 +1000 Subject: [PATCH] Fix zulip_bots bugs to get them working in package --- zulip_bots/zulip_bots/schedulebot.py | 7 ++++--- zulip_bots/zulip_bots/tootbot.py | 4 ++-- zulip_bots/zulip_bots/twitchbot.py | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/zulip_bots/zulip_bots/schedulebot.py b/zulip_bots/zulip_bots/schedulebot.py index d077e34..a2ee497 100644 --- a/zulip_bots/zulip_bots/schedulebot.py +++ b/zulip_bots/zulip_bots/schedulebot.py @@ -5,13 +5,14 @@ gevent.monkey.patch_all() import csv import logging import time +from calendar import timegm from datetime import datetime, timedelta import gevent.pool import argh -from zulip import Client -from config import get_config +from .zulip import Client +from .config import get_config logging.basicConfig(level='INFO') @@ -205,7 +206,7 @@ def main(conf_file, hour=-1, no_groups=False, stream="General", no_mentions=Fals send_auth = config.get("send_user", config["api_user"]) send_client = Client(config["url"], send_auth["email"], send_auth["api_key"]) group_ids = config["groups"] - start_time = time.strptime(config["start_time"], "%Y-%m-%dT%H:%M:%S") + start_time = timegm(time.strptime(config["start_time"], "%Y-%m-%dT%H:%M:%S")) schedule = parse_schedule(config["members"], config["schedule"]) if hour >= 0: if not no_groups: diff --git a/zulip_bots/zulip_bots/tootbot.py b/zulip_bots/zulip_bots/tootbot.py index 57113da..00c8c39 100644 --- a/zulip_bots/zulip_bots/tootbot.py +++ b/zulip_bots/zulip_bots/tootbot.py @@ -7,8 +7,8 @@ import time import mastodon from bs4 import BeautifulSoup -import zulip -from config import get_config +from . import zulip +from .config import get_config cli = argh.EntryPoint() diff --git a/zulip_bots/zulip_bots/twitchbot.py b/zulip_bots/zulip_bots/twitchbot.py index 1c3540a..ad53446 100644 --- a/zulip_bots/zulip_bots/twitchbot.py +++ b/zulip_bots/zulip_bots/twitchbot.py @@ -7,8 +7,8 @@ import logging import argh import girc -import zulip -from config import get_config +from . import zulip +from .config import get_config def run(zulip_client, nick, oauth_token, stream, topic):