javier/Wino-Mail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-implemented signature page to support different signatures for different actions

Browse Source
This commit is contained in:
Aleh Khantsevich
2024-06-13 00:51:59 +02:00
parent 0ccf67000c
commit b54555a4f7
19 changed files with 1164 additions and 1303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Wino.Core/Services/MailService.cs
View File

@@ -673,16 +673,26 @@ namespace Wino.Core.Services
builder.HtmlBody = visitor.HtmlBody;
}
else
// Append signatures if needed.
if (account.Preferences.IsSignatureEnabled)
{
// Add signature if any.
var accountSignature = await _signatureService.GetAccountSignatureAsync(account.Id);
var signatureId = reason == DraftCreationReason.Empty ?
account.Preferences.SignatureIdForNewMessages :
account.Preferences.SignatureIdForFollowingMessages;
if (accountSignature != null)
if (signatureId != null)
{
// Leave some space for new mail content.
var signature = await _signatureService.GetSignatureAsync(signatureId.Value);
builder.HtmlBody = @$"<html><br><br>{accountSignature.HtmlBody}</html>";
if (string.IsNullOrWhiteSpace(builder.HtmlBody))
{
builder.HtmlBody = @$"<html><br><br>{signature.HtmlBody}</html>";
}
else
{
builder.HtmlBody += @$"{signature.HtmlBody}";
}
}
}
@@ -726,7 +736,7 @@ namespace Wino.Core.Services
message.Body = builder.ToMessageBody();
}
InternetAddressList ExtractRecipients(string parameterValue)
static InternetAddressList ExtractRecipients(string parameterValue)
{
var list = new InternetAddressList();