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

Gimme more #545

Merged
greg6775 merged 140 commits from master into hax-dev 2020-09-19 23:18:45 +02:00
Conversation 0 Commits 140 Files changed 71 +10 -61
4 changed files with 10 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7a4549c566 - Show all commits

6
pom.xml
View file

@ -69,7 +69,7 @@
<dependency>
<groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId>
<version>4.2.0_194</version>
<version>4.2.0_204</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
@ -89,7 +89,7 @@
<dependency>
<groupId>club.minnced</groupId>
<artifactId>discord-webhooks</artifactId>
<version>0.3.2</version>
<version>0.4.1</version>
</dependency>
<dependency>
<groupId>org.kohsuke</groupId>
@ -149,7 +149,7 @@
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.1.0</version>
<version>3.1.1</version>
</plugin>
</plugins>
</pluginManagement>

1
src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java
View file

@ -68,6 +68,7 @@ public class InviteDetectCommand implements Command {
break;
default:
e.getHelpCommand().sendHelp(this, e);
break;
}
} else e.getHelpCommand().sendHelp(this, e);
}

57
src/main/java/com/bbn/hadder/commands/moderation/RoleAssignmentCommand.java
View file

@ -1,57 +0,0 @@
/*
* Copyright 2019-2020 GregTCLTK and Schlauer-Hax
*
* Licensed under the GNU Affero General Public License, Version 3.0;
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.gnu.org/licenses/agpl-3.0.en.html
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.bbn.hadder.commands.moderation;
import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.core.Perm;
import com.bbn.hadder.core.Perms;
import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.Permission;
@Perms(Perm.MANAGE_ROLES)
public class RoleAssignmentCommand implements Command {
@Override
public void executed(String[] args, CommandEvent e) {
//TODO: THIS LOL
if (e.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) {
} else
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
}
@Override
public String[] labels() {
return new String[0];
}
@Override
public String description() {
return null;
}
@Override
public String usage() {
return null;
}
@Override
public String example() {
return null;
}
}

7
src/main/java/com/bbn/hadder/commands/music/SkipCommand.java
View file

@ -32,7 +32,12 @@ public class SkipCommand implements Command {
"commands.music.skip.success.title",
"commands.music.skip.success.description").build()).queue();
} else {
e.getTextChannel().sendMessage("Get rekt lol Mach Loop aus noob").queue();
e.getAudioManager().getTrackManager(e.getGuild()).setLoop(false);
e.getAudioManager().forceSkipTrack(e);
e.getAudioManager().getTrackManager(e.getGuild()).setLoop(true);
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
"commands.music.skip.success.title",
"commands.music.skip.success.description").build()).queue();
}
} else {
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,