From e00794dbe470de1425940bf1088f87d051f3aad5 Mon Sep 17 00:00:00 2001 From: Chris's Razer Blade <59944262+CCShambotsProgramming@users.noreply.github.com> Date: Mon, 19 Apr 2021 19:44:32 -0400 Subject: [PATCH] Added Functionality --- .../buildOutputCleanup.lock | Bin 17 -> 17 bytes build/classes/java/main/Main.class | Bin 6513 -> 6786 bytes src/main/java/Main.java | 32 ++++++++++++------ src/main/java/ServerMHl/WOL.java | 4 ++- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 1dd3c8df53fd834990d0235f3449d1416641df3a..de3fea524aa56a1a6be92e586a15822f9584e315 100644 GIT binary patch literal 17 VcmZR+urrIZI9HK{0Sp+A0stzc1Iqva literal 17 UcmZR+urrIZI9HK{0Sp*R0V-4jdjJ3c diff --git a/build/classes/java/main/Main.class b/build/classes/java/main/Main.class index b307ce0aec69561c73b677a03bde34e82d9ecd94..e8d301bfb15e782f5dae5e3382f964c86cf55000 100644 GIT binary patch delta 3069 zcmZWr30xHC75~4P-JRKCVAnxFG{B-_y%t0xA}XRl1?5mdtw$>>tgvy}Rd!M1kxgy1 zu~HAFHNl$ZXre|LKDi?2^J_n$Hrk+qHTNDL(n5tqL3iUMGbY~ojFhjyj6~!1q7{2HFz;>%$ z4_c)HLVTk)TpSF9y@Bw2&pJEqL8*!_VirO5h5W(B(tu}$-`hZ-C3ci!wuCthwpf`MC;f zTA`vIELyH-13bP!h>$$8;y%w>PmbRcXw0bzxA+2$Q;J6|k+D)=ZW|oe1fPWaRIGwu zf5?^>X+l6n5UW{6lPAi zzA0g+ie1>PACuY>+M!GMmWpq~MwqzgdYbN+htebZE;(&dIXYDA!*>V+>RVe{IGDx@ zRw#YcdsgXN*e0FYLes*s5q)9Rk>+|f%!;j)Q3Ex+749EEu zquiBc{u~y=Caeqk3HkaC`-r6fkFbnR{ds#vZ(#1U4$X*;b@T2O-PAh2n5%~9G=!Ql?*zo&rs3^pHuOIkQYmu;M*ETTQFDjQ3SsGxW&;@A`0sFW^#J8rt>mKl2m8p#kpfp%gR42D;5z;#;f9KT<3oLuIzcYNe^h*oPxMpjErG21srVg= zont%S8*Xh0=)DOk`pkq@{q=-=Su(1cGf`I^g$ZIP%mpddH}OoxdYNNa!cc{V(Qt{f zxJl3m{awd-8mS+4<|d3*Xbg>&$gNT~<($0cw2*euVWaWfGiZWJgK3D9ChE5bOta(@ zvh)GYESp5!%hGw9u5Z_p7jgsRerPwM&a2D`Z-tHLPnpW$m3Xy|J_S0#8v&p3Y#ame z_%F|DlmRz!izz#9^O1m0^$)d~5ra3G#Q_81LK22CH5Mrthe0uSbBRa*NMt?>h>T$) ziRH2hmNO7pD#YqBU6@$O)0C>QJ(x}?uymrN1A{tI#%NU!<`c%A#v-5#OH(b*y6!@F zI>ffNW8uy9zR7-(X$g`zdyU=`ub+YOlp4112z4ZdGZM(Xv@)*n1-%resw3f`; z&)}ujtCu~zzPVw`ZR60HYSq@TxDK2Z^K1vv#dOG|k6H}+0Mo4|z29okdzoHm(rq?_ z-p2I(CcQ~A=(S95G-AN(lpBHGu-Bd1nFxUo(MG zPJ12;8Op#`6By)F3}65QUpE2C8JA~EvK{7E0-ZHxe&Tpc=TXgLIggD%1kduOhsOmT zH<&q%2PX=x;qjbX+unm60yFF(9Hh-|ZEq~y+>J*kNp5Yw2_{RY@m)jMQv&nOb8FA^ z^J)jRXS;EvK;meoN*q9Us$`r-?uZ`d)=u=ZAEZRLb~1*(eS?!>9~gZ;2E_;BNtC#? zQ?b|^X4)`kPb~VP#pFB_iyiAkq_@Km`ombbgIRms+K*$gt)1vK)t`?=gRGu8e;SJ| z?aS9L{JcLie_;kC#jU;6&nkA~mj@$oy0u^TgVD=Vdhi=E(%h~6uK&!aPtmN;mob6& zIb3<;pdc3-?&XS`2sfsn3{&Ym3h5OT(Q7ECD=4LRP)65KP9I}7-9!}^<2)fA^MzzY zYJ_yu3S+QP$i`w}3YH3mST0n-E7W48(10d^|7QrT@C)m)T6h3!gq;Wp?Fb8xW1a96 zHVB8XQRv2I;Vd2yE?|pr30s9%u}ydz4-4;MyKn<-!bjN2)xTRDfIVV5bTJEi#qroD z&WPYKu?kO`-J%Qpr|AmEyT`SjE|tKo0Iiidafc8o-{> z#A&4Q4GSf*ck+>W3vLNT651p*-9$UjOR$@T~);Vi9b=od(_&QOHb&5a$_O zUfhX4ox(eFMt9-QhL}iHj>7VQ!(5?9?l#UiSSg8;8MhmM4g2h=VornCF?vWB{=z|! zEC*o`k1`a^jcD)gHpL`ISt*6RVmuBSM5)|;4gXjn#1~P-sTkjoKH&>kmGMGpW3|6q zdNFu0=jfy9-fsM}rUxI1(OT{QOhm1o!~b3@V$`LX0W{R5(LH8}WNs>VzBpNZ{JNHz}ym zFb%chb4P`1x`r8;DJqK#*L6-&e>*AQ)w4q(} zx+)VvEYq+YVS?Hoh_z3P22FxoTrx{Vgy3wAo3XfxPJ*L#X?KT;E`qzYGZblS4t1C+ z;smL6sfr$gtF_aNgkmaI5tP{RIDcW z2Y_bYj7`_G6DsZ}WM0wyzlF7gwANU6FlsChg~K&b_V3H~F6NT%HlxEha4$(qcr9wv8o? zP|S!#R~og+_y<*dk1!-RS6ZI0I zU?4$8eN>cqeV(iKUKSTT27O=Td5cE=fRJ}hE@)oyZlF4X9yH-cR$(6#CtW!;e8}UR z#cAzbp;%*A)Tj%G;+%z_auj3nXs1A78?}&D-Ks|-i8l3op*sSH3pTZdp?_2w+ z5pz|1PAI}of50)b>ZIBz3K|_T56vrj@ubY^9Vjad^C!EKN4 z1E{dOcE(Qj;kEAf-wp8dox9gwu4G)#b^1G4eLIfGm99PLV?Jv0dmR@4Eb}XDey7vo zw=y5I`He1%e~9^Ro4;4F_#Wn0+I(2G_{5zI++_o|>$b*x2JW$e*}AP#%fNj$P_5fK z;~7ZUK#A_Qj9kya8XFj_dn_P>fd_0r(Y=+fL9XZcNT5B|%)`qxg{cupz&h<}rgco) znJm$_SXg2zWm?FzE!W|HupeKMxB@m2_E0+mkEQ|(4&kvXh0$#`nynnh4zTntiKVOk zPx+rdgm3Plu`KbORJ}w2Bi~IyE`P*n-hnKJUr2#*UOs?{4DL?_&)6kl$sS0BUv(s9 zUrYu2dU0^OZTD~roWO1tKFAi1q@dWq!bvAyNrhwVge7}46G@+D`0|f@&VRMpJ0RRz((1N&2lb;T#T)9C7!Tb#ANv?Wn&(2DI%F=wFCAep~QH0^ij>EBJEgqU(EiV7B_W9r9 z{=i;XIq+?jYWsJ+cq)T{GihbHLM_ z#%B^&JEj*-@(^E5-D9=o0e|N6KGvT3qy2w$yo@0&TtkmtXCA_zn)>l~Ie8zgB1t-! zv^;} diff --git a/src/main/java/Main.java b/src/main/java/Main.java index be22f0f..2527145 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -45,14 +45,18 @@ public static boolean testingMode = true; @Override public void onMessageReceived(MessageReceivedEvent event) { Message msg = event.getMessage(); + MessageChannel channel = event.getChannel(); + String content = msg.getContentRaw(); + + if (islogEnabled) { //enables / disables terminal output System.out.println("Message Received from " + event.getAuthor().getName() + " with the message: " + msg); } - String content = msg.getContentRaw(); - System.out.println(content); - MessageChannel channel = event.getChannel(); - if (!event.getAuthor().getName().equals("CPEServerNotification")) { + + //System.out.println("message content = " + content); + //System.out.println("contains results = " + contains(content, Constants.ACTIVATOR)); + if (contains(content, Constants.ACTIVATOR) && !event.getAuthor().getName().equals("CPEServerNotification")) switch (content) { case (Constants.ACTIVATOR + "test"): { channel.sendMessage("Test Received!").queue(); @@ -74,7 +78,10 @@ public static boolean testingMode = true; break; case (Constants.ACTIVATOR + "c"): { - WOL.wol("192.168.1.77", "90:B1:1C:26:23:34"); + channel.sendMessage("Sending WOL message to Server").queue(); + String wolReturn = WOL.wol("192.168.1.77", "90:B1:1C:26:23:34"); + System.out.println(wolReturn); + channel.sendMessage(wolReturn).queue(); } break; @@ -84,8 +91,8 @@ public static boolean testingMode = true; break; case (Constants.ACTIVATOR + "CUMMEY"): { - while(true){ - channel.sendMessage("CUM ZONE").queue(); + while (true) { + channel.sendMessage("CUM ZONE").queue(); } } @@ -143,7 +150,7 @@ public static boolean testingMode = true; channel.sendMessage("You are not Authorised to use sudo commands").queue(); } } - case(Constants.ACTIVATOR + "debug mode"):{ + case (Constants.ACTIVATOR + "debugMode"): { System.out.println(event.getChannel().getId()); } default: { //broken @@ -151,15 +158,15 @@ public static boolean testingMode = true; } } - } } -public static String getIsTestingMode(){ + + public static String getIsTestingMode(){ if(testingMode) return "TESTING MODE"; else return (" ' " + Constants.ACTIVATOR +" ' to activate bot"); } -public static String consoleIn() { + public static String consoleIn() { Scanner scanner = new Scanner(System.in); return scanner.nextLine(); } @@ -173,4 +180,7 @@ public static String consoleIn() { // System.out.println("Message Received from " + event.getAuthor().getName() + " with the message: " + msg); // // } + public static boolean contains(String str, char chr) { + return str.indexOf(chr) != -1; + } } \ No newline at end of file diff --git a/src/main/java/ServerMHl/WOL.java b/src/main/java/ServerMHl/WOL.java index 80d80a8..9f0986b 100644 --- a/src/main/java/ServerMHl/WOL.java +++ b/src/main/java/ServerMHl/WOL.java @@ -7,7 +7,7 @@ public class WOL { public static final int PORT = 9; - public static void wol(String ipStr, String macStr) { + public static String wol(String ipStr, String macStr) { try { @@ -27,9 +27,11 @@ public class WOL { socket.close(); System.out.println("Wake-on-LAN packet sent."); + return "WOL Packet Sent"; } catch (Exception e) { System.out.println("Failed to send Wake-on-LAN packet: + e"); + return "Failed to send Wake-on-LAN packet: + e"; } }