From 37fbd5c24babe09d9b82915f691ef269be82a1d4 Mon Sep 17 00:00:00 2001
From: RElesgoe <RElesgoe@users.noreply.github.com>
Date: Mon, 24 Aug 2020 23:01:07 -0700
Subject: [PATCH 1/4] Fix missing </item>
---
conf/i18n/common.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/conf/i18n/common.xml b/conf/i18n/common.xml
index 8eb220f..e9a001d 100644
--- a/conf/i18n/common.xml
+++ b/conf/i18n/common.xml
@@ -2071,6 +2071,7 @@
<item id="516" file="clan.cpp" function="clan_create">
<original>This is a newly created clan</original>
<translate></translate>
+ </item>
<item id="517" file="command.cpp" function="_handle_email_command">
<original>An error has occurred.</original>
<translate></translate>
@@ -2132,4 +2133,4 @@
<translate></translate>
</item>
</items>
-</root>
\ No newline at end of file
+</root>
From 633dfa98f33bf6d2c31f86db50a213ff15faa92b Mon Sep 17 00:00:00 2001
From: RElesgoe <RElesgoe@users.noreply.github.com>
Date: Tue, 25 Aug 2020 05:39:07 -0700
Subject: [PATCH 2/4] Update anongame_wol.cpp
---
src/bnetd/anongame_wol.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/bnetd/anongame_wol.cpp b/src/bnetd/anongame_wol.cpp
index f46da14..5801828 100644
--- a/src/bnetd/anongame_wol.cpp
+++ b/src/bnetd/anongame_wol.cpp
@@ -24,6 +24,8 @@
#include <cctype>
#include <cstdlib>
+#include <fmt/format.h>
+
#include "compat/strcasecmp.h"
#include "common/irc_protocol.h"
@@ -316,10 +318,9 @@ namespace pvpgn
if (!nick)
nick = "UserName";
- std::string data(":matchbot!u@h " + std::string(command) + " " + std::string(nick) + " " + std::string(text));
- data.erase(MAX_IRC_MESSAGE_LEN, std::string::npos);
+ std::string data = fmt::format(":matchbot!u@h {} {} {}", command, nick, text);
- DEBUG2("[{}] sent \"{}\"", conn_get_socket(conn), data.c_str());
+ DEBUG2("[{}] sent \"{}\"", conn_get_socket(conn));
data.append("\r\n");
packet_set_size(p, 0);
packet_append_data(p, data.c_str(), data.length());
From 68f52fd632b44ecedd476f495fc53e4882d060f7 Mon Sep 17 00:00:00 2001
From: RElesgoe <RElesgoe@users.noreply.github.com>
Date: Tue, 25 Aug 2020 19:11:07 -0700
Subject: [PATCH 3/4] Update anongame_wol.cpp
---
src/bnetd/anongame_wol.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bnetd/anongame_wol.cpp b/src/bnetd/anongame_wol.cpp
index 5801828..310ec23 100644
--- a/src/bnetd/anongame_wol.cpp
+++ b/src/bnetd/anongame_wol.cpp
@@ -320,7 +320,7 @@ namespace pvpgn
std::string data = fmt::format(":matchbot!u@h {} {} {}", command, nick, text);
- DEBUG2("[{}] sent \"{}\"", conn_get_socket(conn));
+ DEBUG2("[{}] sent \"{}\"", conn_get_socket(conn), data);
data.append("\r\n");
packet_set_size(p, 0);
packet_append_data(p, data.c_str(), data.length());
From c2167e18a6fc26c40220f921b51698dc7d104db8 Mon Sep 17 00:00:00 2001
From: RElesgoe <RElesgoe@users.noreply.github.com>
Date: Fri, 28 Aug 2020 22:51:43 -0700
Subject: [PATCH 4/4] Throttle smtp_consumer() thread
---
src/bnetd/smtp.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/bnetd/smtp.cpp b/src/bnetd/smtp.cpp
index 20cc317..0207479 100644
--- a/src/bnetd/smtp.cpp
+++ b/src/bnetd/smtp.cpp
@@ -18,6 +18,7 @@
#include <array>
#include <atomic>
+#include <chrono>
#include <cstdint>
#include <ctime>
#include <fstream>
@@ -162,6 +163,8 @@ namespace pvpgn
curl_multi_handle_mutex.unlock();
}
+
+ std::this_thread::sleep_for(std::chrono::seconds(3));
}
}