diff --git a/api/src/main/java/com/discordsrv/api/discord/entity/guild/DiscordGuildMember.java b/api/src/main/java/com/discordsrv/api/discord/entity/guild/DiscordGuildMember.java index bd951175..bf6fd051 100644 --- a/api/src/main/java/com/discordsrv/api/discord/entity/guild/DiscordGuildMember.java +++ b/api/src/main/java/com/discordsrv/api/discord/entity/guild/DiscordGuildMember.java @@ -123,7 +123,7 @@ public interface DiscordGuildMember extends JDAEntity, Mentionable { * Gets the color of this user's highest role that has a color. * @return the color that will be used for this user */ - @Placeholder("color") + @Placeholder(value = "color", relookup = "color") Color getColor(); /** diff --git a/common/src/main/java/com/discordsrv/common/discord/api/entity/guild/DiscordGuildMemberImpl.java b/common/src/main/java/com/discordsrv/common/discord/api/entity/guild/DiscordGuildMemberImpl.java index b3fbabb9..9efb03e3 100644 --- a/common/src/main/java/com/discordsrv/common/discord/api/entity/guild/DiscordGuildMemberImpl.java +++ b/common/src/main/java/com/discordsrv/common/discord/api/entity/guild/DiscordGuildMemberImpl.java @@ -24,6 +24,7 @@ import com.discordsrv.api.discord.entity.guild.DiscordGuild; import com.discordsrv.api.discord.entity.guild.DiscordGuildMember; import com.discordsrv.api.discord.entity.guild.DiscordRole; import com.discordsrv.api.placeholder.annotation.Placeholder; +import com.discordsrv.api.placeholder.annotation.PlaceholderPrefix; import com.discordsrv.api.placeholder.annotation.PlaceholderRemainder; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.component.util.ComponentUtil; @@ -39,6 +40,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletableFuture; +@PlaceholderPrefix("user_") public class DiscordGuildMemberImpl implements DiscordGuildMember { private final DiscordSRV discordSRV; diff --git a/common/src/main/java/com/discordsrv/common/discord/api/entity/message/ReceivedDiscordMessageImpl.java b/common/src/main/java/com/discordsrv/common/discord/api/entity/message/ReceivedDiscordMessageImpl.java index c9c88af4..80802eda 100644 --- a/common/src/main/java/com/discordsrv/common/discord/api/entity/message/ReceivedDiscordMessageImpl.java +++ b/common/src/main/java/com/discordsrv/common/discord/api/entity/message/ReceivedDiscordMessageImpl.java @@ -30,6 +30,7 @@ import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; import com.discordsrv.api.discord.exception.RestErrorResponseException; import com.discordsrv.api.placeholder.annotation.Placeholder; +import com.discordsrv.api.placeholder.annotation.PlaceholderPrefix; import com.discordsrv.api.placeholder.annotation.PlaceholderRemainder; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.component.util.ComponentUtil; @@ -49,6 +50,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletableFuture; +@PlaceholderPrefix("message_") public class ReceivedDiscordMessageImpl implements ReceivedDiscordMessage { public static ReceivedDiscordMessage fromJDA(DiscordSRV discordSRV, Message message) {