Skip to content

Check if a CoreMember is muted before authorizing a MessageCommand to… #54

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.

Sign up for GitHub

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

Open
jordanamr wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Check if a CoreMember is muted before authorizing a MessageCommand to… #54

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 32 additions & 13 deletions catalyst-common/src/main/java/org/anvilpowered/catalyst/common/command/MessageCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@

import com.google.inject.Inject;
import com.mojang.brigadier.context.CommandContext;
import org.anvilpowered.anvil.api.Anvil;
import org.anvilpowered.anvil.api.coremember.CoreMemberManager;
import org.anvilpowered.anvil.api.model.coremember.CoreMember;
import org.anvilpowered.anvil.api.util.TextService;
import org.anvilpowered.anvil.api.util.UserService;
import org.anvilpowered.catalyst.api.plugin.PluginMessages;
Expand Down Expand Up @@ -62,19 +65,35 @@ public int execute(CommandContext<TCommandSource> context, Class<?> consoleClass
textService.send(pluginMessages.messageSelf(), context.getSource());
return 0;
}
privateMessageService.sendMessage(
userService.getUserName((TPlayer) context.getSource()),
name,
message
);
privateMessageService.replyMap().put(
userService.getUUID(targetPlayer.get()),
userService.getUUID((TPlayer) context.getSource())
);
privateMessageService.replyMap().put(
userService.getUUID((TPlayer) context.getSource()),
userService.getUUID(targetPlayer.get())
);
Anvil.getServiceManager().provide(CoreMemberManager.class).getPrimaryComponent()
.getOneForUser(
userService.getUUID((TPlayer) context.getSource())
Copy link
Member

@jacoballen1 jacoballen1 Dec 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we move this up to the line before,
so it goes
.getOneForUser(userUUID)
.thenAcceptAsync()

).thenAcceptAsync(optionalMember -> {
if (!optionalMember.isPresent()) {
return;
}
CoreMember<?> coreMember = optionalMember.get();
if (Anvil.getServiceManager().provide(CoreMemberManager.class).getPrimaryComponent().checkMuted(coreMember)) {
textService.send(
pluginMessages.getMuteMessage(coreMember.getMuteReason(), coreMember.getMuteEndUtc()),
context.getSource()
);
} else {
privateMessageService.sendMessage(
userService.getUserName((TPlayer) context.getSource()),
name,
message
);
privateMessageService.replyMap().put(
userService.getUUID(targetPlayer.get()),
userService.getUUID((TPlayer) context.getSource())
);
privateMessageService.replyMap().put(
userService.getUUID((TPlayer) context.getSource()),
userService.getUUID(targetPlayer.get())
);
}
});
} else {
textService.send(pluginMessages.offlineOrInvalidPlayer(), context.getSource());
}
Expand Down