Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ENH: Use message subject when sending instant subscription messages #6199

Merged
merged 3 commits into from
Nov 30, 2024
Merged

ENH: Use message subject when sending instant subscription messages #6199

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b8fd89
ENH: Use message subject when sending instant subscription messages
johnhenley Nov 6, 2024
fc9d8af
ENH: Use message subject when sending instant subscription messages
johnhenley Nov 6, 2024
1a8fad9
fall back to default subject when empty subject
johnhenley Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions DNN Platform/Library/Services/Social/Messaging/Scheduler/CoreMessagingScheduler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information

Expand Down Expand Up @@ -695,7 +695,6 @@ private void SendMessage(MessageRecipient messageRecipient)
var defaultLanguage = toUser.Profile.PreferredLocale;
var portalSettings = new PortalSettings(message.PortalID);

var emailSubjectTemplate = GetEmailSubjectTemplate(portalSettings, defaultLanguage);
var emailBodyTemplate = GetEmailBodyTemplate(portalSettings, defaultLanguage);
var emailBodyItemTemplate = GetEmailBodyItemTemplate(portalSettings, defaultLanguage);

Expand All @@ -709,7 +708,12 @@ private void SendMessage(MessageRecipient messageRecipient)
var senderName = GetSenderName(author.DisplayName, portalSettings.PortalName);
var senderAddress = GetSenderAddress(senderName, portalSettings.Email);
var emailBodyItemContent = GetEmailItemContent(portalSettings, messageRecipient, emailBodyItemTemplate);
var subject = string.Format(emailSubjectTemplate, portalSettings.PortalName);
var subject = InternalMessagingController.Instance.GetMessage(message.MessageID).Subject;
if (string.IsNullOrEmpty(subject))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this have a check for a possible missing subject?

{
subject = string.Format(GetEmailSubjectTemplate(portalSettings, defaultLanguage), portalSettings.PortalName);
}

var body = GetEmailBody(emailBodyTemplate, emailBodyItemContent, portalSettings, toUser);
body = RemoveHttpUrlsIfSiteisSSLEnabled(body, portalSettings);

Expand Down
Loading