From f8adff77c7632ba1e396219459a59e61a9fad674 Mon Sep 17 00:00:00 2001 From: Savvy Date: Fri, 14 Jul 2017 05:53:47 -0400 Subject: [PATCH] Added music leave command, fixed lombok problems, moved RixaManager -> RixaGuild. --- .../2.13/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes .gradle/2.13/taskArtifacts/fileHashes.bin | Bin 39675 -> 40011 bytes .idea/modules/Rixa_main.iml | 2 +- .idea/modules/Rixa_test.iml | 1 + .idea/workspace.xml | 744 ++++++------------ build.gradle | 2 +- src/main/java/me/savvy/rixa/Rixa.java | 2 + .../rixa/commands/admin/BatchMoveCommand.java | 3 +- .../rixa/commands/admin/ConfigCommand.java | 12 +- .../rixa/commands/general/MusicCommand.java | 7 +- .../commands/general/ServerInfoCommand.java | 3 +- .../commands/handlers/CommandHandler.java | 4 +- .../commands/mod/DeleteMessagesCommand.java | 3 +- .../savvy/rixa/commands/mod/MuteCommand.java | 3 +- .../commands/mod/PurgeMessagesCommand.java | 3 +- .../java/me/savvy/rixa/events/BotEvent.java | 3 +- .../me/savvy/rixa/events/MemberEvent.java | 3 +- .../me/savvy/rixa/events/MessageEvent.java | 8 +- .../me/savvy/rixa/events/VoiceChannel.java | 23 + .../java/me/savvy/rixa/guild/RixaGuild.java | 44 +- .../java/me/savvy/rixa/guild/RixaManager.java | 39 - .../reactions/react/ConfigReaction.java | 7 +- .../modules/reactions/react/HelpReaction.java | 16 +- .../rixa/modules/twitter/TwitterModule.java | 8 +- 24 files changed, 346 insertions(+), 594 deletions(-) create mode 100644 src/main/java/me/savvy/rixa/events/VoiceChannel.java delete mode 100644 src/main/java/me/savvy/rixa/guild/RixaManager.java diff --git a/.gradle/2.13/taskArtifacts/cache.properties.lock b/.gradle/2.13/taskArtifacts/cache.properties.lock index 1b6b67dbae86ba95950d1b0e9ad73ef9132efa41..cdf3f4c3e9874ee1f710e63f3ebca93de8ee24eb 100644 GIT binary patch literal 17 UcmZRM`)gkj_?x4T0SvTy0W(DeuK)l5 literal 17 UcmZRM`)gkj_?x4T0SvVA0W&8AkpKVy diff --git a/.gradle/2.13/taskArtifacts/fileHashes.bin b/.gradle/2.13/taskArtifacts/fileHashes.bin index 9ce369e6c8cfaf18e985e1ebfe949dbf1ac8e125..bcbb7d62b98466d1466136836d65215628793bc9 100644 GIT binary patch delta 1129 zcmYMyX-pGA6bJC`ib`oE)wZw-*s(z+7!g}5@vf+71mevhB33FSl>i=*8f_{DL7+%= zII1m114cAOj-e{vPz4lk4Jvr2mVg(Eng}9xcQ$dq%q08U|9dn025e;8Mbapq>c(Ln zL%C}S!Fyxw|9w9Azdu@C8#?Gs=#i4r4igydaZ7YVb~*m$*Z`{W`9+XsIjr=n5tP3; zbM~d>ZZm#q?nEocpCbq}8j?snNQ)4Gz$kapycKC>gp!#`gF^0!7kodY66~q>6tfKx31zuIL>y&7#kxa@*=TFlAgt zP(N-uH5zM54Ks@=;F;?9D%J#t)JH}YJu+zRY~**0+}_Y917!n?I3pTf2r2vDkG3?F zfYC$`jJ)R3b&<*#K_5S)Ui*%}&5``f(WU!1`TRcCj>ndJovEsx&jW80PBaJK=iW}L z+C7&=ff#voFn1(5k`8)A3upTmFHtL69K9D4&*igFi6PkyRjVjq8fonm$e!P8G$^bM zS6VNzNWmgM8lj;hVgktOt2K_6Z#6mMcrv4E;}lvd^&~y7u18eGG`DzC#b9dPmN|TT zd`Ysj!}inqhwT=`}-!UPp$CNH87DGyf&=8UH4LwOn`*D zePQbhZQbp6B*k4x<=Yu04_k}Xh)u5FEQW)nvw_m)Oo_K{;8;y3e1F{H|6+@8z;Jj4 zGr(yk0|^@<1>n%g%-92l*6_S#y)zm!`@NZ1CCp;9xPKaRJ%4VT?zx&D+ii-tusUn6 zX8?`lr2M`uco9U))RQw&>JIFX#SGxUPQ_M!akWm4$Sk1Q~0JVRUFXDsysK zt7c-H{zlAjP*A zPB;Kj>{&QDF;HT1eR~c_?V;2%6>X{O+z)g2M%8R@hybdMHC_;MAEMT;5~OysT8A*> z2vds~0HjUj&mx3&kU9;2@qFdtfWWfoNlaEJbfhM3)g(%Wb(`{{rklXlf^eDPViw=0{Z1!)k4AS z^C`^PI+`61YK5kPtdKq}6$w$yHCZq~a&mKl2uod0{e#J~3*;xuPb!$)93#rSe#?T% z6N_Xg?}(A$UNe6J)I(dqe*Zs7lu@BDV4{=4=dy+utSavMK8PyLHei^G sPX0UHN+Ek**WSWwGyn1ls`o7qOYs9){vb@c6rzyL2An|hXY?=u04#grrvLx| diff --git a/.idea/modules/Rixa_main.iml b/.idea/modules/Rixa_main.iml index 49b7c2c..7606438 100644 --- a/.idea/modules/Rixa_main.iml +++ b/.idea/modules/Rixa_main.iml @@ -13,6 +13,7 @@ + @@ -34,7 +35,6 @@ - diff --git a/.idea/modules/Rixa_test.iml b/.idea/modules/Rixa_test.iml index a954436..1f38323 100644 --- a/.idea/modules/Rixa_test.iml +++ b/.idea/modules/Rixa_test.iml @@ -14,6 +14,7 @@ + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 46a6f48..62e99ec 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,8 @@ - + @@ -42,106 +42,11 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -176,11 +81,13 @@ log_channel testin testing + RixaManager setTitle(String.format("Help: %s", title)) ; the configuration + RixaGuild @@ -429,8 +336,8 @@ @@ -612,11 +519,6 @@ @@ -676,10 +583,10 @@ - @@ -712,6 +619,24 @@ - + - + - - - - + + + + @@ -831,135 +722,12 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1278,58 +1046,40 @@ - + - - - - + - + - - - - + - + + - - + - - + - - - - - - - + - - - - - - - + + @@ -1382,59 +1132,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1466,9 +1164,8 @@ - + - @@ -1476,7 +1173,6 @@ - @@ -1484,14 +1180,6 @@ - - - - - - - - @@ -1502,13 +1190,6 @@ - - - - - - - @@ -1559,13 +1240,6 @@ - - - - - - - @@ -1573,13 +1247,6 @@ - - - - - - - @@ -1587,37 +1254,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1629,9 +1266,6 @@ - - - @@ -1639,7 +1273,6 @@ - @@ -1650,14 +1283,6 @@ - - - - - - - - @@ -1665,22 +1290,6 @@ - - - - - - - - - - - - - - - - @@ -1692,25 +1301,6 @@ - - - - - - - - - - - - - - - - - - - @@ -1718,31 +1308,197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1776,7 +1532,7 @@ @@ -1788,7 +1544,7 @@ @@ -1821,7 +1577,7 @@ - Gradle: com.fasterxml.jackson.core:jackson-annotations:2.8.0 + Gradle: com.mashape.unirest:unirest-java:1.4.9