Skip to content

Commit

Permalink
DEV: Resolve add_to_serializer deprecations (#152)
Browse files Browse the repository at this point in the history
  • Loading branch information
davidtaylorhq committed Apr 24, 2023
1 parent a1ae9a4 commit d9cab96
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 deletions.
1 change: 1 addition & 0 deletions .discourse-compatibility
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
3.1.0.beta3: a1ae9a4c55563516e8a7f8c040f6828066164f66
2.9.0.beta3: 2de1fe5df1a5c25ad1e0e31e8d28adca315d9092
27 changes: 14 additions & 13 deletions plugin.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,8 @@ class Engine < ::Rails::Engine
User.class_eval { prepend DiscourseTopicVoting::UserExtension }
end

add_to_serializer(:post, :can_vote, false) { object.topic&.can_vote? }
add_to_serializer(:post, :include_can_vote?) do
SiteSetting.voting_enabled && object.post_number == 1
add_to_serializer(:post, :can_vote, include_condition: -> { object.post_number == 1 }) do
object.topic&.can_vote?
end

add_to_serializer(:topic_view, :can_vote) { object.topic.can_vote? }
Expand Down Expand Up @@ -103,18 +102,20 @@ class Engine < ::Rails::Engine
)
end

add_to_serializer(:topic_list_item, :vote_count, false) { object.vote_count }
add_to_serializer(:topic_list_item, :can_vote, false) { object.can_vote? }
add_to_serializer(:topic_list_item, :user_voted, false) do
object.user_voted?(scope.user) if scope.user
add_to_serializer(:topic_list_item, :vote_count, include_condition: -> { object.can_vote? }) do
object.vote_count
end
add_to_serializer(:topic_list_item, :can_vote, include_condition: -> { object.regular? }) do
object.can_vote?
end
add_to_serializer(:topic_list_item, :include_vote_count?) { object.can_vote? }
add_to_serializer(:topic_list_item, :include_can_vote?) do
SiteSetting.voting_enabled && object.regular?
add_to_serializer(:topic_list_item, :user_voted, include_condition: -> { object.can_vote? }) do
object.user_voted?(scope.user) if scope.user
end
add_to_serializer(:topic_list_item, :include_user_voted?) { object.can_vote? }
add_to_serializer(:basic_category, :can_vote, false) { true }
add_to_serializer(:basic_category, :include_can_vote?) { Category.can_vote?(object.id) }
add_to_serializer(
:basic_category,
:can_vote,
include_condition: -> { Category.can_vote?(object.id) },
) { true }

register_search_advanced_filter(/^min_vote_count:(\d+)$/) do |posts, match|
posts.where(
Expand Down

0 comments on commit d9cab96

Please sign in to comment.