Skip to content
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

Jump to bottom

Add PrivateMessageEvent to listen to private messages #59

Open
wants to merge 1 commit into
base: v4.0.0-stable
Choose a base branch
from
Open

Add PrivateMessageEvent to listen to private messages #59

Show file tree
Hide file tree
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
50 changes: 50 additions & 0 deletions src/main/java/venture/Aust1n46/chat/api/events/PrivateMessageEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package venture.Aust1n46.chat.api.events;

import lombok.Getter;
import lombok.Setter;
import org.bukkit.event.Cancellable;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import venture.Aust1n46.chat.model.VentureChatPlayer;

/**
* Event called when a private message has been sent to a player.
* This event can not be cancelled.
*
* @author LOOHP
*/
@Getter
public class PrivateMessageEvent extends Event implements Cancellable {

private static final HandlerList handlers = new HandlerList();

private final VentureChatPlayer sender;
private final VentureChatPlayer receiver;
private final String msg;
private @Getter @Setter boolean cancelled;
private @Setter String echo;
private @Setter String send;
private @Setter String spy;
private final boolean bungee;

public PrivateMessageEvent(VentureChatPlayer sender, VentureChatPlayer receiver, String msg, String echo, String send, String spy, boolean bungee, boolean async) {
super(async);
this.sender = sender;
this.receiver = receiver;
this.msg = msg;
this.echo = echo;
this.send = send;
this.spy = spy;
this.bungee = bungee;
this.cancelled = false;
}

@Override
public HandlerList getHandlers() {
return handlers;
}

public static HandlerList getHandlerList() {
return handlers;
}
}
22 changes: 19 additions & 3 deletions src/main/java/venture/Aust1n46/chat/controllers/PluginMessageController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.google.inject.Singleton;

import me.clip.placeholderapi.PlaceholderAPI;
import venture.Aust1n46.chat.api.events.PrivateMessageEvent;
import venture.Aust1n46.chat.api.events.VentureChatEvent;
import venture.Aust1n46.chat.initators.commands.MuteContainer;
import venture.Aust1n46.chat.initiators.application.VentureChat;
Expand Down Expand Up @@ -730,7 +731,22 @@ public void run() {
sendPluginMessage(stream);
return;
}
p.getPlayer().sendMessage(FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), send.replaceAll("receiver_", ""))) + msg);

send = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), send.replaceAll("receiver_", ""))) + msg;
echo = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), echo.replaceAll("receiver_", ""))) + msg;
spy = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), spy.replaceAll("receiver_", ""))) + msg;

PrivateMessageEvent privateMessageEvent = new PrivateMessageEvent(playerApiService.getOnlineMineverseChatPlayer(sender), p, msg, echo, send, spy, true, !plugin.getServer().isPrimaryThread());
plugin.getServer().getPluginManager().callEvent(privateMessageEvent);
if (privateMessageEvent.isCancelled()) {
return;
}
send = privateMessageEvent.getSend();
echo = privateMessageEvent.getEcho();
spy = privateMessageEvent.getSpy();

p.getPlayer().sendMessage(send);

if (p.isNotifications()) {
formatService.playMessageSound(p);
}
Expand All @@ -747,8 +763,8 @@ public void run() {
out.writeUTF(p.getUuid().toString());
out.writeUTF(sender.toString());
out.writeUTF(sName);
out.writeUTF(FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), echo.replaceAll("receiver_", ""))) + msg);
out.writeUTF(FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(p.getPlayer(), spy.replaceAll("receiver_", ""))) + msg);
out.writeUTF(echo);
out.writeUTF(spy);
sendPluginMessage(stream);
return;
}
Expand Down
11 changes: 11 additions & 0 deletions src/main/java/venture/Aust1n46/chat/initators/commands/Message.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.google.inject.Inject;

import me.clip.placeholderapi.PlaceholderAPI;
import venture.Aust1n46.chat.api.events.PrivateMessageEvent;
import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.initiators.application.VentureChat;
import venture.Aust1n46.chat.localization.LocalizedMessage;
Expand Down Expand Up @@ -104,9 +105,19 @@ public void executeCommand(Player sender, String command, String[] args) {
echo = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), echo.replaceAll("receiver_", ""))) + msg;
spy = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), spy.replaceAll("receiver_", ""))) + msg;

PrivateMessageEvent privateMessageEvent = new PrivateMessageEvent(mcp, player, msg, echo, send, spy, false, !plugin.getServer().isPrimaryThread());
plugin.getServer().getPluginManager().callEvent(privateMessageEvent);
if (privateMessageEvent.isCancelled()) {
return;
}
send = privateMessageEvent.getSend();
echo = privateMessageEvent.getEcho();
spy = privateMessageEvent.getSpy();

player.setReplyPlayer(mcp.getUuid());
mcp.setReplyPlayer(player.getUuid());
player.getPlayer().sendMessage(send);

mcp.getPlayer().sendMessage(echo);
if (player.isNotifications()) {
formatService.playMessageSound(player);
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/venture/Aust1n46/chat/initators/commands/Reply.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.google.inject.Inject;

import me.clip.placeholderapi.PlaceholderAPI;
import venture.Aust1n46.chat.api.events.PrivateMessageEvent;
import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.initiators.application.VentureChat;
import venture.Aust1n46.chat.localization.LocalizedMessage;
Expand Down Expand Up @@ -94,6 +95,15 @@ public void executeCommand(Player sender, String command, String[] args) {
echo = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), echo.replaceAll("receiver_", ""))) + msg;
spy = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(player.getPlayer(), spy.replaceAll("receiver_", ""))) + msg;

PrivateMessageEvent privateMessageEvent = new PrivateMessageEvent(mcp, player, msg, echo, send, spy, false, !plugin.getServer().isPrimaryThread());
plugin.getServer().getPluginManager().callEvent(privateMessageEvent);
if (privateMessageEvent.isCancelled()) {
return;
}
send = privateMessageEvent.getSend();
echo = privateMessageEvent.getEcho();
spy = privateMessageEvent.getSpy();

if (!mcp.getPlayer().hasPermission("venturechat.spy.override")) {
for (VentureChatPlayer p : playerApiService.getOnlineMineverseChatPlayers()) {
if (p.getName().equals(mcp.getName()) || p.getName().equals(player.getName())) {
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/venture/Aust1n46/chat/initiators/listeners/ChatListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

import me.clip.placeholderapi.PlaceholderAPI;
import net.essentialsx.api.v2.services.discord.DiscordService;
import venture.Aust1n46.chat.api.events.PrivateMessageEvent;
import venture.Aust1n46.chat.api.events.VentureChatEvent;
import venture.Aust1n46.chat.controllers.PluginMessageController;
import venture.Aust1n46.chat.initators.commands.MuteContainer;
Expand Down Expand Up @@ -124,6 +125,15 @@ private void processPrivateMessageConversation(final VentureChatPlayer ventureCh
echo = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(tp.getPlayer(), echo.replaceAll("receiver_", ""))) + filtered;
spy = FormatUtils.FormatStringAll(PlaceholderAPI.setBracketPlaceholders(tp.getPlayer(), spy.replaceAll("receiver_", ""))) + filtered;

PrivateMessageEvent privateMessageEvent = new PrivateMessageEvent(ventureChatPlayer, tp, filtered, echo, send, spy, false, !plugin.getServer().isPrimaryThread());
plugin.getServer().getPluginManager().callEvent(privateMessageEvent);
if (privateMessageEvent.isCancelled()) {
return;
}
send = privateMessageEvent.getSend();
echo = privateMessageEvent.getEcho();
spy = privateMessageEvent.getSpy();

if (!ventureChatPlayer.getPlayer().hasPermission("venturechat.spy.override")) {
for (VentureChatPlayer p : playerApiService.getOnlineMineverseChatPlayers()) {
if (p.getName().equals(ventureChatPlayer.getName()) || p.getName().equals(tp.getName())) {
Expand Down