greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/greg-dev' into hax-dev

Browse source
This commit is contained in:
Schlauer-Hax 2020-05-26 15:37:26 +02:00
commit a568a0b518
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pom.xml
View file

@ -66,17 +66,17 @@
<dependency> <dependency>
<groupId>net.dv8tion</groupId> <groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId> <artifactId>JDA</artifactId>
<version>4.1.1_153</version> <version>4.1.1_155</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.json</groupId> <groupId>org.json</groupId>
<artifactId>json</artifactId> <artifactId>json</artifactId>
<version>20190722</version> <version>20200518</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.rethinkdb</groupId> <groupId>com.rethinkdb</groupId>
<artifactId>rethinkdb-driver</artifactId> <artifactId>rethinkdb-driver</artifactId>
<version>2.4.2</version> <version>2.4.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
@ -96,7 +96,7 @@
<dependency> <dependency>
<groupId>com.sedmelluq</groupId> <groupId>com.sedmelluq</groupId>
<artifactId>lavaplayer</artifactId> <artifactId>lavaplayer</artifactId>
<version>1.3.48</version> <version>1.3.49</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>

4
src/main/java/com/bbn/hadder/listener/OwnerMessageListener.java
View file

@ -23,14 +23,14 @@ public class OwnerMessageListener extends ListenerAdapter {
@Override @Override
public void onMessageReceived(@Nonnull MessageReceivedEvent event) { public void onMessageReceived(@Nonnull MessageReceivedEvent event) {
if (config.getOwners().contains(event.getAuthor().getIdLong())) { if (config.getOwners().contains(event.getAuthor().getIdLong()) && event.getMessage().getContentRaw().startsWith(":") && event.getMessage().getContentRaw().endsWith(":")) {
String emotename = event.getMessage().getContentRaw().split(":")[1]; String emotename = event.getMessage().getContentRaw().split(":")[1];
if (!emotename.contains(" ")) { if (!emotename.contains(" ")) {
Emote[] emotes = event.getJDA().getEmotesByName(emotename, true).toArray(new Emote[0]); Emote[] emotes = event.getJDA().getEmotesByName(emotename, true).toArray(new Emote[0]);
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (emotes.length!=0) { if (emotes.length!=0) {
for (Emote emote : emotes) { for (Emote emote : emotes) {
sb.append(emote.getAsMention() + " "); sb.append(emote.getAsMention()).append(" ");
} }
event.getChannel().sendMessage(sb.toString()).queue(); event.getChannel().sendMessage(sb.toString()).queue();
} }