fix, docs: RCON works again, readme improved

README.md

@@ -5,13 +5,19 @@ FDR is a simple executable (NOT a Factorio mod) which allows you to connect your
 
 #### Powered by [rconpp](https://github.com/Jaskowicz1/rconpp)
 
+### Features
+
+- Support for all commands.
+- Achievements still enabled when installed.
+- Talk to Discord from Factorio and vice versa.
+
 ---
 
 ## Requirements
 
 - [D++](https://github.com/brainboxdotcc/DPP/) (10.0.29 or higher).
 - A Factorio Server.
-- A Discord Bot with the `Message Content` intent on.
+- A Discord Bot with the `Message Content` and the `Server Members` intent on.
 - A channel for messages.
 - RCON enabled on the Factorio server (Add `--rcon-port <port (recommend: 27015)> --rcon-password <password>` to the arguments when running the server).
 
@@ -35,12 +41,8 @@ console_log_path=<log_path>
 admin_role=<role_id>
 ```
 
-Look at the section below for more information on the config.
-
 From here, you can do `./fdr` and you should see FDR up and running! If everything went well, FDR should have sent a message in your Factorio and Discord chat!
 
----
-
 ## Configuration Information
 
 This section will tell you what each part of the config means.

src/main.cpp

@@ -5,8 +5,7 @@
 #include <iostream>
 #include <fstream>
 
-int main(int argc, char *argv[]) {
-
+int main() {
 	std::ifstream config_file("config.cfg");
 	std::string config_line{};
 
@@ -37,7 +36,7 @@ int main(int argc, char *argv[]) {
 			bot_token = temp_line;
 		} else if (temp_line.rfind("msg_channel=", 0) == 0) {
 			temp_line.replace(temp_line.find("msg_channel="), sizeof("msg_channel=") - 1, "");
-			ip = temp_line;
+			FDR::config.msg_channel = temp_line;
 		} else if (temp_line.rfind("allow_achievements=", 0) == 0) {
 			temp_line.replace(temp_line.find("allow_achievements="), sizeof("allow_achievements=") - 1, "");
 			FDR::config.allow_achievements = (temp_line == "true");
@@ -55,18 +54,20 @@ int main(int argc, char *argv[]) {
 				std::cout << "Console path does not exist. FDR will only be able to communicate to Factorio and will not receive any input from Factorio." << "\n";
 				FDR::config.can_communicate_to_console = false;
 			} else {
-				std::cout << "Console path exists. FDR run at full functionality!" << "\n";
+				std::cout << "Console path exists. FDR can now run at full functionality!" << "\n";
 				FDR::config.can_communicate_to_console = true;
 			}
 		} else if (temp_line.rfind("admin_role=", 0) == 0) {
 			temp_line.replace(temp_line.find("admin_role="), sizeof("admin_role=") - 1, "");
 			FDR::config.admin_role = temp_line;
 		}
 	}
+
+	std::cout << "Configuration loaded. Starting FDR." << "\n";
 
-	rcon rcon_client{argv[1], port, argv[3]};
+	rcon rcon_client{ip, port, pass};
 
-	dpp::cluster bot(argv[4], dpp::i_default_intents | dpp::i_message_content, 0, 0, 1, true, dpp::cache_policy::cpol_none);
+	dpp::cluster bot(bot_token, dpp::i_default_intents | dpp::i_message_content | dpp::i_guild_members, 0, 0, 1, true, dpp::cache_policy::cpol_none);
 
 	/* Output simple log messages to stdout */
 	bot.on_log(dpp::utility::cout_logger());
@@ -89,11 +90,11 @@ int main(int argc, char *argv[]) {
 	    		});
 		} else if (event.command.get_command_name() == "time") {
 	    		rcon_client.send_data("/time", 3, data_type::SERVERDATA_EXECCOMMAND, [event](const std::string& data) {
-				event.reply(dpp::message(data).set_flags(dpp::m_ephemeral));
+				event.reply(dpp::message("Server uptime: " + data).set_flags(dpp::m_ephemeral));
 	    		});
 		} else if (event.command.get_command_name() == "version") {
 	    		rcon_client.send_data("/version", 3, data_type::SERVERDATA_EXECCOMMAND, [event](const std::string& data) {
-				event.reply(dpp::message(data).set_flags(dpp::m_ephemeral));
+				event.reply(dpp::message("Factorio version: " + data).set_flags(dpp::m_ephemeral));
 	    		});
 		} else if (event.command.get_command_name() == "players") {
 	    		rcon_client.send_data("/players online", 3, data_type::SERVERDATA_EXECCOMMAND, [event](const std::string& data) {
@@ -104,6 +105,11 @@ int main(int argc, char *argv[]) {
 				event.reply(dpp::message(data).set_flags(dpp::m_ephemeral));
 	    		});
 		} else if (event.command.get_command_name() == "command") {
+			if (std::find(event.command.member.get_roles().begin(), event.command.member.get_roles().end(), FDR::config.admin_role) == event.command.member.get_roles().end()) {
+				event.reply(dpp::message("You do not have the required role to run this command!").set_flags(dpp::m_ephemeral));
+				return;
+			}
+
 			auto command_to_run = std::get<std::string>(event.get_parameter("cmd"));
 
 			rcon_client.send_data("/command " + command_to_run, 3, data_type::SERVERDATA_EXECCOMMAND, [event](const std::string& data) {
@@ -114,7 +120,7 @@ int main(int argc, char *argv[]) {
 
 	/* Register slash command here in on_ready */
 	bot.on_ready([&bot, &rcon_client](const dpp::ready_t& event) {
-		/* Wrap command registration in run_once to make sure it doesnt run on every full reconnection */
+		/* Wrap command registration in run_once to make sure it doesn't run on every full reconnection */
 		if (dpp::run_once<struct register_bot_commands>()) {
 			dpp::slashcommand evolution_command("evolution", "See the current evolution", bot.me.id);
 			dpp::slashcommand time_command("time", "See the current time", bot.me.id);
@@ -148,7 +154,9 @@ int main(int argc, char *argv[]) {
 	    		});
 		}, 120);
 
-		rcon_client.send_data("Factorio-Discord-Relay (FDR) has loaded.", 999, data_type::SERVERDATA_EXECCOMMAND);
+		rcon_client.send_data("Factorio-Discord-Relay (FDR) has loaded!", 999, data_type::SERVERDATA_EXECCOMMAND);
+
+		bot.message_create(dpp::message(FDR::config.msg_channel, "Factorio-Discord-Relay (FDR) has loaded!"));
 	});
 
     	bot.start(dpp::st_wait);

src/rcon.cpp

@@ -46,7 +46,7 @@ const std::string rcon::send_data_sync(const std::string data, const int32_t id,
 	if(!connected) {
 		std::cout << "Cannot send data when not connected." << "\n";
 		return "";
-		}
+	}
 
 	unsigned long long packet_len = data.length() + HEADER_SIZE;
 	unsigned char packet[packet_len];
@@ -80,7 +80,7 @@ bool rcon::connect() {
 	server.sin_addr.s_addr = inet_addr(address.c_str());
 	server.sin_port = htons(port);
 
-	// Make it non blocking.
+	// Make it non-blocking.
 	fcntl(sock, F_SETFL, O_NONBLOCK);
 
 	// Set a timeout of 4 milliseconds.
@@ -117,8 +117,8 @@ void rcon::form_packet(unsigned char packet[], const std::string& data, int32_t
 		std::cout << "This packet is too big to send. Please generate a smaller packet." << "\n";
 		return;
 	}
-    
-	//bzero(packet, data_size);
+
+	(memset(packet, '\0', data_size), (void) 0);
 
 	// Each part is 4 bytes, so we allocate each part 4 bytes away.
 	packet[0] = data_size;