From 808823561cc6e9c11d9e0174cec318a2f0214d1b Mon Sep 17 00:00:00 2001 From: Yamsha Date: Tue, 2 Feb 2021 11:46:57 +0100 Subject: [PATCH] Add setting player count in bot activity --- mta/discord-events/events.lua | 10 ++++++++++ mta/discord/discord.lua | 2 ++ src/library/Bot.js | 8 ++++++++ src/library/PacketManager.js | 2 ++ src/library/handler/ServerStatusHandler.js | 19 +++++++++++++++++++ 5 files changed, 41 insertions(+) create mode 100644 src/library/handler/ServerStatusHandler.js diff --git a/mta/discord-events/events.lua b/mta/discord-events/events.lua index 2a6a3af..8f04fb0 100644 --- a/mta/discord-events/events.lua +++ b/mta/discord-events/events.lua @@ -13,11 +13,20 @@ function getPlayerName(player) return player.name:monochrome() end +function sendPlayerCount(correction) + correction = correction or 0 + local player_count = getPlayerCount() + correction + local max_players = getMaxPlayers() + exports.discord:send("server.player_count", { player_count = player_count, max_players = max_players }) +end +addEventHandler("onDiscordChannelBound", root, sendPlayerCount) + addEvent("onDiscordUserCommand") addEventHandler("onPlayerJoin", root, function () exports.discord:send("player.join", { player = getPlayerName(source) }) + sendPlayerCount() end ) @@ -46,6 +55,7 @@ addEventHandler("onPlayerQuit", root, else exports.discord:send("player.quit", { player = playerName, type = quitType, reason = reason }) end + sendPlayerCount(-1) end ) diff --git a/mta/discord/discord.lua b/mta/discord/discord.lua index 895a502..346ae19 100644 --- a/mta/discord/discord.lua +++ b/mta/discord/discord.lua @@ -1,5 +1,6 @@ addEvent("onDiscordPacket") +addEvent("onDiscordChannelBound") local socket = false @@ -92,6 +93,7 @@ function handleSelectChannelPacket(socket, payload) outputDebugString("[Discord] Bot isn't ready") else outputDebugString("[Discord] Channel has been bound") + triggerEvent("onDiscordChannelBound", resourceRoot) if not socket.bindmessage then socket:write(table.json { diff --git a/src/library/Bot.js b/src/library/Bot.js index 7c19e09..bf6a7d6 100644 --- a/src/library/Bot.js +++ b/src/library/Bot.js @@ -48,6 +48,14 @@ class Bot extends EventEmitter { return this.connected; } + setActivity(status) { + if (!this.connected || !this.channel) { + return Promise.reject(new Error("Bot is offline or not in your guild or didn't find the specified channel")); + } + + return this.client.user.setActivity(status); + } + sendMessage(message) { if (!this.connected || !this.channel) { return Promise.reject(new Error("Bot is offline or not in your guild or didn't find the specified channel")); diff --git a/src/library/PacketManager.js b/src/library/PacketManager.js index 4c27795..40b1607 100644 --- a/src/library/PacketManager.js +++ b/src/library/PacketManager.js @@ -8,6 +8,7 @@ const ChatConfirmHandler = require("./handler/ChatConfirmHandler"); const PlayerEventHandler = require("./handler/PlayerEventHandler"); const MapManagerHandler = require("./handler/MapManagerHandler"); const WebradioHandler = require("./handler/WebradioHandler"); +const ServerStatusHandler = require("./handler/ServerStatusHandler"); class PacketManager { constructor() { @@ -21,6 +22,7 @@ class PacketManager { this.register(new PlayerEventHandler()); this.register(new MapManagerHandler()); this.register(new WebradioHandler()); + this.register(new ServerStatusHandler()); } /** diff --git a/src/library/handler/ServerStatusHandler.js b/src/library/handler/ServerStatusHandler.js new file mode 100644 index 0000000..229405d --- /dev/null +++ b/src/library/handler/ServerStatusHandler.js @@ -0,0 +1,19 @@ +"use strict"; + +const Handler = require("./Handler"); + +class ServerStatusHandler extends Handler { + constructor() { + super(); + + this.types.add("server.player_count"); + } + + execute(bot, session, type, payload) { + if (type == "server.player_count") { + bot.setActivity(`${payload.player_count}/${payload.max_players}`); + } + } +} + +module.exports = ServerStatusHandler;