Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update comms.py

Browse source 
Extend fstring usage for consistency and clarity and fixing my gaff
This commit is contained in:
homeofpoe 2022-10-25 16:23:54 -07:00 • committed by GitHub
parent bf6eeb288f
commit 2cf69c89e6
1 changed files with 19 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

43
evennia/commands/default/comms.py
View file

@ -547,7 +547,7 @@ class CmdChannel(COMMAND_DEFAULT_CLASS):
if message: if message:
channel.msg(message, senders=caller, bypass_mute=True) channel.msg(message, senders=caller, bypass_mute=True)
channel.delete() channel.delete()
logger.log_sec("Channel {} was deleted by {}".format(channel_key, caller)) logger.log_sec("fChannel {channel_key} was deleted by {caller}")
def set_lock(self, channel, lockstring): def set_lock(self, channel, lockstring):
""" """
@ -1390,9 +1390,9 @@ class CmdPage(COMMAND_DEFAULT_CLASS):
self.msg("Who do you want page?") self.msg("Who do you want page?")
return return
header = "|wAccount|n |c%s|n |wpages:|n" % caller.key header = f"|wAccount|n |c{caller.key}|n |wpages:|n"
if message.startswith(":"): if message.startswith(":"):
message = "%s %s" % (caller.key, message.strip(":").strip()) message = f"{caller.key} {message.strip(':').strip()}"
# create the persistent message object # create the persistent message object
create.create_message(caller, message, receivers=targets) create.create_message(caller, message, receivers=targets)
@ -1468,7 +1468,7 @@ class CmdPage(COMMAND_DEFAULT_CLASS):
lastpages = "\n ".join(listing) lastpages = "\n ".join(listing)
if lastpages: if lastpages:
string = "Your latest pages:\n %s" % lastpages string = f"Your latest pages:\n {lastpages}"
else: else:
string = "You haven't paged anyone yet." string = "You haven't paged anyone yet."
self.msg(string) self.msg(string)
@ -1565,7 +1565,7 @@ class CmdIRC2Chan(COMMAND_DEFAULT_CLASS):
return return
if "disconnect" in self.switches or "remove" in self.switches or "delete" in self.switches: if "disconnect" in self.switches or "remove" in self.switches or "delete" in self.switches:
botname = "ircbot-%s" % self.lhs botname = f"ircbot-{self.lhs}"
matches = AccountDB.objects.filter(db_is_bot=True, username=botname) matches = AccountDB.objects.filter(db_is_bot=True, username=botname)
dbref = utils.dbref(self.lhs) dbref = utils.dbref(self.lhs)
if not matches and dbref: if not matches and dbref:
@ -1592,7 +1592,7 @@ class CmdIRC2Chan(COMMAND_DEFAULT_CLASS):
irc_network, irc_port, irc_channel, irc_botname = [ irc_network, irc_port, irc_channel, irc_botname = [
part.strip() for part in self.rhs.split(None, 4) part.strip() for part in self.rhs.split(None, 4)
] ]
irc_channel = "#%s" % irc_channel irc_channel = f"#{irc_channel}"
except Exception: except Exception:
string = "IRC bot definition '%s' is not valid." % self.rhs string = "IRC bot definition '%s' is not valid." % self.rhs
self.msg(string) self.msg(string)
@ -1601,7 +1601,7 @@ class CmdIRC2Chan(COMMAND_DEFAULT_CLASS):
botclass = None botclass = None
if ":" in irc_botname: if ":" in irc_botname:
irc_botname, botclass = [part.strip() for part in irc_botname.split(":", 2)] irc_botname, botclass = [part.strip() for part in irc_botname.split(":", 2)]
botname = "ircbot-%s" % irc_botname botname = f"ircbot-{irc_botname}"
# If path given, use custom bot otherwise use default. # If path given, use custom bot otherwise use default.
botclass = botclass if botclass else bots.IRCBot botclass = botclass if botclass else bots.IRCBot
irc_ssl = "ssl" in self.switches irc_ssl = "ssl" in self.switches
@ -1612,13 +1612,13 @@ class CmdIRC2Chan(COMMAND_DEFAULT_CLASS):
# re-use an existing bot # re-use an existing bot
bot = bot[0] bot = bot[0]
if not bot.is_bot: if not bot.is_bot:
self.msg("Account '%s' already exists and is not a bot." % botname) self.msg(f"Account '{botname}' already exists and is not a bot.")
return return
else: else:
try: try:
bot = create.create_account(botname, None, None, typeclass=botclass) bot = create.create_account(botname, None, None, typeclass=botclass)
except Exception as err: except Exception as err:
self.msg("|rError, could not create the bot:|n '%s'." % err) self.msg(f"|rError, could not create the bot:|n '{err}'.")
return return
bot.start( bot.start(
ev_channel=channel, ev_channel=channel,
@ -1681,26 +1681,21 @@ class CmdIRCStatus(COMMAND_DEFAULT_CLASS):
channel = ircbot.db.irc_channel channel = ircbot.db.irc_channel
network = ircbot.db.irc_network network = ircbot.db.irc_network
port = ircbot.db.irc_port port = ircbot.db.irc_port
chtext = "IRC bot '%s' on channel %s (%s:%s)" % ( chtext = f"IRC bot '{ircbot.db.irc_botname}' on channel {channel} ({network}:{port})"
ircbot.db.irc_botname,
channel,
network,
port,
)
if option == "ping": if option == "ping":
# check connection by sending outself a ping through the server. # check connection by sending outself a ping through the server.
self.caller.msg("Pinging through %s." % chtext) self.caller.msg(f"Pinging through {chtext}.")
ircbot.ping(self.caller) ircbot.ping(self.caller)
elif option in ("users", "nicklist", "who"): elif option in ("users", "nicklist", "who"):
# retrieve user list. The bot must handles the echo since it's # retrieve user list. The bot must handles the echo since it's
# an asynchronous call. # an asynchronous call.
self.caller.msg("Requesting nicklist from %s (%s:%s)." % (channel, network, port)) self.caller.msg(f"Requesting nicklist from {channel} ({network}:{port}).")
ircbot.get_nicklist(self.caller) ircbot.get_nicklist(self.caller)
elif self.caller.locks.check_lockstring( elif self.caller.locks.check_lockstring(
self.caller, "dummy:perm(ircstatus) or perm(Developer)" self.caller, "dummy:perm(ircstatus) or perm(Developer)"
): ):
# reboot the client # reboot the client
self.caller.msg("Forcing a disconnect + reconnect of %s." % chtext) self.caller.msg(f"Forcing a disconnect + reconnect of {chtext}.")
ircbot.reconnect() ircbot.reconnect()
else: else:
self.caller.msg("You don't have permission to force-reload the IRC bot.") self.caller.msg("You don't have permission to force-reload the IRC bot.")
@ -1782,7 +1777,7 @@ class CmdRSS2Chan(COMMAND_DEFAULT_CLASS):
return return
if "disconnect" in self.switches or "remove" in self.switches or "delete" in self.switches: if "disconnect" in self.switches or "remove" in self.switches or "delete" in self.switches:
botname = "rssbot-%s" % self.lhs botname = f"rssbot-{self.lhs}"
matches = AccountDB.objects.filter(db_is_bot=True, db_key=botname) matches = AccountDB.objects.filter(db_is_bot=True, db_key=botname)
if not matches: if not matches:
# try dbref match # try dbref match
@ -1801,13 +1796,13 @@ class CmdRSS2Chan(COMMAND_DEFAULT_CLASS):
channel = self.lhs channel = self.lhs
url = self.rhs url = self.rhs
botname = "rssbot-%s" % url botname = f"rssbot-{url}"
bot = AccountDB.objects.filter(username__iexact=botname) bot = AccountDB.objects.filter(username__iexact=botname)
if bot: if bot:
# re-use existing bot # re-use existing bot
bot = bot[0] bot = bot[0]
if not bot.is_bot: if not bot.is_bot:
self.msg("Account '%s' already exists and is not a bot." % botname) self.msg("Account '{botname}' already exists and is not a bot.")
return return
else: else:
# create a new bot # create a new bot
@ -1875,7 +1870,7 @@ class CmdGrapevine2Chan(COMMAND_DEFAULT_CLASS):
return return
if "disconnect" in self.switches or "remove" in self.switches or "delete" in self.switches: if "disconnect" in self.switches or "remove" in self.switches or "delete" in self.switches:
botname = "grapevinebot-%s" % self.lhs botname = f"grapevinebot-{self.lhs}"
matches = AccountDB.objects.filter(db_is_bot=True, db_key=botname) matches = AccountDB.objects.filter(db_is_bot=True, db_key=botname)
if not matches: if not matches:
@ -1902,10 +1897,10 @@ class CmdGrapevine2Chan(COMMAND_DEFAULT_CLASS):
# re-use existing bot # re-use existing bot
bot = bot[0] bot = bot[0]
if not bot.is_bot: if not bot.is_bot:
self.msg("Account '%s' already exists and is not a bot." % botname) self.msg(f"Account '{botname}' already exists and is not a bot.")
return return
else: else:
self.msg("Reusing bot '%s' (%s)" % (botname, bot.dbref)) self.msg(f"Reusing bot '{botname}' ({bot.dbref})")
else: else:
# create a new bot # create a new bot
bot = create.create_account(botname, None, None, typeclass=bots.GrapevineBot) bot = create.create_account(botname, None, None, typeclass=bots.GrapevineBot)