Skip to content

Commit f0466c8

Browse files
LukaMrtLukaMrt
committed
fix bugs
1 parent c2b6757 commit f0466c8

File tree

8 files changed

+39
-39
lines changed

8 files changed

+39
-39
lines changed

‎build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ java {
4444

4545
jar {
4646
manifest {
47-
attributes 'Main-Class': 'fr.luka.jambot.Main'
47+
attributes 'Main-Class': 'fr.lukam.jambot.Main'
4848
}
49-
dependsOn ('dependencies')
5049
}

‎src/main/resources/configuration.toml.example renamed to ‎configuration.toml.example

File renamed without changes.

‎src/main/java/fr/lukam/jambot/Main.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ private static boolean buildJDA() {
3636

3737
try {
3838

39+
System.out.println(ConfigurationUtils.getToken().token);
3940
jda = JDABuilder.createDefault(ConfigurationUtils.getToken().token)
4041
.setStatus(OnlineStatus.ONLINE)
4142
.setActivity(Activity.of(Activity.ActivityType.DEFAULT, "préfixe : " + prefix.prefix))

‎src/main/java/fr/lukam/jambot/commands/Command.java

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package fr.lukam.jambot.commands;
22

3-
import fr.lukam.jambot.commands.impl.CommandPropose;
43
import fr.lukam.jambot.model.Themes;
54
import fr.lukam.jambot.utils.SerializerUtils;
65
import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
@@ -9,8 +8,6 @@
98
import java.io.File;
109
import java.io.FileWriter;
1110
import java.io.IOException;
12-
import java.net.URISyntaxException;
13-
import java.net.URL;
1411

1512
public abstract class Command {
1613

@@ -23,38 +20,35 @@ public abstract class Command {
2320
protected Themes retrieveThemes() {
2421

2522
try {
23+
File file = new File("themes.json");
2624

27-
URL resource = CommandPropose.class.getClassLoader().getResource("themes.json");
28-
29-
if (resource == null) {
25+
if (!file.exists()) {
3026
return new Themes();
3127
}
3228

33-
File file = new File(resource.toURI());
3429
return SerializerUtils.deserialize(file, Themes.class);
3530

36-
} catch (URISyntaxException | IOException e) {
31+
} catch (IOException e) {
3732
e.printStackTrace();
3833
return new Themes();
3934
}
4035

4136
}
4237

4338
protected void registerThemes(Themes themes) {
44-
try {
4539

46-
URL resource = CommandPropose.class.getClassLoader().getResource("themes.json");
40+
try {
41+
File file = new File("themes.json");
4742

48-
if (resource == null) {
43+
if (!file.exists()) {
4944
return;
5045
}
5146

52-
File file = new File(resource.toURI());
5347
BufferedWriter writer = new BufferedWriter(new FileWriter(file));
5448
writer.write(SerializerUtils.serialize(themes));
5549
writer.close();
5650

57-
} catch (URISyntaxException | IOException e) {
51+
} catch (IOException e) {
5852
e.printStackTrace();
5953
}
6054
}

‎src/main/java/fr/lukam/jambot/commands/impl/CommandList.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
package fr.lukam.jambot.commands.impl;
22

3+
import fr.lukam.jambot.commands.Command;
34
import fr.lukam.jambot.commands.StaffCommand;
45
import fr.lukam.jambot.model.Themes;
56
import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
67

7-
public class CommandList extends StaffCommand {
8+
public class CommandList extends Command {
9+
10+
@Override
11+
public boolean canExecute(GuildMessageReceivedEvent event) {
12+
return true;
13+
}
814

915
@Override
1016
public void execute(GuildMessageReceivedEvent event) {

‎src/main/java/fr/lukam/jambot/commands/impl/CommandPropose.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public boolean canExecute(GuildMessageReceivedEvent event) {
2323
@Override
2424
public void execute(GuildMessageReceivedEvent event) {
2525

26-
if (channels.isAuthorized(event.getChannel().getIdLong())) {
26+
if (!channels.isAuthorized(event.getChannel().getIdLong())) {
2727
event.getChannel().sendMessage("Vous ne pouvez pas faire cette action ici.").queue();
2828
return;
2929
}

‎src/main/java/fr/lukam/jambot/utils/ConfigurationUtils.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.electronwill.nightconfig.core.file.FileConfig;
44
import fr.lukam.jambot.model.*;
55

6-
import java.net.URL;
6+
import java.io.File;
77
import java.util.Arrays;
88
import java.util.List;
99

@@ -13,7 +13,7 @@ public class ConfigurationUtils {
1313
private static final String TOKEN_DEFAULT = "token";
1414

1515
private static final String PREFIX_PATH = "prefix";
16-
private static final char PREFIX_DEFAULT = '*';
16+
private static final String PREFIX_DEFAULT = "*";
1717

1818
private static final String GUILD_PATH = "guild";
1919
private static final String GUILD_DEFAULT = "803180065277712404";
@@ -29,13 +29,13 @@ public class ConfigurationUtils {
2929

3030
public static Token getToken() {
3131

32-
URL file = ConfigurationUtils.class.getClassLoader().getResource("configuration.toml");
32+
File file = new File("configuration.toml");
3333

34-
if (file == null) {
34+
if (!file.exists()) {
3535
return new Token(TOKEN_DEFAULT);
3636
}
3737

38-
FileConfig fileConfig = FileConfig.of(file.getPath().substring(1));
38+
FileConfig fileConfig = FileConfig.of(file);
3939
fileConfig.load();
4040
String token = fileConfig.getOrElse(TOKEN_PATH, TOKEN_DEFAULT);
4141
fileConfig.close();
@@ -44,28 +44,28 @@ public static Token getToken() {
4444

4545
public static Prefix getPrefix() {
4646

47-
URL file = ConfigurationUtils.class.getClassLoader().getResource("configuration.toml");
47+
File file = new File("configuration.toml");
4848

49-
if (file == null) {
50-
return new Prefix(PREFIX_DEFAULT);
49+
if (!file.exists()) {
50+
return new Prefix(PREFIX_DEFAULT.charAt(0));
5151
}
5252

53-
FileConfig fileConfig = FileConfig.of(file.getPath().substring(1));
53+
FileConfig fileConfig = FileConfig.of(file);
5454
fileConfig.load();
55-
char prefix = fileConfig.getOrElse(PREFIX_PATH, PREFIX_DEFAULT);
55+
char prefix = fileConfig.getOrElse(PREFIX_PATH, PREFIX_DEFAULT).charAt(0);
5656
fileConfig.close();
5757
return new Prefix(prefix);
5858
}
5959

6060
public static GuildId getGuildId() {
6161

62-
URL file = ConfigurationUtils.class.getClassLoader().getResource("configuration.toml");
62+
File file = new File("configuration.toml");
6363

64-
if (file == null) {
64+
if (!file.exists()) {
6565
return new GuildId(GUILD_DEFAULT);
6666
}
6767

68-
FileConfig fileConfig = FileConfig.of(file.getPath().substring(1));
68+
FileConfig fileConfig = FileConfig.of(file);
6969
fileConfig.load();
7070
String guildId = fileConfig.getOrElse(GUILD_PATH, GUILD_DEFAULT);
7171
fileConfig.close();
@@ -74,13 +74,13 @@ public static GuildId getGuildId() {
7474

7575
public static RoleId getRoleID() {
7676

77-
URL file = ConfigurationUtils.class.getClassLoader().getResource("configuration.toml");
77+
File file = new File("configuration.toml");
7878

79-
if (file == null) {
79+
if (!file.exists()) {
8080
return new RoleId(GUILD_DEFAULT);
8181
}
8282

83-
FileConfig fileConfig = FileConfig.of(file.getPath().substring(1));
83+
FileConfig fileConfig = FileConfig.of(file);
8484
fileConfig.load();
8585
String roleId = fileConfig.getOrElse(ROLE_PATH, ROLE_DEFAULT);
8686
fileConfig.close();
@@ -89,13 +89,13 @@ public static RoleId getRoleID() {
8989

9090
public static Authorized getAuthorized() {
9191

92-
URL file = ConfigurationUtils.class.getClassLoader().getResource("configuration.toml");
92+
File file = new File("configuration.toml");
9393

94-
if (file == null) {
94+
if (!file.exists()) {
9595
return new Authorized(AUTHORIZED_DEFAULT);
9696
}
9797

98-
FileConfig fileConfig = FileConfig.of(file.getPath().substring(1));
98+
FileConfig fileConfig = FileConfig.of(file);
9999
fileConfig.load();
100100
List<String> authorized = fileConfig.getOrElse(AUTHORIZED_PATH, AUTHORIZED_DEFAULT);
101101
fileConfig.close();
@@ -104,13 +104,13 @@ public static Authorized getAuthorized() {
104104

105105
public static Channels getChannels() {
106106

107-
URL file = ConfigurationUtils.class.getClassLoader().getResource("configuration.toml");
107+
File file = new File("configuration.toml");
108108

109-
if (file == null) {
109+
if (!file.exists()) {
110110
return new Channels(CHANNELS_DEFAULT);
111111
}
112112

113-
FileConfig fileConfig = FileConfig.of(file.getPath().substring(1));
113+
FileConfig fileConfig = FileConfig.of(file);
114114
fileConfig.load();
115115
List<String> channels = fileConfig.getOrElse(CHANNELS_PATH, CHANNELS_DEFAULT);
116116
fileConfig.close();

‎src/main/resources/themes.json renamed to ‎themes.json

File renamed without changes.

0 commit comments

Comments
 (0)