File tree Expand file tree Collapse file tree 2 files changed +6
-3
lines changed
src/main/kotlin/net/azisaba/guildchatdiscord Expand file tree Collapse file tree 2 files changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ plugins {
55}
66
77group = " net.azisaba"
8- version = " 2.0 .0"
8+ version = " 2.1 .0"
99
1010repositories {
1111 mavenCentral()
@@ -22,7 +22,7 @@ dependencies {
2222 implementation(" org.mariadb.jdbc:mariadb-java-client:3.0.8" )
2323 implementation(" com.zaxxer:HikariCP:5.0.1" )
2424 implementation(" com.charleskorn.kaml:kaml:0.47.0" ) // YAML support for kotlinx.serialization
25- implementation(" net.azisaba.interchat:api:2.0.0-SNAPSHOT " )
25+ implementation(" net.azisaba.interchat:api:2.1.0 " )
2626 // ByteBuf
2727 implementation(" io.netty:netty-buffer:4.1.82.Final" )
2828 // Support for minecraft chat components
Original file line number Diff line number Diff line change @@ -6,6 +6,7 @@ import dev.kord.rest.request.RestRequestException
66import dev.kord.rest.service.RestClient
77import kotlinx.coroutines.runBlocking
88import net.azisaba.guildchatdiscord.util.DatabaseManager
9+ import net.azisaba.interchat.api.guild.GuildMember
910import net.azisaba.interchat.api.network.PacketListener
1011import net.azisaba.interchat.api.network.protocol.GuildMessagePacket
1112import net.azisaba.interchat.api.text.MessageFormatter
@@ -29,17 +30,19 @@ object InterChatPacketListener : PacketListener {
2930 if (guild == null || user == null || guild.deleted()) {
3031 return @collectAsync
3132 }
33+ val members = guild.members.join()
34+ val nickname = members.stream().filter { it.uuid() == user.id() }.findAny().map(GuildMember ::nickname)
3235 val formattedText = MessageFormatter .format(
3336 guild.format(),
3437 guild,
3538 packet.server(),
3639 user,
40+ nickname.orElse(null ),
3741 packet.message(),
3842 packet.transliteratedMessage(),
3943 )
4044 val formattedComponent = LEGACY_COMPONENT_SERIALIZER .deserialize(formattedText)
4145 val plainText = PLAIN_TEXT_COMPONENT_SERIALIZER .serialize(formattedComponent)
42- val members = guild.members.join()
4346 DatabaseManager .getWebhooksByGuildId(packet.guildId()).forEach { info ->
4447 InterChatDiscord .asyncExecutor.execute {
4548 runBlocking {
You can’t perform that action at this time.
0 commit comments