Merge pull request #644 from TotallyNotRobots/missing-mode-info

Handle missing mode info for a mode

cloudbot/util/irc.py

@@ -45,8 +45,11 @@ class ModeChange:
     info = attr.ib(type=ChannelMode)
 
     @property
-    def is_status(self):
-        return self.info.type is ModeType.Status
+    def is_status(self) -> bool:
+        if not self.info:
+            return False
+
+        return self.info.type == ModeType.Status
 
 
 @attr.s(hash=True)
@@ -78,6 +81,9 @@ def parse_mode_string(
             adding = False
         else:
             mode_info = server_modes.get(c)
+            if not mode_info:
+                logger.warning("No ModeInfo found for %s", c)
+
             if mode_info and mode_info.has_param(adding):
                 param = params.pop(0)
             else:

plugins/cryptocurrency.py

@@ -9,6 +9,7 @@
 License:
     GPL v3
 """
+
 import inspect
 import time
 import warnings
@@ -660,7 +661,7 @@ def crypto_command(text, event):
 def format_price(price: Union[int, float, Real]) -> str:
     price = float(price)
     if price < 1:
-        precision = max(2, min(10, -Decimal(str(price)).as_tuple().exponent))
+        precision = max(2, min(10, len(str(Decimal(str(price)))) - 2))
         num_format = "{:01,.{}f}".format(price, precision)
     else:
         num_format = "{:,.2f}".format(price)

plugins/minecraft_ping.py

@@ -2,7 +2,7 @@
 
 # TODO(linuxdaemon): Implement bedrock support
 from mcstatus import JavaServer as MinecraftServer
-from mcstatus.pinger import PingResponse
+from mcstatus.status_response import JavaStatusResponse
 
 from cloudbot import hook
 from cloudbot.util import colors
@@ -48,7 +48,7 @@ def mcping(text):
         return str(e)
 
     try:
-        s = server.status()  # type: PingResponse
+        s: JavaStatusResponse = server.status()
     except socket.gaierror:
         return "Invalid hostname"
     except socket.timeout:

requirements-dev.txt

@@ -1,13 +1,14 @@
 darker[flynt,isort] == 1.6.1
 freezegun == 1.1.0
-mypy == 0.910
+mypy == 1.0.0
 pre-commit == 3.3.3
 pylint == 3.1.0
 pytest == 6.2.5
 pytest-asyncio == 0.20.3
 pytest-cov == 4.1.0
 pytest-random-order == 1.0.4
 responses == 0.25.0
+typing_extensions == 4.10.0
 types-requests == 2.27.7
 types-setuptools == 57.4.7
 types-six == 1.16.2

tests/core_tests/util_tests/test_irc.py

@@ -0,0 +1,30 @@
+from cloudbot.util import irc
+
+
+def test_mode_parse():
+    mode_info = {
+        "a": irc.ChannelMode(character="a", type=irc.ModeType.A),
+        "d": irc.StatusMode.make("^", "d", 3),
+    }
+    parsed = irc.parse_mode_string("+ad", ["foo", "bar"], mode_info)
+
+    assert parsed == [
+        irc.ModeChange("a", True, "foo", mode_info["a"]),
+        irc.ModeChange("d", True, "bar", mode_info["d"]),
+    ]
+
+
+def test_mode_parse_missing_mode():
+    mode_info = {
+        "a": irc.ChannelMode(character="a", type=irc.ModeType.A),
+        "d": irc.StatusMode.make("^", "d", 3),
+    }
+    parsed = irc.parse_mode_string("+adx", ["foo", "bar"], mode_info)
+
+    assert parsed == [
+        irc.ModeChange("a", True, "foo", mode_info["a"]),
+        irc.ModeChange("d", True, "bar", mode_info["d"]),
+        irc.ModeChange("x", True, None, None),
+    ]
+
+    assert [m.is_status for m in parsed] == [False, True, False]