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

Fix bug in CmdPage. Resolve #3166

Browse source
This commit is contained in:
Griatch 2023-04-29 08:13:49 +02:00
parent 879d1d3f79
commit 3e6e074bd3
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,6 @@ Communication commands:
""" """
from django.conf import settings from django.conf import settings
from evennia.accounts import bots from evennia.accounts import bots
from evennia.accounts.models import AccountDB from evennia.accounts.models import AccountDB
from evennia.comms.comms import DefaultChannel from evennia.comms.comms import DefaultChannel
@ -777,7 +776,6 @@ class CmdChannel(COMMAND_DEFAULT_CLASS):
maxwidth=_DEFAULT_WIDTH, maxwidth=_DEFAULT_WIDTH,
) )
for chan in subscribed: for chan in subscribed:
locks = "-" locks = "-"
chanid = "-" chanid = "-"
if chan.access(self.caller, "control"): if chan.access(self.caller, "control"):
@ -1158,7 +1156,6 @@ class CmdChannel(COMMAND_DEFAULT_CLASS):
reason = reason[0].strip() if reason else "" reason = reason[0].strip() if reason else ""
for chan in channels: for chan in channels:
if not chan.access(caller, "control"): if not chan.access(caller, "control"):
self.msg(f"You need 'control'-access to boot a user from {chan.key}.") self.msg(f"You need 'control'-access to boot a user from {chan.key}.")
return return
@ -1245,9 +1242,11 @@ class CmdChannel(COMMAND_DEFAULT_CLASS):
) )
ask_yes_no( ask_yes_no(
caller, caller,
f"Are you sure you want to ban user {target.key} from " (
f"channel(s) {channames} (make sure name/channels are correct{reasonwarn}) " f"Are you sure you want to ban user {target.key} from "
"{options}?", f"channel(s) {channames} (make sure name/channels are correct{reasonwarn}) "
"{options}?"
),
_ban_user, _ban_user,
"Aborted.", "Aborted.",
) )
@ -1360,7 +1359,7 @@ class CmdPage(COMMAND_DEFAULT_CLASS):
targets.append(target_obj) targets.append(target_obj)
message = self.rhs.strip() message = self.rhs.strip()
else: else:
target, *message = self.args.split(" ", 4) target, *message = self.args.split(" ", 1)
if target and target.isnumeric(): if target and target.isnumeric():
# a number to specify a historic page # a number to specify a historic page
number = int(target) number = int(target)
@ -1970,7 +1969,8 @@ class CmdDiscord2Chan(COMMAND_DEFAULT_CLASS):
if not discord_bot.is_typeclass(settings.DISCORD_BOT_CLASS, exact=True): if not discord_bot.is_typeclass(settings.DISCORD_BOT_CLASS, exact=True):
self.msg( self.msg(
f"WARNING: The Discord bot's typeclass is '{discord_bot.typeclass_path}'. This does not match {settings.DISCORD_BOT_CLASS} in settings!" f"WARNING: The Discord bot's typeclass is '{discord_bot.typeclass_path}'. This does"
f" not match {settings.DISCORD_BOT_CLASS} in settings!"
) )
if "start" in self.switches: if "start" in self.switches:
@ -1984,13 +1984,15 @@ class CmdDiscord2Chan(COMMAND_DEFAULT_CLASS):
if "guild" in self.switches: if "guild" in self.switches:
discord_bot.db.tag_guild = not discord_bot.db.tag_guild discord_bot.db.tag_guild = not discord_bot.db.tag_guild
self.msg( self.msg(
f"Messages to Evennia |wwill {'' if discord_bot.db.tag_guild else 'not '}|ninclude the Discord server." f"Messages to Evennia |wwill {'' if discord_bot.db.tag_guild else 'not '}|ninclude"
" the Discord server."
) )
return return
if "channel" in self.switches: if "channel" in self.switches:
discord_bot.db.tag_channel = not discord_bot.db.tag_channel discord_bot.db.tag_channel = not discord_bot.db.tag_channel
self.msg( self.msg(
f"Relayed messages |wwill {'' if discord_bot.db.tag_channel else 'not '}|ninclude the originating channel." f"Relayed messages |wwill {'' if discord_bot.db.tag_channel else 'not '}|ninclude"
" the originating channel."
) )
return return
@ -2029,7 +2031,8 @@ class CmdDiscord2Chan(COMMAND_DEFAULT_CLASS):
dc_chan_names = discord_bot.attributes.get("discord_channels", {}) dc_chan_names = discord_bot.attributes.get("discord_channels", {})
dc_info = dc_chan_names.get(dc_chan, {"name": "unknown", "guild": "unknown"}) dc_info = dc_chan_names.get(dc_chan, {"name": "unknown", "guild": "unknown"})
self.msg( self.msg(
f"Removed link between {ev_chan} and #{dc_info.get('name','?')}@{dc_info.get('guild','?')}" f"Removed link between {ev_chan} and"
f" #{dc_info.get('name','?')}@{dc_info.get('guild','?')}"
) )
return return
else: else: