TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-11 20:00:46 +00:00
Code Issues Projects Releases Wiki Activity

Check recipient socialspy exempt during PMs. Resolves #166

Browse source
This commit is contained in:
Ali Moghnieh 2016-07-25 13:10:06 +01:00
parent 352c92b880
commit 017082c07a
No known key found for this signature in database
GPG key ID: F09D3A1BAF2E6D70
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Essentials/src/com/earth2me/essentials/messaging/SimpleMessageRecipient.java
View file

@ -35,6 +35,13 @@ public class SimpleMessageRecipient implements IMessageRecipient {
private long lastMessageMs; private long lastMessageMs;
private WeakReference<IMessageRecipient> replyRecipient; private WeakReference<IMessageRecipient> replyRecipient;
protected static User getUser(IMessageRecipient recipient) {
if (recipient instanceof SimpleMessageRecipient) {
return ((SimpleMessageRecipient) recipient).parent instanceof User ? (User) ((SimpleMessageRecipient) recipient).parent : null;
}
return recipient instanceof User ? (User) recipient : null;
}
public SimpleMessageRecipient(IEssentials ess, IMessageRecipient parent) { public SimpleMessageRecipient(IEssentials ess, IMessageRecipient parent) {
this.ess = ess; this.ess = ess;
@ -78,9 +85,12 @@ public class SimpleMessageRecipient implements IMessageRecipient {
sendMessage(tl("msgFormat", tl("me"), recipient.getDisplayName(), message)); sendMessage(tl("msgFormat", tl("me"), recipient.getDisplayName(), message));
// Better Social Spy // Better Social Spy
User senderUser = getUser(); User senderUser = getUser(this);
User recipientUser = getUser(recipient);
if (senderUser != null // not null if player. if (senderUser != null // not null if player.
&& !senderUser.isAuthorized("essentials.chat.spy.exempt")) { // Dont spy on chats involving socialspy exempt players
&& !senderUser.isAuthorized("essentials.chat.spy.exempt")
&& (recipientUser != null && !recipientUser.isAuthorized("essentials.chat.spy.exempt"))) {
for (User onlineUser : ess.getOnlineUsers()) { for (User onlineUser : ess.getOnlineUsers()) {
if (onlineUser.isSocialSpyEnabled() if (onlineUser.isSocialSpyEnabled()
// Don't send socialspy messages to message sender/receiver to prevent spam // Don't send socialspy messages to message sender/receiver to prevent spam
@ -104,7 +114,7 @@ public class SimpleMessageRecipient implements IMessageRecipient {
return MessageResponse.UNREACHABLE; return MessageResponse.UNREACHABLE;
} }
User user = getUser(); User user = getUser(this);
boolean afk = false; boolean afk = false;
if (user != null) { if (user != null) {
if (user.isIgnoreMsg() if (user.isIgnoreMsg()
@ -134,10 +144,6 @@ public class SimpleMessageRecipient implements IMessageRecipient {
this.lastMessageMs = System.currentTimeMillis(); this.lastMessageMs = System.currentTimeMillis();
return afk ? MessageResponse.SUCCESS_BUT_AFK : MessageResponse.SUCCESS; return afk ? MessageResponse.SUCCESS_BUT_AFK : MessageResponse.SUCCESS;
} }
protected User getUser() {
return this.parent instanceof User ? (User) this.parent : null;
}
@Override public boolean isReachable() { @Override public boolean isReachable() {
return this.parent.isReachable(); return this.parent.isReachable();