From 599fe4f38bd481db53607e90dda5578ea252d71a Mon Sep 17 00:00:00 2001
From: Georg <georg@lysergic.dev>
Date: Thu, 26 Aug 2021 19:32:19 +0200
Subject: [PATCH] Improved `ipquery`

Signed-off-by: Georg <georg@lysergic.dev>
---
 __pycache__/config.cpython-38.pyc | Bin 2704 -> 2814 bytes
 __pycache__/plugin.cpython-38.pyc | Bin 10414 -> 10478 bytes
 config.py                         |   7 +++++++
 plugin.py                         |   8 +++++---
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/__pycache__/config.cpython-38.pyc b/__pycache__/config.cpython-38.pyc
index d7e3eddde9fa538fc3436fb5d4b51afce8e916a2..3666f160aacd5e43f844b67b8c23ba59b489de4a 100644
GIT binary patch
delta 165
zcmbOr`cITMl$V!_0SK(mt0&%_$Scdlz_d|kFC#x^Dn}N7ie4&H7GH{fioxVNjLM>h
zsZ0y_QjAiJ7cwnmW@Jd=3}(<Y*(}2Jj?IC&q$DSb#n{Zipvsa<0SJQg@&gi!ic^cM
z6g=|F6>{?P(iKYb6_OK^Gg1}8J^Vd`6;ks`iZWA+71HvH^d|q|c*D41@=MOSlO4Et
QxcC@(7}*$^{xkgt09l+bsQ>@~

delta 80
zcmew-Izf~-l$V!_0SNY=R8KUW$SceAgmI(JUdG9+Ok$#XsZ0y_QuI>{7BVelW@Jd=
k3}(<Y+-$(~j%{)Z=QGA7lfAj-a`7?pFtRZ+{b%|Q08_seY5)KL

diff --git a/__pycache__/plugin.cpython-38.pyc b/__pycache__/plugin.cpython-38.pyc
index 1a89f54dde53079c5fb46704d00c4c0857e2a27f..2038462b1e89cad60622e4d7a8e5256a5f2026b2 100644
GIT binary patch
delta 1324
zcmZ8hO>7%g5cb=(*FW`d?W73oc<nZETqtb>fvTdVq^<e`6sKuXphebpck9@7c9XYj
zl2{v>wjj}@IW&_>l^R5f)FMD26(b}L2nit}Zso#Z#fbwK5O*a0X4Zj7*xK*y`@WfZ
z^XARlPey+mjh~6dB0l_y4@%1D(fjdO^ilw)^c=#+8bEM->pqR$Ve_KnYp{mkFk5s)
zO;~1*poz=kyx;MU`O5xw{IFsxvTe$zbggbZ-VV=9m^j*Yv&`I}rK_f)SsyTd27{LU
zyo3Yah2RD(-PUJ$hWJ8&KSn}@fGpjR*5Zm?Hx0D26<de<TekJ0M^#nS34Iw&ED6CU
zMp)<D=&Zob!ofr@dli(yG&B+sw%TbWeqoY|He7)VseblZ=X&aC#x(e5>uyOWz6QT<
z-NPneXF6Y~6VV{Jh=7@T2^mBv1WhmUd^*S;!1dG+e4g%$Qx!w_cvZUqKc$CuIH7f>
z30SwVEoq_?(ELvDs-O8BwjOk(+deJegke`^TslWVYp|3#!5Z*GX2+#Scg11kU2)Q?
zxqgM$EdE~xZdAi!YPwd{u;P50>;kIUGHf^Yui{O4f<k+cBBNk^YPzNKxnFT&#Swgg
zD2uQt{v$%1wNqn;Sy4LGp68_!tyX57s)oZ}9NZwDprNaFIpj))Y1dVqtML6JPi7ZT
zZD-^}O5F3r{{06IBxK=aUA?$3A)`SdJ3Mk34fu0p6_bTiy3#b1NuA^?#6@M{c*RSY
zsH;T9yAcl2rigqKZe^PfEuiFz*j8@HoYJu?OwM0H4hp%a#@;5slq`%Wn4~r`_Yzu=
z>owwW*~1%cL>xJ_G0X86j-NatpPrlYl364+yqWtFe3%>USwNOka4!-kBfbR5zD9CW
z*&rADu6a3bn!A$Ptm}r&7va(TY3T+zufSXRm)QdRn9s9S_#>ZVH{oIV8OaN`0_WsA
zDE=jHW0#?~@P3qN*H8Q9Yw%s+S;_7Oi5G{qnDjbHa2`$+%aTQ}OE6c=^?2<r(>zDu
zoxm0NsCY0#dvT*!#p-4e;qPK)-wFv~15b|YHN23k<apB~r(1Q~Bi)dqs$Kau$!i4f
z;*H3_JKIC-&(6K=RTiQY@upi4>mTkWwFbxf^MQNFH=)`8>G+rA_Z7m%m%t5SXSVbg
zts0Mz^fgHv-vYV_+}qm6_=asbK}X#DUw8AnD9*s^117rxKM(BPd6wMH6L=N!YBfs%
s{4-pc;$M(L3GusdtaLOSOv=e@G8>A+t&+{&gV<n!y#~7n-(Z!00L>j)3;+NC

delta 1124
zcmYjQUuYC(5Wm^I+w8@?f8L&2yO-Ns8ZXyc+JLb|L`&3))x--mlBPo3>}@W0iFfha
zJ=BuK`e2hN!Qeol!Ip{zDXj%Pu#{5hOJ79r(X!xUOKG65edtSP_8QWI@Au93`_0TZ
z-`wn9Bj1h0M`N+h5dDrnEm;1$592ZIwJ;qcw2shn4TAYlEmVVf@T4-7rB#@h%JQnb
zAkWKK()7V<G9C&Q!S8S#yHPK@UxOH>sG=-hr_GPJj^|t!I#Xe>mo`yiU>_1a%X9GI
zww*e;P1u$_?W~gEauFf9^@ny@f^oDGJKzJn+n2_hiB7=Qr-=<vCdosb$E8#+v|0~R
zZvoi&+x9n<GV@coJN+h9@MJpIJ<UXwp+>M-#04hKGt2~;zesn$GklQh$LHy;c$5T{
zR?viVDC_-rNPh`b9Mi{?4>@WIAM5Wy6(RG=-e~(>1H}9C1-IgdEm3jB|E}POIhG?>
z&1AQ4km+g!p@;^Zpn=v}&x|T6M-)L!;@>ZK!6fc5_Q3+4G<K6cWemU~-Z6F+uaeV8
znkk(q*^Or1JCHEN$4tddX}D_79N8qV;R|CnyFijJUz%?CYGck3me&xzT5gh2ZPd}q
z?tlL}2d7MF(5ly+^5B)z<i<%qVLoO`NB?tXZi%^sDUF>vF?`HCb7jt9cA42|`+7dF
z;Gfx%4Bsp`d5|e^BBj(-OKvF~N#v8Rm0epTU+gRPY}KiIVi{+0XOvs)w}!vu&Qe1R
zGY7ZvpqT~4ar2-OM6Tf-^Dc>px_45a&UW9|nD)c`Xt9pb{9(myCmGK7Z>zI8%V6P+
zd{Gf>uHX;(Y$lj1lh0X(MTV=mk$*?$xA+>ha$>WSVhIoTln$)15Uo@5g;Swnzs)fi
zkQbX(FCcx@vhB9~8O!SopVR2+_@YOJe_FryOn}NI(g!4PsCS@U)H*Kr<|1DaU&C*E
zAC3LUaX%5zAQx!!)r(E1=?u9Q!C$iYnWf0qK#JgL->_$gJ<WgdtVpn904cWa5j64f
zo(9~)J%zVl9cR*F2s#w>s!2ybd`Vby;(J!OAaM_u3&*2M(o7mjLyh6D1rNT&p}uZ7
KhmF2P82%T={37lE

diff --git a/config.py b/config.py
index 983cb6d..90dd9c9 100644
--- a/config.py
+++ b/config.py
@@ -140,6 +140,13 @@ conf.registerGlobalValue(SnoParser.whois, 'sample',
     """
     , private=True
 ))
+conf.registerGlobalValue(SnoParser.whois, 'ttl',
+    registry.Integer('3600',
+    """
+    SnoParser: How long to cache WHOIS entries for.
+    """
+    , private=True
+))
 conf.registerGroup(SnoParser.whois, 'redis')
 conf.registerGlobalValue(SnoParser.whois.redis, 'db',
     registry.Integer('0',
diff --git a/plugin.py b/plugin.py
index 4d9a797..4b16961 100644
--- a/plugin.py
+++ b/plugin.py
@@ -141,7 +141,8 @@ class SnoParser(callbacks.Plugin):
     def whois_set_cache(self, key: str, value: str) -> bool:
         """Data to Redis."""
 
-        state = self.redis_client_whois.setex(key, timedelta(seconds=3600), value=value,)
+        duration = self.registryValue('whois.ttl')
+        state = self.redis_client_whois.setex(key, timedelta(seconds=duration), value=value,)
         return state
 
     def whois_run(self, sourceip: str) -> dict:
@@ -238,12 +239,13 @@ class SnoParser(callbacks.Plugin):
         """
 
         data = self.whois_get_cache(key=ipaddress)
-        decoded = data.decode('utf-8')
+        decoded_data = data.decode('utf-8')
         ttl = self.redis_client_whois.ttl(ipaddress)
         count = self.redis_client_ips.get(ipaddress)
+        decoded_count = count.decode('utf-8')
 
         print('SnoParser manual query: ', data, ' ', ttl)
-        irc.reply(f'{decoded} - Count: {count} - Remaining: {ttl}s')
+        irc.reply(f'{decoded_data} - Count: {decoded_count} - Remaining: {ttl}s')
         
     ipquery = wrap(ipquery, ['anything'])