File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -276,7 +276,7 @@ def post
276276
277277 def post_follow
278278 @post = Post . find ( params [ :post_id ] )
279- if CommentThread . post_followed? ( @post , current_user )
279+ if @post . followed_by? ( current_user )
280280 ThreadFollower . where ( post : @post , user : current_user ) . destroy_all
281281 else
282282 ThreadFollower . create ( post : @post , user : current_user )
Original file line number Diff line number Diff line change @@ -44,6 +44,7 @@ def can_access?(user)
4444 ( !deleted? || user &.privilege? ( 'flag_curate' ) || user &.post_privilege? ( 'flag_curate' , post ) ) &&
4545 post . can_access? ( user )
4646 end
47+ <<<<<<< HEAD
4748
4849 # Gets a list of user IDs who should be pingable in the thread.
4950 # @return [Array<Integer>]
@@ -85,4 +86,6 @@ def create_follower
8586 ThreadFollower . create comment_thread : self , user : post . user
8687 end
8788 end
89+ =======
90+ >>>>>>> 2 dc90352 ( Move followed_by? method to post model to simplify calling )
8891end
Original file line number Diff line number Diff line change @@ -234,6 +234,10 @@ def reaction_list
234234 . to_h { |_k , v | [ v . first . reaction_type , v ] }
235235 end
236236
237+ def followed_by? ( user )
238+ ThreadFollower . where ( post : self , user : user ) . any?
239+ end
240+
237241 private
238242
239243 ##
Original file line number Diff line number Diff line change 532532 <%= pluralize ( public_count , 'comment thread' ) %>
533533 </ h4 >
534534 <% if user_signed_in? %>
535- <% if CommentThread . post_followed? ( post , current_user ) %>
535+ <% if post . followed_by? ( current_user ) %>
536536 <%= link_to follow_post_comments_path ( post_id : post . id ) , method : :post ,
537537 class : "button is-muted is-outlined is-small" ,
538538 title : 'Don\'t follow new comment threads on this post' ,
You can’t perform that action at this time.
0 commit comments