Upstream
/
Essentials
mirror of https://github.com/EssentialsX/Essentials.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve MuteStatusChangeEvent (#3068) 

Co-Authored-By: md678685 <1917406+md678685@users.noreply.github.com>

Adds getTimestamp and getReason methods to MuteStatusChangeEvent with the apropriate JavaDocs explaining them.

Closes #2459.
This commit is contained in:
Josh Roy 2020-04-23 11:28:08 -04:00 committed by GitHub
parent 12c8623666
commit 6bbdbc89a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/User.java
View File

@ -590,7 +590,7 @@ public class User extends UserData implements Comparable<User>, IMessageRecipien
//Returns true if status expired during this check
public boolean checkMuteTimeout(final long currentTime) {
if (getMuteTimeout() > 0 && getMuteTimeout() < currentTime && isMuted()) {
final MuteStatusChangeEvent event = new MuteStatusChangeEvent(this, null, false);
final MuteStatusChangeEvent event = new MuteStatusChangeEvent(this, null, false, getMuteTimeout(), getMuteReason());
ess.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) {

6
Essentials/src/com/earth2me/essentials/commands/Commandmute.java
View File

@ -44,7 +44,7 @@ public class Commandmute extends EssentialsCommand {
long muteTimestamp = 0;
String time;
String muteReason = "";
String muteReason = null;
if (args.length > 1) {
time = args[1];
@ -63,11 +63,11 @@ public class Commandmute extends EssentialsCommand {
final boolean willMute = (args.length > 1) || !user.getMuted();
final User controller = sender.isPlayer() ? ess.getUser(sender.getPlayer()) : null;
final MuteStatusChangeEvent event = new MuteStatusChangeEvent(user, controller, willMute);
final MuteStatusChangeEvent event = new MuteStatusChangeEvent(user, controller, willMute, muteTimestamp, muteReason);
ess.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) {
if (args.length > 1) {
if (muteReason != null) {
user.setMuteReason(muteReason.isEmpty() ? null : muteReason);
user.setMuted(true);
} else {

23
Essentials/src/net/ess3/api/events/MuteStatusChangeEvent.java
View File

@ -2,9 +2,30 @@ package net.ess3.api.events;
import net.ess3.api.IUser;
import java.util.Optional;
public class MuteStatusChangeEvent extends StatusChangeEvent {
public MuteStatusChangeEvent(IUser affected, IUser controller, boolean value) {
private Long timestamp;
private String reason;
public MuteStatusChangeEvent(IUser affected, IUser controller, boolean value, Long timestamp, String reason) {
super(affected, controller, value);
this.timestamp = timestamp;
this.reason = reason == null ? null : (reason.isEmpty() ? null : reason);
}
/**
* @return If the mute is temporary, returns a present optional with the timestamp; if permanent or unknown, returns an empty optional.
*/
public Optional<Long> getTimestamp() {
return Optional.ofNullable(timestamp <= 0 ? null : timestamp);
}
/**
* @return Returns the reason if provided, otherwise null.
*/
public String getReason() {
return reason;
}
}