-
-
Notifications
You must be signed in to change notification settings - Fork 2.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Blacklist user from using music and DJ commands #1367
Open
mnasiatka
wants to merge
4
commits into
jagrosh:master
Choose a base branch
from
mnasiatka:blacklist
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
104 changes: 104 additions & 0 deletions
104
src/main/java/com/jagrosh/jmusicbot/commands/admin/BlacklistUserCmd.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| /* | ||
| * Copyright 2018 John Grosh <[email protected]>. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * 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.jagrosh.jmusicbot.commands.admin; | ||
|
|
||
| import com.jagrosh.jdautilities.command.CommandEvent; | ||
| import com.jagrosh.jdautilities.commons.utils.FinderUtil; | ||
| import com.jagrosh.jdautilities.menu.OrderedMenu; | ||
| import com.jagrosh.jmusicbot.Bot; | ||
| import com.jagrosh.jmusicbot.commands.AdminCommand; | ||
| import com.jagrosh.jmusicbot.settings.Settings; | ||
| import com.jagrosh.jmusicbot.utils.FormatUtil; | ||
| import com.sun.org.apache.xpath.internal.operations.String; | ||
| import net.dv8tion.jda.api.entities.Member; | ||
| import net.dv8tion.jda.api.entities.Role; | ||
| import net.dv8tion.jda.api.entities.User; | ||
|
|
||
| import java.text.Format; | ||
| import java.util.List; | ||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.regex.MatchResult; | ||
| import java.util.regex.Matcher; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| /** | ||
| * | ||
| * @author John Grosh <[email protected]> | ||
| */ | ||
| public class BlacklistUserCmd extends AdminCommand | ||
| { | ||
| public BlacklistUserCmd(Bot bot) | ||
| { | ||
| this.name = "blacklist"; | ||
| this.help = "allow/disallow user from issuing commands"; | ||
| this.arguments = "<user>"; | ||
| this.aliases = bot.getConfig().getAliases(this.name); | ||
| } | ||
|
|
||
| @Override | ||
| protected void execute(CommandEvent event) | ||
| { | ||
| if(event.getArgs().isEmpty()) | ||
| { | ||
| event.replyError("You need to mention a user!"); | ||
| return; | ||
| } | ||
| Settings s = event.getClient().getSettingsFor(event.getGuild()); | ||
| if(event.getArgs().equalsIgnoreCase("none")) | ||
| { | ||
| s.clearBlacklistedUsers(); | ||
| event.replySuccess("Blacklist cleared; All users can use commands."); | ||
| return; | ||
| } | ||
|
|
||
| User target; | ||
| List<Member> found = FinderUtil.findMembers(event.getArgs(), event.getGuild()); | ||
| if(found.isEmpty()) | ||
| { | ||
| event.replyError("Unable to find the user!"); | ||
| return; | ||
| } | ||
| else if(found.size()>1) | ||
| { | ||
| StringBuilder builder = new StringBuilder(); | ||
| for(int i=0; i<found.size() && i<4; i++) | ||
| { | ||
| Member member = found.get(i); | ||
| builder.append("\n**"+member.getUser().getName()+"**#"+member.getUser().getDiscriminator()); | ||
| } | ||
| event.replyWarning("Found multiple users: " + builder.toString()); | ||
| return; | ||
| } | ||
| else | ||
| { | ||
| target = found.get(0).getUser(); | ||
| } | ||
| handleBlacklistUser(target, event); | ||
| } | ||
|
|
||
| private void handleBlacklistUser(User target, CommandEvent event) { | ||
| Settings s = event.getClient().getSettingsFor(event.getGuild()); | ||
| if (s.getBlacklistedUsers().contains(target.getId())) | ||
| { | ||
| s.removeBlacklistedUser(target.getId()); | ||
| event.replySuccess("User "+ event.getArgs() + " can now use commands"); | ||
| } else | ||
| { | ||
| s.setBlacklistedUser(target.getId()); | ||
| event.replySuccess("User "+ event.getArgs() + " can no longer use commands"); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I went with
StringBuilderinstead ofOrderedMenu.Builderto display duplicates because it seems like any user would be able to interact with the emoji options and blacklist the incorrect user, which is not the intended use case. IfOrderedMenu.Builderchecks that the author is the one choosing the option I think it'd be fine to switch back to it though