Unpin redis and adapt plugins to work on other redis versions

ban.py

@@ -20,6 +20,7 @@
 import datetime
 import time
 import re
+import redis
 
 LENGTH_REGEX = re.compile(r"(?P<number>[0-9]+) (?P<scale>seconds?|minutes?|hours?|days?|weeks?|months?|years?)")
 TIME_FORMAT = "%Y-%m-%d %H:%M:%S"
@@ -239,7 +240,10 @@ def cmd_unban(self, player, msg, channel):
         else:
             db = self.db.pipeline()
             for ban_id, score in bans:
-                db.zincrby(base_key, ban_id, -score)
+                if redis.VERSION < (3,):
+                    db.zincrby(base_key, ban_id, -score)
+                else:
+                    db.zincrby(base_key, -score, ban_id)
             db.execute()
             channel.reply("^6{}^7 has been unbanned.".format(name))
 

requirements.txt

@@ -1,4 +1,4 @@
-redis>=2.10, <3.0
+redis
 hiredis
 requests
 pyzmq<18; python_version < '3.9'

silence.py

@@ -20,6 +20,7 @@
 import datetime
 import time
 import re
+import redis
 
 LENGTH_REGEX = re.compile(r"(?P<number>[0-9]+) (?P<scale>seconds?|minutes?|hours?|days?|weeks?|months?|years?)")
 TIME_FORMAT = "%Y-%m-%d %H:%M:%S"
@@ -194,7 +195,10 @@ def cmd_unsilence(self, player, msg, channel):
         else:
             db = self.db.pipeline()
             for silence_id, score in silences:
-                db.zincrby(base_key, silence_id, -score)
+                if redis.VERSION < (3,):
+                    db.zincrby(base_key, silence_id, -score)
+                else:
+                    db.zincrby(base_key, -score, silence_id)
             db.execute()
             if ident in self.silenced:
                 del self.silenced[ident]

tests/__init__.py

@@ -8,10 +8,12 @@
 sys.path.append(PATH + "/minqlx-plugin-tests/src/unittest/python")
 
 from .test_balance import TestBalance
+from .test_ban import TestBan
 
 def suite():
     r = unittest.TestSuite()
     r.addTest(TestBalance())
+    r.addTest(TestBan())
     return r
 
 

tests/test_ban.py

@@ -0,0 +1,25 @@
+from minqlx_plugin_test import setup_plugin, connected_players, mocked_channel, fake_player, unstub, setup_cvars
+import unittest
+
+from ban import ban
+
+
+class TestBan(unittest.TestCase):
+    def setUp(self):
+        setup_plugin()
+        connected_players()
+        setup_cvars({
+            "qlx_database": "redis",
+        })
+        self.plugin = ban()
+
+    def tearDown(self):
+        unstub()
+
+    def test_ban(self):
+        steam_id = 666
+        player = fake_player(steam_id, "Woodpecker")
+        channel = mocked_channel()
+        connected_players(player)
+        self.plugin.cmd_ban(None, ["!ban", "666", "10", "seconds"], channel)
+        raise NotImplementedError("Tests to check if ban actually executed")