github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: Invited users should watch PM topic once topic has been visited.

Browse Source 
https://meta.discourse.org/t/notifications-not-received-for-private-messages-im-invited-to/71577/11
This commit is contained in:
Guo Xiang Tan
2018-02-26 17:57:16 +08:00
parent 982e5bae3a
commit c1f53e1ece
2 changed files with 49 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/models/topic_user.rb
View File

@ -187,15 +187,30 @@ SQL
end
unless attrs[:notification_level]
auto_track_after = UserOption.where(user_id: user_id).pluck(:auto_track_topics_after_msecs).first
auto_track_after ||= SiteSetting.default_other_auto_track_topics_after_msecs
if Topic.private_messages.where(id: topic_id).exists? &&
Notification.where(
user_id: user_id,
topic_id: topic_id,
notification_type: Notification.types[:invited_to_private_message]
).exists?
if auto_track_after >= 0 && auto_track_after <= (attrs[:total_msecs_viewed].to_i || 0)
attrs[:notification_level] ||= notification_levels[:tracking]
attrs[:notification_level] = notification_levels[:watching]
else
auto_track_after = UserOption.where(user_id: user_id).pluck(:auto_track_topics_after_msecs).first
auto_track_after ||= SiteSetting.default_other_auto_track_topics_after_msecs
if auto_track_after >= 0 && auto_track_after <= (attrs[:total_msecs_viewed].to_i || 0)
attrs[:notification_level] ||= notification_levels[:tracking]
end
end
end
TopicUser.create(attrs.merge!(user_id: user_id, topic_id: topic_id, first_visited_at: now , last_visited_at: now))
TopicUser.create!(attrs.merge!(
user_id: user_id,
topic_id: topic_id,
first_visited_at: now ,
last_visited_at: now
))
end
def track_visit!(topic_id, user_id)