warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adds configuration system. (#125)

Browse source
This commit is contained in:
Kamron Batman 2020-05-02 16:44:05 -07:00 • committed by GitHub
parent 2b4a6e1de1
commit 5b01754e3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 409 additions and 420 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Projects/Scripts/Misc/AccountPrompt.cs
View file

@ -7,7 +7,7 @@ namespace Server.Misc
{
public static void Initialize()
{
if (Accounts.Count == 0 && !Core.Service)
if (Accounts.Count == 0)
{
Console.WriteLine("This server has no accounts.");
Console.Write("Do you want to create the owner account now? (y/n)");
@ -36,4 +36,4 @@ namespace Server.Misc
}
}
}
}
}

6
Projects/Scripts/Misc/CrashGuard.cs
View file

@ -41,8 +41,7 @@ namespace Server.Misc
{
Console.Write("Crash: Sending email...");
if (Email.FROM_ADDRESS != null && Email.CRASH_ADDRESS != null)
Email.SendCrashEmail(filePath);
Email.SendCrashEmail(filePath);
}
private static string GetRoot()
@ -229,8 +228,7 @@ namespace Server.Misc
Console.WriteLine("done");
if (Email.FROM_ADDRESS != null && Email.CRASH_ADDRESS != null)
SendEmail(filePath);
SendEmail(filePath);
}
catch
{

37
Projects/Scripts/Misc/Email.cs
View file

@ -4,22 +4,13 @@ using System.Threading.Tasks;
using MailKit.Net.Smtp;
using MimeKit;
using Server.Accounting;
using Server.Configurations;
using Server.Engines.Help;
namespace Server.Misc
{
public static class Email
{
public static readonly MailboxAddress FROM_ADDRESS = new MailboxAddress(Configuration.Instance.emailSettings.FromName, Configuration.Instance.emailSettings.FromAddress);
public static readonly MailboxAddress CRASH_ADDRESS = new MailboxAddress(Configuration.Instance.emailSettings.crashName, Configuration.Instance.emailSettings.crashAddress);
public static readonly MailboxAddress SPEECH_LOG_PAGE_ADDRESS = new MailboxAddress(Configuration.Instance.emailSettings.speechLogPageName, Configuration.Instance.emailSettings.speechLogPageAddress);
public static readonly string EMAIL_SERVER = Configuration.Instance.emailSettings.emailServer;
public static readonly int EMAIL_PORT = Configuration.Instance.emailSettings.emailPort;
public static readonly string EMAIL_SERVER_USERNAME = Configuration.Instance.emailSettings.emailUsername;
public static readonly string EMAIL_SERVER_PASSWORD = Configuration.Instance.emailSettings.emailPassword;
public static readonly int RETRY_SEND_EMAIL_COUNT = 5;
public static readonly int SEND_DELAY_SECONDS = 2;
/// <summary>
/// Sends Queue-Page request using Email
/// </summary>
@ -27,12 +18,14 @@ namespace Server.Misc
/// <param name="pageType"></param>
public static void SendQueueEmail(PageEntry entry, string pageType)
{
if (!EmailConfiguration.EmailEnabled) return;
Mobile sender = entry.Sender;
DateTime time = DateTime.UtcNow;
var message = new MimeMessage();
message.From.Add(FROM_ADDRESS);
message.To.Add(SPEECH_LOG_PAGE_ADDRESS);
message.From.Add(EmailConfiguration.FromAddress);
message.To.Add(EmailConfiguration.SpeechLogPageAddress);
message.Subject = "ModernUO Speech Log Page Forwarding";
using (StringWriter writer = new StringWriter())
@ -77,9 +70,11 @@ namespace Server.Misc
/// <param name="filePath"></param>
public static void SendCrashEmail(string filePath)
{
if (EmailConfiguration.EmailEnabled) return;
var message = new MimeMessage();
message.From.Add(FROM_ADDRESS);
message.To.Add(CRASH_ADDRESS);
message.From.Add(EmailConfiguration.FromAddress);
message.To.Add(EmailConfiguration.CrashAddress);
message.Subject = "Automated ModernUO Crash Report";
var builder = new BodyBuilder
{
@ -96,19 +91,21 @@ namespace Server.Misc
/// <param name="message"></param>
private static async void SendAsync(MimeMessage message)
{
if (!EmailConfiguration.EmailEnabled) return;
DateTime now = DateTime.UtcNow;
string messageID = $"<{now:yyyyMMdd}.{now:HHmmssff}@{EMAIL_SERVER}>";
string messageID = $"<{now:yyyyMMdd}.{now:HHmmssff}@{EmailConfiguration.EmailServer}>";
message.Headers.Add("Message-ID", messageID);
message.From.Add(FROM_ADDRESS);
message.From.Add(EmailConfiguration.FromAddress);
int delay = SEND_DELAY_SECONDS;
int delay = EmailConfiguration.EmailSendRetryDelay;
for (int i = 0; i < RETRY_SEND_EMAIL_COUNT; i++)
for (int i = 0; i < EmailConfiguration.EmailSendRetryCount; i++)
try
{
using SmtpClient client = new SmtpClient();
await client.ConnectAsync(EMAIL_SERVER, EMAIL_PORT, true);
await client.AuthenticateAsync(EMAIL_SERVER_USERNAME, EMAIL_SERVER_PASSWORD);
await client.ConnectAsync(EmailConfiguration.EmailServer, EmailConfiguration.EmailPort, true);
await client.AuthenticateAsync(EmailConfiguration.EmailServerUsername, EmailConfiguration.EmailServerPassword);
await client.SendAsync(message);
await client.DisconnectAsync(true);
return;