From 7e29462a6ce1a9053b99c844813e8bf1fe808f3f Mon Sep 17 00:00:00 2001
From: Khakers <22665282+khakers@users.noreply.github.com>
Date: Sun, 23 Jul 2023 11:54:51 -0700
Subject: [PATCH] fix migrations.py type hints for python 3.8

---
 core/migrations.py |  13 +++++++++----
 requirements.txt   | Bin 2414 -> 1136 bytes
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/migrations.py b/core/migrations.py
index 25dd757d43..c51521abab 100644
--- a/core/migrations.py
+++ b/core/migrations.py
@@ -1,6 +1,6 @@
 import datetime
 import re
-from typing import Optional
+from typing import Optional, List
 
 from core import blocklist
 from core.models import getLogger
@@ -76,7 +76,7 @@ def _convert_legacy_block_format(
 
 async def _convert_legacy_block_list(
     blocklist_dict: dict,
-    blocklist_batch: list[blocklist.BlocklistEntry],
+    blocklist_batch: List[blocklist.BlocklistEntry],
     block_type: blocklist.BlockType,
     bot,
 ) -> int:
@@ -115,6 +115,10 @@ async def migrate_blocklist(bot):
     logger.info("preparing to migrate blocklist")
     skipped = 0
 
+    if len(blocked_users) == 0 and len(bot.blocked_roles) == 0:
+        logger.info("no blocklist entries to migrate")
+        return
+
     blocklist_batch: list[blocklist.BlocklistEntry] = []
     logger.info(f"preparing to process {len(blocked_users)} blocked users")
     skipped += await _convert_legacy_block_list(
@@ -133,8 +137,9 @@ async def migrate_blocklist(bot):
     )
     logger.info("processed blocked roles")
 
-    await bot.api.db.blocklist.insert_many([x.__dict__ for x in blocklist_batch])
-    blocklist_batch.clear()
+    if len(blocklist_batch) > 0:
+        await bot.api.db.blocklist.insert_many([x.__dict__ for x in blocklist_batch])
+        blocklist_batch.clear()
 
     logger.info("clearing old blocklists")
     bot.blocked_users.clear()
diff --git a/requirements.txt b/requirements.txt
index 4abd41f3da65e262eb76e9e0fa4cb5470a2e2dad..bad033c0ce5adc8cbcf462bac0bc3c49f31ce315 100644
GIT binary patch
literal 1136
zcmYjQ%Wm5+5WMqWOo)^p=|P90C~|3m009d0RL~S<Z_0;Ct`aL>-&wf<dfW$RXJ?0w
z%9VK@hF(ADgK|_FU9yYAV05pIa(Sg9)sqB`YoT!%tUl@^!ZrIHQwn9_Vc6?VTjiK*
zLkAw~PMuvI2{nWFdv%V^|K4gnYTi*Tewye$t5aVj@%-aa@K4eZDwC9L2e^~AR(-Ua
z1L*ka@+#DXr@y+|0`GFE$whh(RVr3cBFWGP@adH=u~e7bFm!s46?|(g#NgRVMuv`I
zT3Q%y2@*)gsF9j4b=31J#DqCA9O*0#JwV3X=9RA{OC2hxkjl%pl>mmD4>MEAms%DG
zZ9v4TiDHOFh=IM8L@n<jM<7d!pj?PY%n(^kryhx){tXdn`%Ybr5e7zj<%S>`w!{gG
z(ik$t+bAEj-6N5)b&o4hE2HDB^@#NlR?LK;7^|XtUw7sF0!emrEjIud{RtCdVWy8q
zMkVjv`6E=RaM=Wx)zT7~M)CkXg8N>jbzXPj#vwPz0CT_@K+KMpDo%rKBrIbH83#3R
zVy9+U#a$?0AgUaAmir2C@tX*JM2fF%4t`r2va0zE65Aq1JyDG1Z5Tf3gP=vn6Ra_k
zn6pQ&S91+JUs4i(iixb6SHFz`3QhvNHBv^^LII3h6OM?_u*Z3%C@0?urG*J=Snw8%
zd%9rVZ5dhhY5n>6`?tFuM%D0V3615K=w5zFU8YHvfDk9E8r?($1MyT#$-y&NL4r*9
zEg&FY6CsD!Fm6W&A2536`ZX^}kdQbiro6)7ur|(uI+wetjr>yy<ZA&Lm34;Fzy7}w
zeg`yKYJ}1Id*5EYQsu?PZ8HlLq45^ZA^S1{02_6X)~L7YX6Ob|GIw<q@`#PB`U@M=
BQ1So(

literal 2414
zcmZveU279z5QX1s!Jm?1l3Mk`3lZs!LZKjdCCPS8qxmw~wn=}ydY(Bud83tOv30)A
zoH;Yw-@hhhUe@Kdbb2=Bt)6i?E3fswEYHicV*5^Bv$E1}i|`rBj^D8NS(QWN$@o_%
zww*F>RbyUmB6cL(MZC_xQ|ziVWgx$KS(aA5clw!J=kj}@chuJb<+kklJVt;AnWjRw
zQjK{Z3r299_tu5%P5E&WOT1&7=o6Gp`KD(cUfHF6-XDFg%ja_0=W&h9(h412WQLLQ
zkAf+XjQT$QtuYkW$tAW~xsUANt1LH~(j>ZXRb!xD*ZOU#|68cyqj=jMqu@9(Va>jo
ztGj}+Mi~~7WfFN{9JXQoB3Nt0HBT$QR{otjNH02ajT_m%X=eD{l)Z9UCFH6~U^2U?
zxs}(M)OLtmV6Bs|R~J1^kF~HH(T)1vMQkTN*7^-R<gixgs}+KE`L24{QU}J`3ST3S
zP0We-nRr8SRzKdnRvdGrb683aJrOFV5ApE73e@O5>sCxNW$M(odrDmodj>DVdL>3q
zyK*JiG4@*_8%A!J9iDWY`^!YPLXtBY2LI!jCHn_P>$7r?_D21d;KP;^Pj&AOb6d+Y
zQEbi44txJ?NBP8A%W&vu_U=)g4U}W5saQt?@eObLUIqBS(d$m(n_ZtjsppDIO@p1C
zKCv@@rr+tU`%ovk)T9@Y8Kt3UFw={b@AyL~Y@qCWdB7SM5ViRBkPm;Og|SX~xB9m#
zzwRKL3isskW)sgYI)0-#)HRV7=kl2aCf^PBiwAd){qhv@R)U^N-VXdw5E}x|SgjQ*
zX0B<^Or4Z1SE|0yvn~%2$vp5$luWYIru*)|U*2N0f~S?nWLwP}H7@n!MaGNQd&B-W
z!kL|UTHdQfdJq~I@szNEDSJJ{q~U8Fc-bo68lBrTIP%7qg)Wmfrcm*m`lF%0CsrrU
zrhX~!%BS)%GNpc8neKl|53T0V^@;)eSjdvit?Ybhazf-DX<Lm2we7>^xj8@D+y$c(
z@kXSllR0-{if<2B%Zv~W<DMXBS}70})jMIvlC^93Y|95_x>Kb@XCMDX0DpY%{cZ5~
zfI4*O{@K0LZva;=Sx%d8GcndDy>-gEiR`oTRVe?zdtiYNYmKc#vvb{oap29IzCQP|
zaGCC;GcI{<AYW!MRdya^<(}}j2>a?y^uFWkZ2{+lGBSaB=Z7cVA41Vq7`&iZPxTLx
Cm{xrN