incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix disconnect when sending mail to offline user

Browse Source
This commit is contained in:
Martin Michelsen
2022-09-22 16:55:58 -07:00
parent 8afc952294
commit a1c86189e4
1 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ReceiveCommands.cc
+30 -18
View File
@@ -2079,28 +2079,40 @@ static void on_simple_mail(shared_ptr<ServerState> s, shared_ptr<Client> c,
throw logic_error("invalid game version"); throw logic_error("invalid game version");
} }
auto target = s->find_client(nullptr, to_guild_card_number); shared_ptr<Client> target;
try {
target = s->find_client(nullptr, to_guild_card_number);
} catch (const out_of_range&) { }
// If the sender is blocked, don't forward the mail if (!target) {
for (size_t y = 0; y < 30; y++) { // TODO: We should store pending messages for accounts somewhere, and send
if (target->game_data.account()->blocked_senders.data()[y] == c->license->serial_number) { // them when the player signs on again. We should also persist the player's
return; // autoreply setting when they're offline and use it if appropriate here.
send_text_message(c, u"$C6Player is offline");
} else {
// If the sender is blocked, don't forward the mail
for (size_t y = 0; y < 30; y++) {
if (target->game_data.account()->blocked_senders.data()[y] == c->license->serial_number) {
return;
}
} }
}
// If the target has auto-reply enabled, send the autoreply // If the target has auto-reply enabled, send the autoreply. Note that we also
if (!target->game_data.player()->auto_reply.empty()) { // forward the message in this case.
send_simple_mail(c, target->license->serial_number, if (!target->game_data.player()->auto_reply.empty()) {
target->game_data.player()->disp.name, send_simple_mail(c, target->license->serial_number,
target->game_data.player()->auto_reply); target->game_data.player()->disp.name,
} target->game_data.player()->auto_reply);
}
// Forward the message // Forward the message
send_simple_mail( send_simple_mail(
target, target,
c->license->serial_number, c->license->serial_number,
c->game_data.player()->disp.name, c->game_data.player()->disp.name,
message); message);
}
} }