Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #850 from bplexico/refactor_post_rb 

Refactored post model to reduce duplication in validator methods
This commit is contained in:
Sam 2013-05-17 15:56:53 -07:00
parent 34f4ff9a3f a86646312b
commit 25105082d5
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/models/post.rb
View File

@ -148,23 +148,21 @@ class Post < ActiveRecord::Base
# Ensure maximum amount of mentions in a post # Ensure maximum amount of mentions in a post
def max_mention_validator def max_mention_validator
if acting_user.present? && acting_user.has_trust_level?(:basic) if acting_user_is_trusted?
errors.add(:base, I18n.t(:too_many_mentions, count: SiteSetting.max_mentions_per_post)) if raw_mentions.size > SiteSetting.max_mentions_per_post add_error_if_count_exceeded(:too_many_mentions, raw_mentions.size, SiteSetting.max_mentions_per_post)
else else
errors.add(:base, I18n.t(:too_many_mentions_newuser, count: SiteSetting.newuser_max_mentions_per_post)) if raw_mentions.size > SiteSetting.newuser_max_mentions_per_post add_error_if_count_exceeded(:too_many_mentions_newuser, raw_mentions.size, SiteSetting.newuser_max_mentions_per_post)
end end
end end
# Ensure new users can not put too many images in a post # Ensure new users can not put too many images in a post
def max_images_validator def max_images_validator
return if acting_user.present? && acting_user.has_trust_level?(:basic) add_error_if_count_exceeded(:too_many_images, image_count, SiteSetting.newuser_max_images) unless acting_user_is_trusted?
errors.add(:base, I18n.t(:too_many_images, count: SiteSetting.newuser_max_images)) if image_count > SiteSetting.newuser_max_images
end end
# Ensure new users can not put too many links in a post # Ensure new users can not put too many links in a post
def max_links_validator def max_links_validator
return if acting_user.present? && acting_user.has_trust_level?(:basic) add_error_if_count_exceeded(:too_many_links, link_count, SiteSetting.newuser_max_links) unless acting_user_is_trusted?
errors.add(:base, I18n.t(:too_many_links, count: SiteSetting.newuser_max_links)) if link_count > SiteSetting.newuser_max_links
end end
@ -476,4 +474,14 @@ class Post < ActiveRecord::Base
def self.private_messages_count_per_day(since_days_ago, topic_subtype) def self.private_messages_count_per_day(since_days_ago, topic_subtype)
private_posts.with_topic_subtype(topic_subtype).where('posts.created_at > ?', since_days_ago.days.ago).group('date(posts.created_at)').order('date(posts.created_at)').count private_posts.with_topic_subtype(topic_subtype).where('posts.created_at > ?', since_days_ago.days.ago).group('date(posts.created_at)').order('date(posts.created_at)').count
end end
private
def acting_user_is_trusted?
acting_user.present? && acting_user.has_trust_level?(:basic)
end
def add_error_if_count_exceeded(key_for_translation, current_count, max_count)
errors.add(:base, I18n.t(key_for_translation, count: max_count)) if current_count > max_count
end
end end