helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mailer: Fix case insensitivity for recipient (#1176)

Browse source
This commit is contained in:
ORelio 2020-08-04 18:18:30 +02:00
parent 92e776cebc
commit a17d60047a
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
MinecraftClient/ChatBots/Mailer.cs
View file

@ -108,6 +108,7 @@ namespace MinecraftClient.ChatBots
private string sender; private string sender;
private string senderLower; private string senderLower;
private string recipient; private string recipient;
private string recipientLower;
private string message; private string message;
private DateTime datesent; private DateTime datesent;
private bool delivered; private bool delivered;
@ -118,6 +119,7 @@ namespace MinecraftClient.ChatBots
this.sender = sender; this.sender = sender;
this.senderLower = sender.ToLower(); this.senderLower = sender.ToLower();
this.recipient = recipient; this.recipient = recipient;
this.recipientLower = recipient.ToLower();
this.message = message; this.message = message;
this.datesent = datesent; this.datesent = datesent;
this.delivered = false; this.delivered = false;
@ -127,6 +129,7 @@ namespace MinecraftClient.ChatBots
public string Sender { get { return sender; } } public string Sender { get { return sender; } }
public string SenderLowercase { get { return senderLower; } } public string SenderLowercase { get { return senderLower; } }
public string Recipient { get { return recipient; } } public string Recipient { get { return recipient; } }
public string RecipientLowercase { get { return recipientLower; } }
public string Content { get { return message; } } public string Content { get { return message; } }
public DateTime DateSent { get { return datesent; } } public DateTime DateSent { get { return datesent; } }
public bool Delivered { get { return delivered; } } public bool Delivered { get { return delivered; } }
@ -279,8 +282,8 @@ namespace MinecraftClient.ChatBots
ignoreList = IgnoreList.FromFile(Settings.Mailer_IgnoreListFile); ignoreList = IgnoreList.FromFile(Settings.Mailer_IgnoreListFile);
// Process at most 3 mails at a time to avoid spamming. Other mails will be processed on next mail send // Process at most 3 mails at a time to avoid spamming. Other mails will be processed on next mail send
HashSet<string> onlinePlayer = new HashSet<string>(GetOnlinePlayers()); HashSet<string> onlinePlayersLowercase = new HashSet<string>(GetOnlinePlayers().Select(name => name.ToLower()));
foreach (Mail mail in mailDatabase.Where(mail => !mail.Delivered && onlinePlayer.Contains(mail.Recipient)).Take(3)) foreach (Mail mail in mailDatabase.Where(mail => !mail.Delivered && onlinePlayersLowercase.Contains(mail.RecipientLowercase)).Take(3))
{ {
string sender = mail.Anonymous ? "Anonymous" : mail.Sender; string sender = mail.Anonymous ? "Anonymous" : mail.Sender;
SendPrivateMessage(mail.Recipient, sender + " mailed: " + mail.Content); SendPrivateMessage(mail.Recipient, sender + " mailed: " + mail.Content);

2
MinecraftClient/Settings.cs
View file

@ -638,7 +638,7 @@ namespace MinecraftClient
+ "consoletitle=%username%@%serverip% - Minecraft Console Client\r\n" + "consoletitle=%username%@%serverip% - Minecraft Console Client\r\n"
+ "internalcmdchar=slash # Use 'none', 'slash' or 'backslash'\r\n" + "internalcmdchar=slash # Use 'none', 'slash' or 'backslash'\r\n"
+ "splitmessagedelay=2 # Seconds between each part of a long message\r\n" + "splitmessagedelay=2 # Seconds between each part of a long message\r\n"
+ "botowners=Player1,Player2,Player3 # Name list or myfile.txt one name per line. !Server admins can impersonate owners!\r\n" + "botowners=Player1,Player2,Player3 # Name list or myfile.txt, one name per line. !Server admins can impersonate owners!\r\n"
+ "botmessagedelay=2 # Seconds to delay between message a bot makes to avoid accidental spam\r\n" + "botmessagedelay=2 # Seconds to delay between message a bot makes to avoid accidental spam\r\n"
+ "mcversion=auto # Use 'auto' or '1.X.X' values\r\n" + "mcversion=auto # Use 'auto' or '1.X.X' values\r\n"
+ "mcforge=auto # Use 'auto' or 'false'\r\n" + "mcforge=auto # Use 'auto' or 'false'\r\n"