From 1cbf9920167bfaf43192501c2c06813afb1eaa96 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Sun, 2 Jul 2023 10:22:42 +0200 Subject: [PATCH] Swap arguments of accountExtban --- src/conf.py | 2 +- src/ircutils.py | 2 +- test/test_ircutils.py | 36 ++++++++++++++++++------------------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/conf.py b/src/conf.py index 7e13c1106..e47c3a4c4 100644 --- a/src/conf.py +++ b/src/conf.py @@ -1280,7 +1280,7 @@ class Banmask(registry.SpaceSeparatedSetOfStrings): irc = world.getIrc(network) if irc is None: continue - extban = ircutils.accountExtban(nick, irc) + extban = ircutils.accountExtban(irc, nick) if extban is not None: masks.append(extban) diff --git a/src/ircutils.py b/src/ircutils.py index ca7c26f56..2dbe69ce6 100644 --- a/src/ircutils.py +++ b/src/ircutils.py @@ -346,7 +346,7 @@ def banmask(hostmask): return '*!*@' + host -def accountExtban(nick, irc): +def accountExtban(irc, nick): """If 'nick' is logged in and the network supports account extbans, returns a ban mask for it. If not, returns None.""" if 'ACCOUNTEXTBAN' not in irc.state.supported: diff --git a/test/test_ircutils.py b/test/test_ircutils.py index a9c40a6f6..59363e73f 100644 --- a/test/test_ircutils.py +++ b/test/test_ircutils.py @@ -377,48 +377,48 @@ class FunctionsTestCase(SupyTestCase): with self.subTest('spec example'): irc.state.supported['ACCOUNTEXTBAN'] = 'a,account' irc.state.supported['EXTBAN'] = '~,abc' - self.assertEqual(ircutils.accountExtban('foo', irc), + self.assertEqual(ircutils.accountExtban(irc, 'foo'), '~a:account1') - self.assertIsNone(ircutils.accountExtban('bar', irc)) - self.assertIsNone(ircutils.accountExtban('baz', irc)) + self.assertIsNone(ircutils.accountExtban(irc, 'bar')) + self.assertIsNone(ircutils.accountExtban(irc, 'baz')) with self.subTest('InspIRCd'): irc.state.supported['ACCOUNTEXTBAN'] = 'account,R' irc.state.supported['EXTBAN'] = ',abcR' - self.assertEqual(ircutils.accountExtban('foo', irc), + self.assertEqual(ircutils.accountExtban(irc, 'foo'), 'account:account1') - self.assertIsNone(ircutils.accountExtban('bar', irc)) - self.assertIsNone(ircutils.accountExtban('baz', irc)) + self.assertIsNone(ircutils.accountExtban(irc, 'bar')) + self.assertIsNone(ircutils.accountExtban(irc, 'baz')) with self.subTest('Solanum'): irc.state.supported['ACCOUNTEXTBAN'] = 'a' irc.state.supported['EXTBAN'] = '$,abc' - self.assertEqual(ircutils.accountExtban('foo', irc), + self.assertEqual(ircutils.accountExtban(irc, 'foo'), '$a:account1') - self.assertIsNone(ircutils.accountExtban('bar', irc)) - self.assertIsNone(ircutils.accountExtban('baz', irc)) + self.assertIsNone(ircutils.accountExtban(irc, 'bar')) + self.assertIsNone(ircutils.accountExtban(irc, 'baz')) with self.subTest('UnrealIRCd'): irc.state.supported['ACCOUNTEXTBAN'] = 'account,a' irc.state.supported['EXTBAN'] = '~,abc' - self.assertEqual(ircutils.accountExtban('foo', irc), + self.assertEqual(ircutils.accountExtban(irc, 'foo'), '~account:account1') - self.assertIsNone(ircutils.accountExtban('bar', irc)) - self.assertIsNone(ircutils.accountExtban('baz', irc)) + self.assertIsNone(ircutils.accountExtban(irc, 'bar')) + self.assertIsNone(ircutils.accountExtban(irc, 'baz')) with self.subTest('no ACCOUNTEXTBAN'): irc.state.supported.pop('ACCOUNTEXTBAN') irc.state.supported['EXTBAN'] = '~,abc' - self.assertIsNone(ircutils.accountExtban('foo', irc)) - self.assertIsNone(ircutils.accountExtban('bar', irc)) - self.assertIsNone(ircutils.accountExtban('baz', irc)) + self.assertIsNone(ircutils.accountExtban(irc, 'foo')) + self.assertIsNone(ircutils.accountExtban(irc, 'bar')) + self.assertIsNone(ircutils.accountExtban(irc, 'baz')) with self.subTest('no EXTBAN'): irc.state.supported['ACCOUNTEXTBAN'] = 'account,a' irc.state.supported.pop('EXTBAN') - self.assertIsNone(ircutils.accountExtban('foo', irc)) - self.assertIsNone(ircutils.accountExtban('bar', irc)) - self.assertIsNone(ircutils.accountExtban('baz', irc)) + self.assertIsNone(ircutils.accountExtban(irc, 'foo')) + self.assertIsNone(ircutils.accountExtban(irc, 'bar')) + self.assertIsNone(ircutils.accountExtban(irc, 'baz')) def testSeparateModes(self):