Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-31 04:57:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Prevent recreation of same-named channels

Browse source
This commit is contained in:
Wendy Wang 2023-02-07 19:55:06 +01:00
parent bee281f82d
commit 559ee5ddf6
2 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -489,9 +489,8 @@ class CmdChannel(COMMAND_DEFAULT_CLASS):
def create_channel(self, name, description, typeclass=None, aliases=None):
"""
Create a new channel. Its name must not previously exist
(users can alias as needed). Will also connect to the
new channel.
Create a new channel. Its name must not previously exist (case agnostic)
(users can alias as needed). Will also connect to the new channel.
Args:
name (str): The new channel name/key.
@ -880,7 +879,6 @@ class CmdChannel(COMMAND_DEFAULT_CLASS):
if "create" in switches:
# create a new channel
if not self.access(caller, "manage"):
self.msg("You don't have access to use channel/create.")
return
@ -937,7 +935,7 @@ class CmdChannel(COMMAND_DEFAULT_CLASS):
)
elif len(found_channels) > 1:
errors.append(
"Multiple possible channel matches/alias for '{channel_name}':\n"
f"Multiple possible channel matches/alias for '{channel_name}':\n"
+ ", ".join(chan.key for chan in found_channels)
)
else:

19
evennia/server/server.py
View file

@ -392,20 +392,21 @@ class Evennia:
from evennia.utils.create import create_channel
superuser = AccountDB.objects.get(id=1)
# mudinfo
mudinfo_chan = settings.CHANNEL_MUDINFO
if mudinfo_chan:
if not ChannelDB.objects.filter(db_key=mudinfo_chan["key"]):
channel = create_channel(**mudinfo_chan)
channel.connect(superuser)
if mudinfo_chan and not ChannelDB.objects.filter(db_key__iexact=mudinfo_chan["key"]):
channel = create_channel(**mudinfo_chan)
channel.connect(superuser)
# connectinfo
connectinfo_chan = settings.CHANNEL_MUDINFO
if connectinfo_chan:
if not ChannelDB.objects.filter(db_key=mudinfo_chan["key"]):
channel = create_channel(**connectinfo_chan)
connectinfo_chan = settings.CHANNEL_CONNECTINFO
if connectinfo_chan and not ChannelDB.objects.filter(
db_key__iexact=connectinfo_chan["key"]
):
channel = create_channel(**connectinfo_chan)
# default channels
for chan_info in settings.DEFAULT_CHANNELS:
if not ChannelDB.objects.filter(db_key=chan_info["key"]):
if not ChannelDB.objects.filter(db_key__iexact=chan_info["key"]):
channel = create_channel(**chan_info)
channel.connect(superuser)