diff --git a/modules/format_activity.py b/modules/format_activity.py index 6cbc14b6..2a01e5b0 100644 --- a/modules/format_activity.py +++ b/modules/format_activity.py @@ -9,8 +9,9 @@ class Module(ModuleManager.BaseModule): minimal=minimal, **kwargs) def _mode_symbols(self, user, channel, server): - modes = list(channel.get_user_status(user)) + modes = list(channel.get_user_modes(user)) if modes: + modes = [mode for mode in modes if mode in server.prefix_modes] modes.sort(key=lambda x: list(server.prefix_modes.keys()).index(x)) return server.prefix_modes[modes[0]] return "" diff --git a/src/IRCChannel.py b/src/IRCChannel.py index 7bb26305..ddce0291 100644 --- a/src/IRCChannel.py +++ b/src/IRCChannel.py @@ -238,5 +238,5 @@ class Channel(IRCObject.Object): def has_mode(self, user: IRCUser.User, mode: str) -> bool: return user in self.modes.get(mode, []) - def get_user_status(self, user: IRCUser.User) -> typing.Set: + def get_user_modes(self, user: IRCUser.User) -> typing.Set: return self.user_modes.get(user, set([]))