Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable coloring of comments icon for comments created by user itself #515

Merged
merged 6 commits into from
Jul 3, 2023
Merged

Disable coloring of comments icon for comments created by user itself #515

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5c72ac1
disable coloring of comments icon for comments created by user itself
fosterfarrell9 Jun 12, 2023
78ac4c9
avoid recreation of existing reader instances
fosterfarrell9 Jun 12, 2023
5ab0c1b
Merge branch 'mampf-next' into feature/no-icon-coloring-for-own-comments
fosterfarrell9 Jul 1, 2023
cfc03bb
replace touch by update method to ensure validation
fosterfarrell9 Jul 1, 2023
9bfe9db
adress the case of overlapping comments
fosterfarrell9 Jul 1, 2023
8de7dcd
fix rubocop offenses
fosterfarrell9 Jul 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions app/controllers/commontator/comments_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,25 @@ def update_unread_status
return unless medium.released.in?(['all', 'users', 'subscribers'])

relevant_users = medium.teachable.media_scope.users
relevant_users.where(unread_comments: false)
relevant_users.where.not(id: current_user.id)
.where(unread_comments: false)
.update_all(unread_comments: true)
@update_icon = relevant_users.exists?(current_user.id)
Splines marked this conversation as resolved.
Show resolved Hide resolved

# make sure that the thread associated to this comment is marked as read
# by the comment creator (unless some other user posted a comment in it
# that has not yet been read)
@reader = Reader.find_or_create_by(user: current_user,
thread: @commontator_thread)
if unseen_comments?
@update_icon = true
return
end
@reader.update(updated_at: Time.current)
end

def unseen_comments?
@commontator_thread.comments.any? do |c|
c.creator != current_user && c.created_at > @reader.updated_at
end
end
end