github/diaspora
1
1
Fork 0
mirror of https://github.com/diaspora/diaspora.git synced 2026-01-09 15:18:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8421 from SuperTux88/cleanup-from-header-unicode-emojis

Browse Source 
Cleanup unicode emojis from email headers
This commit is contained in:
Benjamin Neff
2023-06-10 17:25:54 +02:00
parent cf49899069 dc9a18e24d
commit 02182e3b59
3 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/mailers/notification_mailers/base.rb
View File

@@ -36,15 +36,23 @@ module NotificationMailers
def default_headers
from_name = AppConfig.settings.pod_name
from_name += " (#{@sender.profile.full_name.empty? ? @sender.username : @sender.name})" if @sender.present?
from_name += " (#{person_name(@sender)})" if @sender.present?
{
from: name_and_address(from_name, AppConfig.mail.sender_address),
to: name_and_address(@recipient.name, @recipient.email),
to: name_and_address(person_name(@recipient), @recipient.email),
template_name: self.class.name.demodulize.underscore
}
end
def person_name(person)
if person.profile.full_name.empty?
person.username
else
person.name.gsub(/\p{Emoji}\uFE0F\u20E3?|\p{Emoji_Presentation}/, "").strip
end
end
def with_recipient_locale(&block)
I18n.with_locale(@recipient.language, &block)
end