Add PlaceholderAPI support for discord -> in-game message format.

DiscordSRV · Feb 4, 2020 · f6deed8 · f6deed8
1 parent f125005
commit f6deed8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.rezzedup</groupId>
     <artifactId>discordsrv-staff-chat</artifactId>
     <name>DiscordSRV-Staff-Chat</name>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.14-R0.1-SNAPSHOT</version>
+            <version>1.15-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <!-- 
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>com.discordsrv</groupId>
             <artifactId>discordsrv</artifactId>
-            <version>1.18.0</version>
+            <version>1.18.4</version>
             <scope>provided</scope>
         </dependency>
         <!--

diff --git a/src/main/java/com/rezzedup/discordsrv/staffchat/StaffChatPlugin.java b/src/main/java/com/rezzedup/discordsrv/staffchat/StaffChatPlugin.java
@@ -186,6 +186,13 @@ public void submitMessageFromDiscord(User author, Message message)
 
         // Emoji Unicode -> Alias (library included with DiscordSRV)
         String text = EmojiParser.parseToAliases(event.getText());
+        String format = getConfig().getString("discord-message-format");
+
+        if (getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
+        {
+            // Update format's PAPI placeholders before inserting the message.
+            format = PlaceholderAPI.setPlaceholders(null, format);
+        }
 
         MappedPlaceholder placholders = new MappedPlaceholder();
 
@@ -194,7 +201,7 @@ public void submitMessageFromDiscord(User author, Message message)
         placholders.map("nickname", "displayname").to(message.getGuild().getMember(author)::getNickname);
         placholders.map("discriminator", "discrim").to(author::getDiscriminator);
 
-        updatePlaceholdersThenAnnounceInGame(getConfig().getString("discord-message-format"), placholders);
+        updatePlaceholdersThenAnnounceInGame(format, placholders);
     }
 
     @Override

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -37,7 +37,7 @@
 #
 
 #
-#   *If* PlaceholderAPI is installed, the in-game format will also utilize those.
+#   *If* PlaceholderAPI is installed, both in-game and discord formats will also utilize them.
 #   That plugin is not necessary for the existing placeholders in this config, however.
 #