regex-cleanup #19

Merged
pratyush merged 19 commits from regex-cleanup into master 2023-05-03 13:01:49 +02:00
4 changed files with 16 additions and 4 deletions
Showing only changes of commit a458460cec - Show all commits

Binary file not shown.

Binary file not shown.

View File

@ -61,6 +61,9 @@ conf.registerGlobalValue(SnoParser, 'AutoVhost',
conf.registerGlobalValue(SnoParser, 'preventHighlight',
registry.Boolean(True, ("""Toggles in channel highlights with ZWSP""")))
###
## WHOIS related settings below:
###
conf.registerGroup(SnoParser, 'whois')
conf.registerGlobalValue(SnoParser.whois, 'debug',
registry.Boolean('false',
@ -69,6 +72,13 @@ conf.registerGlobalValue(SnoParser.whois, 'debug',
"""
, private=True
))
conf.registerGlobalValue(SnoParser.whois, 'sample',
registry.String('',
"""
SnoParser: This allows to set a testing IP address, if the plugin shall be evaluated on i.e. a local network. This will override all IP addresses from SNOTICES!
"""
, private=True
))
conf.registerGroup(SnoParser.whois, 'redis')
conf.registerGlobalValue(SnoParser.whois.redis, 'host',
registry.String('127.0.0.1',

View File

@ -85,7 +85,7 @@ class SnoParser(callbacks.Plugin):
asn = whoisres['asn_registry']
country = whoisres['asn_country_code']
description = whoisres['asn_description']
whoisout = 'WHOIS ' + asn + ' ' + country + ' ' + description
whoisout = '# ' + asn + ' ' + country + ' ' + description
except ipwhois.exceptions.IPDefinedError:
whoisout = 'RFC 4291 (Local)'
@ -124,7 +124,7 @@ class SnoParser(callbacks.Plugin):
print("DEBUG - ELSE WHOIS_FRESH CALLED")
print(data)
print(sourceip)
if data.startswith("WHOIS"):
if data.startswith("#"):
#data["cache"] = False
print("DEBUG - CACHE: FALSE")
data = json.dumps(data)
@ -167,8 +167,10 @@ class SnoParser(callbacks.Plugin):
nickname = couple.group(1)
username = couple.group(2)
host = couple.group(3)
#ip = couple.group(4)
ip = '2a03:4000:55:d20::'
if self.registryValue('whois.sample'):
ip = self.registryValue('whois.sample')
else:
ip = couple.group(4)
realname = couple.group(5)
ip_seen = 0
nick_seen = 0