diff --git a/app/models/rating_vote.rb b/app/models/rating_vote.rb index d5fed1e7f..bc5b290e5 100644 --- a/app/models/rating_vote.rb +++ b/app/models/rating_vote.rb @@ -22,7 +22,7 @@ class RatingVote < ApplicationRecord end def permissions - return unless context == "explicit" && !user&.trusted && user_id != article&.user_id + return unless context == "explicit" && !user&.trusted? && user_id != article&.user_id errors.add(:user_id, I18n.t("models.rating_vote.not_permitted")) end diff --git a/app/models/response_template.rb b/app/models/response_template.rb index 8e2c2e398..3b859df6a 100644 --- a/app/models/response_template.rb +++ b/app/models/response_template.rb @@ -37,7 +37,7 @@ class ResponseTemplate < ApplicationRecord def template_count return unless user - return if user.trusted || user.response_templates.count <= 30 + return if user.trusted? || user.response_templates.count <= 30 errors.add(:user, I18n.t("models.response_template.limit_reached")) end diff --git a/app/models/user.rb b/app/models/user.rb index ba67f822a..3665c5a04 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -409,11 +409,9 @@ class User < ApplicationRecord :suspended?, :tag_moderator?, :tech_admin?, - :trusted, # TODO: Remove this method from the code-base :trusted?, :user_subscription_tag_available?, :vomited_on?, - :warned, # TODO: Remove this method from the code-base :warned?, :workshop_eligible?, to: :authorizer, diff --git a/app/policies/authorizer.rb b/app/policies/authorizer.rb index 5a883c2a5..85390002f 100644 --- a/app/policies/authorizer.rb +++ b/app/policies/authorizer.rb @@ -133,11 +133,6 @@ module Authorizer has_any_role?(:tech_admin, :super_admin) end - def trusted - ActiveSupport::Deprecation.warn("User#trusted is deprecated, favor User#trusted?") - trusted? - end - def trusted? return @trusted if defined? @trusted @@ -158,11 +153,6 @@ module Authorizer has_role?(:warned) end - def warned - ActiveSupport::Deprecation.warn("User#warned is deprecated, favor User#warned?") - warned? - end - def workshop_eligible? has_any_role?(:workshop_pass) end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index cd5dc94b9..1410d8ff3 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -52,11 +52,9 @@ RSpec.describe User, type: :model do it { is_expected.to delegate_method(:suspended?).to(:authorizer) } it { is_expected.to delegate_method(:tag_moderator?).to(:authorizer) } it { is_expected.to delegate_method(:tech_admin?).to(:authorizer) } - it { is_expected.to delegate_method(:trusted).to(:authorizer) } it { is_expected.to delegate_method(:trusted?).to(:authorizer) } it { is_expected.to delegate_method(:user_subscription_tag_available?).to(:authorizer) } it { is_expected.to delegate_method(:vomited_on?).to(:authorizer) } - it { is_expected.to delegate_method(:warned).to(:authorizer) } it { is_expected.to delegate_method(:warned?).to(:authorizer) } it { is_expected.to delegate_method(:workshop_eligible?).to(:authorizer) } end