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

Run black reformatter on code

Browse source
This commit is contained in:
Griatch 2022-02-08 13:03:52 +01:00
parent 4582eb4085
commit bd3e31bf3c
178 changed files with 4511 additions and 3385 deletions
Download patch file Download diff file Expand all files Collapse all files

44
evennia/comms/comms.py
View file

@ -107,7 +107,8 @@ class DefaultChannel(ChannelDB, metaclass=TypeclassBase):
"""
if not self._log_file:
self._log_file = self.attributes.get(
"log_file", self.log_file.format(channelname=self.key.lower()))
"log_file", self.log_file.format(channelname=self.key.lower())
)
return self._log_file
def set_log_filename(self, filename):
@ -455,8 +456,13 @@ class DefaultChannel(ChannelDB, metaclass=TypeclassBase):
# needing to use the `channel` command explicitly.
msg_nick_pattern = self.channel_msg_nick_pattern.format(alias=alias)
msg_nick_replacement = self.channel_msg_nick_replacement.format(channelname=chan_key)
user.nicks.add(msg_nick_pattern, msg_nick_replacement, category="inputline",
pattern_is_regex=True, **kwargs)
user.nicks.add(
msg_nick_pattern,
msg_nick_replacement,
category="inputline",
pattern_is_regex=True,
**kwargs,
)
if chan_key != alias:
# this allows for using the alias for general channel lookups
@ -546,7 +552,7 @@ class DefaultChannel(ChannelDB, metaclass=TypeclassBase):
if not bypass_mute:
receivers = [receiver for receiver in receivers if receiver not in self.mutelist]
send_kwargs = {'senders': senders, 'bypass_mute': bypass_mute, **kwargs}
send_kwargs = {"senders": senders, "bypass_mute": bypass_mute, **kwargs}
# pre-send hook
message = self.at_pre_msg(message, **send_kwargs)
@ -826,27 +832,37 @@ class DefaultChannel(ChannelDB, metaclass=TypeclassBase):
# TODO Evennia 1.0+ removed hooks. Remove in 1.1.
def message_transform(self, *args, **kwargs):
raise RuntimeError("Channel.message_transform is no longer used in 1.0+. "
"Use Account/Object.at_pre_channel_msg instead.")
raise RuntimeError(
"Channel.message_transform is no longer used in 1.0+. "
"Use Account/Object.at_pre_channel_msg instead."
)
def distribute_message(self, msgobj, online=False, **kwargs):
raise RuntimeError("Channel.distribute_message is no longer used in 1.0+.")
def format_senders(self, senders=None, **kwargs):
raise RuntimeError("Channel.format_senders is no longer used in 1.0+. "
"Use Account/Object.at_pre_channel_msg instead.")
raise RuntimeError(
"Channel.format_senders is no longer used in 1.0+. "
"Use Account/Object.at_pre_channel_msg instead."
)
def pose_transform(self, msgobj, sender_string, **kwargs):
raise RuntimeError("Channel.pose_transform is no longer used in 1.0+. "
"Use Account/Object.at_pre_channel_msg instead.")
raise RuntimeError(
"Channel.pose_transform is no longer used in 1.0+. "
"Use Account/Object.at_pre_channel_msg instead."
)
def format_external(self, msgobj, senders, emit=False, **kwargs):
raise RuntimeError("Channel.format_external is no longer used in 1.0+. "
"Use Account/Object.at_pre_channel_msg instead.")
raise RuntimeError(
"Channel.format_external is no longer used in 1.0+. "
"Use Account/Object.at_pre_channel_msg instead."
)
def format_message(self, msgobj, emit=False, **kwargs):
raise RuntimeError("Channel.format_message is no longer used in 1.0+. "
"Use Account/Object.at_pre_channel_msg instead.")
raise RuntimeError(
"Channel.format_message is no longer used in 1.0+. "
"Use Account/Object.at_pre_channel_msg instead."
)
def pre_send_message(self, msg, **kwargs):
raise RuntimeError("Channel.pre_send_message was renamed to Channel.at_pre_msg.")

20
evennia/comms/managers.py
View file

@ -215,7 +215,7 @@ class MsgManager(TypedObjectManager):
return self.filter(db_receivers_accounts=obj).exclude(db_hide_from_accounts=obj)
elif typ == "object":
return self.filter(db_receivers_objects=obj).exclude(db_hide_from_objects=obj)
elif typ == 'script':
elif typ == "script":
return self.filter(db_receivers_scripts=obj)
else:
raise CommError
@ -257,7 +257,7 @@ class MsgManager(TypedObjectManager):
sender_restrict = Q(db_sender_accounts__pk=spk) & ~Q(db_hide_from_accounts__pk=spk)
elif styp == "object":
sender_restrict = Q(db_sender_objects__pk=spk) & ~Q(db_hide_from_objects__pk=spk)
elif styp == 'script':
elif styp == "script":
sender_restrict = Q(db_sender_scripts__pk=spk)
else:
sender_restrict = Q()
@ -266,16 +266,16 @@ class MsgManager(TypedObjectManager):
if receiver:
rpk = receiver.pk
if rtyp == "account":
receiver_restrict = (
Q(db_receivers_accounts__pk=rpk) & ~Q(db_hide_from_accounts__pk=rpk))
receiver_restrict = Q(db_receivers_accounts__pk=rpk) & ~Q(db_hide_from_accounts__pk=rpk)
elif rtyp == "object":
receiver_restrict = Q(db_receivers_objects__pk=rpk) & ~Q(db_hide_from_objects__pk=rpk)
elif rtyp == 'script':
elif rtyp == "script":
receiver_restrict = Q(db_receivers_scripts__pk=rpk)
elif rtyp == "channel":
raise DeprecationWarning(
"Msg.objects.search don't accept channel recipients since "
"Channels no longer accepts Msg objects.")
"Channels no longer accepts Msg objects."
)
else:
receiver_restrict = Q()
# filter by full text
@ -289,8 +289,9 @@ class MsgManager(TypedObjectManager):
# back-compatibility alias
message_search = search_message
def create_message(self, senderobj, message, receivers=None, locks=None, tags=None,
header=None, **kwargs):
def create_message(
self, senderobj, message, receivers=None, locks=None, tags=None, header=None, **kwargs
):
"""
Create a new communication Msg. Msgs represent a unit of
database-persistent communication between entites.
@ -315,7 +316,7 @@ class MsgManager(TypedObjectManager):
it's up to the command definitions to limit this as desired.
"""
if 'channels' in kwargs:
if "channels" in kwargs:
raise DeprecationWarning(
"create_message() does not accept 'channel' kwarg anymore "
"- channels no longer accept Msg objects."
@ -339,6 +340,7 @@ class MsgManager(TypedObjectManager):
new_message.save()
return new_message
#
# Channel manager
#

6
evennia/comms/models.py
View file

@ -104,7 +104,7 @@ class Msg(SharedMemoryModel):
blank=True,
db_index=True,
help_text="Identifier for single external sender, for use with senders "
"not represented by a regular database model."
"not represented by a regular database model.",
)
db_receivers_accounts = models.ManyToManyField(
@ -137,7 +137,7 @@ class Msg(SharedMemoryModel):
blank=True,
db_index=True,
help_text="Identifier for single external receiver, for use with recievers "
"not represented by a regular database model."
"not represented by a regular database model.",
)
# header could be used for meta-info about the message if your system needs
@ -286,7 +286,7 @@ class Msg(SharedMemoryModel):
"""
if isinstance(receivers, str):
self.db_receiver_external = receivers
self.save(update_fields=['db_receiver_external'])
self.save(update_fields=["db_receiver_external"])
return
for receiver in make_iter(receivers):

8
evennia/comms/tests.py
View file

@ -21,7 +21,9 @@ class ObjectCreationTest(BaseEvenniaTest):
class ChannelWholistTests(BaseEvenniaTest):
def setUp(self):
super().setUp()
self.default_channel, _ = DefaultChannel.create("coffeetalk", description="A place to talk about coffee.")
self.default_channel, _ = DefaultChannel.create(
"coffeetalk", description="A place to talk about coffee."
)
self.default_channel.connect(self.obj1)
def test_wholist_shows_subscribed_objects(self):
@ -31,7 +33,9 @@ class ChannelWholistTests(BaseEvenniaTest):
def test_wholist_shows_none_when_empty(self):
# No one hates dogs
empty_channel, _ = DefaultChannel.create("doghaters", description="A place where dog haters unite.")
empty_channel, _ = DefaultChannel.create(
"doghaters", description="A place where dog haters unite."
)
expected = "<None>"
result = empty_channel.wholist
self.assertEqual(expected, result)