diff --git a/core/igncore.py b/core/igncore.py index 44cee60..c98d5c8 100644 --- a/core/igncore.py +++ b/core/igncore.py @@ -43,7 +43,7 @@ class IgnCore: self.last_timer_event = 0 self.start_time = int(time.time()) self.major_version = "IGNCore v2.8" - self.minor_version = "3" + self.minor_version = "4" self.incoming_queue = FifoQueue() self.mass_message_queue = None self.conns = DictObject() diff --git a/modules/core/accounting/alts_controller.py b/modules/core/accounting/alts_controller.py index 29a179d..5460794 100644 --- a/modules/core/accounting/alts_controller.py +++ b/modules/core/accounting/alts_controller.py @@ -69,7 +69,7 @@ class AltsController: main = self.account_service.get_main(request.sender.char_id) for alt in alt_chars: if not alt.char_id: - notfound.append(alt) + notfound.append(alt.name if type(alt) == SenderObj else alt) continue if main.char_id == alt.char_id: failed.append(self.getresp("module/alts", "add_fail_self")) @@ -86,9 +86,9 @@ class AltsController: reply += self.getresp("module/alts", "add_success_self", {"char": ", ".join(done)}) if len(notfound) > 0: - reply += "\n" + self.getresp("global", "char_not_found", {"char": ", ".join(notfound)}) + reply += "\n" if reply != "" else '' + self.getresp("global", "char_not_found", {"char": ", ".join(notfound)}) if len(gotalts) > 0: - reply += "\n" + self.getresp("module/alts", "add_fail_already", {"char": ", ".join(gotalts)}) + reply += "\n" if reply != "" else '' + self.getresp("module/alts", "add_fail_already", {"char": ", ".join(gotalts)}) reply += "\n".join(failed) return reply diff --git a/modules/onlinebot/online/org_alias_controller.py b/modules/onlinebot/online/org_alias_controller.py index 0347944..d06a0ca 100644 --- a/modules/onlinebot/online/org_alias_controller.py +++ b/modules/onlinebot/online/org_alias_controller.py @@ -56,7 +56,7 @@ class OrgAliasController: return ChatBlob("Aliases currently in use", "\n".join(blob)) @command(command="orgs", params=[Const("alias"), Const("set"), Any("alias"), Any("org")], access_level="moderator", - description="View the currently registered org aliases", + description="Set the alias for an Org", sub_command="alias_moderate") def cmd_alias_add(self, sender, _, _1, alias, search): orgs = self.org_pork.find_org(search) @@ -81,7 +81,7 @@ class OrgAliasController: return ChatBlob("Pick an Org", blob) @command(command="orgs", params=[Const("alias"), Const("rem"), Any("org")], access_level="moderator", - description="View the currently registered org aliases", + description="remove an Org alias", sub_command="alias_moderate") def cmd_alias_del(self, sender, _, _1, search): orgs = self.org_pork.find_org(search)