IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: send activity summaries based on "last seen" (#27035)

Browse Source 
instead of "last emailed" so that people getting email notifications (from a watched topic for example) also get the activity summaries.

Context - https://meta.discourse.org/t/activity-summary-not-sent-if-other-emails-are-sent/293040

Internal Ref - t/125582

Improvement over 95885645d9
This commit is contained in:
Régis Hanol
2024-05-22 10:23:03 +02:00
committed by GitHub
parent 3d4d21693b
commit 958437e7dd
8 changed files with 255 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/models/user_option.rb
View File

@@ -85,14 +85,8 @@ class UserOption < ActiveRecord::Base
self.like_notification_frequency = SiteSetting.default_other_like_notification_frequency
if SiteSetting.default_email_digest_frequency.to_i <= 0
self.email_digests = false
else
self.email_digests = true
end
self.digest_after_minutes ||= SiteSetting.default_email_digest_frequency.to_i
self.email_digests = SiteSetting.default_email_digest_frequency.to_i > 0
self.digest_after_minutes = SiteSetting.default_email_digest_frequency.to_i
self.include_tl0_in_digests = SiteSetting.default_include_tl0_in_digests
self.text_size = SiteSetting.default_text_size
@@ -107,8 +101,7 @@ class UserOption < ActiveRecord::Base
end
def mailing_list_mode
return false if SiteSetting.disable_mailing_list_mode
super
SiteSetting.disable_mailing_list_mode ? false : super
end
def redirected_to_top_yet?