This commit is contained in:
trhr 2020-04-15 21:58:28 -05:00
parent 95fe5c060f
commit a4a6df4219
3 changed files with 4 additions and 4 deletions

View file

@ -275,11 +275,11 @@ class DefaultAccount(AccountDB, metaclass=TypeclassBase):
raise RuntimeError("Session not found") raise RuntimeError("Session not found")
if self.get_puppet(session) == obj: if self.get_puppet(session) == obj:
# already puppeting this object # already puppeting this object
self.msg(_("You are already puppeting this object.") self.msg(_("You are already puppeting this object."))
return return
if not obj.access(self, "puppet"): if not obj.access(self, "puppet"):
# no access # no access
self.msg(_(f"You don't have permission to puppet '{obj.key}'.") self.msg(_(f"You don't have permission to puppet '{obj.key}'."))
return return
if obj.account: if obj.account:
# object already puppeted # object already puppeted

View file

@ -338,7 +338,7 @@ class IRCBot(Bot):
if hasattr(self, "_ping_callers") and self._ping_callers: if hasattr(self, "_ping_callers") and self._ping_callers:
chstr = f"{self.db.irc_channel} ({self.db.irc_network}:{self.db.irc_port})" chstr = f"{self.db.irc_channel} ({self.db.irc_network}:{self.db.irc_port})"
for obj in self._ping_callers: for obj in self._ping_callers:
obj.msg(_(f"IRC ping return from {chstr} took {kwargs['timing']}s.") obj.msg(_(f"IRC ping return from {chstr} took {kwargs['timing']}s."))
self._ping_callers = [] self._ping_callers = []
return return

View file

@ -61,7 +61,7 @@ class ObjectCreateForm(forms.ModelForm):
required=False, required=False,
widget=forms.TextInput(attrs={"size": "78"}), widget=forms.TextInput(attrs={"size": "78"}),
help_text="Most non-character objects don't need a cmdset" help_text="Most non-character objects don't need a cmdset"
" and can leave this field blank.") " and can leave this field blank."
) )
raw_id_fields = ("db_destination", "db_location", "db_home") raw_id_fields = ("db_destination", "db_location", "db_home")