refactor all checks for channel_type to server.is_channel()

2 files changed, 6 insertions, 3 deletions

diff --git a/src/IRCChannels.py b/src/IRCChannels.py
index ebcc8077..331706fa 100644
--- a/src/IRCChannels.py
+++ b/src/IRCChannels.py
@@ -34,8 +34,8 @@ class Channels(object):
         return self._server.irc_lower(channel_name)
 
     def contains(self, name: str) -> bool:
-        lower = self._name_lower(name)
-        return name[0] in self._server.channel_types and lower in self._channels
+        return (self._server.is_channel(name) and
+            self._name_lower(name) in self._channels)
 
     def add(self, name: str) -> IRCChannel.Channel:
         id = self.get_id(name)
diff --git a/src/IRCServer.py b/src/IRCServer.py
index 752e2f67..e2480dc3 100644
--- a/src/IRCServer.py
+++ b/src/IRCServer.py
@@ -186,10 +186,13 @@ class Server(IRCObject.Object):
         for channel in user.channels:
             channel.remove_user(user)
 
+    def is_channel(self, name: str) -> bool:
+        return name[0] in self.channel_types
+
     def get_target(self, name: str
             ) -> typing.Optional[
             typing.Union[IRCChannel.Channel, IRCUser.User]]:
-        if name[0] in self.channel_types:
+        if self.is_channel(name):
             if name in self.channels:
                 return self.channels.get(name)
         else: