PsychoticNinja/Limnoria
1
0
Fork 0
mirror of https://github.com/progval/Limnoria.git synced 2025-04-25 20:41:18 -05:00
Code Issues Projects Releases Wiki Activity

Swap arguments of accountExtban

Browse Source
This commit is contained in:
Valentin Lorentz 2023-07-02 10:22:42 +02:00
parent d63720f2ed
commit 1cbf992016
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf.py
View File

@ -1280,7 +1280,7 @@ class Banmask(registry.SpaceSeparatedSetOfStrings):
irc = world.getIrc(network) irc = world.getIrc(network)
if irc is None: if irc is None:
continue continue
extban = ircutils.accountExtban(nick, irc) extban = ircutils.accountExtban(irc, nick)
if extban is not None: if extban is not None:
masks.append(extban) masks.append(extban)

2
src/ircutils.py
View File

@ -346,7 +346,7 @@ def banmask(hostmask):
return '*!*@' + host return '*!*@' + host
def accountExtban(nick, irc): def accountExtban(irc, nick):
"""If 'nick' is logged in and the network supports account extbans, """If 'nick' is logged in and the network supports account extbans,
returns a ban mask for it. If not, returns None.""" returns a ban mask for it. If not, returns None."""
if 'ACCOUNTEXTBAN' not in irc.state.supported: if 'ACCOUNTEXTBAN' not in irc.state.supported:

36
test/test_ircutils.py
View File

@ -377,48 +377,48 @@ class FunctionsTestCase(SupyTestCase):
with self.subTest('spec example'): with self.subTest('spec example'):
irc.state.supported['ACCOUNTEXTBAN'] = 'a,account' irc.state.supported['ACCOUNTEXTBAN'] = 'a,account'
irc.state.supported['EXTBAN'] = '~,abc' irc.state.supported['EXTBAN'] = '~,abc'
self.assertEqual(ircutils.accountExtban('foo', irc), self.assertEqual(ircutils.accountExtban(irc, 'foo'),
'~a:account1') '~a:account1')
self.assertIsNone(ircutils.accountExtban('bar', irc)) self.assertIsNone(ircutils.accountExtban(irc, 'bar'))
self.assertIsNone(ircutils.accountExtban('baz', irc)) self.assertIsNone(ircutils.accountExtban(irc, 'baz'))
with self.subTest('InspIRCd'): with self.subTest('InspIRCd'):
irc.state.supported['ACCOUNTEXTBAN'] = 'account,R' irc.state.supported['ACCOUNTEXTBAN'] = 'account,R'
irc.state.supported['EXTBAN'] = ',abcR' irc.state.supported['EXTBAN'] = ',abcR'
self.assertEqual(ircutils.accountExtban('foo', irc), self.assertEqual(ircutils.accountExtban(irc, 'foo'),
'account:account1') 'account:account1')
self.assertIsNone(ircutils.accountExtban('bar', irc)) self.assertIsNone(ircutils.accountExtban(irc, 'bar'))
self.assertIsNone(ircutils.accountExtban('baz', irc)) self.assertIsNone(ircutils.accountExtban(irc, 'baz'))
with self.subTest('Solanum'): with self.subTest('Solanum'):
irc.state.supported['ACCOUNTEXTBAN'] = 'a' irc.state.supported['ACCOUNTEXTBAN'] = 'a'
irc.state.supported['EXTBAN'] = '$,abc' irc.state.supported['EXTBAN'] = '$,abc'
self.assertEqual(ircutils.accountExtban('foo', irc), self.assertEqual(ircutils.accountExtban(irc, 'foo'),
'$a:account1') '$a:account1')
self.assertIsNone(ircutils.accountExtban('bar', irc)) self.assertIsNone(ircutils.accountExtban(irc, 'bar'))
self.assertIsNone(ircutils.accountExtban('baz', irc)) self.assertIsNone(ircutils.accountExtban(irc, 'baz'))
with self.subTest('UnrealIRCd'): with self.subTest('UnrealIRCd'):
irc.state.supported['ACCOUNTEXTBAN'] = 'account,a' irc.state.supported['ACCOUNTEXTBAN'] = 'account,a'
irc.state.supported['EXTBAN'] = '~,abc' irc.state.supported['EXTBAN'] = '~,abc'
self.assertEqual(ircutils.accountExtban('foo', irc), self.assertEqual(ircutils.accountExtban(irc, 'foo'),
'~account:account1') '~account:account1')
self.assertIsNone(ircutils.accountExtban('bar', irc)) self.assertIsNone(ircutils.accountExtban(irc, 'bar'))
self.assertIsNone(ircutils.accountExtban('baz', irc)) self.assertIsNone(ircutils.accountExtban(irc, 'baz'))
with self.subTest('no ACCOUNTEXTBAN'): with self.subTest('no ACCOUNTEXTBAN'):
irc.state.supported.pop('ACCOUNTEXTBAN') irc.state.supported.pop('ACCOUNTEXTBAN')
irc.state.supported['EXTBAN'] = '~,abc' irc.state.supported['EXTBAN'] = '~,abc'
self.assertIsNone(ircutils.accountExtban('foo', irc)) self.assertIsNone(ircutils.accountExtban(irc, 'foo'))
self.assertIsNone(ircutils.accountExtban('bar', irc)) self.assertIsNone(ircutils.accountExtban(irc, 'bar'))
self.assertIsNone(ircutils.accountExtban('baz', irc)) self.assertIsNone(ircutils.accountExtban(irc, 'baz'))
with self.subTest('no EXTBAN'): with self.subTest('no EXTBAN'):
irc.state.supported['ACCOUNTEXTBAN'] = 'account,a' irc.state.supported['ACCOUNTEXTBAN'] = 'account,a'
irc.state.supported.pop('EXTBAN') irc.state.supported.pop('EXTBAN')
self.assertIsNone(ircutils.accountExtban('foo', irc)) self.assertIsNone(ircutils.accountExtban(irc, 'foo'))
self.assertIsNone(ircutils.accountExtban('bar', irc)) self.assertIsNone(ircutils.accountExtban(irc, 'bar'))
self.assertIsNone(ircutils.accountExtban('baz', irc)) self.assertIsNone(ircutils.accountExtban(irc, 'baz'))
def testSeparateModes(self): def testSeparateModes(self):