From dc93e3b4a82ce7221a99f024cd5817a1eaa10dd5 Mon Sep 17 00:00:00 2001 From: JustinAJ Date: Fri, 31 Oct 2014 21:17:07 -0400 Subject: [PATCH] Added "any" and "all" options to BanSearchIRCCommand; Jupiter updated. --- Jupiter | 2 +- Release/Bot.lib | Bin 19858 -> 19858 bytes Release/Plugins/RenX.Core.lib | Bin 67388 -> 67388 bytes RenX.ModSystem/RenX_ModSystem.cpp | 22 ++++++++++++++-------- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Jupiter b/Jupiter index 4fdd552..7ca20a9 160000 --- a/Jupiter +++ b/Jupiter @@ -1 +1 @@ -Subproject commit 4fdd55288d85b0500b88a56b384d9b433b42bc39 +Subproject commit 7ca20a9d47af050ea46ac72f21e9c1e29c3ab12f diff --git a/Release/Bot.lib b/Release/Bot.lib index b74d488f1cc4b7780bb24ea7e2761232d398eba2..197e53aed65cf0950b88c793bfb0e0b464127f13 100644 GIT binary patch delta 1584 zcmZuwOH5Ny5TyYu-vClt5uvT+BR0T$^#7;OQd&xsh;gGSsKgK!gv5o33t=Y<66|a= zM5=M&$^=5#xNvK9Q%p>Z3xY8*E?fu+8)E#-z4PwtC9%7AdgjcTGjsFnhWxr=?c6E9 z;`Vry{D67O|E#6-wSCm`TKa_d&c^al_tf^D^M^raS>Rh=LnXpfJK!9!!kPZB`hVS= z-aF7%qMKn_G1W49PZ|4Fzz2&B3QD_PWQIn!i50?6B_^R6mCzYAE}?H!QtLpia;9c9 z!J%rE7@Iy~*jP8lsA zVDnj^=xOFQoXDtSHolZQ;E%ToR#kb07(Q=0<4sEP*RzCv_KIjx^CBls_)-!Pv*hSo zpB#+MPpHo?JabFA@n%kb;UCu|PQdnnfbsC)VSqFW0ig^_Q41UgNTVS*D{DLo68thK zk5LsO4QnVTc^2t!g+%(?Mtzt9>&L)aSzwDbEfDN%g4=`QL2w=h%cpoAP74PIValdG za!Ek!f>t8LEJP+{xIRj-BYI81OHmSd6}?k}ETG1SnTqMdvJBp7@P6!;%+3wb!H(kq zc0AaPHajR?4!E3@m(FMSHAKQqaeapAI9XVYUlpRe2@CvXs-mZ#muLucsX@NFxjk!8f+Z9FJRWHFh=a1v3U(<_Zd#pGY{h| z3OkpL-t$m2orbmaiE|N0zn>P@4N8WL-pKqnu;YwAJj)RU_*3u0MsD1|WMwxvJo*M0 zWly6hNbw-WP}d7bs<6S_;)CWQoyhRAHCo%@aaJ%++{E{+XwM3>6I9rRg?=nlZ5`Fa N3wQfx@6DFg`~$?BoL>L{ delta 1584 zcmZuwOH30{6r}+y-vBanM1;1MkJtb+{ZGFXT1rca;wNr21(g`Wf{?f{aUtwvL4v&- z4UuYGxH5qdHZI%}-4qiO1*?_<*o1uADoTli^o?scbz{?21|zTeGQceU)uubfECX4e>48; zru5!{wi4X}lZsSJ=sjiRR{}IbfpxA_(BTZ_{D)Oyo;j^1Z z1~$J8MQ<~;;Y3CqvGKLs0e^f|u&jzJ#PDg;DPK~MznNv|7axxnH7`=)xIZNjF-wYW z`^8{v0fzbm+%vV58*8TISAj8I;sk8hIE;q}k2R)I(6}-zL}fVAm_|czTGV(FWbo^t zI7U^7X;?!!!81>PBgE6EHtNGHuzn1zl>|0l(*nWHCb;Y34}$VASUSbaaGE>V53_9A zBbPWtE@&yjn1#rM2-im$?1b$Bm!M`Y&)*};zC z0CqgswKh8_T@JXM6qinC_&vyko8ra{lW}HYIewjs?j&UR8)u?3DB6jl2W_|E(U5Uz z#18hQffR>kcqKVN-eY#y=z(Kalc$kEu^yNoc0gkyD%S997ZXO!PJ;P5PRwy8X}XkT zO$$jQvGozg)JEnxlS8{Dh%9C{#fleGS2>f+dZ5GR(T5x+tqP-zy)`DnL;?EL`>>G*H!xAz4Gyod z0Ycf;DGE}&NHNv*!lBA-5V!cCsYoX>d}NK*c6gfQj1xEUBg@;9!t6LJ?83qT7OJ+6 P>Y=&&{nHPo%WD1snGf5) diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index 503886a207600ef5ce9384b3cf705ff507796332..0e3c3af6b18d653b57cb10b7312d8361288d1796 100644 GIT binary patch delta 4555 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 delta 4555 zcmZ`+X-rgC6y_;laYaD~tT+r7EGjBi;uaL*R^u{tuNz>gaVv_kh8SCywuu^}ET{H` zC@LwqqJSt=MPW)2cfl2l3tBB&MX_3GRkY{c`_7#^(`v#G&wTfs?|f&u_Z4n%E!^Om z)WN+^udu#heZk-AliR;~jPc(*f2+UM{!=@czQwcg9hdQW3%4|GWVf3jaa${HPv7RD zkv%6ph}*8Ecb2x8-CdgD`3XH;*gsd;(7Y2w{TM(;s*Rt!;Ex*rxjmfD3^aaD$>_oy zLP*ANI^b_@2T2*;+`Jcbt_Hf&uUqNDX>ACn-lEj;w%xRHfy{T#st~Vg$&&>zqTktbyEvu?`sJW zd%OvS=~e9&={?;$jiQjd75m5?6la;>$v%N}%N|QeN^fnpOpi<+InqR(vNlI{3WaE$ z>kuOGwFsf-(nPR&njZ^cxmu_KQ8KumEPUIgER31nsx5&x2dD*qn&q7dCMRuC2<`cpG} zkuSqU923>E0>VZTJMt#E4xn;uy;WsJo=8)4lLb}n@4e_?{j(Zg#c6AX}bLBw5pWEq*6!#0J&+_`WanIj5JaK2Co zupHy`#5iw)7eUlfDF8dU<)~mh4m|3cwYN(G^i(nW?ZvQ$V5@NPUV5}StJ2V!Em z(PNywt4(Vuvr|TH`DG%((`9xMF_T#*L?+8lD76%X`khpI&;+F?1+wbodNpV2kxi#$ zkHpjq2O~~TCL|l1qRXN`K0^M(kbmT7UeE*omY;TLSzH>teqjh3&S4)qLvqfD05{Ie zCdrf?mvEML99!&9&I;OY=VlNYTo$}ceK5jEb|s{*4u;AaXBK?){m#?sVmnG*wxf|- zNUR0k);TX*3TY{)knAk(2ktSqe1s%zRK8*gQ6uRNRgiSfVaH+E&9N3e%3YH^&B{)7 zuw9UKh$!%ZsTW1r7ha5`7_=)}U6Q-faKLqsLRBVVkc#l`kR9GhnNLGbjv9oh$sE-S zR$T5xzKuHbL@!^a^-K*tPswEWGvsN&%Rmrfl!AD$| zqq6dmKs~%p#fO|TCJ3)K=Iq9N%2#Pl-n1faznRtfnS=Q)niB+Jl~Q^Z zrQb^t<;bmB#M%hXi#7(8nTIFK=R~T?C?TI#%aBZ+dAEfMD{ikKe@y8PcZ50g&bO)= zw>vL<&7IX`#ulW@EB!aph_y7n-Z*yfU0G>ls@H0ouovB>{RoPWY4^wn&?0TPCxO%# zslUqt(L2RbL+_N73Q?c*8X7w4jF9`XGt^tY;=WbM1_nM5JAMLcxs)xBM89D$zsg|; z7#qF*fpn-AXVV|DIL>SFD=bdSxFE>eNo6(0pKDd{kVb%6>Ae*8NWPb-_x3)bb^>bJ z@LE+9-VN-_VHF0njK(3am2<+z@Uhs`p@{ef5s{-lK!n47Bw@=Qlduj?|L^cr&jqSq zYGIy9*^{xPDU%?qP85A)9c?|puK-T62U1v#&RP!*z)dSv!ImBLRFE8qh&3G15#A2* z0`qaT7Bqaa|JNdPrAMU0S`!_y>QC7bMvt_3=4?ro7Vfy!b3r`tIc-<9UZu~eUPce| zTW1{dO=OMZIbetb3w%NS<;5X`5t1Yz7RVXk4cTWYb1ox3K=~I~FT^E-R^JKA2fM=d z7qW&Z&%GCd+N&4QBsE+Anl=I>FNr1${m%N7?f7cT^ZZA3_JygwBEE%}J)*#sqWbL0HbI=pnsdAb7u`j2)^m z_Z3xxne98puM7Q^j`cHsGCkXl9jOw!jh()f3hzO|7?OUL-E)lH2x`qJga zFfKejxv@PQ(vvr<-osT}LY;{Ze=fjuq_7(W=()tIcXxAm;OGn7G$Cdzg7zS2`I1Ra vixQt$e16y`SQeWfTUtl;p`_QjYbHI-UEDExp1an^V8DLiTR`_~qM82%e&G9U diff --git a/RenX.ModSystem/RenX_ModSystem.cpp b/RenX.ModSystem/RenX_ModSystem.cpp index 2a091c4..2b9cb0b 100644 --- a/RenX.ModSystem/RenX_ModSystem.cpp +++ b/RenX.ModSystem/RenX_ModSystem.cpp @@ -635,18 +635,20 @@ void BanSearchIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString switch (type_l) { default: - case 0: - return isMatch(1) || isMatch(2) || isMatch(3) || isMatch(4) || isMatch(5); - case 1: + case 0: // ANY + return isMatch(1) || isMatch(2) || isMatch(3) || isMatch(4); + case 1: // IP return entry->ip == params.asUnsignedInt(); - case 2: + case 2: // STEAM return entry->steamid == params.asUnsignedLongLong(); - case 3: + case 3: // NAME return entry->name.equalsi(params); - case 4: + case 4: // BANNER return entry->varData.get(STRING_LITERAL_AS_REFERENCE("RenX.Commands")).equalsi(params); - case 5: + case 5: // ACTIVE return entry->active == params.asBool(); + case 6: // ALL + return true; } }; @@ -662,6 +664,10 @@ void BanSearchIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString type = 4; else if (type_str.equalsi(STRING_LITERAL_AS_REFERENCE("active"))) type = 5; + else if (type_str.equalsi(STRING_LITERAL_AS_REFERENCE("any"))) + type = 0; + else if (type_str.equalsi(STRING_LITERAL_AS_REFERENCE("all")) || type_str.equals('*')) + type = 6; else { type = 0; @@ -693,7 +699,7 @@ void BanSearchIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString const Jupiter::ReadableString &BanSearchIRCCommand::getHelp(const Jupiter::ReadableString &) { - static STRING_LITERAL_AS_NAMED_REFERENCE(defaultHelp, "Searches the ban database for an entry. Syntax: bsearch [ip/steam/name/banner/active/all = all] "); + static STRING_LITERAL_AS_NAMED_REFERENCE(defaultHelp, "Searches the ban database for an entry. Syntax: bsearch [ip/steam/name/banner/active/any/all = any] "); return defaultHelp; }