@@ -19,7 +19,6 @@ import net.azisaba.interchat.api.network.Protocol
1919import net.azisaba.interchat.api.network.protocol.GuildMessagePacket
2020import org.slf4j.LoggerFactory
2121import java.io.File
22- import java.util.UUID
2322
2423private val logger = LoggerFactory .getLogger(" GuildChatDiscord" )
2524
@@ -48,32 +47,13 @@ suspend fun main() {
4847
4948 client.on<MessageCreateEvent > {
5049 if (message.author?.isBot != false ) return @on
51- InterChatDiscord .asyncExecutor.execute {
52- val minecraftUuid = DatabaseManager .query(" SELECT `minecraft_uuid` FROM `users` WHERE `discord_id` = ?" ) {
53- it.setLong(1 , message.author!! .id.value.toLong())
54- it.executeQuery().use { rs ->
55- if (rs.next()) {
56- UUID .fromString(rs.getString(" minecraft_uuid" ))
57- } else {
58- null
59- }
60- }
61- } ? : return @execute
62- val guildId = DatabaseManager .query(" SELECT `guild_id` FROM `channels` WHERE `channel_id` = ?" ) {
63- it.setLong(1 , message.channelId.value.toLong())
64- it.executeQuery().use { rs ->
65- if (rs.next()) {
66- rs.getLong(" guild_id" )
67- } else {
68- null
69- }
70- }
71- } ? : return @execute
72- val isMember = InterChatDiscord .guildManager.getMember(guildId, minecraftUuid).exceptionally { null }.join() != null
73- if (! isMember) return @execute
74- val packet = GuildMessagePacket (guildId, " Discord" , minecraftUuid, message.content, null )
75- JedisBoxProvider .get().pubSubHandler.publish(Protocol .GUILD_MESSAGE .name, packet)
76- }
50+ val guildId = DatabaseManager .getGuildIdByChannelId(message.channelId.value.toLong()) ? : return @on
51+ val minecraftUuid = DatabaseManager .getMinecraftUUIDByDiscordId(message.author!! .id.value.toLong()) ? : return @on
52+ // return if the author is not member of the guild
53+ InterChatDiscord .guildManager.getMember(guildId, minecraftUuid).exceptionally { null }.join() ? : return @on
54+ // send packet
55+ val packet = GuildMessagePacket (guildId, " Discord" , minecraftUuid, message.content, null )
56+ JedisBoxProvider .get().pubSubHandler.publish(Protocol .GUILD_MESSAGE .name, packet)
7757 }
7858
7959 client.on<ApplicationCommandInteractionCreateEvent > {
0 commit comments