Commit dfb5b717 authored by Dennis Schubert's avatar Dennis Schubert Committed by Benjamin Neff
Browse files

Add In-Reply-To and References headers to notification mails 

closes #7122
parent 6ca598e5

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ Note: Although this is a minor release, the configuration file changed because t 
* Add support for setting BOSH access protocol via chat configuration [#7100](https://github.com/diaspora/diaspora/pull/7100)

* Add number of unreviewed reports to admin dashboard and admin sidebar [#7109](https://github.com/diaspora/diaspora/pull/7109)

* Don't federate to pods that have been offline for an extended period of time [#7120](https://github.com/diaspora/diaspora/pull/7120)

* Add In-Reply-To and References headers to notification mails [#7122](https://github.com/diaspora/diaspora/pull/7122)



# 0.6.0.1

app/mailers/notification_mailers/also_commented.rb

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ module NotificationMailers 


      if mail?

        @headers[:from] = "\"#{@comment.author_name} (diaspora*)\" <#{AppConfig.mail.sender_address}>"

        @headers[:in_reply_to] = @headers[:references] = "<#{@comment.parent.guid}@#{AppConfig.pod_uri.host}>"

        if @comment.public?

          @headers[:subject] = "Re: #{@comment.comment_email_subject}"

        else

app/mailers/notification_mailers/comment_on_post.rb

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ module NotificationMailers 
      @comment = Comment.find(comment_id)



      @headers[:from] = "\"#{@comment.author_name} (diaspora*)\" <#{AppConfig.mail.sender_address}>"

      @headers[:in_reply_to] = @headers[:references] = "<#{@comment.parent.guid}@#{AppConfig.pod_uri.host}>"

      if @comment.public?

        @headers[:subject] = "Re: #{@comment.comment_email_subject}"

      else

app/mailers/notification_mailers/liked.rb

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ module NotificationMailers 
      @like = Like.find(like_id)



      @headers[:subject] = I18n.t('notifier.liked.liked', :name => @sender.name)

      @headers[:in_reply_to] = @headers[:references] = "<#{@like.parent.guid}@#{AppConfig.pod_uri.host}>"

    end

  end

end

app/mailers/notification_mailers/mentioned.rb

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ module NotificationMailers 
      @post = Mention.find_by_id(target_id).post



      @headers[:subject] = I18n.t('notifier.mentioned.subject', :name => @sender.name)

      @headers[:in_reply_to] = @headers[:references] = "<#{@post.guid}@#{AppConfig.pod_uri.host}>"

    end

  end

end