diff --git a/src/iembot/basicbot.py b/src/iembot/basicbot.py index 0e922c0..7e9fd19 100644 --- a/src/iembot/basicbot.py +++ b/src/iembot/basicbot.py @@ -1,13 +1,13 @@ """Basic iembot/nwsbot implementation.""" import copy -import datetime import os import pickle import random import re import traceback from collections import namedtuple +from datetime import timedelta from io import StringIO from xml.etree import ElementTree as ET @@ -418,7 +418,7 @@ def compute_daily_caller(self): """Figure out when to be called""" log.msg("compute_daily_caller() called...") # Figure out when to spam all rooms with a timestamp - utcnow = utc() + datetime.timedelta(days=1) + utcnow = utc() + timedelta(days=1) tnext = utcnow.replace(hour=0, minute=0, second=0) log.msg( "Initial Calling daily_timestamp in " @@ -735,7 +735,7 @@ def handle_flood_request(self, elem, bstring): with star trek quotes, yes! """ _from = jid.JID(elem["from"]) - if not re.match(r"^nws-", _from.user): + if not re.match("^nws-", str(_from.user)): msg = "Sorry, you must be NWS to flood a chatroom!" self.send_privatechat(elem["from"], msg) return diff --git a/src/iembot/util.py b/src/iembot/util.py index 12f1639..ec01644 100644 --- a/src/iembot/util.py +++ b/src/iembot/util.py @@ -456,7 +456,7 @@ def twitter_errback(err, bot, user_id, tweettext): disable_twitter_user(bot, user_id, errcode) else: sn = bot.tw_users.get(user_id, {}).get("screen_name", "") - msg = f"User: {user_id} ({sn})\n" f"Failed to tweet: {tweettext}" + msg = f"User: {user_id} ({sn})\nFailed to tweet: {tweettext}" email_error(err, bot, msg) @@ -534,7 +534,7 @@ def mastodon_errback(err, bot, user_id, tweettext): disable_mastodon_user(bot, user_id, errcode) else: sn = bot.md_users.get(user_id, {}).get("screen_name", "") - msg = f"User: {user_id} ({sn})\n" f"Failed to toot: {tweettext}" + msg = f"User: {user_id} ({sn})\nFailed to toot: {tweettext}" email_error(err, bot, msg)