TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-07-23 05:53:54 +00:00
Code Issues Projects Releases Wiki Activity

Add isReachable API to IMessageRecipient.

Browse source 
Add translatable message recentlyForeverAlone.
Add behaviour that preserves reply-recipient only if they are reachable, and update reply-recipient if they are not reachable.
Fixes #248
This commit is contained in:
Ali Moghnieh 2015-10-30 19:58:30 +00:00
parent e5ebeaf724
commit 26045e2ec0
6 changed files with 33 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,6 +23,7 @@ import java.lang.ref.WeakReference;
* <li>{@link IMessageRecipient#sendMessage(String)}</li>
* <li>{@link IMessageRecipient#getName()}</li>
* <li>{@link IMessageRecipient#getDisplayName()}</li>
* <li>{@link IMessageRecipient#isReachable()}</li>
* </ul>
*
* The reply-recipient is wrapped in a {@link WeakReference}.
@ -56,6 +57,8 @@ public class SimpleMessageRecipient implements IMessageRecipient {
@Override public MessageResponse sendMessage(IMessageRecipient recipient, String message) {
MessageResponse messageResponse = recipient.onReceiveMessage(this.parent, message);
switch (messageResponse) {
case UNREACHABLE:
sendMessage(tl("recentlyForeverAlone", recipient.getDisplayName()));
case MESSAGES_IGNORED:
sendMessage(tl("msgIgnore", recipient.getDisplayName()));
break;
@ -79,6 +82,10 @@ public class SimpleMessageRecipient implements IMessageRecipient {
@Override
public MessageResponse onReceiveMessage(IMessageRecipient sender, String message) {
if (!isReachable()) {
return MessageResponse.UNREACHABLE;
}
User user = this.parent instanceof User ? (User) this.parent : null;
boolean afk = false;
if (user != null) {
@ -98,7 +105,7 @@ public class SimpleMessageRecipient implements IMessageRecipient {
if (ess.getSettings().isLastMessageReplyRecipient()) {
// If this recipient doesn't have a reply recipient, initiate by setting the first
// message sender to this recipient's replyRecipient.
if (getReplyRecipient() == null) {
if (!isReachable()) {
setReplyRecipient(sender);
}
} else { // Old message functionality, always set the reply recipient to the last person who sent us a message.
@ -107,6 +114,10 @@ public class SimpleMessageRecipient implements IMessageRecipient {
return afk ? MessageResponse.SUCCESS_BUT_AFK : MessageResponse.SUCCESS;
}
@Override public boolean isReachable() {
return this.parent.isReachable();
}
/**
* {@inheritDoc}
* <p />