Commit 76d71441 by Your Name

keep flagged threads and comments out of digest

parent fca509ab
...@@ -233,31 +233,39 @@ helpers do ...@@ -233,31 +233,39 @@ helpers do
notification_map = {} notification_map = {}
comments.each do |c| comments.each do |c|
user_ids = subscriptions_map[c.comment_thread_id.to_s] current_thread = thread_map[c.comment_thread_id]
user_ids.each do |u|
if not notification_map.keys.include? u
notification_map[u] = {}
end
if not notification_map[u].keys.include? c.course_id
notification_map[u][c.course_id] = {}
end
if not notification_map[u][c.course_id].include? c.comment_thread_id.to_s #do not include threads or comments who have current or historical abuse flags
t = notification_map[u][c.course_id][c.comment_thread_id.to_s] = {} if current_thread.abuse_flaggers.to_a.empty? and
t["content"] = [] current_thread.historical_abuse_flaggers.to_a.empty? and
t["title"] = thread_map[c.comment_thread_id].title c.abuse_flaggers.to_a.empty? and
t["commentable_id"] = thread_map[c.comment_thread_id].commentable_id c.historical_abuse_flaggers.to_a.empty?
else
t = notification_map[u][c.course_id][c.comment_thread_id.to_s] user_ids = subscriptions_map[c.comment_thread_id.to_s]
user_ids.each do |u|
if not notification_map.keys.include? u
notification_map[u] = {}
end
if not notification_map[u].keys.include? c.course_id
notification_map[u][c.course_id] = {}
end
if not notification_map[u][c.course_id].include? c.comment_thread_id.to_s
t = notification_map[u][c.course_id][c.comment_thread_id.to_s] = {}
t["content"] = []
t["title"] = current_thread.title
t["commentable_id"] = current_thread.commentable_id
else
t = notification_map[u][c.course_id][c.comment_thread_id.to_s]
end
content_obj = {}
content_obj["username"] = c.author_with_anonymity(:username, "(anonymous)")
content_obj["updated_at"] = c.updated_at
content_obj["body"] = c.body
t["content"] << content_obj
end end
content_obj = {}
content_obj["username"] = c.author_with_anonymity(:username, "(anonymous)")
content_obj["updated_at"] = c.updated_at
content_obj["body"] = c.body
t["content"] << content_obj
end end
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment