Merge pull request #55 from Softawii/feature/voice

Voice Dinamico
Softawii · Aug 7, 2022 · 6d2d631 · 6d2d631
2 parents 75e3362 + c9b0ad2
commit 6d2d631
Show file tree

Hide file tree

Showing 17 changed files with 1,740 additions and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,8 @@ plugins {
 }
 
 group 'com.softwaii.capivara'
-version '1.0.3.3'
+version '1.0.4.0'
+
 
 repositories {
     mavenCentral()
@@ -34,8 +35,8 @@ dependencies {
         exclude module: 'opus-java'
     }
 
-    implementation("com.github.Softawii:curupira:v0.2.2:all")
-
+    implementation("com.github.Softawii:curupira:v0.2.6")
+    implementation("com.github.Softawii:curupira:v0.2.6:all")
     implementation("com.github.minndevelopment:emoji-java:master-SNAPSHOT")
 }
 

diff --git a/src/main/java/com/softawii/capivara/Main.java b/src/main/java/com/softawii/capivara/Main.java
@@ -1,11 +1,10 @@
 package com.softawii.capivara;
 
-import com.softawii.capivara.core.EmbedManager;
-import com.softawii.capivara.core.PackageManager;
+import com.softawii.capivara.core.*;
 import com.softawii.capivara.listeners.EchoGroup;
-import com.softawii.capivara.core.TemplateManager;
 import com.softawii.capivara.listeners.PackageGroup;
 import com.softawii.capivara.listeners.TemplateGroup;
+import com.softawii.capivara.listeners.VoiceGroup;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Activity;
 import org.springframework.boot.CommandLineRunner;
@@ -25,10 +24,14 @@ public static void main(String[] args) {
         BuildProperties buildProperties = context.getBean(BuildProperties.class);
         jda.getPresence().setPresence(Activity.of(Activity.ActivityType.WATCHING,buildProperties.getVersion()), true);
         System.out.println(buildProperties.getVersion() + " Bot is ready as " + jda.getSelfUser().getName());
+
+        // Beans
         PackageGroup.packageManager     = context.getBean(PackageManager.class);
         EchoGroup.embedManager          = context.getBean(EmbedManager.class);
         PackageGroup.embedManager       = EchoGroup.embedManager;
         TemplateGroup.templateManager   = context.getBean(TemplateManager.class);
+        VoiceGroup.Dynamic.voiceManager = context.getBean(VoiceManager.class);
+        VoiceGroup.Dynamic.droneManager = context.getBean(DroneManager.class);
     }
 
     @Override

diff --git a/src/main/java/com/softawii/capivara/config/SpringConfig.java b/src/main/java/com/softawii/capivara/config/SpringConfig.java
@@ -1,10 +1,15 @@
 package com.softawii.capivara.config;
 
+import com.softawii.capivara.Main;
+import com.softawii.capivara.core.PackageManager;
 import com.softawii.capivara.listeners.PackageGroup;
 import com.softawii.capivara.listeners.TemplateGroup;
+import com.softawii.capivara.listeners.VoiceGroup;
+import com.softawii.capivara.listeners.events.VoiceEvents;
 import com.softawii.curupira.core.Curupira;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import net.dv8tion.jda.api.requests.GatewayIntent;
 import net.dv8tion.jda.api.utils.MemberCachePolicy;
 import net.dv8tion.jda.api.utils.cache.CacheFlag;
@@ -44,7 +49,7 @@ public SpringConfig(Environment env) {
     public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
         LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(dataSource());
-        em.setPackagesToScan("com.softawii.capivara.entity","com.softawii.capivara.repository", "com.softawii.capivara.services");
+        em.setPackagesToScan("com.softawii.capivara.entity","com.softawii.capivara.repository", "com.softawii.capivara.services", "com.softawii.capivara.listeners.events");
 
         JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
         em.setJpaVendorAdapter(vendorAdapter);
@@ -57,16 +62,16 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
     private String discordToken;
 
     @Bean
-    public JDA jda() {
+    public JDA jda(VoiceEvents voiceEvents) {
         JDA jda;
         try {
-            JDABuilder builder = JDABuilder.create(discordToken, GatewayIntent.GUILD_MEMBERS);
-            builder.enableIntents(GatewayIntent.GUILD_EMOJIS_AND_STICKERS);
+            JDABuilder builder = JDABuilder.create(discordToken, GatewayIntent.GUILD_MEMBERS, GatewayIntent.GUILD_VOICE_STATES, GatewayIntent.GUILD_EMOJIS_AND_STICKERS, GatewayIntent.GUILD_PRESENCES);
             builder.setMemberCachePolicy(MemberCachePolicy.ALL);
             builder.enableCache(CacheFlag.EMOJI, CacheFlag.ROLE_TAGS, CacheFlag.MEMBER_OVERRIDES, CacheFlag.STICKER);
             builder.addEventListeners(
                     new PackageGroup.AutoCompleter(),
-                    new TemplateGroup.AutoCompleter()
+                    new TemplateGroup.AutoCompleter(),
+                    voiceEvents
             );
             jda = builder.build();
             jda.awaitReady();
@@ -78,17 +83,14 @@ public JDA jda() {
     }
 
     @Bean
-    public Curupira curupira() {
-        JDA jda = jda();
+    public Curupira curupira(JDA jda) {
         String pkg   = "com.softawii.capivara.listeners";
         String resetEnv = env.getProperty("curupira.reset", "false");
         boolean reset = Boolean.parseBoolean(resetEnv);
 
         System.out.println("Reset: " + reset);
 
-        Curupira curupira = new Curupira(jda, reset, null, pkg);
-
-        return curupira;
+        return new Curupira(jda, reset, null, pkg);
     }