:return_path => EMAIL_RETURN_PATH,
:auto_submitted => "auto-generated"
helper :application
+ before_action :set_shared_template_vars
+ before_action :attach_project_logo
def signup_confirm(user, token)
with_recipient_locale user do
- @url = url_for(:host => SERVER_URL,
- :controller => "user", :action => "confirm",
+ @url = url_for(:controller => "user", :action => "confirm",
:display_name => user.display_name,
:confirm_string => token.token)
def email_confirm(user, token)
with_recipient_locale user do
@address = user.new_email
- @url = url_for(:host => SERVER_URL,
- :controller => "user", :action => "confirm_email",
+ @url = url_for(:controller => "user", :action => "confirm_email",
:confirm_string => token.token)
mail :to => user.new_email,
def lost_password(user, token)
with_recipient_locale user do
- @url = url_for(:host => SERVER_URL,
- :controller => "user", :action => "reset_password",
+ @url = url_for(:controller => "user", :action => "reset_password",
:token => token.token)
mail :to => user.email,
@from_user = message.sender.display_name
@text = message.body
@title = message.title
- @readurl = url_for(:host => SERVER_URL,
- :controller => "message", :action => "read",
- :message_id => message.id)
- @replyurl = url_for(:host => SERVER_URL,
- :controller => "message", :action => "reply",
- :message_id => message.id)
+ @readurl = message_url(message)
+ @replyurl = reply_message_url(message)
+ @author = @from_user
+
+ attach_user_avatar(message.sender)
mail :from => from_address(message.sender.display_name, "m", message.id, message.digest),
:to => message.recipient.email,
@from_user = comment.user.display_name
@text = comment.body
@title = comment.diary_entry.title
- @readurl = url_for(:host => SERVER_URL,
- :controller => "diary_entry",
- :action => "view",
- :display_name => comment.diary_entry.user.display_name,
- :id => comment.diary_entry.id,
- :anchor => "comment#{comment.id}")
- @commenturl = url_for(:host => SERVER_URL,
- :controller => "diary_entry",
- :action => "view",
- :display_name => comment.diary_entry.user.display_name,
- :id => comment.diary_entry.id,
- :anchor => "newcomment")
- @replyurl = url_for(:host => SERVER_URL,
- :controller => "message",
- :action => "new",
- :display_name => comment.user.display_name,
- :title => "Re: #{comment.diary_entry.title}")
-
- mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest),
+ @readurl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "comment#{comment.id}")
+ @commenturl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "newcomment")
+ @replyurl = new_message_url(comment.user, :message => { :title => "Re: #{comment.diary_entry.title}" })
+
+ @author = @from_user
+
+ attach_user_avatar(comment.user)
+
+ mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest, recipient.id),
:to => recipient.email,
:subject => I18n.t("notifier.diary_comment_notification.subject", :user => comment.user.display_name)
end
def friend_notification(friend)
with_recipient_locale friend.befriendee do
@friend = friend
- @viewurl = url_for(:host => SERVER_URL,
- :controller => "user", :action => "view",
- :display_name => @friend.befriender.display_name)
- @friendurl = url_for(:host => SERVER_URL,
- :controller => "user", :action => "make_friend",
+ @viewurl = user_url(@friend.befriender)
+ @friendurl = url_for(:controller => "user", :action => "make_friend",
:display_name => @friend.befriender.display_name)
+ @author = @friend.befriender.display_name
+ attach_user_avatar(@friend.befriender)
mail :to => friend.befriendee.email,
:subject => I18n.t("notifier.friend_notification.subject", :user => friend.befriender.display_name)
end
def note_comment_notification(comment, recipient)
with_recipient_locale recipient do
- @noteurl = browse_note_url(comment.note, :host => SERVER_URL)
+ @noteurl = browse_note_url(comment.note)
@place = Nominatim.describe_location(comment.note.lat, comment.note.lon, 14, I18n.locale)
@comment = comment.body
@owner = recipient == comment.note.author
I18n.t("notifier.note_comment_notification.anonymous")
end
+ @author = @commenter
+ attach_user_avatar(comment.author)
+
subject = if @owner
I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter)
else
def changeset_comment_notification(comment, recipient)
with_recipient_locale recipient do
- @changeset_url = changeset_url(comment.changeset, :host => SERVER_URL)
+ @to_user = recipient.display_name
+ @changeset_url = changeset_url(comment.changeset)
@comment = comment.body
@owner = recipient == comment.changeset.user
@commenter = comment.author.display_name
@changeset_comment = comment.changeset.tags["comment"].presence
@time = comment.created_at
@changeset_author = comment.changeset.user.display_name
+ @author = @commenter
subject = if @owner
I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter)
I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter)
end
+ attach_user_avatar(comment.author)
+
mail :to => recipient.email, :subject => subject
end
end
private
+ def set_shared_template_vars
+ @root_url = root_url
+ end
+
+ def attach_project_logo
+ attachments.inline["logo.png"] = File.read(Rails.root.join("app", "assets", "images", "osm_logo_30.png"))
+ end
+
+ def attach_user_avatar(user)
+ attachments.inline["avatar.png"] = File.read(user_avatar_file_path(user))
+ end
+
+ def user_avatar_file_path(user)
+ image = user&.image
+ if image&.file?
+ return image.path(:small)
+ else
+ return Rails.root.join("app", "assets", "images", "users", "images", "small.png")
+ end
+ end
+
def with_recipient_locale(recipient)
I18n.with_locale Locale.available.preferred(recipient.preferred_languages) do
yield
end
end
- def from_address(name, type, id, digest)
+ def from_address(name, type, id, digest, user_id = nil)
if Object.const_defined?(:MESSAGES_DOMAIN) && domain = MESSAGES_DOMAIN
- "#{name} <#{type}-#{id}-#{digest[0, 6]}@#{domain}>"
+ if user_id
+ "#{name} <#{type}-#{id}-#{user_id}-#{digest[0, 6]}@#{domain}>"
+ else
+ "#{name} <#{type}-#{id}-#{digest[0, 6]}@#{domain}>"
+ end
else
EMAIL_FROM
end
projects / rails.git / blobdiff