Chat Preview API

Author: BillyGalbreath

patches/api/0049-Chat-Preview-API.patch

@@ -0,0 +1,61 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <blake.galbreath@gmail.com>
+Date: Mon, 11 Jul 2022 21:09:14 -0500
+Subject: [PATCH] Chat Preview API
+
+
+diff --git a/src/main/java/org/purpurmc/purpur/event/player/PlayerPreviewChatEvent.java b/src/main/java/org/purpurmc/purpur/event/player/PlayerPreviewChatEvent.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..9fec1bb3ae5b72640344a0933d1a1e82355d3c97
+--- /dev/null
++++ b/src/main/java/org/purpurmc/purpur/event/player/PlayerPreviewChatEvent.java
+@@ -0,0 +1,49 @@
++package org.purpurmc.purpur.event.player;
++
++import net.kyori.adventure.text.Component;
++import org.bukkit.Bukkit;
++import org.bukkit.entity.Player;
++import org.bukkit.event.Cancellable;
++import org.bukkit.event.HandlerList;
++import org.bukkit.event.player.PlayerEvent;
++import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
++
++public class PlayerPreviewChatEvent extends PlayerEvent implements Cancellable {
++    private static final HandlerList handlers = new HandlerList();
++    private Component query;
++
++    public PlayerPreviewChatEvent(@NotNull Player who, @Nullable Component query) {
++        super(who, !Bukkit.isPrimaryThread());
++        this.query = query;
++    }
++
++    public Component getQuery() {
++        return this.query;
++    }
++
++    public void setQuery(Component query) {
++        this.query = query;
++    }
++
++    @Override
++    public boolean isCancelled() {
++        return getQuery() == null;
++    }
++
++    @Override
++    public void setCancelled(boolean cancel) {
++        this.query = null;
++    }
++
++    @Override
++    @NotNull
++    public HandlerList getHandlers() {
++        return handlers;
++    }
++
++    @NotNull
++    public static HandlerList getHandlerList() {
++        return handlers;
++    }
++}

patches/server/0285-Chat-Preview-API.patch

@@ -0,0 +1,51 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <blake.galbreath@gmail.com>
+Date: Mon, 11 Jul 2022 20:44:19 -0500
+Subject: [PATCH] Chat Preview API
+
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 3bb51f34be4341c991487a78d8793f074ffdcba4..27c209440913c5bdeeb766f29e6827ef50d54ffd 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -2310,7 +2310,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+     }
+ 
+     private void broadcastChatMessage(ServerboundChatPacket packetplayinchat, FilteredText<PlayerChatMessage> filteredtext) {
+-        if (!((PlayerChatMessage) filteredtext.raw()).verify(this.player)) {
++        /* Purpur start
++         * I'm not real sure how else to handle this right now. so I just skip the
++         * signature verification if this is from a client previewed message.
++         * Sadly, this opens up the possibility for modded clients to lie here. */
++        if (!packetplayinchat.signedPreview() && !((PlayerChatMessage) filteredtext.raw()).verify(this.player)) {
++        // Purpur end
+             ServerGamePacketListenerImpl.LOGGER.warn("{} sent message with invalid signature: '{}'", this.player.getName().getString(), ((PlayerChatMessage) filteredtext.raw()).signedContent().getString());
+         } else {
+             // CraftBukkit start
+@@ -2512,7 +2517,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+ 
+     @Override
+     public void handleChatPreview(ServerboundChatPreviewPacket packet) {
+-        if (false && this.server.previewsChat()) { // CraftBukkit - preview NYI
++        if (this.server.previewsChat()) { // CraftBukkit - preview NYI // Purpur - lets implement it already.. sheesh
+             this.chatPreviewThrottler.schedule(() -> {
+                 int i = packet.queryId();
+                 String s = packet.query();
+@@ -2543,6 +2548,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+     private CompletableFuture<Component> queryChatPreview(String query) {
+         MutableComponent ichatmutablecomponent = Component.literal(query);
+ 
++        // Purpur start
++        net.kyori.adventure.text.Component adventureComponent = PaperAdventure.asAdventure(ichatmutablecomponent);
++        org.purpurmc.purpur.event.player.PlayerPreviewChatEvent previewEvent = new org.purpurmc.purpur.event.player.PlayerPreviewChatEvent(getPlayer().getBukkitEntity(), adventureComponent);
++        if (!previewEvent.callEvent()) {
++            return CompletableFuture.completedFuture(null);
++        }
++        if (!previewEvent.getQuery().equals(adventureComponent)) {
++            return CompletableFuture.completedFuture(PaperAdventure.asVanilla(previewEvent.getQuery()));
++        }
++        // Purpur end
++
+         return this.server.getChatDecorator().decorate(this.player, ichatmutablecomponent).thenApply((ichatbasecomponent) -> {
+             return !ichatmutablecomponent.equals(ichatbasecomponent) ? ichatbasecomponent : null;
+         });