(?:#{I18n.available_locales.join("|")}))\.yml$},
+ names: I18n.available_locales.map(&:to_s),
+ types: :yaml,
+ targets: :translations,
+ canonical: ->(h) { "locales/#{h[:name]}.yml" },
+ ),
+ ThemeFileMatcher.new(
+ regex: /(?!)/, # Never match uploads by filename, they must be named in about.json
+ names: nil,
+ types: :theme_upload_var,
+ targets: :common,
+ canonical: ->(h) { "assets/#{h[:name]}#{File.extname(h[:filename])}" },
+ ),
]
# For now just work for standard fields
def file_path
FILE_MATCHERS.each do |matcher|
- if filename = matcher.filename_from_opts(target: target_name.to_sym,
- name: name,
- type: ThemeField.types[type_id],
- filename: upload&.original_filename)
+ if filename =
+ matcher.filename_from_opts(
+ target: target_name.to_sym,
+ name: name,
+ type: ThemeField.types[type_id],
+ filename: upload&.original_filename,
+ )
return filename
end
end
@@ -546,11 +621,19 @@ class ThemeField < ActiveRecord::Base
def dependent_fields
if extra_scss_field?
- return theme.theme_fields.where(target_id: ThemeField.basic_targets.map { |t| Theme.targets[t.to_sym] },
- name: ThemeField.scss_fields)
+ return(
+ theme.theme_fields.where(
+ target_id: ThemeField.basic_targets.map { |t| Theme.targets[t.to_sym] },
+ name: ThemeField.scss_fields,
+ )
+ )
elsif settings_field?
- return theme.theme_fields.where(target_id: ThemeField.basic_targets.map { |t| Theme.targets[t.to_sym] },
- name: ThemeField.scss_fields + ThemeField.html_fields)
+ return(
+ theme.theme_fields.where(
+ target_id: ThemeField.basic_targets.map { |t| Theme.targets[t.to_sym] },
+ name: ThemeField.scss_fields + ThemeField.html_fields,
+ )
+ )
end
ThemeField.none
end
@@ -561,7 +644,8 @@ class ThemeField < ActiveRecord::Base
end
before_save do
- if (will_save_change_to_value? || will_save_change_to_upload_id?) && !will_save_change_to_value_baked?
+ if (will_save_change_to_value? || will_save_change_to_upload_id?) &&
+ !will_save_change_to_value_baked?
self.value_baked = nil
end
if upload && upload.extension == "js"
@@ -572,29 +656,19 @@ class ThemeField < ActiveRecord::Base
end
end
- after_save do
- dependent_fields.each(&:invalidate_baked!)
- end
+ after_save { dependent_fields.each(&:invalidate_baked!) }
- after_destroy do
- if svg_sprite_field?
- DB.after_commit { SvgSprite.expire_cache }
- end
- end
+ after_destroy { DB.after_commit { SvgSprite.expire_cache } if svg_sprite_field? }
private
- JAVASCRIPT_TYPES = %w(
- text/javascript
- application/javascript
- application/ecmascript
- )
+ JAVASCRIPT_TYPES = %w[text/javascript application/javascript application/ecmascript]
def inline_javascript?(node)
- if node['src'].present?
+ if node["src"].present?
false
- elsif node['type'].present?
- JAVASCRIPT_TYPES.include?(node['type'].downcase)
+ elsif node["type"].present?
+ JAVASCRIPT_TYPES.include?(node["type"].downcase)
else
true
end
diff --git a/app/models/theme_modifier_set.rb b/app/models/theme_modifier_set.rb
index 781ea42f51f..1d1c8e59f2b 100644
--- a/app/models/theme_modifier_set.rb
+++ b/app/models/theme_modifier_set.rb
@@ -1,6 +1,7 @@
# frozen_string_literal: true
class ThemeModifierSet < ActiveRecord::Base
- class ThemeModifierSetError < StandardError; end
+ class ThemeModifierSetError < StandardError
+ end
belongs_to :theme
@@ -26,12 +27,8 @@ class ThemeModifierSet < ActiveRecord::Base
end
after_save do
- if saved_change_to_svg_icons?
- SvgSprite.expire_cache
- end
- if saved_change_to_csp_extensions?
- CSP::Extension.clear_theme_extensions_cache!
- end
+ SvgSprite.expire_cache if saved_change_to_svg_icons?
+ CSP::Extension.clear_theme_extensions_cache! if saved_change_to_csp_extensions?
end
# Given the ids of multiple active themes / theme components, this function
@@ -39,7 +36,11 @@ class ThemeModifierSet < ActiveRecord::Base
def self.resolve_modifier_for_themes(theme_ids, modifier_name)
return nil if !(config = self.modifiers[modifier_name])
- all_values = self.where(theme_id: theme_ids).where.not(modifier_name => nil).map { |s| s.public_send(modifier_name) }
+ all_values =
+ self
+ .where(theme_id: theme_ids)
+ .where.not(modifier_name => nil)
+ .map { |s| s.public_send(modifier_name) }
case config[:type]
when :boolean
all_values.any?
@@ -55,17 +56,21 @@ class ThemeModifierSet < ActiveRecord::Base
return if array.nil?
- array.map do |dimension|
- parts = dimension.split("x")
- next if parts.length != 2
- [parts[0].to_i, parts[1].to_i]
- end.filter(&:present?)
+ array
+ .map do |dimension|
+ parts = dimension.split("x")
+ next if parts.length != 2
+ [parts[0].to_i, parts[1].to_i]
+ end
+ .filter(&:present?)
end
def topic_thumbnail_sizes=(val)
return write_attribute(:topic_thumbnail_sizes, val) if val.nil?
return write_attribute(:topic_thumbnail_sizes, val) if !val.is_a?(Array)
- return write_attribute(:topic_thumbnail_sizes, val) if !val.all? { |v| v.is_a?(Array) && v.length == 2 }
+ if !val.all? { |v| v.is_a?(Array) && v.length == 2 }
+ return write_attribute(:topic_thumbnail_sizes, val)
+ end
super(val.map { |dim| "#{dim[0]}x#{dim[1]}" })
end
@@ -77,7 +82,7 @@ class ThemeModifierSet < ActiveRecord::Base
def self.load_modifiers
hash = {}
columns_hash.each do |column_name, info|
- next if ["id", "theme_id"].include?(column_name)
+ next if %w[id theme_id].include?(column_name)
type = nil
if info.type == :string && info.array?
@@ -85,7 +90,9 @@ class ThemeModifierSet < ActiveRecord::Base
elsif info.type == :boolean && !info.array?
type = :boolean
else
- raise ThemeModifierSetError "Invalid theme modifier column type" if ![:boolean, :string].include?(info.type)
+ if !%i[boolean string].include?(info.type)
+ raise ThemeModifierSetError "Invalid theme modifier column type"
+ end
end
hash[column_name.to_sym] = { type: type }
diff --git a/app/models/top_menu_item.rb b/app/models/top_menu_item.rb
index fad4c9b1ad1..8334f73104f 100644
--- a/app/models/top_menu_item.rb
+++ b/app/models/top_menu_item.rb
@@ -26,7 +26,7 @@
# item.specific_category # => "hardware"
class TopMenuItem
def initialize(value)
- parts = value.split(',')
+ parts = value.split(",")
@name = parts[0]
@filter = initialize_filter(parts[1])
end
@@ -38,18 +38,18 @@ class TopMenuItem
end
def has_specific_category?
- name.split('/')[0] == 'category'
+ name.split("/")[0] == "category"
end
def specific_category
- name.split('/')[1]
+ name.split("/")[1]
end
private
def initialize_filter(value)
if value
- if value.start_with?('-')
+ if value.start_with?("-")
value[1..-1] # all but the leading -
else
Rails.logger.warn "WARNING: found top_menu_item with invalid filter, ignoring '#{value}'..."
diff --git a/app/models/top_topic.rb b/app/models/top_topic.rb
index 3f09fda10e7..975adc8ec72 100644
--- a/app/models/top_topic.rb
+++ b/app/models/top_topic.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class TopTopic < ActiveRecord::Base
-
belongs_to :topic
# The top topics we want to refresh often
@@ -16,13 +15,9 @@ class TopTopic < ActiveRecord::Base
# We don't have to refresh these as often
def self.refresh_older!
- older_periods = periods - [:daily, :all]
+ older_periods = periods - %i[daily all]
- transaction do
- older_periods.each do |period|
- update_counts_and_compute_scores_for(period)
- end
- end
+ transaction { older_periods.each { |period| update_counts_and_compute_scores_for(period) } }
compute_top_score_for(:all)
end
@@ -33,16 +28,11 @@ class TopTopic < ActiveRecord::Base
end
def self.periods
- @@periods ||= [:all, :yearly, :quarterly, :monthly, :weekly, :daily].freeze
+ @@periods ||= %i[all yearly quarterly monthly weekly daily].freeze
end
def self.sorted_periods
- ascending_periods ||= Enum.new(daily: 1,
- weekly: 2,
- monthly: 3,
- quarterly: 4,
- yearly: 5,
- all: 6)
+ ascending_periods ||= Enum.new(daily: 1, weekly: 2, monthly: 3, quarterly: 4, yearly: 5, all: 6)
end
def self.score_column_for_period(period)
@@ -52,25 +42,26 @@ class TopTopic < ActiveRecord::Base
def self.validate_period(period)
if period.blank? || !periods.include?(period.to_sym)
- raise Discourse::InvalidParameters.new("Invalid period. Valid periods are #{periods.join(", ")}")
+ raise Discourse::InvalidParameters.new(
+ "Invalid period. Valid periods are #{periods.join(", ")}",
+ )
end
end
private
def self.sort_orders
- @@sort_orders ||= [:posts, :views, :likes, :op_likes].freeze
+ @@sort_orders ||= %i[posts views likes op_likes].freeze
end
def self.update_counts_and_compute_scores_for(period)
- sort_orders.each do |sort|
- TopTopic.public_send("update_#{sort}_count_for", period)
- end
+ sort_orders.each { |sort| TopTopic.public_send("update_#{sort}_count_for", period) }
compute_top_score_for(period)
end
def self.remove_invisible_topics
- DB.exec("WITH category_definition_topic_ids AS (
+ DB.exec(
+ "WITH category_definition_topic_ids AS (
SELECT COALESCE(topic_id, 0) AS id FROM categories
), invisible_topic_ids AS (
SELECT id
@@ -83,11 +74,13 @@ class TopTopic < ActiveRecord::Base
)
DELETE FROM top_topics
WHERE topic_id IN (SELECT id FROM invisible_topic_ids)",
- private_message: Archetype::private_message)
+ private_message: Archetype.private_message,
+ )
end
def self.add_new_visible_topics
- DB.exec("WITH category_definition_topic_ids AS (
+ DB.exec(
+ "WITH category_definition_topic_ids AS (
SELECT COALESCE(topic_id, 0) AS id FROM categories
), visible_topics AS (
SELECT t.id
@@ -102,11 +95,13 @@ class TopTopic < ActiveRecord::Base
)
INSERT INTO top_topics (topic_id)
SELECT id FROM visible_topics",
- private_message: Archetype::private_message)
+ private_message: Archetype.private_message,
+ )
end
def self.update_posts_count_for(period)
- sql = "SELECT topic_id, GREATEST(COUNT(*), 1) AS count
+ sql =
+ "SELECT topic_id, GREATEST(COUNT(*), 1) AS count
FROM posts
WHERE created_at >= :from
AND deleted_at IS NULL
@@ -119,7 +114,8 @@ class TopTopic < ActiveRecord::Base
end
def self.update_views_count_for(period)
- sql = "SELECT topic_id, COUNT(*) AS count
+ sql =
+ "SELECT topic_id, COUNT(*) AS count
FROM topic_views
WHERE viewed_at >= :from
GROUP BY topic_id"
@@ -128,7 +124,8 @@ class TopTopic < ActiveRecord::Base
end
def self.update_likes_count_for(period)
- sql = "SELECT topic_id, SUM(like_count) AS count
+ sql =
+ "SELECT topic_id, SUM(like_count) AS count
FROM posts
WHERE created_at >= :from
AND deleted_at IS NULL
@@ -140,7 +137,8 @@ class TopTopic < ActiveRecord::Base
end
def self.update_op_likes_count_for(period)
- sql = "SELECT topic_id, like_count AS count
+ sql =
+ "SELECT topic_id, like_count AS count
FROM posts
WHERE created_at >= :from
AND post_number = 1
@@ -152,18 +150,19 @@ class TopTopic < ActiveRecord::Base
end
def self.compute_top_score_for(period)
-
log_views_multiplier = SiteSetting.top_topics_formula_log_views_multiplier.to_f
log_views_multiplier = 2 if log_views_multiplier == 0
first_post_likes_multiplier = SiteSetting.top_topics_formula_first_post_likes_multiplier.to_f
first_post_likes_multiplier = 0.5 if first_post_likes_multiplier == 0
- least_likes_per_post_multiplier = SiteSetting.top_topics_formula_least_likes_per_post_multiplier.to_f
+ least_likes_per_post_multiplier =
+ SiteSetting.top_topics_formula_least_likes_per_post_multiplier.to_f
least_likes_per_post_multiplier = 3 if least_likes_per_post_multiplier == 0
if period == :all
- top_topics = "(
+ top_topics =
+ "(
SELECT t.like_count all_likes_count,
t.id topic_id,
t.posts_count all_posts_count,
@@ -213,22 +212,29 @@ class TopTopic < ActiveRecord::Base
def self.start_of(period)
case period
- when :yearly then 1.year.ago
- when :monthly then 1.month.ago
- when :quarterly then 3.months.ago
- when :weekly then 1.week.ago
- when :daily then 1.day.ago
+ when :yearly
+ 1.year.ago
+ when :monthly
+ 1.month.ago
+ when :quarterly
+ 3.months.ago
+ when :weekly
+ 1.week.ago
+ when :daily
+ 1.day.ago
end
end
def self.update_top_topics(period, sort, inner_join)
- DB.exec("UPDATE top_topics
+ DB.exec(
+ "UPDATE top_topics
SET #{period}_#{sort}_count = c.count
FROM top_topics tt
INNER JOIN (#{inner_join}) c ON tt.topic_id = c.topic_id
WHERE tt.topic_id = top_topics.topic_id
AND tt.#{period}_#{sort}_count <> c.count",
- from: start_of(period))
+ from: start_of(period),
+ )
end
end
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 8c407873e16..b15bbc519f6 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -1,8 +1,10 @@
# frozen_string_literal: true
class Topic < ActiveRecord::Base
- class UserExists < StandardError; end
- class NotAllowed < StandardError; end
+ class UserExists < StandardError
+ end
+ class NotAllowed < StandardError
+ end
include RateLimiter::OnCreateRecord
include HasCustomFields
include Trashable
@@ -14,7 +16,7 @@ class Topic < ActiveRecord::Base
self.ignored_columns = [
"avg_time", # TODO(2021-01-04): remove
- "image_url" # TODO(2021-06-01): remove
+ "image_url", # TODO(2021-06-01): remove
]
def_delegator :featured_users, :user_ids, :featured_user_ids
@@ -37,7 +39,7 @@ class Topic < ActiveRecord::Base
end
def self.thumbnail_sizes
- [ self.share_thumbnail_size ] + DiscoursePluginRegistry.topic_thumbnail_sizes
+ [self.share_thumbnail_size] + DiscoursePluginRegistry.topic_thumbnail_sizes
end
def thumbnail_job_redis_key(sizes)
@@ -49,7 +51,9 @@ class Topic < ActiveRecord::Base
return nil unless original.read_attribute(:width) && original.read_attribute(:height)
thumbnail_sizes = Topic.thumbnail_sizes + extra_sizes
- topic_thumbnails.filter { |record| thumbnail_sizes.include?([record.max_width, record.max_height]) }
+ topic_thumbnails.filter do |record|
+ thumbnail_sizes.include?([record.max_width, record.max_height])
+ end
end
def thumbnail_info(enqueue_if_missing: false, extra_sizes: [])
@@ -59,12 +63,12 @@ class Topic < ActiveRecord::Base
infos = []
infos << { # Always add original
- max_width: nil,
- max_height: nil,
- width: original.width,
- height: original.height,
- url: original.url
- }
+ max_width: nil,
+ max_height: nil,
+ width: original.width,
+ height: original.height,
+ url: original.url,
+ }
records = filtered_topic_thumbnails(extra_sizes: extra_sizes)
@@ -76,15 +80,14 @@ class Topic < ActiveRecord::Base
max_height: record.max_height,
width: record.optimized_image&.width,
height: record.optimized_image&.height,
- url: record.optimized_image&.url
+ url: record.optimized_image&.url,
}
end
thumbnail_sizes = Topic.thumbnail_sizes + extra_sizes
- if SiteSetting.create_thumbnails &&
- enqueue_if_missing &&
- records.length < thumbnail_sizes.length &&
- Discourse.redis.set(thumbnail_job_redis_key(extra_sizes), 1, nx: true, ex: 1.minute)
+ if SiteSetting.create_thumbnails && enqueue_if_missing &&
+ records.length < thumbnail_sizes.length &&
+ Discourse.redis.set(thumbnail_job_redis_key(extra_sizes), 1, nx: true, ex: 1.minute)
Jobs.enqueue(:generate_topic_thumbnails, { topic_id: id, extra_sizes: extra_sizes })
end
@@ -106,19 +109,17 @@ class Topic < ActiveRecord::Base
end
def image_url(enqueue_if_missing: false)
- thumbnail = topic_thumbnails.detect do |record|
- record.max_width == Topic.share_thumbnail_size[0] &&
- record.max_height == Topic.share_thumbnail_size[1]
- end
+ thumbnail =
+ topic_thumbnails.detect do |record|
+ record.max_width == Topic.share_thumbnail_size[0] &&
+ record.max_height == Topic.share_thumbnail_size[1]
+ end
- if thumbnail.nil? &&
- image_upload &&
- SiteSetting.create_thumbnails &&
- image_upload.filesize < SiteSetting.max_image_size_kb.kilobytes &&
- image_upload.read_attribute(:width) &&
- image_upload.read_attribute(:height) &&
- enqueue_if_missing &&
- Discourse.redis.set(thumbnail_job_redis_key([]), 1, nx: true, ex: 1.minute)
+ if thumbnail.nil? && image_upload && SiteSetting.create_thumbnails &&
+ image_upload.filesize < SiteSetting.max_image_size_kb.kilobytes &&
+ image_upload.read_attribute(:width) && image_upload.read_attribute(:height) &&
+ enqueue_if_missing &&
+ Discourse.redis.set(thumbnail_job_redis_key([]), 1, nx: true, ex: 1.minute)
Jobs.enqueue(:generate_topic_thumbnails, { topic_id: id })
end
@@ -169,34 +170,42 @@ class Topic < ActiveRecord::Base
rate_limit :limit_topics_per_day
rate_limit :limit_private_messages_per_day
- validates :title, if: Proc.new { |t| t.new_record? || t.title_changed? },
- presence: true,
- topic_title_length: true,
- censored_words: true,
- watched_words: true,
- quality_title: { unless: :private_message? },
- max_emojis: true,
- unique_among: { unless: Proc.new { |t| (SiteSetting.allow_duplicate_topic_titles? || t.private_message?) },
- message: :has_already_been_used,
- allow_blank: true,
- case_sensitive: false,
- collection: Proc.new { |t|
- SiteSetting.allow_duplicate_topic_titles_category? ?
- Topic.listable_topics.where("category_id = ?", t.category_id) :
- Topic.listable_topics
- }
- }
+ validates :title,
+ if: Proc.new { |t| t.new_record? || t.title_changed? },
+ presence: true,
+ topic_title_length: true,
+ censored_words: true,
+ watched_words: true,
+ quality_title: {
+ unless: :private_message?,
+ },
+ max_emojis: true,
+ unique_among: {
+ unless:
+ Proc.new { |t| (SiteSetting.allow_duplicate_topic_titles? || t.private_message?) },
+ message: :has_already_been_used,
+ allow_blank: true,
+ case_sensitive: false,
+ collection:
+ Proc.new { |t|
+ if SiteSetting.allow_duplicate_topic_titles_category?
+ Topic.listable_topics.where("category_id = ?", t.category_id)
+ else
+ Topic.listable_topics
+ end
+ },
+ }
validates :category_id,
presence: true,
exclusion: {
- in: Proc.new { [SiteSetting.uncategorized_category_id] }
+ in: Proc.new { [SiteSetting.uncategorized_category_id] },
},
- if: Proc.new { |t|
- (t.new_record? || t.category_id_changed?) &&
- !SiteSetting.allow_uncategorized_topics &&
- (t.archetype.nil? || t.regular?)
- }
+ if:
+ Proc.new { |t|
+ (t.new_record? || t.category_id_changed?) &&
+ !SiteSetting.allow_uncategorized_topics && (t.archetype.nil? || t.regular?)
+ }
validates :featured_link, allow_nil: true, url: true
validate if: :featured_link do
@@ -205,10 +214,22 @@ class Topic < ActiveRecord::Base
end
end
- validates :external_id, allow_nil: true, uniqueness: { case_sensitive: false }, length: { maximum: EXTERNAL_ID_MAX_LENGTH }, format: { with: /\A[\w-]+\z/ }
+ validates :external_id,
+ allow_nil: true,
+ uniqueness: {
+ case_sensitive: false,
+ },
+ length: {
+ maximum: EXTERNAL_ID_MAX_LENGTH,
+ },
+ format: {
+ with: /\A[\w-]+\z/,
+ }
before_validation do
- self.title = TextCleaner.clean_title(TextSentinel.title_sentinel(title).text) if errors[:title].empty?
+ self.title = TextCleaner.clean_title(TextSentinel.title_sentinel(title).text) if errors[
+ :title
+ ].empty?
self.featured_link = self.featured_link.strip.presence if self.featured_link
end
@@ -241,11 +262,11 @@ class Topic < ActiveRecord::Base
has_one :published_page
belongs_to :user
- belongs_to :last_poster, class_name: 'User', foreign_key: :last_post_user_id
- belongs_to :featured_user1, class_name: 'User', foreign_key: :featured_user1_id
- belongs_to :featured_user2, class_name: 'User', foreign_key: :featured_user2_id
- belongs_to :featured_user3, class_name: 'User', foreign_key: :featured_user3_id
- belongs_to :featured_user4, class_name: 'User', foreign_key: :featured_user4_id
+ belongs_to :last_poster, class_name: "User", foreign_key: :last_post_user_id
+ belongs_to :featured_user1, class_name: "User", foreign_key: :featured_user1_id
+ belongs_to :featured_user2, class_name: "User", foreign_key: :featured_user2_id
+ belongs_to :featured_user3, class_name: "User", foreign_key: :featured_user3_id
+ belongs_to :featured_user4, class_name: "User", foreign_key: :featured_user4_id
has_many :topic_users
has_many :dismissed_topic_users
@@ -257,12 +278,12 @@ class Topic < ActiveRecord::Base
has_many :user_profiles
has_one :user_warning
- has_one :first_post, -> { where post_number: 1 }, class_name: 'Post'
+ has_one :first_post, -> { where post_number: 1 }, class_name: "Post"
has_one :topic_search_data
has_one :topic_embed, dependent: :destroy
has_one :linked_topic, dependent: :destroy
- belongs_to :image_upload, class_name: 'Upload'
+ belongs_to :image_upload, class_name: "Upload"
has_many :topic_thumbnails, through: :image_upload
# When we want to temporarily attach some data to a forum topic (usually before serialization)
@@ -270,7 +291,7 @@ class Topic < ActiveRecord::Base
attr_accessor :category_user_data
attr_accessor :dismissed
- attr_accessor :posters # TODO: can replace with posters_summary once we remove old list code
+ attr_accessor :posters # TODO: can replace with posters_summary once we remove old list code
attr_accessor :participants
attr_accessor :topic_list
attr_accessor :meta_data
@@ -278,7 +299,7 @@ class Topic < ActiveRecord::Base
attr_accessor :import_mode # set to true to optimize creation and save for imports
# The regular order
- scope :topic_list_order, -> { order('topics.bumped_at desc') }
+ scope :topic_list_order, -> { order("topics.bumped_at desc") }
# Return private message topics
scope :private_messages, -> { where(archetype: Archetype.private_message) }
@@ -295,50 +316,57 @@ class Topic < ActiveRecord::Base
JOIN group_users gu ON gu.user_id = :user_id AND gu.group_id = tg.group_id
SQL
- scope :private_messages_for_user, ->(user) do
- private_messages.where(
- "topics.id IN (#{PRIVATE_MESSAGES_SQL_USER})
+ scope :private_messages_for_user,
+ ->(user) {
+ private_messages.where(
+ "topics.id IN (#{PRIVATE_MESSAGES_SQL_USER})
OR topics.id IN (#{PRIVATE_MESSAGES_SQL_GROUP})",
- user_id: user.id
- )
- end
+ user_id: user.id,
+ )
+ }
- scope :listable_topics, -> { where('topics.archetype <> ?', Archetype.private_message) }
+ scope :listable_topics, -> { where("topics.archetype <> ?", Archetype.private_message) }
- scope :by_newest, -> { order('topics.created_at desc, topics.id desc') }
+ scope :by_newest, -> { order("topics.created_at desc, topics.id desc") }
scope :visible, -> { where(visible: true) }
- scope :created_since, lambda { |time_ago| where('topics.created_at > ?', time_ago) }
+ scope :created_since, lambda { |time_ago| where("topics.created_at > ?", time_ago) }
scope :exclude_scheduled_bump_topics, -> { where.not(id: TopicTimer.scheduled_bump_topics) }
- scope :secured, lambda { |guardian = nil|
- ids = guardian.secure_category_ids if guardian
+ scope :secured,
+ lambda { |guardian = nil|
+ ids = guardian.secure_category_ids if guardian
- # Query conditions
- condition = if ids.present?
- ["NOT read_restricted OR id IN (:cats)", cats: ids]
- else
- ["NOT read_restricted"]
- end
+ # Query conditions
+ condition =
+ if ids.present?
+ ["NOT read_restricted OR id IN (:cats)", cats: ids]
+ else
+ ["NOT read_restricted"]
+ end
- where("topics.category_id IS NULL OR topics.category_id IN (SELECT id FROM categories WHERE #{condition[0]})", condition[1])
- }
+ where(
+ "topics.category_id IS NULL OR topics.category_id IN (SELECT id FROM categories WHERE #{condition[0]})",
+ condition[1],
+ )
+ }
- scope :in_category_and_subcategories, lambda { |category_id|
- where("topics.category_id IN (?)", Category.subcategory_ids(category_id.to_i)) if category_id
- }
+ scope :in_category_and_subcategories,
+ lambda { |category_id|
+ if category_id
+ where("topics.category_id IN (?)", Category.subcategory_ids(category_id.to_i))
+ end
+ }
- scope :with_subtype, ->(subtype) { where('topics.subtype = ?', subtype) }
+ scope :with_subtype, ->(subtype) { where("topics.subtype = ?", subtype) }
attr_accessor :ignore_category_auto_close
attr_accessor :skip_callbacks
attr_accessor :advance_draft
- before_create do
- initialize_default_values
- end
+ before_create { initialize_default_values }
after_create do
unless skip_callbacks
@@ -348,13 +376,9 @@ class Topic < ActiveRecord::Base
end
before_save do
- unless skip_callbacks
- ensure_topic_has_a_category
- end
+ ensure_topic_has_a_category unless skip_callbacks
- if title_changed?
- write_attribute(:fancy_title, Topic.fancy_title(title))
- end
+ write_attribute(:fancy_title, Topic.fancy_title(title)) if title_changed?
if category_id_changed? || new_record?
inherit_auto_close_from_category
@@ -369,7 +393,8 @@ class Topic < ActiveRecord::Base
ApplicationController.banner_json_cache.clear
end
- if tags_changed || saved_change_to_attribute?(:category_id) || saved_change_to_attribute?(:title)
+ if tags_changed || saved_change_to_attribute?(:category_id) ||
+ saved_change_to_attribute?(:title)
SearchIndexer.queue_post_reindex(self.id)
if tags_changed
@@ -418,11 +443,11 @@ class Topic < ActiveRecord::Base
end
def self.top_viewed(max = 10)
- Topic.listable_topics.visible.secured.order('views desc').limit(max)
+ Topic.listable_topics.visible.secured.order("views desc").limit(max)
end
def self.recent(max = 10)
- Topic.listable_topics.visible.secured.order('created_at desc').limit(max)
+ Topic.listable_topics.visible.secured.order("created_at desc").limit(max)
end
def self.count_exceeds_minimum?
@@ -430,7 +455,11 @@ class Topic < ActiveRecord::Base
end
def best_post
- posts.where(post_type: Post.types[:regular], user_deleted: false).order('score desc nulls last').limit(1).first
+ posts
+ .where(post_type: Post.types[:regular], user_deleted: false)
+ .order("score desc nulls last")
+ .limit(1)
+ .first
end
def self.has_flag_scope
@@ -447,8 +476,11 @@ class Topic < ActiveRecord::Base
# all users (in groups or directly targeted) that are going to get the pm
def all_allowed_users
- moderators_sql = " UNION #{User.moderators.to_sql}" if private_message? && (has_flags? || is_official_warning?)
- User.from("(#{allowed_users.to_sql} UNION #{allowed_group_users.to_sql}#{moderators_sql}) as users")
+ moderators_sql = " UNION #{User.moderators.to_sql}" if private_message? &&
+ (has_flags? || is_official_warning?)
+ User.from(
+ "(#{allowed_users.to_sql} UNION #{allowed_group_users.to_sql}#{moderators_sql}) as users",
+ )
end
# Additional rate limits on topics: per day and private messages per day
@@ -482,7 +514,11 @@ class Topic < ActiveRecord::Base
if !new_record? && !Discourse.readonly_mode?
# make sure data is set in table, this also allows us to change algorithm
# by simply nulling this column
- DB.exec("UPDATE topics SET fancy_title = :fancy_title where id = :id", id: self.id, fancy_title: fancy_title)
+ DB.exec(
+ "UPDATE topics SET fancy_title = :fancy_title where id = :id",
+ id: self.id,
+ fancy_title: fancy_title,
+ )
end
end
@@ -494,25 +530,34 @@ class Topic < ActiveRecord::Base
opts = opts || {}
period = ListController.best_period_for(since)
- topics = Topic
- .visible
- .secured(Guardian.new(user))
- .joins("LEFT OUTER JOIN topic_users ON topic_users.topic_id = topics.id AND topic_users.user_id = #{user.id.to_i}")
- .joins("LEFT OUTER JOIN category_users ON category_users.category_id = topics.category_id AND category_users.user_id = #{user.id.to_i}")
- .joins("LEFT OUTER JOIN users ON users.id = topics.user_id")
- .where(closed: false, archived: false)
- .where("COALESCE(topic_users.notification_level, 1) <> ?", TopicUser.notification_levels[:muted])
- .created_since(since)
- .where('topics.created_at < ?', (SiteSetting.editing_grace_period || 0).seconds.ago)
- .listable_topics
- .includes(:category)
+ topics =
+ Topic
+ .visible
+ .secured(Guardian.new(user))
+ .joins(
+ "LEFT OUTER JOIN topic_users ON topic_users.topic_id = topics.id AND topic_users.user_id = #{user.id.to_i}",
+ )
+ .joins(
+ "LEFT OUTER JOIN category_users ON category_users.category_id = topics.category_id AND category_users.user_id = #{user.id.to_i}",
+ )
+ .joins("LEFT OUTER JOIN users ON users.id = topics.user_id")
+ .where(closed: false, archived: false)
+ .where(
+ "COALESCE(topic_users.notification_level, 1) <> ?",
+ TopicUser.notification_levels[:muted],
+ )
+ .created_since(since)
+ .where("topics.created_at < ?", (SiteSetting.editing_grace_period || 0).seconds.ago)
+ .listable_topics
+ .includes(:category)
unless opts[:include_tl0] || user.user_option.try(:include_tl0_in_digests)
topics = topics.where("COALESCE(users.trust_level, 0) > 0")
end
if !!opts[:top_order]
- topics = topics.joins("LEFT OUTER JOIN top_topics ON top_topics.topic_id = topics.id").order(<<~SQL)
+ topics =
+ topics.joins("LEFT OUTER JOIN top_topics ON top_topics.topic_id = topics.id").order(<<~SQL)
COALESCE(topic_users.notification_level, 1) DESC,
COALESCE(category_users.notification_level, 1) DESC,
COALESCE(top_topics.#{TopTopic.score_column_for_period(period)}, 0) DESC,
@@ -520,27 +565,34 @@ class Topic < ActiveRecord::Base
SQL
end
- if opts[:limit]
- topics = topics.limit(opts[:limit])
- end
+ topics = topics.limit(opts[:limit]) if opts[:limit]
# Remove category topics
category_topic_ids = Category.pluck(:topic_id).compact!
- if category_topic_ids.present?
- topics = topics.where("topics.id NOT IN (?)", category_topic_ids)
- end
+ topics = topics.where("topics.id NOT IN (?)", category_topic_ids) if category_topic_ids.present?
# Remove muted and shared draft categories
- remove_category_ids = CategoryUser.where(user_id: user.id, notification_level: CategoryUser.notification_levels[:muted]).pluck(:category_id)
+ remove_category_ids =
+ CategoryUser.where(
+ user_id: user.id,
+ notification_level: CategoryUser.notification_levels[:muted],
+ ).pluck(:category_id)
if SiteSetting.digest_suppress_categories.present?
- topics = topics.where("topics.category_id NOT IN (?)", SiteSetting.digest_suppress_categories.split("|").map(&:to_i))
- end
- if SiteSetting.shared_drafts_enabled?
- remove_category_ids << SiteSetting.shared_drafts_category
+ topics =
+ topics.where(
+ "topics.category_id NOT IN (?)",
+ SiteSetting.digest_suppress_categories.split("|").map(&:to_i),
+ )
end
+ remove_category_ids << SiteSetting.shared_drafts_category if SiteSetting.shared_drafts_enabled?
if remove_category_ids.present?
remove_category_ids.uniq!
- topics = topics.where("topic_users.notification_level != ? OR topics.category_id NOT IN (?)", TopicUser.notification_levels[:muted], remove_category_ids)
+ topics =
+ topics.where(
+ "topic_users.notification_level != ? OR topics.category_id NOT IN (?)",
+ TopicUser.notification_levels[:muted],
+ remove_category_ids,
+ )
end
# Remove muted tags
@@ -548,9 +600,12 @@ class Topic < ActiveRecord::Base
unless muted_tag_ids.empty?
# If multiple tags per topic, include topics with tags that aren't muted,
# and don't forget untagged topics.
- topics = topics.where(
- "EXISTS ( SELECT 1 FROM topic_tags WHERE topic_tags.topic_id = topics.id AND tag_id NOT IN (?) )
- OR NOT EXISTS (SELECT 1 FROM topic_tags WHERE topic_tags.topic_id = topics.id)", muted_tag_ids)
+ topics =
+ topics.where(
+ "EXISTS ( SELECT 1 FROM topic_tags WHERE topic_tags.topic_id = topics.id AND tag_id NOT IN (?) )
+ OR NOT EXISTS (SELECT 1 FROM topic_tags WHERE topic_tags.topic_id = topics.id)",
+ muted_tag_ids,
+ )
end
topics
@@ -585,10 +640,23 @@ class Topic < ActiveRecord::Base
((Time.zone.now - created_at) / 1.minute).round
end
- def self.listable_count_per_day(start_date, end_date, category_id = nil, include_subcategories = false)
- result = listable_topics.where("topics.created_at >= ? AND topics.created_at <= ?", start_date, end_date)
- result = result.group('date(topics.created_at)').order('date(topics.created_at)')
- result = result.where(category_id: include_subcategories ? Category.subcategory_ids(category_id) : category_id) if category_id
+ def self.listable_count_per_day(
+ start_date,
+ end_date,
+ category_id = nil,
+ include_subcategories = false
+ )
+ result =
+ listable_topics.where(
+ "topics.created_at >= ? AND topics.created_at <= ?",
+ start_date,
+ end_date,
+ )
+ result = result.group("date(topics.created_at)").order("date(topics.created_at)")
+ result =
+ result.where(
+ category_id: include_subcategories ? Category.subcategory_ids(category_id) : category_id,
+ ) if category_id
result.count
end
@@ -613,20 +681,16 @@ class Topic < ActiveRecord::Base
return [] if search_data.blank?
- tsquery = Search.set_tsquery_weight_filter(search_data, 'A')
+ tsquery = Search.set_tsquery_weight_filter(search_data, "A")
if raw.present?
- cooked = SearchIndexer::HtmlScrubber.scrub(
- PrettyText.cook(raw[0...MAX_SIMILAR_BODY_LENGTH].strip)
- )
+ cooked =
+ SearchIndexer::HtmlScrubber.scrub(PrettyText.cook(raw[0...MAX_SIMILAR_BODY_LENGTH].strip))
prepared_data = cooked.present? && Search.prepare_data(cooked)
if prepared_data.present?
- raw_tsquery = Search.set_tsquery_weight_filter(
- prepared_data,
- 'B'
- )
+ raw_tsquery = Search.set_tsquery_weight_filter(prepared_data, "B")
tsquery = "#{tsquery} & #{raw_tsquery}"
end
@@ -636,46 +700,62 @@ class Topic < ActiveRecord::Base
guardian = Guardian.new(user)
- excluded_category_ids_sql = Category.secured(guardian).where(search_priority: Searchable::PRIORITIES[:ignore]).select(:id).to_sql
+ excluded_category_ids_sql =
+ Category
+ .secured(guardian)
+ .where(search_priority: Searchable::PRIORITIES[:ignore])
+ .select(:id)
+ .to_sql
- if user
- excluded_category_ids_sql = <<~SQL
+ excluded_category_ids_sql = <<~SQL if user
#{excluded_category_ids_sql}
UNION
#{CategoryUser.muted_category_ids_query(user, include_direct: true).select("categories.id").to_sql}
SQL
- end
- candidates = Topic
- .visible
- .listable_topics
- .secured(guardian)
- .joins("JOIN topic_search_data s ON topics.id = s.topic_id")
- .joins("LEFT JOIN categories c ON topics.id = c.topic_id")
- .where("search_data @@ #{tsquery}")
- .where("c.topic_id IS NULL")
- .where("topics.category_id NOT IN (#{excluded_category_ids_sql})")
- .order("ts_rank(search_data, #{tsquery}) DESC")
- .limit(SiteSetting.max_similar_results * 3)
+ candidates =
+ Topic
+ .visible
+ .listable_topics
+ .secured(guardian)
+ .joins("JOIN topic_search_data s ON topics.id = s.topic_id")
+ .joins("LEFT JOIN categories c ON topics.id = c.topic_id")
+ .where("search_data @@ #{tsquery}")
+ .where("c.topic_id IS NULL")
+ .where("topics.category_id NOT IN (#{excluded_category_ids_sql})")
+ .order("ts_rank(search_data, #{tsquery}) DESC")
+ .limit(SiteSetting.max_similar_results * 3)
candidate_ids = candidates.pluck(:id)
return [] if candidate_ids.blank?
- similars = Topic
- .joins("JOIN posts AS p ON p.topic_id = topics.id AND p.post_number = 1")
- .where("topics.id IN (?)", candidate_ids)
- .order("similarity DESC")
- .limit(SiteSetting.max_similar_results)
+ similars =
+ Topic
+ .joins("JOIN posts AS p ON p.topic_id = topics.id AND p.post_number = 1")
+ .where("topics.id IN (?)", candidate_ids)
+ .order("similarity DESC")
+ .limit(SiteSetting.max_similar_results)
if raw.present?
- similars
- .select(DB.sql_fragment("topics.*, similarity(topics.title, :title) + similarity(p.raw, :raw) AS similarity, p.cooked AS blurb", title: title, raw: raw))
- .where("similarity(topics.title, :title) + similarity(p.raw, :raw) > 0.2", title: title, raw: raw)
+ similars.select(
+ DB.sql_fragment(
+ "topics.*, similarity(topics.title, :title) + similarity(p.raw, :raw) AS similarity, p.cooked AS blurb",
+ title: title,
+ raw: raw,
+ ),
+ ).where(
+ "similarity(topics.title, :title) + similarity(p.raw, :raw) > 0.2",
+ title: title,
+ raw: raw,
+ )
else
- similars
- .select(DB.sql_fragment("topics.*, similarity(topics.title, :title) AS similarity, p.cooked AS blurb", title: title))
- .where("similarity(topics.title, :title) > 0.2", title: title)
+ similars.select(
+ DB.sql_fragment(
+ "topics.*, similarity(topics.title, :title) AS similarity, p.cooked AS blurb",
+ title: title,
+ ),
+ ).where("similarity(topics.title, :title) > 0.2", title: title)
end
end
@@ -683,30 +763,34 @@ class Topic < ActiveRecord::Base
TopicStatusUpdater.new(self, user).update!(status, enabled, opts)
DiscourseEvent.trigger(:topic_status_updated, self, status, enabled)
- if status == 'closed'
+ if status == "closed"
StaffActionLogger.new(user).log_topic_closed(self, closed: enabled)
- elsif status == 'archived'
+ elsif status == "archived"
StaffActionLogger.new(user).log_topic_archived(self, archived: enabled)
end
if enabled && private_message? && status.to_s["closed"]
group_ids = user.groups.pluck(:id)
if group_ids.present?
- allowed_group_ids = self.allowed_groups
- .where('topic_allowed_groups.group_id IN (?)', group_ids).pluck(:id)
- allowed_group_ids.each do |id|
- GroupArchivedMessage.archive!(id, self)
- end
+ allowed_group_ids =
+ self.allowed_groups.where("topic_allowed_groups.group_id IN (?)", group_ids).pluck(:id)
+ allowed_group_ids.each { |id| GroupArchivedMessage.archive!(id, self) }
end
end
end
# Atomically creates the next post number
def self.next_post_number(topic_id, opts = {})
- highest = DB.query_single("SELECT coalesce(max(post_number),0) AS max FROM posts WHERE topic_id = ?", topic_id).first.to_i
+ highest =
+ DB
+ .query_single(
+ "SELECT coalesce(max(post_number),0) AS max FROM posts WHERE topic_id = ?",
+ topic_id,
+ )
+ .first
+ .to_i
if opts[:whisper]
-
result = DB.query_single(<<~SQL, highest, topic_id)
UPDATE topics
SET highest_staff_post_number = ? + 1
@@ -715,11 +799,9 @@ class Topic < ActiveRecord::Base
SQL
result.first.to_i
-
else
-
reply_sql = opts[:reply] ? ", reply_count = reply_count + 1" : ""
- posts_sql = opts[:post] ? ", posts_count = posts_count + 1" : ""
+ posts_sql = opts[:post] ? ", posts_count = posts_count + 1" : ""
result = DB.query_single(<<~SQL, highest: highest, topic_id: topic_id)
UPDATE topics
@@ -814,7 +896,8 @@ class Topic < ActiveRecord::Base
archetype = Topic.where(id: topic_id).pluck_first(:archetype)
# ignore small_action replies for private messages
- post_type = archetype == Archetype.private_message ? " AND post_type <> #{Post.types[:small_action]}" : ''
+ post_type =
+ archetype == Archetype.private_message ? " AND post_type <> #{Post.types[:small_action]}" : ""
result = DB.query_single(<<~SQL, topic_id: topic_id)
UPDATE topics
@@ -875,7 +958,10 @@ class Topic < ActiveRecord::Base
def changed_to_category(new_category)
return true if new_category.blank? || Category.exists?(topic_id: id)
- return false if new_category.id == SiteSetting.uncategorized_category_id && !SiteSetting.allow_uncategorized_topics
+ if new_category.id == SiteSetting.uncategorized_category_id &&
+ !SiteSetting.allow_uncategorized_topics
+ return false
+ end
Topic.transaction do
old_category = category
@@ -884,9 +970,7 @@ class Topic < ActiveRecord::Base
self.update_attribute(:category_id, new_category.id)
if old_category
- Category
- .where(id: old_category.id)
- .update_all("topic_count = topic_count - 1")
+ Category.where(id: old_category.id).update_all("topic_count = topic_count - 1")
end
# when a topic changes category we may have to start watching it
@@ -897,7 +981,11 @@ class Topic < ActiveRecord::Base
if !SiteSetting.disable_category_edit_notifications && (post = self.ordered_posts.first)
notified_user_ids = [post.user_id, post.last_editor_id].uniq
DB.after_commit do
- Jobs.enqueue(:notify_category_change, post_id: post.id, notified_user_ids: notified_user_ids)
+ Jobs.enqueue(
+ :notify_category_change,
+ post_id: post.id,
+ notified_user_ids: notified_user_ids,
+ )
end
end
@@ -905,16 +993,16 @@ class Topic < ActiveRecord::Base
# linked to posts secure/not secure depending on whether the
# category is private. this is only done if the category
# has actually changed to avoid noise.
- DB.after_commit do
- Jobs.enqueue(:update_topic_upload_security, topic_id: self.id)
- end
+ DB.after_commit { Jobs.enqueue(:update_topic_upload_security, topic_id: self.id) }
end
Category.where(id: new_category.id).update_all("topic_count = topic_count + 1")
if Topic.update_featured_topics != false
CategoryFeaturedTopic.feature_topics_for(old_category) unless @import_mode
- CategoryFeaturedTopic.feature_topics_for(new_category) unless @import_mode || old_category.try(:id) == new_category.id
+ unless @import_mode || old_category.try(:id) == new_category.id
+ CategoryFeaturedTopic.feature_topics_for(new_category)
+ end
end
end
@@ -924,11 +1012,12 @@ class Topic < ActiveRecord::Base
def add_small_action(user, action_code, who = nil, opts = {})
custom_fields = {}
custom_fields["action_code_who"] = who if who.present?
- opts = opts.merge(
- post_type: Post.types[:small_action],
- action_code: action_code,
- custom_fields: custom_fields
- )
+ opts =
+ opts.merge(
+ post_type: Post.types[:small_action],
+ action_code: action_code,
+ custom_fields: custom_fields,
+ )
add_moderator_post(user, nil, opts)
end
@@ -936,22 +1025,27 @@ class Topic < ActiveRecord::Base
def add_moderator_post(user, text, opts = nil)
opts ||= {}
new_post = nil
- creator = PostCreator.new(user,
- raw: text,
- post_type: opts[:post_type] || Post.types[:moderator_action],
- action_code: opts[:action_code],
- no_bump: opts[:bump].blank?,
- topic_id: self.id,
- silent: opts[:silent],
- skip_validations: true,
- custom_fields: opts[:custom_fields],
- import_mode: opts[:import_mode])
+ creator =
+ PostCreator.new(
+ user,
+ raw: text,
+ post_type: opts[:post_type] || Post.types[:moderator_action],
+ action_code: opts[:action_code],
+ no_bump: opts[:bump].blank?,
+ topic_id: self.id,
+ silent: opts[:silent],
+ skip_validations: true,
+ custom_fields: opts[:custom_fields],
+ import_mode: opts[:import_mode],
+ )
if (new_post = creator.create) && new_post.present?
increment!(:moderator_posts_count) if new_post.persisted?
# If we are moving posts, we want to insert the moderator post where the previous posts were
# in the stream, not at the end.
- new_post.update!(post_number: opts[:post_number], sort_order: opts[:post_number]) if opts[:post_number].present?
+ if opts[:post_number].present?
+ new_post.update!(post_number: opts[:post_number], sort_order: opts[:post_number])
+ end
# Grab any links that are present
TopicLink.extract_from(new_post)
@@ -1016,14 +1110,16 @@ class Topic < ActiveRecord::Base
def reached_recipients_limit?
return false unless private_message?
- topic_allowed_users.count + topic_allowed_groups.count >= SiteSetting.max_allowed_message_recipients
+ topic_allowed_users.count + topic_allowed_groups.count >=
+ SiteSetting.max_allowed_message_recipients
end
def invite_group(user, group)
TopicAllowedGroup.create!(topic_id: self.id, group_id: group.id)
self.allowed_groups.reload
- last_post = self.posts.order('post_number desc').where('not hidden AND posts.deleted_at IS NULL').first
+ last_post =
+ self.posts.order("post_number desc").where("not hidden AND posts.deleted_at IS NULL").first
if last_post
Jobs.enqueue(:post_alert, post_id: last_post.id)
add_small_action(user, "invited_group", group.name)
@@ -1045,12 +1141,14 @@ class Topic < ActiveRecord::Base
topic_allowed_users.user_id != :op_user_id
)
SQL
- User.where([
- allowed_user_where_clause,
- { group_id: group.id, topic_id: self.id, op_user_id: self.user_id }
- ]).find_each do |allowed_user|
- remove_allowed_user(Discourse.system_user, allowed_user)
- end
+ User
+ .where(
+ [
+ allowed_user_where_clause,
+ { group_id: group.id, topic_id: self.id, op_user_id: self.user_id },
+ ],
+ )
+ .find_each { |allowed_user| remove_allowed_user(Discourse.system_user, allowed_user) }
true
end
@@ -1068,11 +1166,11 @@ class Topic < ActiveRecord::Base
raise NotAllowed.new(I18n.t("not_accepting_pms", username: target_user.username))
end
- if TopicUser
- .where(topic: self,
- user: target_user,
- notification_level: TopicUser.notification_levels[:muted])
- .exists?
+ if TopicUser.where(
+ topic: self,
+ user: target_user,
+ notification_level: TopicUser.notification_levels[:muted],
+ ).exists?
raise NotAllowed.new(I18n.t("topic_invite.muted_topic"))
end
@@ -1080,7 +1178,10 @@ class Topic < ActiveRecord::Base
raise NotAllowed.new(I18n.t("topic_invite.receiver_does_not_allow_pm"))
end
- if UserCommScreener.new(acting_user: target_user, target_user_ids: invited_by.id).disallowing_pms_from_actor?(invited_by.id)
+ if UserCommScreener.new(
+ acting_user: target_user,
+ target_user_ids: invited_by.id,
+ ).disallowing_pms_from_actor?(invited_by.id)
raise NotAllowed.new(I18n.t("topic_invite.sender_does_not_allow_pm"))
end
@@ -1090,12 +1191,13 @@ class Topic < ActiveRecord::Base
!!invite_to_topic(invited_by, target_user, group_ids, guardian)
end
elsif username_or_email =~ /^.+@.+$/ && guardian.can_invite_via_email?(self)
- !!Invite.generate(invited_by,
+ !!Invite.generate(
+ invited_by,
email: username_or_email,
topic: self,
group_ids: group_ids,
custom_message: custom_message,
- invite_to_topic: true
+ invite_to_topic: true,
)
end
end
@@ -1106,7 +1208,9 @@ class Topic < ActiveRecord::Base
def grant_permission_to_user(lower_email)
user = User.find_by_email(lower_email)
- topic_allowed_users.create!(user_id: user.id) unless topic_allowed_users.exists?(user_id: user.id)
+ unless topic_allowed_users.exists?(user_id: user.id)
+ topic_allowed_users.create!(user_id: user.id)
+ end
end
def max_post_number
@@ -1114,15 +1218,18 @@ class Topic < ActiveRecord::Base
end
def move_posts(moved_by, post_ids, opts)
- post_mover = PostMover.new(self, moved_by, post_ids, move_to_pm: opts[:archetype].present? && opts[:archetype] == "private_message")
+ post_mover =
+ PostMover.new(
+ self,
+ moved_by,
+ post_ids,
+ move_to_pm: opts[:archetype].present? && opts[:archetype] == "private_message",
+ )
if opts[:destination_topic_id]
topic = post_mover.to_topic(opts[:destination_topic_id], participants: opts[:participants])
- DiscourseEvent.trigger(:topic_merged,
- post_mover.original_topic,
- post_mover.destination_topic
- )
+ DiscourseEvent.trigger(:topic_merged, post_mover.original_topic, post_mover.destination_topic)
topic
elsif opts[:title]
@@ -1142,10 +1249,7 @@ class Topic < ActiveRecord::Base
def update_action_counts
update_column(
:like_count,
- Post
- .where.not(post_type: Post.types[:whisper])
- .where(topic_id: id)
- .sum(:like_count)
+ Post.where.not(post_type: Post.types[:whisper]).where(topic_id: id).sum(:like_count),
)
end
@@ -1159,26 +1263,26 @@ class Topic < ActiveRecord::Base
def make_banner!(user, bannered_until = nil)
if bannered_until
- bannered_until = begin
- Time.parse(bannered_until)
- rescue ArgumentError
- raise Discourse::InvalidParameters.new(:bannered_until)
- end
+ bannered_until =
+ begin
+ Time.parse(bannered_until)
+ rescue ArgumentError
+ raise Discourse::InvalidParameters.new(:bannered_until)
+ end
end
# only one banner at the same time
previous_banner = Topic.where(archetype: Archetype.banner).first
previous_banner.remove_banner!(user) if previous_banner.present?
- UserProfile.where("dismissed_banner_key IS NOT NULL")
- .update_all(dismissed_banner_key: nil)
+ UserProfile.where("dismissed_banner_key IS NOT NULL").update_all(dismissed_banner_key: nil)
self.archetype = Archetype.banner
self.bannered_until = bannered_until
self.add_small_action(user, "banner.enabled")
self.save
- MessageBus.publish('/site/banner', banner)
+ MessageBus.publish("/site/banner", banner)
Jobs.cancel_scheduled_job(:remove_banner, topic_id: self.id)
Jobs.enqueue_at(bannered_until, :remove_banner, topic_id: self.id) if bannered_until
@@ -1190,7 +1294,7 @@ class Topic < ActiveRecord::Base
self.add_small_action(user, "banner.disabled")
self.save
- MessageBus.publish('/site/banner', nil)
+ MessageBus.publish("/site/banner", nil)
Jobs.cancel_scheduled_job(:remove_banner, topic_id: self.id)
end
@@ -1198,24 +1302,18 @@ class Topic < ActiveRecord::Base
def banner
post = self.ordered_posts.first
- {
- html: post.cooked,
- key: self.id,
- url: self.url
- }
+ { html: post.cooked, key: self.id, url: self.url }
end
cattr_accessor :slug_computed_callbacks
self.slug_computed_callbacks = []
def slug_for_topic(title)
- return '' unless title.present?
+ return "" unless title.present?
slug = Slug.for(title)
# this is a hook for plugins that need to modify the generated slug
- self.class.slug_computed_callbacks.each do |callback|
- slug = callback.call(self, slug, title)
- end
+ self.class.slug_computed_callbacks.each { |callback| slug = callback.call(self, slug, title) }
slug
end
@@ -1223,7 +1321,7 @@ class Topic < ActiveRecord::Base
# Even if the slug column in the database is null, topic.slug will return something:
def slug
unless slug = read_attribute(:slug)
- return '' unless title.present?
+ return "" unless title.present?
slug = slug_for_topic(title)
if new_record?
write_attribute(:slug, slug)
@@ -1295,17 +1393,18 @@ class Topic < ActiveRecord::Base
def update_pinned(status, global = false, pinned_until = nil)
if pinned_until
- pinned_until = begin
- Time.parse(pinned_until)
- rescue ArgumentError
- raise Discourse::InvalidParameters.new(:pinned_until)
- end
+ pinned_until =
+ begin
+ Time.parse(pinned_until)
+ rescue ArgumentError
+ raise Discourse::InvalidParameters.new(:pinned_until)
+ end
end
update_columns(
pinned_at: status ? Time.zone.now : nil,
pinned_globally: global,
- pinned_until: pinned_until
+ pinned_until: pinned_until,
)
Jobs.cancel_scheduled_job(:unpin_topic, topic_id: self.id)
@@ -1321,17 +1420,19 @@ class Topic < ActiveRecord::Base
end
def muted?(user)
- if user && user.id
- notifier.muted?(user.id)
- end
+ notifier.muted?(user.id) if user && user.id
end
def self.ensure_consistency!
# unpin topics that might have been missed
- Topic.where('pinned_until < ?', Time.now).update_all(pinned_at: nil, pinned_globally: false, pinned_until: nil)
- Topic.where('bannered_until < ?', Time.now).find_each do |topic|
- topic.remove_banner!(Discourse.system_user)
- end
+ Topic.where("pinned_until < ?", Time.now).update_all(
+ pinned_at: nil,
+ pinned_globally: false,
+ pinned_until: nil,
+ )
+ Topic
+ .where("bannered_until < ?", Time.now)
+ .find_each { |topic| topic.remove_banner!(Discourse.system_user) }
end
def inherit_slow_mode_from_category
@@ -1343,11 +1444,8 @@ class Topic < ActiveRecord::Base
def inherit_auto_close_from_category(timer_type: :close)
auto_close_hours = self.category&.auto_close_hours
- if self.open? &&
- !@ignore_category_auto_close &&
- auto_close_hours.present? &&
- public_topic_timer&.execute_at.blank?
-
+ if self.open? && !@ignore_category_auto_close && auto_close_hours.present? &&
+ public_topic_timer&.execute_at.blank?
based_on_last_post = self.category.auto_close_based_on_last_post
duration_minutes = based_on_last_post ? auto_close_hours * 60 : nil
@@ -1374,7 +1472,7 @@ class Topic < ActiveRecord::Base
auto_close_time,
by_user: Discourse.system_user,
based_on_last_post: based_on_last_post,
- duration_minutes: duration_minutes
+ duration_minutes: duration_minutes,
)
end
end
@@ -1407,8 +1505,18 @@ class Topic < ActiveRecord::Base
# * duration_minutes: The duration of the timer in minutes, which is used if the timer is based
# on the last post or if the timer type is delete_replies.
# * silent: Affects whether the close topic timer status change will be silent or not.
- def set_or_create_timer(status_type, time, by_user: nil, based_on_last_post: false, category_id: SiteSetting.uncategorized_category_id, duration_minutes: nil, silent: nil)
- return delete_topic_timer(status_type, by_user: by_user) if time.blank? && duration_minutes.blank?
+ def set_or_create_timer(
+ status_type,
+ time,
+ by_user: nil,
+ based_on_last_post: false,
+ category_id: SiteSetting.uncategorized_category_id,
+ duration_minutes: nil,
+ silent: nil
+ )
+ if time.blank? && duration_minutes.blank?
+ return delete_topic_timer(status_type, by_user: by_user)
+ end
duration_minutes = duration_minutes ? duration_minutes.to_i : 0
public_topic_timer = !!TopicTimer.public_types[status_type]
@@ -1427,21 +1535,30 @@ class Topic < ActiveRecord::Base
if topic_timer.based_on_last_post
if duration_minutes > 0
- last_post_created_at = self.ordered_posts.last.present? ? self.ordered_posts.last.created_at : time_now
+ last_post_created_at =
+ self.ordered_posts.last.present? ? self.ordered_posts.last.created_at : time_now
topic_timer.duration_minutes = duration_minutes
topic_timer.execute_at = last_post_created_at + duration_minutes.minutes
topic_timer.created_at = last_post_created_at
end
elsif topic_timer.status_type == TopicTimer.types[:delete_replies]
if duration_minutes > 0
- first_reply_created_at = (self.ordered_posts.where("post_number > 1").minimum(:created_at) || time_now)
+ first_reply_created_at =
+ (self.ordered_posts.where("post_number > 1").minimum(:created_at) || time_now)
topic_timer.duration_minutes = duration_minutes
topic_timer.execute_at = first_reply_created_at + duration_minutes.minutes
topic_timer.created_at = first_reply_created_at
end
else
utc = Time.find_zone("UTC")
- is_float = (Float(time) rescue nil)
+ is_float =
+ (
+ begin
+ Float(time)
+ rescue StandardError
+ nil
+ end
+ )
if is_float
num_hours = time.to_f
@@ -1458,7 +1575,14 @@ class Topic < ActiveRecord::Base
if by_user&.staff? || by_user&.trust_level == TrustLevel[4]
topic_timer.user = by_user
else
- topic_timer.user ||= (self.user.staff? || self.user.trust_level == TrustLevel[4] ? self.user : Discourse.system_user)
+ topic_timer.user ||=
+ (
+ if self.user.staff? || self.user.trust_level == TrustLevel[4]
+ self.user
+ else
+ Discourse.system_user
+ end
+ )
end
if self.persisted?
@@ -1490,9 +1614,8 @@ class Topic < ActiveRecord::Base
end
def secure_group_ids
- @secure_group_ids ||= if self.category && self.category.read_restricted?
- self.category.secure_group_ids
- end
+ @secure_group_ids ||=
+ (self.category.secure_group_ids if self.category && self.category.read_restricted?)
end
def has_topic_embed?
@@ -1584,7 +1707,10 @@ class Topic < ActiveRecord::Base
end
def self.time_to_first_response_per_day(start_date, end_date, opts = {})
- time_to_first_response(TIME_TO_FIRST_RESPONSE_SQL, opts.merge(start_date: start_date, end_date: end_date))
+ time_to_first_response(
+ TIME_TO_FIRST_RESPONSE_SQL,
+ opts.merge(start_date: start_date, end_date: end_date),
+ )
end
def self.time_to_first_response_total(opts = nil)
@@ -1606,7 +1732,12 @@ class Topic < ActiveRecord::Base
ORDER BY tt.created_at
SQL
- def self.with_no_response_per_day(start_date, end_date, category_id = nil, include_subcategories = nil)
+ def self.with_no_response_per_day(
+ start_date,
+ end_date,
+ category_id = nil,
+ include_subcategories = nil
+ )
builder = DB.build(WITH_NO_RESPONSE_SQL)
builder.where("t.created_at >= :start_date", start_date: start_date) if start_date
builder.where("t.created_at < :end_date", end_date: end_date) if end_date
@@ -1662,9 +1793,7 @@ class Topic < ActiveRecord::Base
def update_excerpt(excerpt)
update_column(:excerpt, excerpt)
- if archetype == "banner"
- ApplicationController.banner_json_cache.clear
- end
+ ApplicationController.banner_json_cache.clear if archetype == "banner"
end
def pm_with_non_human_user?
@@ -1692,9 +1821,9 @@ class Topic < ActiveRecord::Base
def self.private_message_topics_count_per_day(start_date, end_date, topic_subtype)
private_messages
.with_subtype(topic_subtype)
- .where('topics.created_at >= ? AND topics.created_at <= ?', start_date, end_date)
- .group('date(topics.created_at)')
- .order('date(topics.created_at)')
+ .where("topics.created_at >= ? AND topics.created_at <= ?", start_date, end_date)
+ .group("date(topics.created_at)")
+ .order("date(topics.created_at)")
.count
end
@@ -1703,11 +1832,12 @@ class Topic < ActiveRecord::Base
end
def reset_bumped_at
- post = ordered_posts.where(
- user_deleted: false,
- hidden: false,
- post_type: Post.types[:regular]
- ).last || first_post
+ post =
+ ordered_posts.where(
+ user_deleted: false,
+ hidden: false,
+ post_type: Post.types[:regular],
+ ).last || first_post
self.bumped_at = post.created_at
self.save(validate: false)
@@ -1716,21 +1846,26 @@ class Topic < ActiveRecord::Base
def auto_close_threshold_reached?
return if user&.staff?
- scores = ReviewableScore.pending
- .joins(:reviewable)
- .where('reviewable_scores.score >= ?', Reviewable.min_score_for_priority)
- .where('reviewables.topic_id = ?', self.id)
- .pluck('COUNT(DISTINCT reviewable_scores.user_id), COALESCE(SUM(reviewable_scores.score), 0.0)')
- .first
+ scores =
+ ReviewableScore
+ .pending
+ .joins(:reviewable)
+ .where("reviewable_scores.score >= ?", Reviewable.min_score_for_priority)
+ .where("reviewables.topic_id = ?", self.id)
+ .pluck(
+ "COUNT(DISTINCT reviewable_scores.user_id), COALESCE(SUM(reviewable_scores.score), 0.0)",
+ )
+ .first
- scores[0] >= SiteSetting.num_flaggers_to_close_topic && scores[1] >= Reviewable.score_to_auto_close_topic
+ scores[0] >= SiteSetting.num_flaggers_to_close_topic &&
+ scores[1] >= Reviewable.score_to_auto_close_topic
end
def update_category_topic_count_by(num)
if category_id.present?
Category
- .where('id = ?', category_id)
- .where('topic_id != ? OR topic_id IS NULL', self.id)
+ .where("id = ?", category_id)
+ .where("topic_id != ? OR topic_id IS NULL", self.id)
.update_all("topic_count = topic_count + #{num.to_i}")
end
end
@@ -1749,40 +1884,46 @@ class Topic < ActiveRecord::Base
# TODO(martin) Look at improving this N1, it will just get slower the
# more replies/incoming emails there are for the topic.
- self.incoming_email.where("created_at <= ?", received_before).each do |incoming_email|
- to_addresses = incoming_email.to_addresses_split
- cc_addresses = incoming_email.cc_addresses_split
- combined_addresses = [to_addresses, cc_addresses].flatten
+ self
+ .incoming_email
+ .where("created_at <= ?", received_before)
+ .each do |incoming_email|
+ to_addresses = incoming_email.to_addresses_split
+ cc_addresses = incoming_email.cc_addresses_split
+ combined_addresses = [to_addresses, cc_addresses].flatten
- # We only care about the emails addressed to the group or CC'd to the
- # group if the group is present. If combined addresses is empty we do
- # not need to do this check, and instead can proceed on to adding the
- # from address.
- #
- # Will not include test1@gmail.com if the only IncomingEmail
- # is:
- #
- # from: test1@gmail.com
- # to: test+support@discoursemail.com
- #
- # Because we don't care about the from addresses and also the to address
- # is not the email_username, which will be something like test1@gmail.com.
- if group.present? && combined_addresses.any?
- next if combined_addresses.none? { |address| address =~ group.email_username_regex }
+ # We only care about the emails addressed to the group or CC'd to the
+ # group if the group is present. If combined addresses is empty we do
+ # not need to do this check, and instead can proceed on to adding the
+ # from address.
+ #
+ # Will not include test1@gmail.com if the only IncomingEmail
+ # is:
+ #
+ # from: test1@gmail.com
+ # to: test+support@discoursemail.com
+ #
+ # Because we don't care about the from addresses and also the to address
+ # is not the email_username, which will be something like test1@gmail.com.
+ if group.present? && combined_addresses.any?
+ next if combined_addresses.none? { |address| address =~ group.email_username_regex }
+ end
+
+ email_addresses.add(incoming_email.from_address)
+ email_addresses.merge(combined_addresses)
end
- email_addresses.add(incoming_email.from_address)
- email_addresses.merge(combined_addresses)
- end
-
- email_addresses.subtract([nil, ''])
+ email_addresses.subtract([nil, ""])
email_addresses.delete(group.email_username) if group.present?
email_addresses.to_a
end
def create_invite_notification!(target_user, notification_type, invited_by, post_number: 1)
- if UserCommScreener.new(acting_user: invited_by, target_user_ids: target_user.id).ignoring_or_muting_actor?(target_user.id)
+ if UserCommScreener.new(
+ acting_user: invited_by,
+ target_user_ids: target_user.id,
+ ).ignoring_or_muting_actor?(target_user.id)
raise NotAllowed.new(I18n.t("not_accepting_pms", username: target_user.username))
end
@@ -1794,8 +1935,8 @@ class Topic < ActiveRecord::Base
topic_title: self.title,
display_username: invited_by.username,
original_user_id: user.id,
- original_username: user.username
- }.to_json
+ original_username: user.username,
+ }.to_json,
)
end
@@ -1804,28 +1945,35 @@ class Topic < ActiveRecord::Base
invited_by,
"topic-invitations-per-day",
SiteSetting.max_topic_invitations_per_day,
- 1.day.to_i
+ 1.day.to_i,
).performed!
RateLimiter.new(
invited_by,
"topic-invitations-per-minute",
SiteSetting.max_topic_invitations_per_minute,
- 1.day.to_i
+ 1.day.to_i,
).performed!
end
def cannot_permanently_delete_reason(user)
- all_posts_count = Post.with_deleted
- .where(topic_id: self.id)
- .where(post_type: [Post.types[:regular], Post.types[:moderator_action], Post.types[:whisper]])
- .count
+ all_posts_count =
+ Post
+ .with_deleted
+ .where(topic_id: self.id)
+ .where(
+ post_type: [Post.types[:regular], Post.types[:moderator_action], Post.types[:whisper]],
+ )
+ .count
if posts_count > 0 || all_posts_count > 1
- I18n.t('post.cannot_permanently_delete.many_posts')
+ I18n.t("post.cannot_permanently_delete.many_posts")
elsif self.deleted_by_id == user&.id && self.deleted_at >= Post::PERMANENT_DELETE_TIMER.ago
- time_left = RateLimiter.time_left(Post::PERMANENT_DELETE_TIMER.to_i - Time.zone.now.to_i + self.deleted_at.to_i)
- I18n.t('post.cannot_permanently_delete.wait_or_different_admin', time_left: time_left)
+ time_left =
+ RateLimiter.time_left(
+ Post::PERMANENT_DELETE_TIMER.to_i - Time.zone.now.to_i + self.deleted_at.to_i,
+ )
+ I18n.t("post.cannot_permanently_delete.wait_or_different_admin", time_left: time_left)
end
end
@@ -1855,9 +2003,11 @@ class Topic < ActiveRecord::Base
when :liked, :unliked
stats = { like_count: topic.like_count }
when :created, :destroyed, :deleted, :recovered
- stats = { posts_count: topic.posts_count,
- last_posted_at: topic.last_posted_at.as_json,
- last_poster: BasicUserSerializer.new(topic.last_poster, root: false).as_json }
+ stats = {
+ posts_count: topic.posts_count,
+ last_posted_at: topic.last_posted_at.as_json,
+ last_poster: BasicUserSerializer.new(topic.last_poster, root: false).as_json,
+ }
else
stats = nil
end
@@ -1866,11 +2016,7 @@ class Topic < ActiveRecord::Base
secure_audience = topic.secure_audience_publish_messages
if secure_audience[:user_ids] != [] && secure_audience[:group_ids] != []
- message = stats.merge({
- id: topic_id,
- updated_at: Time.now,
- type: :stats,
- })
+ message = stats.merge({ id: topic_id, updated_at: Time.now, type: :stats })
MessageBus.publish("/topic/#{topic_id}", message, opts.merge(secure_audience))
end
end
@@ -1880,15 +2026,15 @@ class Topic < ActiveRecord::Base
def invite_to_private_message(invited_by, target_user, guardian)
if !guardian.can_send_private_message?(target_user)
- raise UserExists.new(I18n.t(
- "activerecord.errors.models.topic.attributes.base.cant_send_pm"
- ))
+ raise UserExists.new(I18n.t("activerecord.errors.models.topic.attributes.base.cant_send_pm"))
end
rate_limit_topic_invitation(invited_by)
Topic.transaction do
- topic_allowed_users.create!(user_id: target_user.id) unless topic_allowed_users.exists?(user_id: target_user.id)
+ unless topic_allowed_users.exists?(user_id: target_user.id)
+ topic_allowed_users.create!(user_id: target_user.id)
+ end
user_in_allowed_group = (user.group_ids & topic_allowed_groups.map(&:group_id)).present?
add_small_action(invited_by, "invited_user", target_user.username) if !user_in_allowed_group
@@ -1896,7 +2042,7 @@ class Topic < ActiveRecord::Base
create_invite_notification!(
target_user,
Notification.types[:invited_to_private_message],
- invited_by
+ invited_by,
)
end
end
@@ -1908,24 +2054,18 @@ class Topic < ActiveRecord::Base
if group_ids.present?
(
self.category.groups.where(id: group_ids).where(automatic: false) -
- target_user.groups.where(automatic: false)
+ target_user.groups.where(automatic: false)
).each do |group|
if guardian.can_edit_group?(group)
group.add(target_user)
- GroupActionLogger
- .new(invited_by, group)
- .log_add_user_to_group(target_user)
+ GroupActionLogger.new(invited_by, group).log_add_user_to_group(target_user)
end
end
end
if Guardian.new(target_user).can_see_topic?(self)
- create_invite_notification!(
- target_user,
- Notification.types[:invited_to_topic],
- invited_by
- )
+ create_invite_notification!(target_user, Notification.types[:invited_to_topic], invited_by)
end
end
end
diff --git a/app/models/topic_converter.rb b/app/models/topic_converter.rb
index 47c8b4a3c72..8eab3a31d0c 100644
--- a/app/models/topic_converter.rb
+++ b/app/models/topic_converter.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class TopicConverter
-
attr_reader :topic
def initialize(topic, user)
@@ -17,16 +16,17 @@ class TopicConverter
elsif SiteSetting.allow_uncategorized_topics
SiteSetting.uncategorized_category_id
else
- Category.where(read_restricted: false)
+ Category
+ .where(read_restricted: false)
.where.not(id: SiteSetting.uncategorized_category_id)
- .order('id asc')
+ .order("id asc")
.pluck_first(:id)
end
PostRevisor.new(@topic.first_post, @topic).revise!(
@user,
category_id: category_id,
- archetype: Archetype.default
+ archetype: Archetype.default,
)
update_user_stats
@@ -45,7 +45,7 @@ class TopicConverter
PostRevisor.new(@topic.first_post, @topic).revise!(
@user,
category_id: nil,
- archetype: Archetype.private_message
+ archetype: Archetype.private_message,
)
add_allowed_users
@@ -63,9 +63,12 @@ class TopicConverter
private
def posters
- @posters ||= @topic.posts
- .where.not(post_type: [Post.types[:small_action], Post.types[:whisper]])
- .distinct.pluck(:user_id)
+ @posters ||=
+ @topic
+ .posts
+ .where.not(post_type: [Post.types[:small_action], Post.types[:whisper]])
+ .distinct
+ .pluck(:user_id)
end
def increment_users_post_count
@@ -134,8 +137,6 @@ class TopicConverter
end
def update_post_uploads_secure_status
- DB.after_commit do
- Jobs.enqueue(:update_topic_upload_security, topic_id: @topic.id)
- end
+ DB.after_commit { Jobs.enqueue(:update_topic_upload_security, topic_id: @topic.id) }
end
end
diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index 6b0e3662f84..3b9545bf815 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -9,7 +9,13 @@ class TopicEmbed < ActiveRecord::Base
validates_uniqueness_of :embed_url
before_validation(on: :create) do
- unless (topic_embed = TopicEmbed.with_deleted.where('deleted_at IS NOT NULL AND embed_url = ?', embed_url).first).nil?
+ unless (
+ topic_embed =
+ TopicEmbed
+ .with_deleted
+ .where("deleted_at IS NOT NULL AND embed_url = ?", embed_url)
+ .first
+ ).nil?
topic_embed.destroy!
end
end
@@ -19,23 +25,21 @@ class TopicEmbed < ActiveRecord::Base
end
def self.normalize_url(url)
- url.downcase.sub(/\/$/, '').sub(/\-+/, '-').strip
+ url.downcase.sub(%r{/$}, "").sub(/\-+/, "-").strip
end
def self.imported_from_html(url)
I18n.with_locale(SiteSetting.default_locale) do
- "\n
\n#{I18n.t('embed.imported_from', link: "#{url}")}\n"
+ "\n
\n#{I18n.t("embed.imported_from", link: "#{url}")}\n"
end
end
# Import an article from a source (RSS/Atom/Other)
def self.import(user, url, title, contents, category_id: nil, cook_method: nil, tags: nil)
- return unless url =~ /^https?\:\/\//
+ return unless url =~ %r{^https?\://}
- if SiteSetting.embed_truncate && cook_method.nil?
- contents = first_paragraph_from(contents)
- end
- contents ||= ''
+ contents = first_paragraph_from(contents) if SiteSetting.embed_truncate && cook_method.nil?
+ contents ||= ""
contents = contents.dup << imported_from_html(url)
url = normalize_url(url)
@@ -49,11 +53,12 @@ class TopicEmbed < ActiveRecord::Base
Topic.transaction do
eh = EmbeddableHost.record_for_url(url)
- cook_method ||= if SiteSetting.embed_support_markdown
- Post.cook_methods[:regular]
- else
- Post.cook_methods[:raw_html]
- end
+ cook_method ||=
+ if SiteSetting.embed_support_markdown
+ Post.cook_methods[:regular]
+ else
+ Post.cook_methods[:raw_html]
+ end
create_args = {
title: title,
@@ -63,17 +68,17 @@ class TopicEmbed < ActiveRecord::Base
category: category_id || eh.try(:category_id),
tags: SiteSetting.tagging_enabled ? tags : nil,
}
- if SiteSetting.embed_unlisted?
- create_args[:visible] = false
- end
+ create_args[:visible] = false if SiteSetting.embed_unlisted?
creator = PostCreator.new(user, create_args)
post = creator.create
if post.present?
- TopicEmbed.create!(topic_id: post.topic_id,
- embed_url: url,
- content_sha1: content_sha1,
- post_id: post.id)
+ TopicEmbed.create!(
+ topic_id: post.topic_id,
+ embed_url: url,
+ content_sha1: content_sha1,
+ post_id: post.id,
+ )
end
end
else
@@ -87,7 +92,7 @@ class TopicEmbed < ActiveRecord::Base
post_ids: [post.id],
topic_id: post.topic_id,
new_owner: user,
- acting_user: Discourse.system_user
+ acting_user: Discourse.system_user,
).change_owner!
# make sure the post returned has the right author
@@ -108,16 +113,11 @@ class TopicEmbed < ActiveRecord::Base
end
def self.find_remote(url)
- require 'ruby-readability'
+ require "ruby-readability"
url = UrlHelper.normalized_encode(url)
original_uri = URI.parse(url)
- fd = FinalDestination.new(
- url,
- validate_uri: true,
- max_redirects: 5,
- follow_canonical: true,
- )
+ fd = FinalDestination.new(url, validate_uri: true, max_redirects: 5, follow_canonical: true)
uri = fd.resolve
return if uri.blank?
@@ -125,12 +125,17 @@ class TopicEmbed < ActiveRecord::Base
opts = {
tags: %w[div p code pre h1 h2 h3 b em i strong a img ul li ol blockquote],
attributes: %w[href src class],
- remove_empty_nodes: false
+ remove_empty_nodes: false,
}
- opts[:whitelist] = SiteSetting.allowed_embed_selectors if SiteSetting.allowed_embed_selectors.present?
- opts[:blacklist] = SiteSetting.blocked_embed_selectors if SiteSetting.blocked_embed_selectors.present?
- allowed_embed_classnames = SiteSetting.allowed_embed_classnames if SiteSetting.allowed_embed_classnames.present?
+ opts[
+ :whitelist
+ ] = SiteSetting.allowed_embed_selectors if SiteSetting.allowed_embed_selectors.present?
+ opts[
+ :blacklist
+ ] = SiteSetting.blocked_embed_selectors if SiteSetting.blocked_embed_selectors.present?
+ allowed_embed_classnames =
+ SiteSetting.allowed_embed_classnames if SiteSetting.allowed_embed_classnames.present?
response = FetchResponse.new
begin
@@ -139,7 +144,7 @@ class TopicEmbed < ActiveRecord::Base
return
end
- raw_doc = Nokogiri::HTML5(html)
+ raw_doc = Nokogiri.HTML5(html)
auth_element = raw_doc.at('meta[@name="author"]')
if auth_element.present?
response.author = User.where(username_lower: auth_element[:content].strip).first
@@ -147,39 +152,51 @@ class TopicEmbed < ActiveRecord::Base
read_doc = Readability::Document.new(html, opts)
- title = +(raw_doc.title || '')
+ title = +(raw_doc.title || "")
title.strip!
if SiteSetting.embed_title_scrubber.present?
- title.sub!(Regexp.new(SiteSetting.embed_title_scrubber), '')
+ title.sub!(Regexp.new(SiteSetting.embed_title_scrubber), "")
title.strip!
end
response.title = title
- doc = Nokogiri::HTML5(read_doc.content)
+ doc = Nokogiri.HTML5(read_doc.content)
- tags = { 'img' => 'src', 'script' => 'src', 'a' => 'href' }
- doc.search(tags.keys.join(',')).each do |node|
- url_param = tags[node.name]
- src = node[url_param]
- unless (src.nil? || src.empty?)
- begin
- # convert URL to absolute form
- node[url_param] = URI.join(url, UrlHelper.normalized_encode(src)).to_s
- rescue URI::Error, Addressable::URI::InvalidURIError
- # If there is a mistyped URL, just do nothing
+ tags = { "img" => "src", "script" => "src", "a" => "href" }
+ doc
+ .search(tags.keys.join(","))
+ .each do |node|
+ url_param = tags[node.name]
+ src = node[url_param]
+ unless (src.nil? || src.empty?)
+ begin
+ # convert URL to absolute form
+ node[url_param] = URI.join(url, UrlHelper.normalized_encode(src)).to_s
+ rescue URI::Error, Addressable::URI::InvalidURIError
+ # If there is a mistyped URL, just do nothing
+ end
end
+ # only allow classes in the allowlist
+ allowed_classes =
+ if allowed_embed_classnames.blank?
+ []
+ else
+ allowed_embed_classnames.split(/[ ,]+/i)
+ end
+ doc
+ .search('[class]:not([class=""])')
+ .each do |classnode|
+ classes =
+ classnode[:class]
+ .split(" ")
+ .select { |classname| allowed_classes.include?(classname) }
+ if classes.length === 0
+ classnode.delete("class")
+ else
+ classnode[:class] = classes.join(" ")
+ end
+ end
end
- # only allow classes in the allowlist
- allowed_classes = if allowed_embed_classnames.blank? then [] else allowed_embed_classnames.split(/[ ,]+/i) end
- doc.search('[class]:not([class=""])').each do |classnode|
- classes = classnode[:class].split(' ').select { |classname| allowed_classes.include?(classname) }
- if classes.length === 0
- classnode.delete('class')
- else
- classnode[:class] = classes.join(' ')
- end
- end
- end
response.body = doc.to_html
response
@@ -208,59 +225,69 @@ class TopicEmbed < ActiveRecord::Base
prefix += ":#{uri.port}" if uri.port != 80 && uri.port != 443
fragment = Nokogiri::HTML5.fragment("#{contents}
")
- fragment.css('a').each do |a|
- if a['href'].present?
- begin
- a['href'] = URI.join(prefix, a['href']).to_s
- rescue URI::InvalidURIError
- # NOOP, URL is malformed
+ fragment
+ .css("a")
+ .each do |a|
+ if a["href"].present?
+ begin
+ a["href"] = URI.join(prefix, a["href"]).to_s
+ rescue URI::InvalidURIError
+ # NOOP, URL is malformed
+ end
end
end
- end
- fragment.css('img').each do |a|
- if a['src'].present?
- begin
- a['src'] = URI.join(prefix, a['src']).to_s
- rescue URI::InvalidURIError
- # NOOP, URL is malformed
+ fragment
+ .css("img")
+ .each do |a|
+ if a["src"].present?
+ begin
+ a["src"] = URI.join(prefix, a["src"]).to_s
+ rescue URI::InvalidURIError
+ # NOOP, URL is malformed
+ end
end
end
- end
- fragment.at('div').inner_html
+ fragment.at("div").inner_html
end
def self.topic_id_for_embed(embed_url)
- embed_url = normalize_url(embed_url).sub(/^https?\:\/\//, '')
- TopicEmbed.where("embed_url ~* ?", "^https?://#{Regexp.escape(embed_url)}$").pluck_first(:topic_id)
+ embed_url = normalize_url(embed_url).sub(%r{^https?\://}, "")
+ TopicEmbed.where("embed_url ~* ?", "^https?://#{Regexp.escape(embed_url)}$").pluck_first(
+ :topic_id,
+ )
end
def self.first_paragraph_from(html)
- doc = Nokogiri::HTML5(html)
+ doc = Nokogiri.HTML5(html)
result = +""
- doc.css('p').each do |p|
- if p.text.present?
- result << p.to_s
- return result if result.size >= 100
+ doc
+ .css("p")
+ .each do |p|
+ if p.text.present?
+ result << p.to_s
+ return result if result.size >= 100
+ end
end
- end
return result unless result.blank?
# If there is no first paragraph, return the first div (onebox)
- doc.css('div').first.to_s
+ doc.css("div").first.to_s
end
def self.expanded_for(post)
- Discourse.cache.fetch("embed-topic:#{post.topic_id}", expires_in: 10.minutes) do
- url = TopicEmbed.where(topic_id: post.topic_id).pluck_first(:embed_url)
- response = TopicEmbed.find_remote(url)
+ Discourse
+ .cache
+ .fetch("embed-topic:#{post.topic_id}", expires_in: 10.minutes) do
+ url = TopicEmbed.where(topic_id: post.topic_id).pluck_first(:embed_url)
+ response = TopicEmbed.find_remote(url)
- body = response.body
- body << TopicEmbed.imported_from_html(url)
- body
- end
+ body = response.body
+ body << TopicEmbed.imported_from_html(url)
+ body
+ end
end
end
diff --git a/app/models/topic_featured_users.rb b/app/models/topic_featured_users.rb
index 3cd3c7fda31..5383ae6655f 100644
--- a/app/models/topic_featured_users.rb
+++ b/app/models/topic_featured_users.rb
@@ -18,14 +18,15 @@ class TopicFeaturedUsers
end
def user_ids
- [topic.featured_user1_id,
- topic.featured_user2_id,
- topic.featured_user3_id,
- topic.featured_user4_id].uniq.compact
+ [
+ topic.featured_user1_id,
+ topic.featured_user2_id,
+ topic.featured_user3_id,
+ topic.featured_user4_id,
+ ].uniq.compact
end
def self.ensure_consistency!(topic_id = nil)
-
filter = "#{"AND t.id = #{topic_id.to_i}" if topic_id}"
filter2 = "#{"AND tt.id = #{topic_id.to_i}" if topic_id}"
@@ -87,7 +88,11 @@ SQL
private
def update_participant_count
- count = topic.posts.where('NOT hidden AND post_type in (?)', Topic.visible_post_types).count('distinct user_id')
+ count =
+ topic
+ .posts
+ .where("NOT hidden AND post_type in (?)", Topic.visible_post_types)
+ .count("distinct user_id")
topic.update_columns(participant_count: count)
end
end
diff --git a/app/models/topic_group.rb b/app/models/topic_group.rb
index 7f3c4060f34..f9e0f65fb01 100644
--- a/app/models/topic_group.rb
+++ b/app/models/topic_group.rb
@@ -31,10 +31,14 @@ class TopicGroup < ActiveRecord::Base
tg.group_id
SQL
- updated_groups = DB.query(
- update_query,
- user_id: user.id, topic_id: topic_id, post_number: post_number, now: DateTime.now
- )
+ updated_groups =
+ DB.query(
+ update_query,
+ user_id: user.id,
+ topic_id: topic_id,
+ post_number: post_number,
+ now: DateTime.now,
+ )
end
def self.create_topic_group(user, topic_id, post_number, updated_group_ids)
@@ -47,7 +51,8 @@ class TopicGroup < ActiveRecord::Base
AND tag.topic_id = :topic_id
SQL
- query += 'AND NOT(tag.group_id IN (:already_updated_groups))' unless updated_group_ids.length.zero?
+ query +=
+ "AND NOT(tag.group_id IN (:already_updated_groups))" unless updated_group_ids.length.zero?
query += <<~SQL
ON CONFLICT(topic_id, group_id)
@@ -56,7 +61,11 @@ class TopicGroup < ActiveRecord::Base
DB.exec(
query,
- user_id: user.id, topic_id: topic_id, post_number: post_number, now: DateTime.now, already_updated_groups: updated_group_ids
+ user_id: user.id,
+ topic_id: topic_id,
+ post_number: post_number,
+ now: DateTime.now,
+ already_updated_groups: updated_group_ids,
)
end
end
diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb
index 690779cb06e..03bc3587b45 100644
--- a/app/models/topic_link.rb
+++ b/app/models/topic_link.rb
@@ -1,9 +1,8 @@
# frozen_string_literal: true
-require 'uri'
+require "uri"
class TopicLink < ActiveRecord::Base
-
def self.max_domain_length
100
end
@@ -15,14 +14,14 @@ class TopicLink < ActiveRecord::Base
belongs_to :topic
belongs_to :user
belongs_to :post
- belongs_to :link_topic, class_name: 'Topic'
- belongs_to :link_post, class_name: 'Post'
+ belongs_to :link_topic, class_name: "Topic"
+ belongs_to :link_post, class_name: "Post"
validates_presence_of :url
validates_length_of :url, maximum: 500
- validates_uniqueness_of :url, scope: [:topic_id, :post_id]
+ validates_uniqueness_of :url, scope: %i[topic_id post_id]
has_many :topic_link_clicks, dependent: :destroy
@@ -36,7 +35,6 @@ class TopicLink < ActiveRecord::Base
end
def self.topic_map(guardian, topic_id)
-
# Sam: complicated reports are really hard in AR
builder = DB.build(<<~SQL)
SELECT ftl.url,
@@ -56,16 +54,18 @@ class TopicLink < ActiveRecord::Base
LIMIT 50
SQL
- builder.where('ftl.topic_id = :topic_id', topic_id: topic_id)
- builder.where('ft.deleted_at IS NULL')
+ builder.where("ftl.topic_id = :topic_id", topic_id: topic_id)
+ builder.where("ft.deleted_at IS NULL")
builder.where("ftl.extension IS NULL OR ftl.extension NOT IN ('png','jpg','gif')")
- builder.where("COALESCE(ft.archetype, 'regular') <> :archetype", archetype: Archetype.private_message)
+ builder.where(
+ "COALESCE(ft.archetype, 'regular') <> :archetype",
+ archetype: Archetype.private_message,
+ )
builder.where("clicks > 0")
builder.secure_category(guardian.secure_category_ids)
builder.query
-
end
def self.counts_for(guardian, topic, posts)
@@ -73,7 +73,9 @@ class TopicLink < ActiveRecord::Base
# Sam: this is not tidy in AR and also happens to be a critical path
# for topic view
- builder = DB.build("SELECT
+ builder =
+ DB.build(
+ "SELECT
l.post_id,
l.url,
l.clicks,
@@ -86,28 +88,39 @@ class TopicLink < ActiveRecord::Base
LEFT JOIN categories AS c ON c.id = t.category_id
/*left_join*/
/*where*/
- ORDER BY reflection ASC, clicks DESC")
+ ORDER BY reflection ASC, clicks DESC",
+ )
- builder.where('t.deleted_at IS NULL')
- builder.where("COALESCE(t.archetype, 'regular') <> :archetype", archetype: Archetype.private_message)
+ builder.where("t.deleted_at IS NULL")
+ builder.where(
+ "COALESCE(t.archetype, 'regular') <> :archetype",
+ archetype: Archetype.private_message,
+ )
if guardian.authenticated?
- builder.left_join("topic_users AS tu ON (t.id = tu.topic_id AND tu.user_id = #{guardian.user.id.to_i})")
- builder.where('COALESCE(tu.notification_level,1) > :muted', muted: TopicUser.notification_levels[:muted])
+ builder.left_join(
+ "topic_users AS tu ON (t.id = tu.topic_id AND tu.user_id = #{guardian.user.id.to_i})",
+ )
+ builder.where(
+ "COALESCE(tu.notification_level,1) > :muted",
+ muted: TopicUser.notification_levels[:muted],
+ )
end
# not certain if pluck is right, cause it may interfere with caching
- builder.where('l.post_id in (:post_ids)', post_ids: posts.map(&:id))
+ builder.where("l.post_id in (:post_ids)", post_ids: posts.map(&:id))
builder.secure_category(guardian.secure_category_ids)
result = {}
builder.query.each do |l|
result[l.post_id] ||= []
- result[l.post_id] << { url: l.url,
- clicks: l.clicks,
- title: l.title,
- internal: l.internal,
- reflection: l.reflection }
+ result[l.post_id] << {
+ url: l.url,
+ clicks: l.clicks,
+ title: l.title,
+ internal: l.internal,
+ reflection: l.reflection,
+ }
end
result
end
@@ -127,22 +140,20 @@ class TopicLink < ActiveRecord::Base
.reject { |_, p| p.nil? || "mailto" == p.scheme }
.uniq { |_, p| p }
.each do |link, parsed|
-
- TopicLink.transaction do
- begin
- url, reflected_id = self.ensure_entry_for(post, link, parsed)
- current_urls << url unless url.nil?
- reflected_ids << reflected_id unless reflected_id.nil?
- rescue URI::Error
- # if the URI is invalid, don't store it.
- rescue ActionController::RoutingError
- # If we can't find the route, no big deal
+ TopicLink.transaction do
+ begin
+ url, reflected_id = self.ensure_entry_for(post, link, parsed)
+ current_urls << url unless url.nil?
+ reflected_ids << reflected_id unless reflected_id.nil?
+ rescue URI::Error
+ # if the URI is invalid, don't store it.
+ rescue ActionController::RoutingError
+ # If we can't find the route, no big deal
+ end
end
end
- end
self.cleanup_entries(post, current_urls, reflected_ids)
-
end
def self.crawl_link_title(topic_link_id)
@@ -154,20 +165,23 @@ class TopicLink < ActiveRecord::Base
end
def self.duplicate_lookup(topic)
- results = TopicLink
- .includes(:post, :user)
- .joins(:post, :user)
- .where("posts.id IS NOT NULL AND users.id IS NOT NULL")
- .where(topic_id: topic.id, reflection: false)
- .last(200)
+ results =
+ TopicLink
+ .includes(:post, :user)
+ .joins(:post, :user)
+ .where("posts.id IS NOT NULL AND users.id IS NOT NULL")
+ .where(topic_id: topic.id, reflection: false)
+ .last(200)
lookup = {}
results.each do |tl|
- normalized = tl.url.downcase.sub(/^https?:\/\//, '').sub(/\/$/, '')
- lookup[normalized] = { domain: tl.domain,
- username: tl.user.username_lower,
- posted_at: tl.post.created_at,
- post_number: tl.post.post_number }
+ normalized = tl.url.downcase.sub(%r{^https?://}, "").sub(%r{/$}, "")
+ lookup[normalized] = {
+ domain: tl.domain,
+ username: tl.user.username_lower,
+ posted_at: tl.post.created_at,
+ post_number: tl.post.post_number,
+ }
end
lookup
@@ -199,7 +213,6 @@ class TopicLink < ActiveRecord::Base
extension: nil,
reflection: false
)
-
domain ||= Discourse.current_hostname
sql = <<~SQL
@@ -242,26 +255,24 @@ class TopicLink < ActiveRecord::Base
), (SELECT id FROM new_row) IS NOT NULL
SQL
- topic_link_id, new_record = DB.query_single(sql,
- post_id: post_id,
- user_id: user_id,
- topic_id: topic_id,
- url: url,
- domain: domain,
- internal: internal,
- link_topic_id: link_topic_id,
- link_post_id: link_post_id,
- quote: quote,
- extension: extension,
- reflection: reflection,
- now: Time.now
- )
+ topic_link_id, new_record =
+ DB.query_single(
+ sql,
+ post_id: post_id,
+ user_id: user_id,
+ topic_id: topic_id,
+ url: url,
+ domain: domain,
+ internal: internal,
+ link_topic_id: link_topic_id,
+ link_post_id: link_post_id,
+ quote: quote,
+ extension: extension,
+ reflection: reflection,
+ now: Time.now,
+ )
- if new_record
- DB.after_commit do
- crawl_link_title(topic_link_id)
- end
- end
+ DB.after_commit { crawl_link_title(topic_link_id) } if new_record
topic_link_id
end
@@ -314,7 +325,8 @@ class TopicLink < ActiveRecord::Base
url = url[0...TopicLink.max_url_length]
return nil if parsed && parsed.host && parsed.host.length > TopicLink.max_domain_length
- file_extension = File.extname(parsed.path)[1..10].downcase unless parsed.path.nil? || File.extname(parsed.path).empty?
+ file_extension = File.extname(parsed.path)[1..10].downcase unless parsed.path.nil? ||
+ File.extname(parsed.path).empty?
safe_create_topic_link(
post_id: post.id,
@@ -332,22 +344,23 @@ class TopicLink < ActiveRecord::Base
reflected_id = nil
# Create the reflection if we can
- if topic && post.topic && topic.archetype != 'private_message' && post.topic.archetype != 'private_message' && post.topic.visible?
+ if topic && post.topic && topic.archetype != "private_message" &&
+ post.topic.archetype != "private_message" && post.topic.visible?
prefix = Discourse.base_url_no_prefix
reflected_url = "#{prefix}#{post.topic.relative_url(post.post_number)}"
- reflected_id = safe_create_topic_link(
- user_id: post.user_id,
- topic_id: topic&.id,
- post_id: reflected_post&.id,
- url: reflected_url,
- domain: Discourse.current_hostname,
- reflection: true,
- internal: true,
- link_topic_id: post.topic_id,
- link_post_id: post.id
- )
-
+ reflected_id =
+ safe_create_topic_link(
+ user_id: post.user_id,
+ topic_id: topic&.id,
+ post_id: reflected_post&.id,
+ url: reflected_url,
+ domain: Discourse.current_hostname,
+ reflection: true,
+ internal: true,
+ link_topic_id: post.topic_id,
+ link_post_id: post.id,
+ )
end
[url, reflected_id]
@@ -358,27 +371,25 @@ class TopicLink < ActiveRecord::Base
if current_urls.present?
TopicLink.where(
"(url not in (:urls)) AND (post_id = :post_id AND NOT reflection)",
- urls: current_urls, post_id: post.id
+ urls: current_urls,
+ post_id: post.id,
).delete_all
current_reflected_ids.compact!
if current_reflected_ids.present?
TopicLink.where(
"(id not in (:reflected_ids)) AND (link_post_id = :post_id AND reflection)",
- reflected_ids: current_reflected_ids, post_id: post.id
+ reflected_ids: current_reflected_ids,
+ post_id: post.id,
).delete_all
else
- TopicLink
- .where("link_post_id = :post_id AND reflection", post_id: post.id)
- .delete_all
+ TopicLink.where("link_post_id = :post_id AND reflection", post_id: post.id).delete_all
end
else
- TopicLink
- .where(
- "(post_id = :post_id AND NOT reflection) OR (link_post_id = :post_id AND reflection)",
- post_id: post.id
- )
- .delete_all
+ TopicLink.where(
+ "(post_id = :post_id AND NOT reflection) OR (link_post_id = :post_id AND reflection)",
+ post_id: post.id,
+ ).delete_all
end
end
end
diff --git a/app/models/topic_link_click.rb b/app/models/topic_link_click.rb
index 8770567997d..a1f121ee844 100644
--- a/app/models/topic_link_click.rb
+++ b/app/models/topic_link_click.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
-require 'ipaddr'
-require 'url_helper'
+require "ipaddr"
+require "url_helper"
class TopicLinkClick < ActiveRecord::Base
belongs_to :topic_link, counter_cache: :clicks
@@ -9,9 +9,9 @@ class TopicLinkClick < ActiveRecord::Base
validates_presence_of :topic_link_id
- ALLOWED_REDIRECT_HOSTNAMES = Set.new(%W{www.youtube.com youtu.be})
+ ALLOWED_REDIRECT_HOSTNAMES = Set.new(%W[www.youtube.com youtu.be])
include ActiveSupport::Deprecation::DeprecatedConstantAccessor
- deprecate_constant 'WHITELISTED_REDIRECT_HOSTNAMES', 'TopicLinkClick::ALLOWED_REDIRECT_HOSTNAMES'
+ deprecate_constant "WHITELISTED_REDIRECT_HOSTNAMES", "TopicLinkClick::ALLOWED_REDIRECT_HOSTNAMES"
# Create a click from a URL and post_id
def self.create_from(args = {})
@@ -22,32 +22,33 @@ class TopicLinkClick < ActiveRecord::Base
urls = Set.new
urls << url
if url =~ /^http/
- urls << url.sub(/^https/, 'http')
- urls << url.sub(/^http:/, 'https:')
+ urls << url.sub(/^https/, "http")
+ urls << url.sub(/^http:/, "https:")
urls << UrlHelper.schemaless(url)
end
urls << UrlHelper.absolute_without_cdn(url)
urls << uri.path if uri.try(:host) == Discourse.current_hostname
- query = url.index('?')
+ query = url.index("?")
unless query.nil?
- endpos = url.index('#') || url.size
+ endpos = url.index("#") || url.size
urls << url[0..query - 1] + url[endpos..-1]
end
# link can have query params, and analytics can add more to the end:
i = url.length
- while i = url.rindex('&', i - 1)
+ while i = url.rindex("&", i - 1)
urls << url[0...i]
end
# add a cdn link
if uri
if Discourse.asset_host.present?
- cdn_uri = begin
- URI.parse(Discourse.asset_host)
- rescue URI::Error
- end
+ cdn_uri =
+ begin
+ URI.parse(Discourse.asset_host)
+ rescue URI::Error
+ end
if cdn_uri && cdn_uri.hostname == uri.hostname && uri.path.starts_with?(cdn_uri.path)
is_cdn_link = true
@@ -56,10 +57,11 @@ class TopicLinkClick < ActiveRecord::Base
end
if SiteSetting.Upload.s3_cdn_url.present?
- cdn_uri = begin
- URI.parse(SiteSetting.Upload.s3_cdn_url)
- rescue URI::Error
- end
+ cdn_uri =
+ begin
+ URI.parse(SiteSetting.Upload.s3_cdn_url)
+ rescue URI::Error
+ end
if cdn_uri && cdn_uri.hostname == uri.hostname && uri.path.starts_with?(cdn_uri.path)
is_cdn_link = true
@@ -80,12 +82,15 @@ class TopicLinkClick < ActiveRecord::Base
link = link.where(topic_id: args[:topic_id]) if args[:topic_id].present?
# select the TopicLink associated to first url
- link = link.order("array_position(ARRAY[#{urls.map { |s| "#{ActiveRecord::Base.connection.quote(s)}" }.join(',')}], url::text)").first
+ link =
+ link.order(
+ "array_position(ARRAY[#{urls.map { |s| "#{ActiveRecord::Base.connection.quote(s)}" }.join(",")}], url::text)",
+ ).first
# If no link is found...
unless link.present?
# ... return the url for relative links or when using the same host
- return url if url =~ /^\/[^\/]/ || uri.try(:host) == Discourse.current_hostname
+ return url if url =~ %r{^/[^/]} || uri.try(:host) == Discourse.current_hostname
# If we have it somewhere else on the site, just allow the redirect.
# This is likely due to a onebox of another topic.
@@ -112,7 +117,6 @@ class TopicLinkClick < ActiveRecord::Base
url
end
-
end
# == Schema Information
diff --git a/app/models/topic_list.rb b/app/models/topic_list.rb
index 815e9c23085..b4be8c367fd 100644
--- a/app/models/topic_list.rb
+++ b/app/models/topic_list.rb
@@ -13,16 +13,12 @@ class TopicList
def self.cancel_preload(&blk)
if @preload
@preload.delete blk
- if @preload.length == 0
- @preload = nil
- end
+ @preload = nil if @preload.length == 0
end
end
def self.preload(topics, object)
- if @preload
- @preload.each { |preload| preload.call(topics, object) }
- end
+ @preload.each { |preload| preload.call(topics, object) } if @preload
end
def self.on_preload_user_ids(&blk)
@@ -49,7 +45,7 @@ class TopicList
:tags,
:shared_drafts,
:category,
- :publish_read_state
+ :publish_read_state,
)
def initialize(filter, current_user, topics, opts = nil)
@@ -58,13 +54,9 @@ class TopicList
@topics_input = topics
@opts = opts || {}
- if @opts[:category]
- @category = Category.find_by(id: @opts[:category_id])
- end
+ @category = Category.find_by(id: @opts[:category_id]) if @opts[:category]
- if @opts[:tags]
- @tags = Tag.where(id: @opts[:tags]).all
- end
+ @tags = Tag.where(id: @opts[:tags]).all if @opts[:tags]
@publish_read_state = !!@opts[:publish_read_state]
end
@@ -89,19 +81,19 @@ class TopicList
# Attach some data for serialization to each topic
@topic_lookup = TopicUser.lookup_for(@current_user, @topics) if @current_user
- @dismissed_topic_users_lookup = DismissedTopicUser.lookup_for(@current_user, @topics) if @current_user
+ @dismissed_topic_users_lookup =
+ DismissedTopicUser.lookup_for(@current_user, @topics) if @current_user
post_action_type =
if @current_user
if @opts[:filter].present?
- if @opts[:filter] == "liked"
- PostActionType.types[:like]
- end
+ PostActionType.types[:like] if @opts[:filter] == "liked"
end
end
# Data for bookmarks or likes
- post_action_lookup = PostAction.lookup_for(@current_user, @topics, post_action_type) if post_action_type
+ post_action_lookup =
+ PostAction.lookup_for(@current_user, @topics, post_action_type) if post_action_type
# Create a lookup for all the user ids we need
user_ids = []
@@ -125,23 +117,19 @@ class TopicList
ft.user_data.post_action_data = { post_action_type => actions }
end
- ft.posters = ft.posters_summary(
- user_lookup: user_lookup
- )
+ ft.posters = ft.posters_summary(user_lookup: user_lookup)
- ft.participants = ft.participants_summary(
- user_lookup: user_lookup,
- user: @current_user
- )
+ ft.participants = ft.participants_summary(user_lookup: user_lookup, user: @current_user)
ft.topic_list = self
end
topic_preloader_associations = [:image_upload, { topic_thumbnails: :optimized_image }]
topic_preloader_associations.concat(DiscoursePluginRegistry.topic_preloader_associations.to_a)
- ActiveRecord::Associations::Preloader
- .new(records: @topics, associations: topic_preloader_associations)
- .call
+ ActiveRecord::Associations::Preloader.new(
+ records: @topics,
+ associations: topic_preloader_associations,
+ ).call
if preloaded_custom_fields.present?
Topic.preload_custom_fields(@topics, preloaded_custom_fields)
@@ -153,18 +141,19 @@ class TopicList
end
def attributes
- { 'more_topics_url' => page }
+ { "more_topics_url" => page }
end
private
def category_user_lookup
- @category_user_lookup ||= begin
- if @current_user
- CategoryUser.lookup_for(@current_user, @topics.map(&:category_id).uniq)
- else
- []
+ @category_user_lookup ||=
+ begin
+ if @current_user
+ CategoryUser.lookup_for(@current_user, @topics.map(&:category_id).uniq)
+ else
+ []
+ end
end
- end
end
end
diff --git a/app/models/topic_notifier.rb b/app/models/topic_notifier.rb
index 2bcc6beb1c0..d733698d3d5 100644
--- a/app/models/topic_notifier.rb
+++ b/app/models/topic_notifier.rb
@@ -5,15 +5,15 @@ class TopicNotifier
@topic = topic
end
- { watch!: :watching,
+ {
+ watch!: :watching,
track!: :tracking,
regular!: :regular,
- mute!: :muted }.each_pair do |method_name, level|
-
+ mute!: :muted,
+ }.each_pair do |method_name, level|
define_method method_name do |user_id|
change_level user_id, level
end
-
end
def watch_topic!(user_id, reason = :created_topic)
diff --git a/app/models/topic_participants_summary.rb b/app/models/topic_participants_summary.rb
index ba365075228..8f098bd84cc 100644
--- a/app/models/topic_participants_summary.rb
+++ b/app/models/topic_participants_summary.rb
@@ -18,7 +18,7 @@ class TopicParticipantsSummary
def new_topic_poster_for(user)
TopicPoster.new.tap do |topic_poster|
topic_poster.user = user
- topic_poster.extras = 'latest' if is_latest_poster?(user)
+ topic_poster.extras = "latest" if is_latest_poster?(user)
end
end
diff --git a/app/models/topic_poster.rb b/app/models/topic_poster.rb
index 762734799c2..99d8e3741d9 100644
--- a/app/models/topic_poster.rb
+++ b/app/models/topic_poster.rb
@@ -7,11 +7,11 @@ class TopicPoster < OpenStruct
def attributes
{
- 'user' => user,
- 'description' => description,
- 'extras' => extras,
- 'id' => id,
- 'primary_group' => primary_group
+ "user" => user,
+ "description" => description,
+ "extras" => extras,
+ "id" => id,
+ "primary_group" => primary_group,
}
end
diff --git a/app/models/topic_posters_summary.rb b/app/models/topic_posters_summary.rb
index cded3ebbce8..abf47658ef9 100644
--- a/app/models/topic_posters_summary.rb
+++ b/app/models/topic_posters_summary.rb
@@ -2,7 +2,6 @@
# This is used in topic lists
class TopicPostersSummary
-
# localization is fast, but this allows us to avoid
# calling it in a loop which adds up
def self.translations
@@ -10,7 +9,7 @@ class TopicPostersSummary
original_poster: I18n.t(:original_poster),
most_recent_poster: I18n.t(:most_recent_poster),
frequent_poster: I18n.t(:frequent_poster),
- joiner: I18n.t(:poster_description_joiner)
+ joiner: I18n.t(:poster_description_joiner),
}
end
@@ -35,34 +34,35 @@ class TopicPostersSummary
topic_poster.primary_group = user_lookup.primary_groups[user.id]
topic_poster.flair_group = user_lookup.flair_groups[user.id]
if topic.last_post_user_id == user.id
- topic_poster.extras = +'latest'
- topic_poster.extras << ' single' if user_ids.uniq.size == 1
+ topic_poster.extras = +"latest"
+ topic_poster.extras << " single" if user_ids.uniq.size == 1
end
topic_poster
end
def descriptions_by_id(ids: nil)
- @descriptions_by_id ||= begin
- result = {}
- ids = ids || user_ids
+ @descriptions_by_id ||=
+ begin
+ result = {}
+ ids = ids || user_ids
- if id = ids.shift
- result[id] ||= []
- result[id] << @translations[:original_poster]
+ if id = ids.shift
+ result[id] ||= []
+ result[id] << @translations[:original_poster]
+ end
+
+ if id = ids.shift
+ result[id] ||= []
+ result[id] << @translations[:most_recent_poster]
+ end
+
+ while id = ids.shift
+ result[id] ||= []
+ result[id] << @translations[:frequent_poster]
+ end
+
+ result
end
-
- if id = ids.shift
- result[id] ||= []
- result[id] << @translations[:most_recent_poster]
- end
-
- while id = ids.shift
- result[id] ||= []
- result[id] << @translations[:frequent_poster]
- end
-
- result
- end
end
def descriptions_for(user)
@@ -90,7 +90,7 @@ class TopicPostersSummary
end
def user_ids
- [ topic.user_id, topic.last_post_user_id, *topic.featured_user_ids ]
+ [topic.user_id, topic.last_post_user_id, *topic.featured_user_ids]
end
def user_lookup
diff --git a/app/models/topic_tag.rb b/app/models/topic_tag.rb
index 60943b393ca..67a8218d94a 100644
--- a/app/models/topic_tag.rb
+++ b/app/models/topic_tag.rb
@@ -27,7 +27,8 @@ class TopicTag < ActiveRecord::Base
if topic.archetype == Archetype.private_message
tag.decrement!(:pm_topic_count)
else
- if topic.category_id && stat = CategoryTagStat.find_by(tag_id: tag_id, category: topic.category_id)
+ if topic.category_id &&
+ stat = CategoryTagStat.find_by(tag_id: tag_id, category: topic.category_id)
stat.topic_count == 1 ? stat.destroy : stat.decrement!(:topic_count)
end
diff --git a/app/models/topic_thumbnail.rb b/app/models/topic_thumbnail.rb
index f12161510f0..7800e4ed0b6 100644
--- a/app/models/topic_thumbnail.rb
+++ b/app/models/topic_thumbnail.rb
@@ -10,30 +10,34 @@ class TopicThumbnail < ActiveRecord::Base
belongs_to :upload
belongs_to :optimized_image
- def self.find_or_create_for!(original, max_width: , max_height:)
- existing = TopicThumbnail.find_by(upload: original, max_width: max_width, max_height: max_height)
+ def self.find_or_create_for!(original, max_width:, max_height:)
+ existing =
+ TopicThumbnail.find_by(upload: original, max_width: max_width, max_height: max_height)
return existing if existing
return nil if !SiteSetting.create_thumbnails?
- target_width, target_height = ImageSizer.resize(original.width, original.height, { max_width: max_width, max_height: max_height })
+ target_width, target_height =
+ ImageSizer.resize(
+ original.width,
+ original.height,
+ { max_width: max_width, max_height: max_height },
+ )
if target_width < original.width && target_height < original.height
optimized = OptimizedImage.create_for(original, target_width, target_height)
end
# may have been associated already, bulk insert will skip dupes
- TopicThumbnail.insert_all([
- upload_id: original.id,
- max_width: max_width,
- max_height: max_height,
- optimized_image_id: optimized&.id
- ])
-
- TopicThumbnail.find_by(
- upload: original,
- max_width: max_width,
- max_height: max_height
+ TopicThumbnail.insert_all(
+ [
+ upload_id: original.id,
+ max_width: max_width,
+ max_height: max_height,
+ optimized_image_id: optimized&.id,
+ ],
)
+
+ TopicThumbnail.find_by(upload: original, max_width: max_width, max_height: max_height)
end
def self.ensure_consistency!
@@ -48,8 +52,11 @@ class TopicThumbnail < ActiveRecord::Base
.delete_all
# Delete records for sizes which are no longer needed
- sizes = Topic.thumbnail_sizes + ThemeModifierHelper.new(theme_ids: Theme.pluck(:id)).topic_thumbnail_sizes
- sizes_sql = sizes.map { |s| "(max_width = #{s[0].to_i} AND max_height = #{s[1].to_i})" }.join(" OR ")
+ sizes =
+ Topic.thumbnail_sizes +
+ ThemeModifierHelper.new(theme_ids: Theme.pluck(:id)).topic_thumbnail_sizes
+ sizes_sql =
+ sizes.map { |s| "(max_width = #{s[0].to_i} AND max_height = #{s[1].to_i})" }.join(" OR ")
TopicThumbnail.where.not(sizes_sql).delete_all
end
end
diff --git a/app/models/topic_timer.rb b/app/models/topic_timer.rb
index 82a00e8dc3c..22abd8b3c96 100644
--- a/app/models/topic_timer.rb
+++ b/app/models/topic_timer.rb
@@ -13,25 +13,26 @@ class TopicTimer < ActiveRecord::Base
validates :topic_id, presence: true
validates :execute_at, presence: true
validates :status_type, presence: true
- validates :status_type, uniqueness: { scope: [:topic_id, :deleted_at] }, if: :public_type?
- validates :status_type, uniqueness: { scope: [:topic_id, :deleted_at, :user_id] }, if: :private_type?
+ validates :status_type, uniqueness: { scope: %i[topic_id deleted_at] }, if: :public_type?
+ validates :status_type, uniqueness: { scope: %i[topic_id deleted_at user_id] }, if: :private_type?
validates :category_id, presence: true, if: :publishing_to_category?
validate :executed_at_in_future?
validate :duration_in_range?
- scope :scheduled_bump_topics, -> { where(status_type: TopicTimer.types[:bump], deleted_at: nil).pluck(:topic_id) }
- scope :pending_timers, ->(before_time = Time.now.utc) do
- where("execute_at <= :before_time AND deleted_at IS NULL", before_time: before_time)
- end
+ scope :scheduled_bump_topics,
+ -> { where(status_type: TopicTimer.types[:bump], deleted_at: nil).pluck(:topic_id) }
+ scope :pending_timers,
+ ->(before_time = Time.now.utc) {
+ where("execute_at <= :before_time AND deleted_at IS NULL", before_time: before_time)
+ }
before_save do
self.created_at ||= Time.zone.now if execute_at
self.public_type = self.public_type?
- if (will_save_change_to_execute_at? &&
- !attribute_in_database(:execute_at).nil?) ||
- will_save_change_to_user_id?
+ if (will_save_change_to_execute_at? && !attribute_in_database(:execute_at).nil?) ||
+ will_save_change_to_user_id?
end
end
@@ -46,10 +47,10 @@ class TopicTimer < ActiveRecord::Base
after_save do
if (saved_change_to_execute_at? || saved_change_to_user_id?)
if status_type == TopicTimer.types[:silent_close] || status_type == TopicTimer.types[:close]
- topic.update_status('closed', false, user) if topic.closed?
+ topic.update_status("closed", false, user) if topic.closed?
end
if status_type == TopicTimer.types[:open]
- topic.update_status('closed', true, user) if topic.open?
+ topic.update_status("closed", true, user) if topic.open?
end
end
end
@@ -72,22 +73,23 @@ class TopicTimer < ActiveRecord::Base
bump: :bump_topic,
delete_replies: :delete_replies,
silent_close: :close_topic,
- clear_slow_mode: :clear_slow_mode
+ clear_slow_mode: :clear_slow_mode,
}
end
def self.types
- @types ||= Enum.new(
- close: 1,
- open: 2,
- publish_to_category: 3,
- delete: 4,
- reminder: 5,
- bump: 6,
- delete_replies: 7,
- silent_close: 8,
- clear_slow_mode: 9
- )
+ @types ||=
+ Enum.new(
+ close: 1,
+ open: 2,
+ publish_to_category: 3,
+ delete: 4,
+ reminder: 5,
+ bump: 6,
+ delete_replies: 7,
+ silent_close: 8,
+ clear_slow_mode: 9,
+ )
end
def self.public_types
@@ -126,24 +128,29 @@ class TopicTimer < ActiveRecord::Base
return if duration_minutes.blank?
if duration_minutes.to_i <= 0
- errors.add(:duration_minutes, I18n.t(
- 'activerecord.errors.models.topic_timer.attributes.duration_minutes.cannot_be_zero'
- ))
+ errors.add(
+ :duration_minutes,
+ I18n.t("activerecord.errors.models.topic_timer.attributes.duration_minutes.cannot_be_zero"),
+ )
end
if duration_minutes.to_i > MAX_DURATION_MINUTES
- errors.add(:duration_minutes, I18n.t(
- 'activerecord.errors.models.topic_timer.attributes.duration_minutes.exceeds_maximum'
- ))
+ errors.add(
+ :duration_minutes,
+ I18n.t(
+ "activerecord.errors.models.topic_timer.attributes.duration_minutes.exceeds_maximum",
+ ),
+ )
end
end
def executed_at_in_future?
return if created_at.blank? || (execute_at > created_at)
- errors.add(:execute_at, I18n.t(
- 'activerecord.errors.models.topic_timer.attributes.execute_at.in_the_past'
- ))
+ errors.add(
+ :execute_at,
+ I18n.t("activerecord.errors.models.topic_timer.attributes.execute_at.in_the_past"),
+ )
end
def schedule_auto_delete_replies_job
diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
index 65bf2fa59ca..038f7ba7eb2 100644
--- a/app/models/topic_tracking_state.rb
+++ b/app/models/topic_tracking_state.rb
@@ -35,9 +35,7 @@ class TopicTrackingState
return unless topic.regular?
tag_ids, tags = nil
- if SiteSetting.tagging_enabled
- tag_ids, tags = topic.tags.pluck(:id, :name).transpose
- end
+ tag_ids, tags = topic.tags.pluck(:id, :name).transpose if SiteSetting.tagging_enabled
payload = {
last_read_post_number: nil,
@@ -45,7 +43,7 @@ class TopicTrackingState
created_at: topic.created_at,
category_id: topic.category_id,
archetype: topic.archetype,
- created_in_new_period: true
+ created_in_new_period: true,
}
if tags
@@ -53,11 +51,7 @@ class TopicTrackingState
payload[:topic_tag_ids] = tag_ids
end
- message = {
- topic_id: topic.id,
- message_type: NEW_TOPIC_MESSAGE_TYPE,
- payload: payload
- }
+ message = { topic_id: topic.id, message_type: NEW_TOPIC_MESSAGE_TYPE, payload: payload }
group_ids = topic.category && topic.category.secure_group_ids
@@ -69,9 +63,7 @@ class TopicTrackingState
return unless topic.regular?
tag_ids, tags = nil
- if SiteSetting.tagging_enabled
- tag_ids, tags = topic.tags.pluck(:id, :name).transpose
- end
+ tag_ids, tags = topic.tags.pluck(:id, :name).transpose if SiteSetting.tagging_enabled
message = {
topic_id: topic.id,
@@ -79,8 +71,8 @@ class TopicTrackingState
payload: {
bumped_at: topic.bumped_at,
category_id: topic.category_id,
- archetype: topic.archetype
- }
+ archetype: topic.archetype,
+ },
}
if tags
@@ -102,32 +94,30 @@ class TopicTrackingState
end
def self.publish_muted(topic)
- user_ids = topic.topic_users
- .where(notification_level: NotificationLevels.all[:muted])
- .joins(:user)
- .where("users.last_seen_at > ?", 7.days.ago)
- .order("users.last_seen_at DESC")
- .limit(100)
- .pluck(:user_id)
+ user_ids =
+ topic
+ .topic_users
+ .where(notification_level: NotificationLevels.all[:muted])
+ .joins(:user)
+ .where("users.last_seen_at > ?", 7.days.ago)
+ .order("users.last_seen_at DESC")
+ .limit(100)
+ .pluck(:user_id)
return if user_ids.blank?
- message = {
- topic_id: topic.id,
- message_type: MUTED_MESSAGE_TYPE,
- }
+ message = { topic_id: topic.id, message_type: MUTED_MESSAGE_TYPE }
MessageBus.publish("/latest", message.as_json, user_ids: user_ids)
end
def self.publish_unmuted(topic)
- user_ids = User.watching_topic(topic)
- .where("users.last_seen_at > ?", 7.days.ago)
- .order("users.last_seen_at DESC")
- .limit(100)
- .pluck(:id)
+ user_ids =
+ User
+ .watching_topic(topic)
+ .where("users.last_seen_at > ?", 7.days.ago)
+ .order("users.last_seen_at DESC")
+ .limit(100)
+ .pluck(:id)
return if user_ids.blank?
- message = {
- topic_id: topic.id,
- message_type: UNMUTED_MESSAGE_TYPE,
- }
+ message = { topic_id: topic.id, message_type: UNMUTED_MESSAGE_TYPE }
MessageBus.publish("/latest", message.as_json, user_ids: user_ids)
end
@@ -137,16 +127,12 @@ class TopicTrackingState
# perhaps cut down to users that are around in the last 7 days as well
tags = nil
tag_ids = nil
- if include_tags_in_report?
- tag_ids, tags = post.topic.tags.pluck(:id, :name).transpose
- end
+ tag_ids, tags = post.topic.tags.pluck(:id, :name).transpose if include_tags_in_report?
# We don't need to publish unread to the person who just made the post,
# this is why they are excluded from the initial scope.
- scope = TopicUser
- .tracking(post.topic_id)
- .includes(user: :user_stat)
- .where.not(user_id: post.user_id)
+ scope =
+ TopicUser.tracking(post.topic_id).includes(user: :user_stat).where.not(user_id: post.user_id)
group_ids =
if post.post_type == Post.types[:whisper]
@@ -156,9 +142,11 @@ class TopicTrackingState
end
if group_ids.present?
- scope = scope
- .joins("INNER JOIN group_users gu ON gu.user_id = topic_users.user_id")
- .where("gu.group_id IN (?)", group_ids)
+ scope =
+ scope.joins("INNER JOIN group_users gu ON gu.user_id = topic_users.user_id").where(
+ "gu.group_id IN (?)",
+ group_ids,
+ )
end
user_ids = scope.pluck(:user_id)
@@ -177,36 +165,23 @@ class TopicTrackingState
payload[:topic_tag_ids] = tag_ids
end
- message = {
- topic_id: post.topic_id,
- message_type: UNREAD_MESSAGE_TYPE,
- payload: payload
- }
+ message = { topic_id: post.topic_id, message_type: UNREAD_MESSAGE_TYPE, payload: payload }
- MessageBus.publish("/unread", message.as_json,
- user_ids: user_ids
- )
+ MessageBus.publish("/unread", message.as_json, user_ids: user_ids)
end
def self.publish_recover(topic)
group_ids = topic.category && topic.category.secure_group_ids
- message = {
- topic_id: topic.id,
- message_type: RECOVER_MESSAGE_TYPE
- }
+ message = { topic_id: topic.id, message_type: RECOVER_MESSAGE_TYPE }
MessageBus.publish("/recover", message.as_json, group_ids: group_ids)
-
end
def self.publish_delete(topic)
group_ids = topic.category && topic.category.secure_group_ids
- message = {
- topic_id: topic.id,
- message_type: DELETE_MESSAGE_TYPE
- }
+ message = { topic_id: topic.id, message_type: DELETE_MESSAGE_TYPE }
MessageBus.publish("/delete", message.as_json, group_ids: group_ids)
end
@@ -214,10 +189,7 @@ class TopicTrackingState
def self.publish_destroy(topic)
group_ids = topic.category && topic.category.secure_group_ids
- message = {
- topic_id: topic.id,
- message_type: DESTROY_MESSAGE_TYPE
- }
+ message = { topic_id: topic.id, message_type: DESTROY_MESSAGE_TYPE }
MessageBus.publish("/destroy", message.as_json, group_ids: group_ids)
end
@@ -229,25 +201,21 @@ class TopicTrackingState
topic_id: topic_id,
user: user,
last_read_post_number: last_read_post_number,
- notification_level: notification_level
+ notification_level: notification_level,
)
end
def self.publish_dismiss_new(user_id, topic_ids: [])
- message = {
- message_type: DISMISS_NEW_MESSAGE_TYPE,
- payload: {
- topic_ids: topic_ids
- }
- }
+ message = { message_type: DISMISS_NEW_MESSAGE_TYPE, payload: { topic_ids: topic_ids } }
MessageBus.publish(self.unread_channel_key(user_id), message.as_json, user_ids: [user_id])
end
def self.new_filter_sql
- TopicQuery.new_filter(
- Topic, treat_as_new_topic_clause_sql: treat_as_new_topic_clause
- ).where_clause.ast.to_sql +
- " AND topics.created_at > :min_new_topic_date" +
+ TopicQuery
+ .new_filter(Topic, treat_as_new_topic_clause_sql: treat_as_new_topic_clause)
+ .where_clause
+ .ast
+ .to_sql + " AND topics.created_at > :min_new_topic_date" +
" AND dismissed_topic_users.id IS NULL"
end
@@ -256,13 +224,18 @@ class TopicTrackingState
end
def self.treat_as_new_topic_clause
- User.where("GREATEST(CASE
+ User
+ .where(
+ "GREATEST(CASE
WHEN COALESCE(uo.new_topic_duration_minutes, :default_duration) = :always THEN u.created_at
WHEN COALESCE(uo.new_topic_duration_minutes, :default_duration) = :last_visit THEN COALESCE(u.previous_visit_at,u.created_at)
ELSE (:now::timestamp - INTERVAL '1 MINUTE' * COALESCE(uo.new_topic_duration_minutes, :default_duration))
END, u.created_at, :min_date)",
- treat_as_new_topic_params
- ).where_clause.ast.to_sql
+ treat_as_new_topic_params,
+ )
+ .where_clause
+ .ast
+ .to_sql
end
def self.treat_as_new_topic_params
@@ -271,7 +244,7 @@ class TopicTrackingState
last_visit: User::NewTopicDuration::LAST_VISIT,
always: User::NewTopicDuration::ALWAYS,
default_duration: SiteSetting.default_other_new_topic_duration_minutes,
- min_date: Time.at(SiteSetting.min_new_topics_time).to_datetime
+ min_date: Time.at(SiteSetting.min_new_topics_time).to_datetime,
}
end
@@ -296,31 +269,32 @@ class TopicTrackingState
sql = new_and_unread_sql(topic_id, user, tag_ids)
sql = tags_included_wrapped_sql(sql)
- report = DB.query(
- sql + "\n\n LIMIT :max_topics",
- {
- user_id: user.id,
- topic_id: topic_id,
- min_new_topic_date: Time.at(SiteSetting.min_new_topics_time).to_datetime,
- max_topics: TopicTrackingState::MAX_TOPICS,
- }
- .merge(treat_as_new_topic_params)
- )
+ report =
+ DB.query(
+ sql + "\n\n LIMIT :max_topics",
+ {
+ user_id: user.id,
+ topic_id: topic_id,
+ min_new_topic_date: Time.at(SiteSetting.min_new_topics_time).to_datetime,
+ max_topics: TopicTrackingState::MAX_TOPICS,
+ }.merge(treat_as_new_topic_params),
+ )
report
end
def self.new_and_unread_sql(topic_id, user, tag_ids)
- sql = report_raw_sql(
- topic_id: topic_id,
- skip_unread: true,
- skip_order: true,
- staff: user.staff?,
- admin: user.admin?,
- whisperer: user.whisperer?,
- user: user,
- muted_tag_ids: tag_ids
- )
+ sql =
+ report_raw_sql(
+ topic_id: topic_id,
+ skip_unread: true,
+ skip_order: true,
+ staff: user.staff?,
+ admin: user.admin?,
+ whisperer: user.whisperer?,
+ user: user,
+ muted_tag_ids: tag_ids,
+ )
sql << "\nUNION ALL\n\n"
@@ -333,13 +307,12 @@ class TopicTrackingState
admin: user.admin?,
whisperer: user.whisperer?,
user: user,
- muted_tag_ids: tag_ids
+ muted_tag_ids: tag_ids,
)
end
def self.tags_included_wrapped_sql(sql)
- if SiteSetting.tagging_enabled && TopicTrackingState.include_tags_in_report?
- return <<~SQL
+ return <<~SQL if SiteSetting.tagging_enabled && TopicTrackingState.include_tags_in_report?
WITH tags_included_cte AS (
#{sql}
)
@@ -350,7 +323,6 @@ class TopicTrackingState
) tags
FROM tags_included_cte
SQL
- end
sql
end
@@ -395,7 +367,9 @@ class TopicTrackingState
new_filter_sql
end
- select_sql = select || "
+ select_sql =
+ select ||
+ "
DISTINCT topics.id as topic_id,
u.id as user_id,
topics.created_at,
@@ -441,11 +415,13 @@ class TopicTrackingState
tags_filter = ""
- if muted_tag_ids.present? && ['always', 'only_muted'].include?(SiteSetting.remove_muted_tags_from_latest)
- existing_tags_sql = "(select array_agg(tag_id) from topic_tags where topic_tags.topic_id = topics.id)"
- muted_tags_array_sql = "ARRAY[#{muted_tag_ids.join(',')}]"
+ if muted_tag_ids.present? &&
+ %w[always only_muted].include?(SiteSetting.remove_muted_tags_from_latest)
+ existing_tags_sql =
+ "(select array_agg(tag_id) from topic_tags where topic_tags.topic_id = topics.id)"
+ muted_tags_array_sql = "ARRAY[#{muted_tag_ids.join(",")}]"
- if SiteSetting.remove_muted_tags_from_latest == 'always'
+ if SiteSetting.remove_muted_tags_from_latest == "always"
tags_filter = <<~SQL
NOT (
COALESCE(#{existing_tags_sql}, ARRAY[]::int[]) && #{muted_tags_array_sql}
@@ -487,13 +463,9 @@ class TopicTrackingState
)
SQL
- if topic_id
- sql << " AND topics.id = :topic_id"
- end
+ sql << " AND topics.id = :topic_id" if topic_id
- unless skip_order
- sql << " ORDER BY topics.bumped_at DESC"
- end
+ sql << " ORDER BY topics.bumped_at DESC" unless skip_order
sql
end
@@ -503,7 +475,11 @@ class TopicTrackingState
end
def self.publish_read_indicator_on_write(topic_id, last_read_post_number, user_id)
- topic = Topic.includes(:allowed_groups).select(:highest_post_number, :archetype, :id).find_by(id: topic_id)
+ topic =
+ Topic
+ .includes(:allowed_groups)
+ .select(:highest_post_number, :archetype, :id)
+ .find_by(id: topic_id)
if topic&.private_message?
groups = read_allowed_groups_of(topic)
@@ -512,7 +488,11 @@ class TopicTrackingState
end
def self.publish_read_indicator_on_read(topic_id, last_read_post_number, user_id)
- topic = Topic.includes(:allowed_groups).select(:highest_post_number, :archetype, :id).find_by(id: topic_id)
+ topic =
+ Topic
+ .includes(:allowed_groups)
+ .select(:highest_post_number, :archetype, :id)
+ .find_by(id: topic_id)
if topic&.private_message?
groups = read_allowed_groups_of(topic)
@@ -523,14 +503,21 @@ class TopicTrackingState
end
def self.read_allowed_groups_of(topic)
- topic.allowed_groups
+ topic
+ .allowed_groups
.joins(:group_users)
.where(publish_read_state: true)
- .select('ARRAY_AGG(group_users.user_id) AS members', :name, :id)
- .group('groups.id')
+ .select("ARRAY_AGG(group_users.user_id) AS members", :name, :id)
+ .group("groups.id")
end
- def self.update_topic_list_read_indicator(topic, groups, last_read_post_number, user_id, write_event)
+ def self.update_topic_list_read_indicator(
+ topic,
+ groups,
+ last_read_post_number,
+ user_id,
+ write_event
+ )
return unless last_read_post_number == topic.highest_post_number
message = { topic_id: topic.id, show_indicator: write_event }.as_json
groups_to_update = []
@@ -546,7 +533,11 @@ class TopicTrackingState
end
return if groups_to_update.empty?
- MessageBus.publish("/private-messages/unread-indicator/#{topic.id}", message, user_ids: groups_to_update.flat_map(&:members))
+ MessageBus.publish(
+ "/private-messages/unread-indicator/#{topic.id}",
+ message,
+ user_ids: groups_to_update.flat_map(&:members),
+ )
end
def self.trigger_post_read_count_update(post, groups, last_read_post_number, user_id)
diff --git a/app/models/topic_user.rb b/app/models/topic_user.rb
index 638fa4f891c..0e00f68f2de 100644
--- a/app/models/topic_user.rb
+++ b/app/models/topic_user.rb
@@ -2,7 +2,7 @@
class TopicUser < ActiveRecord::Base
self.ignored_columns = [
- :highest_seen_post_number # Remove after 01 Jan 2022
+ :highest_seen_post_number, # Remove after 01 Jan 2022
]
belongs_to :user
@@ -11,20 +11,18 @@ class TopicUser < ActiveRecord::Base
# used for serialization
attr_accessor :post_action_data
- scope :level, lambda { |topic_id, level|
- where(topic_id: topic_id)
- .where("COALESCE(topic_users.notification_level, :regular) >= :level",
- regular: TopicUser.notification_levels[:regular],
- level: TopicUser.notification_levels[level])
- }
+ scope :level,
+ lambda { |topic_id, level|
+ where(topic_id: topic_id).where(
+ "COALESCE(topic_users.notification_level, :regular) >= :level",
+ regular: TopicUser.notification_levels[:regular],
+ level: TopicUser.notification_levels[level],
+ )
+ }
- scope :tracking, lambda { |topic_id|
- level(topic_id, :tracking)
- }
+ scope :tracking, lambda { |topic_id| level(topic_id, :tracking) }
- scope :watching, lambda { |topic_id|
- level(topic_id, :watching)
- }
+ scope :watching, lambda { |topic_id| level(topic_id, :watching) }
def topic_bookmarks
Bookmark.where(topic: topic, user: user)
@@ -32,38 +30,62 @@ class TopicUser < ActiveRecord::Base
# Class methods
class << self
-
# Enums
def notification_levels
NotificationLevels.topic_levels
end
def notification_reasons
- @notification_reasons ||= Enum.new(created_topic: 1,
- user_changed: 2,
- user_interacted: 3,
- created_post: 4,
- auto_watch: 5,
- auto_watch_category: 6,
- auto_mute_category: 7,
- auto_track_category: 8,
- plugin_changed: 9,
- auto_watch_tag: 10,
- auto_mute_tag: 11,
- auto_track_tag: 12)
+ @notification_reasons ||=
+ Enum.new(
+ created_topic: 1,
+ user_changed: 2,
+ user_interacted: 3,
+ created_post: 4,
+ auto_watch: 5,
+ auto_watch_category: 6,
+ auto_mute_category: 7,
+ auto_track_category: 8,
+ plugin_changed: 9,
+ auto_watch_tag: 10,
+ auto_mute_tag: 11,
+ auto_track_tag: 12,
+ )
end
def auto_notification(user_id, topic_id, reason, notification_level)
- should_change = TopicUser
- .where(user_id: user_id, topic_id: topic_id)
- .where("notifications_reason_id IS NULL OR (notification_level < :max AND notification_level > :min)", max: notification_level, min: notification_levels[:regular])
- .exists?
+ should_change =
+ TopicUser
+ .where(user_id: user_id, topic_id: topic_id)
+ .where(
+ "notifications_reason_id IS NULL OR (notification_level < :max AND notification_level > :min)",
+ max: notification_level,
+ min: notification_levels[:regular],
+ )
+ .exists?
- change(user_id, topic_id, notification_level: notification_level, notifications_reason_id: reason) if should_change
+ if should_change
+ change(
+ user_id,
+ topic_id,
+ notification_level: notification_level,
+ notifications_reason_id: reason,
+ )
+ end
end
- def auto_notification_for_staging(user_id, topic_id, reason, notification_level = notification_levels[:watching])
- change(user_id, topic_id, notification_level: notification_level, notifications_reason_id: reason)
+ def auto_notification_for_staging(
+ user_id,
+ topic_id,
+ reason,
+ notification_level = notification_levels[:watching]
+ )
+ change(
+ user_id,
+ topic_id,
+ notification_level: notification_level,
+ notifications_reason_id: reason,
+ )
end
def unwatch_categories!(user, category_ids)
@@ -80,14 +102,15 @@ class TopicUser < ActiveRecord::Base
WHERE t.id = tu.topic_id AND tu.notification_level <> :muted AND category_id IN (:category_ids) AND tu.user_id = :user_id
SQL
- DB.exec(sql,
+ DB.exec(
+ sql,
watching: notification_levels[:watching],
tracking: notification_levels[:tracking],
regular: notification_levels[:regular],
muted: notification_levels[:muted],
category_ids: category_ids,
user_id: user.id,
- track_threshold: track_threshold
+ track_threshold: track_threshold,
)
end
@@ -119,9 +142,7 @@ class TopicUser < ActiveRecord::Base
# it then creates the row instead.
def change(user_id, topic_id, attrs)
# For plugin compatibility, remove after 01 Jan 2022
- if attrs[:highest_seen_post_number]
- attrs.delete(:highest_seen_post_number)
- end
+ attrs.delete(:highest_seen_post_number) if attrs[:highest_seen_post_number]
# Sometimes people pass objs instead of the ids. We can handle that.
topic_id = topic_id.id if topic_id.is_a?(::Topic)
@@ -143,15 +164,17 @@ class TopicUser < ActiveRecord::Base
rows = TopicUser.where(topic_id: topic_id, user_id: user_id).update_all([attrs_sql, *vals])
- if rows == 0
- create_missing_record(user_id, topic_id, attrs)
- end
+ create_missing_record(user_id, topic_id, attrs) if rows == 0
end
if attrs[:notification_level]
- notification_level_change(user_id, topic_id, attrs[:notification_level], attrs[:notifications_reason_id])
+ notification_level_change(
+ user_id,
+ topic_id,
+ attrs[:notification_level],
+ attrs[:notifications_reason_id],
+ )
end
-
rescue ActiveRecord::RecordNotUnique
# In case of a race condition to insert, do nothing
end
@@ -161,67 +184,90 @@ class TopicUser < ActiveRecord::Base
message[:notifications_reason_id] = reason_id if reason_id
MessageBus.publish("/topic/#{topic_id}", message, user_ids: [user_id])
- DiscourseEvent.trigger(:topic_notification_level_changed,
+ DiscourseEvent.trigger(
+ :topic_notification_level_changed,
notification_level,
user_id,
- topic_id
+ topic_id,
)
-
end
def create_missing_record(user_id, topic_id, attrs)
now = DateTime.now
unless attrs[:notification_level]
- category_notification_level = CategoryUser.where(user_id: user_id)
- .where("category_id IN (SELECT category_id FROM topics WHERE id = :id)", id: topic_id)
- .where("notification_level IN (:levels)", levels: [CategoryUser.notification_levels[:watching],
- CategoryUser.notification_levels[:tracking]])
- .order("notification_level DESC")
- .limit(1)
- .pluck(:notification_level)
- .first
+ category_notification_level =
+ CategoryUser
+ .where(user_id: user_id)
+ .where("category_id IN (SELECT category_id FROM topics WHERE id = :id)", id: topic_id)
+ .where(
+ "notification_level IN (:levels)",
+ levels: [
+ CategoryUser.notification_levels[:watching],
+ CategoryUser.notification_levels[:tracking],
+ ],
+ )
+ .order("notification_level DESC")
+ .limit(1)
+ .pluck(:notification_level)
+ .first
- tag_notification_level = TagUser.where(user_id: user_id)
- .where("tag_id IN (SELECT tag_id FROM topic_tags WHERE topic_id = :id)", id: topic_id)
- .where("notification_level IN (:levels)", levels: [CategoryUser.notification_levels[:watching],
- CategoryUser.notification_levels[:tracking]])
- .order("notification_level DESC")
- .limit(1)
- .pluck(:notification_level)
- .first
+ tag_notification_level =
+ TagUser
+ .where(user_id: user_id)
+ .where("tag_id IN (SELECT tag_id FROM topic_tags WHERE topic_id = :id)", id: topic_id)
+ .where(
+ "notification_level IN (:levels)",
+ levels: [
+ CategoryUser.notification_levels[:watching],
+ CategoryUser.notification_levels[:tracking],
+ ],
+ )
+ .order("notification_level DESC")
+ .limit(1)
+ .pluck(:notification_level)
+ .first
- if category_notification_level && !(tag_notification_level && (tag_notification_level > category_notification_level))
+ if category_notification_level &&
+ !(tag_notification_level && (tag_notification_level > category_notification_level))
attrs[:notification_level] = category_notification_level
attrs[:notifications_changed_at] = DateTime.now
- attrs[:notifications_reason_id] = category_notification_level == CategoryUser.notification_levels[:watching] ?
- TopicUser.notification_reasons[:auto_watch_category] :
+ attrs[:notifications_reason_id] = (
+ if category_notification_level == CategoryUser.notification_levels[:watching]
+ TopicUser.notification_reasons[:auto_watch_category]
+ else
TopicUser.notification_reasons[:auto_track_category]
-
+ end
+ )
elsif tag_notification_level
attrs[:notification_level] = tag_notification_level
attrs[:notifications_changed_at] = DateTime.now
- attrs[:notifications_reason_id] = tag_notification_level == TagUser.notification_levels[:watching] ?
- TopicUser.notification_reasons[:auto_watch_tag] :
+ attrs[:notifications_reason_id] = (
+ if tag_notification_level == TagUser.notification_levels[:watching]
+ TopicUser.notification_reasons[:auto_watch_tag]
+ else
TopicUser.notification_reasons[:auto_track_tag]
+ end
+ )
end
-
end
unless attrs[:notification_level]
if Topic.private_messages.where(id: topic_id).exists? &&
- Notification.where(
- user_id: user_id,
- topic_id: topic_id,
- notification_type: Notification.types[:invited_to_private_message]
- ).exists?
-
- group_notification_level = Group
- .joins("LEFT OUTER JOIN group_users gu ON gu.group_id = groups.id AND gu.user_id = #{user_id}")
- .joins("LEFT OUTER JOIN topic_allowed_groups tag ON tag.topic_id = #{topic_id}")
- .where("gu.id IS NOT NULL AND tag.id IS NOT NULL")
- .pluck(:default_notification_level)
- .first
+ Notification.where(
+ user_id: user_id,
+ topic_id: topic_id,
+ notification_type: Notification.types[:invited_to_private_message],
+ ).exists?
+ group_notification_level =
+ Group
+ .joins(
+ "LEFT OUTER JOIN group_users gu ON gu.group_id = groups.id AND gu.user_id = #{user_id}",
+ )
+ .joins("LEFT OUTER JOIN topic_allowed_groups tag ON tag.topic_id = #{topic_id}")
+ .where("gu.id IS NOT NULL AND tag.id IS NOT NULL")
+ .pluck(:default_notification_level)
+ .first
if group_notification_level.present?
attrs[:notification_level] = group_notification_level
@@ -229,7 +275,8 @@ class TopicUser < ActiveRecord::Base
attrs[:notification_level] = notification_levels[:watching]
end
else
- auto_track_after = UserOption.where(user_id: user_id).pluck_first(:auto_track_topics_after_msecs)
+ auto_track_after =
+ UserOption.where(user_id: user_id).pluck_first(:auto_track_topics_after_msecs)
auto_track_after ||= SiteSetting.default_other_auto_track_topics_after_msecs
if auto_track_after >= 0 && auto_track_after <= (attrs[:total_msecs_viewed].to_i || 0)
@@ -238,12 +285,14 @@ class TopicUser < ActiveRecord::Base
end
end
- TopicUser.create!(attrs.merge!(
- user_id: user_id,
- topic_id: topic_id,
- first_visited_at: now ,
- last_visited_at: now
- ))
+ TopicUser.create!(
+ attrs.merge!(
+ user_id: user_id,
+ topic_id: topic_id,
+ first_visited_at: now,
+ last_visited_at: now,
+ ),
+ )
DiscourseEvent.trigger(:topic_first_visited_by_user, topic_id, user_id)
end
@@ -252,9 +301,7 @@ class TopicUser < ActiveRecord::Base
now = DateTime.now
rows = TopicUser.where(topic_id: topic_id, user_id: user_id).update_all(last_visited_at: now)
- if rows == 0
- change(user_id, topic_id, last_visited_at: now, first_visited_at: now)
- end
+ change(user_id, topic_id, last_visited_at: now, first_visited_at: now) if rows == 0
end
# Update the last read and the last seen post count, but only if it doesn't exist.
@@ -289,7 +336,8 @@ class TopicUser < ActiveRecord::Base
t.archetype
SQL
- INSERT_TOPIC_USER_SQL = "INSERT INTO topic_users (user_id, topic_id, last_read_post_number, last_visited_at, first_visited_at, notification_level)
+ INSERT_TOPIC_USER_SQL =
+ "INSERT INTO topic_users (user_id, topic_id, last_read_post_number, last_visited_at, first_visited_at, notification_level)
SELECT :user_id, :topic_id, :post_number, :now, :now, :new_status
FROM topics AS ft
JOIN users u on u.id = :user_id
@@ -309,7 +357,7 @@ class TopicUser < ActiveRecord::Base
now: DateTime.now,
msecs: msecs,
tracking: notification_levels[:tracking],
- threshold: SiteSetting.default_other_auto_track_topics_after_msecs
+ threshold: SiteSetting.default_other_auto_track_topics_after_msecs,
}
rows = DB.query(UPDATE_TOPIC_USER_SQL, args)
@@ -327,23 +375,22 @@ class TopicUser < ActiveRecord::Base
post_number: post_number,
user: user,
notification_level: after,
- private_message: archetype == Archetype.private_message
+ private_message: archetype == Archetype.private_message,
)
end
- if new_posts_read > 0
- user.update_posts_read!(new_posts_read, mobile: opts[:mobile])
- end
+ user.update_posts_read!(new_posts_read, mobile: opts[:mobile]) if new_posts_read > 0
- if before != after
- notification_level_change(user.id, topic_id, after, nil)
- end
+ notification_level_change(user.id, topic_id, after, nil) if before != after
end
if rows.length == 0
# The user read at least one post in a topic that they haven't viewed before.
args[:new_status] = notification_levels[:regular]
- if (user.user_option.auto_track_topics_after_msecs || SiteSetting.default_other_auto_track_topics_after_msecs) == 0
+ if (
+ user.user_option.auto_track_topics_after_msecs ||
+ SiteSetting.default_other_auto_track_topics_after_msecs
+ ) == 0
args[:new_status] = notification_levels[:tracking]
end
@@ -352,10 +399,7 @@ class TopicUser < ActiveRecord::Base
post_number: post_number,
user: user,
notification_level: args[:new_status],
- private_message: Topic.exists?(
- archetype: Archetype.private_message,
- id: topic_id
- )
+ private_message: Topic.exists?(archetype: Archetype.private_message, id: topic_id),
)
user.update_posts_read!(new_posts_read, mobile: opts[:mobile])
@@ -387,14 +431,8 @@ class TopicUser < ActiveRecord::Base
TopicTrackingState
end
- klass.publish_read(
- topic_id,
- post_number,
- user,
- notification_level
- )
+ klass.publish_read(topic_id, post_number, user, notification_level)
end
-
end
# Update the cached topic_user.liked column based on data
@@ -441,16 +479,17 @@ class TopicUser < ActiveRecord::Base
WHERE x.topic_id = tu.topic_id AND x.user_id = tu.user_id AND x.state != tu.#{action_type_name}
SQL
- if user_id
- builder.where("tu2.user_id IN (:user_id)", user_id: user_id)
- end
+ builder.where("tu2.user_id IN (:user_id)", user_id: user_id) if user_id
- if topic_id
- builder.where("tu2.topic_id IN (:topic_id)", topic_id: topic_id)
- end
+ builder.where("tu2.topic_id IN (:topic_id)", topic_id: topic_id) if topic_id
if post_id
- builder.where("tu2.topic_id IN (SELECT topic_id FROM posts WHERE id IN (:post_id))", post_id: post_id) if !topic_id
+ if !topic_id
+ builder.where(
+ "tu2.topic_id IN (SELECT topic_id FROM posts WHERE id IN (:post_id))",
+ post_id: post_id,
+ )
+ end
builder.where(<<~SQL, post_id: post_id)
tu2.user_id IN (
SELECT user_id FROM post_actions
@@ -515,13 +554,10 @@ SQL
)
SQL
- if topic_id
- builder.where("t.topic_id = :topic_id", topic_id: topic_id)
- end
+ builder.where("t.topic_id = :topic_id", topic_id: topic_id) if topic_id
builder.exec
end
-
end
# == Schema Information
diff --git a/app/models/topic_view_item.rb b/app/models/topic_view_item.rb
index d37e8ec7a62..4472ed4b1d6 100644
--- a/app/models/topic_view_item.rb
+++ b/app/models/topic_view_item.rb
@@ -1,10 +1,10 @@
# frozen_string_literal: true
-require 'ipaddr'
+require "ipaddr"
# awkward TopicView is taken
class TopicViewItem < ActiveRecord::Base
- self.table_name = 'topic_views'
+ self.table_name = "topic_views"
belongs_to :user
belongs_to :topic
validates_presence_of :topic_id, :ip_address, :viewed_at
@@ -24,7 +24,8 @@ class TopicViewItem < ActiveRecord::Base
TopicViewItem.transaction do
# this is called real frequently, working hard to avoid exceptions
- sql = "INSERT INTO topic_views (topic_id, ip_address, viewed_at, user_id)
+ sql =
+ "INSERT INTO topic_views (topic_id, ip_address, viewed_at, user_id)
SELECT :topic_id, :ip_address, :viewed_at, :user_id
WHERE NOT EXISTS (
SELECT 1 FROM topic_views
@@ -42,17 +43,18 @@ class TopicViewItem < ActiveRecord::Base
result = builder.exec(topic_id: topic_id, ip_address: ip, viewed_at: at, user_id: user_id)
- Topic.where(id: topic_id).update_all 'views = views + 1'
+ Topic.where(id: topic_id).update_all "views = views + 1"
if result > 0
- UserStat.where(user_id: user_id).update_all 'topics_entered = topics_entered + 1' if user_id
+ if user_id
+ UserStat.where(user_id: user_id).update_all "topics_entered = topics_entered + 1"
+ end
end
# Update the views count in the parent, if it exists.
end
end
end
-
end
# == Schema Information
diff --git a/app/models/translation_override.rb b/app/models/translation_override.rb
index 932ac08fa66..73137243ed0 100644
--- a/app/models/translation_override.rb
+++ b/app/models/translation_override.rb
@@ -3,17 +3,17 @@
class TranslationOverride < ActiveRecord::Base
# Allowlist i18n interpolation keys that can be included when customizing translations
ALLOWED_CUSTOM_INTERPOLATION_KEYS = {
- [
- "user_notifications.user_",
- "user_notifications.only_reply_by_email",
- "user_notifications.reply_by_email",
- "user_notifications.visit_link_to_respond",
- "user_notifications.header_instructions",
- "user_notifications.pm_participants",
- "unsubscribe_mailing_list",
- "unsubscribe_link_and_mail",
- "unsubscribe_link",
- ] => %w{
+ %w[
+ user_notifications.user_
+ user_notifications.only_reply_by_email
+ user_notifications.reply_by_email
+ user_notifications.visit_link_to_respond
+ user_notifications.header_instructions
+ user_notifications.pm_participants
+ unsubscribe_mailing_list
+ unsubscribe_link_and_mail
+ unsubscribe_link
+ ] => %w[
topic_title
topic_title_url_encoded
message
@@ -34,12 +34,13 @@ class TranslationOverride < ActiveRecord::Base
optional_pm
optional_cat
optional_tags
- }
+ ],
}
include HasSanitizableFields
include ActiveSupport::Deprecation::DeprecatedConstantAccessor
- deprecate_constant 'CUSTOM_INTERPOLATION_KEYS_WHITELIST', 'TranslationOverride::ALLOWED_CUSTOM_INTERPOLATION_KEYS'
+ deprecate_constant "CUSTOM_INTERPOLATION_KEYS_WHITELIST",
+ "TranslationOverride::ALLOWED_CUSTOM_INTERPOLATION_KEYS"
validates_uniqueness_of :translation_key, scope: :locale
validates_presence_of :locale, :translation_key, :value
@@ -50,10 +51,11 @@ class TranslationOverride < ActiveRecord::Base
params = { locale: locale, translation_key: key }
translation_override = find_or_initialize_by(params)
- sanitized_value = translation_override.sanitize_field(value, additional_attributes: ['data-auto-route'])
+ sanitized_value =
+ translation_override.sanitize_field(value, additional_attributes: ["data-auto-route"])
data = { value: sanitized_value }
- if key.end_with?('_MF')
+ if key.end_with?("_MF")
_, filename = JsLocaleHelper.find_message_format_locale([locale], fallback_to_english: false)
data[:compiled_js] = JsLocaleHelper.compile_message_format(filename, locale, sanitized_value)
end
@@ -74,22 +76,18 @@ class TranslationOverride < ActiveRecord::Base
overrides = TranslationOverride.pluck(:locale, :translation_key)
overrides = overrides.group_by(&:first).map { |k, a| [k, a.map(&:last)] }
- overrides.each do |locale, keys|
- clear_cached_keys!(locale, keys)
- end
+ overrides.each { |locale, keys| clear_cached_keys!(locale, keys) }
end
def self.reload_locale!
I18n.reload!
ExtraLocalesController.clear_cache!
- MessageBus.publish('/i18n-flush', refresh: true)
+ MessageBus.publish("/i18n-flush", refresh: true)
end
def self.clear_cached_keys!(locale, keys)
should_clear_anon_cache = false
- keys.each do |key|
- should_clear_anon_cache |= expire_cache(locale, key)
- end
+ keys.each { |key| should_clear_anon_cache |= expire_cache(locale, key) }
Site.clear_anon_cache! if should_clear_anon_cache
end
@@ -99,9 +97,9 @@ class TranslationOverride < ActiveRecord::Base
end
def self.expire_cache(locale, key)
- if key.starts_with?('post_action_types.')
+ if key.starts_with?("post_action_types.")
ApplicationSerializer.expire_cache_fragment!("post_action_types_#{locale}")
- elsif key.starts_with?('topic_flag_types.')
+ elsif key.starts_with?("topic_flag_types.")
ApplicationSerializer.expire_cache_fragment!("post_action_flag_types_#{locale}")
else
return false
@@ -119,9 +117,7 @@ class TranslationOverride < ActiveRecord::Base
def check_interpolation_keys
transformed_key = transform_pluralized_key(translation_key)
- original_text = I18n.overrides_disabled do
- I18n.t(transformed_key, locale: :en)
- end
+ original_text = I18n.overrides_disabled { I18n.t(transformed_key, locale: :en) }
if original_text
original_interpolation_keys = I18nInterpolationKeysFinder.find(original_text)
@@ -129,20 +125,21 @@ class TranslationOverride < ActiveRecord::Base
custom_interpolation_keys = []
ALLOWED_CUSTOM_INTERPOLATION_KEYS.select do |keys, value|
- if keys.any? { |key| transformed_key.start_with?(key) }
- custom_interpolation_keys = value
- end
+ custom_interpolation_keys = value if keys.any? { |key| transformed_key.start_with?(key) }
end
- invalid_keys = (original_interpolation_keys | new_interpolation_keys) -
- original_interpolation_keys -
- custom_interpolation_keys
+ invalid_keys =
+ (original_interpolation_keys | new_interpolation_keys) - original_interpolation_keys -
+ custom_interpolation_keys
if invalid_keys.present?
- self.errors.add(:base, I18n.t(
- 'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
- keys: invalid_keys.join(', ')
- ))
+ self.errors.add(
+ :base,
+ I18n.t(
+ "activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys",
+ keys: invalid_keys.join(", "),
+ ),
+ )
false
end
@@ -151,7 +148,7 @@ class TranslationOverride < ActiveRecord::Base
def transform_pluralized_key(key)
match = key.match(/(.*)\.(zero|two|few|many)$/)
- match ? match.to_a.second + '.other' : key
+ match ? match.to_a.second + ".other" : key
end
end
diff --git a/app/models/trust_level3_requirements.rb b/app/models/trust_level3_requirements.rb
index 61970b2b9eb..8c2889d6fa7 100644
--- a/app/models/trust_level3_requirements.rb
+++ b/app/models/trust_level3_requirements.rb
@@ -3,13 +3,12 @@
# This class performs calculations to determine if a user qualifies for
# the Leader (3) trust level.
class TrustLevel3Requirements
-
class PenaltyCounts
attr_reader :silenced, :suspended
def initialize(user, row)
- @silenced = row['silence_count'] || 0
- @suspended = row['suspend_count'] || 0
+ @silenced = row["silence_count"] || 0
+ @suspended = row["suspend_count"] || 0
# If penalty started more than 6 months ago and still continues, it will
# not be selected by the query from 'penalty_counts'.
@@ -27,19 +26,32 @@ class TrustLevel3Requirements
LOW_WATER_MARK = 0.9
FORGIVENESS_PERIOD = 6.months
- attr_accessor :days_visited, :min_days_visited,
- :num_topics_replied_to, :min_topics_replied_to,
- :topics_viewed, :min_topics_viewed,
- :posts_read, :min_posts_read,
- :topics_viewed_all_time, :min_topics_viewed_all_time,
- :posts_read_all_time, :min_posts_read_all_time,
- :num_flagged_posts, :max_flagged_posts,
- :num_likes_given, :min_likes_given,
- :num_likes_received, :min_likes_received,
- :num_likes_received, :min_likes_received,
- :num_likes_received_days, :min_likes_received_days,
- :num_likes_received_users, :min_likes_received_users,
- :trust_level_locked, :on_grace_period
+ attr_accessor :days_visited,
+ :min_days_visited,
+ :num_topics_replied_to,
+ :min_topics_replied_to,
+ :topics_viewed,
+ :min_topics_viewed,
+ :posts_read,
+ :min_posts_read,
+ :topics_viewed_all_time,
+ :min_topics_viewed_all_time,
+ :posts_read_all_time,
+ :min_posts_read_all_time,
+ :num_flagged_posts,
+ :max_flagged_posts,
+ :num_likes_given,
+ :min_likes_given,
+ :num_likes_received,
+ :min_likes_received,
+ :num_likes_received,
+ :min_likes_received,
+ :num_likes_received_days,
+ :min_likes_received_days,
+ :num_likes_received_users,
+ :min_likes_received_users,
+ :trust_level_locked,
+ :on_grace_period
def initialize(user)
@user = user
@@ -48,18 +60,12 @@ class TrustLevel3Requirements
def requirements_met?
return false if trust_level_locked
- (!@user.suspended?) &&
- (!@user.silenced?) &&
- penalty_counts.total == 0 &&
- days_visited >= min_days_visited &&
- num_topics_replied_to >= min_topics_replied_to &&
- topics_viewed >= min_topics_viewed &&
- posts_read >= min_posts_read &&
- num_flagged_posts <= max_flagged_posts &&
- num_flagged_by_users <= max_flagged_by_users &&
+ (!@user.suspended?) && (!@user.silenced?) && penalty_counts.total == 0 &&
+ days_visited >= min_days_visited && num_topics_replied_to >= min_topics_replied_to &&
+ topics_viewed >= min_topics_viewed && posts_read >= min_posts_read &&
+ num_flagged_posts <= max_flagged_posts && num_flagged_by_users <= max_flagged_by_users &&
topics_viewed_all_time >= min_topics_viewed_all_time &&
- posts_read_all_time >= min_posts_read_all_time &&
- num_likes_given >= min_likes_given &&
+ posts_read_all_time >= min_posts_read_all_time && num_likes_given >= min_likes_given &&
num_likes_received >= min_likes_received &&
num_likes_received_users >= min_likes_received_users &&
num_likes_received_days >= min_likes_received_days
@@ -69,14 +75,11 @@ class TrustLevel3Requirements
return false if trust_level_locked
return false if SiteSetting.default_trust_level > 2
- @user.suspended? ||
- @user.silenced? ||
- penalty_counts.total > 0 ||
+ @user.suspended? || @user.silenced? || penalty_counts.total > 0 ||
days_visited < min_days_visited * LOW_WATER_MARK ||
num_topics_replied_to < min_topics_replied_to * LOW_WATER_MARK ||
topics_viewed < min_topics_viewed * LOW_WATER_MARK ||
- posts_read < min_posts_read * LOW_WATER_MARK ||
- num_flagged_posts > max_flagged_posts ||
+ posts_read < min_posts_read * LOW_WATER_MARK || num_flagged_posts > max_flagged_posts ||
num_flagged_by_users > max_flagged_by_users ||
topics_viewed_all_time < min_topics_viewed_all_time ||
posts_read_all_time < min_posts_read_all_time ||
@@ -110,7 +113,7 @@ class TrustLevel3Requirements
unsilence_user: UserHistory.actions[:unsilence_user],
suspend_user: UserHistory.actions[:suspend_user],
unsuspend_user: UserHistory.actions[:unsuspend_user],
- since: FORGIVENESS_PERIOD.ago
+ since: FORGIVENESS_PERIOD.ago,
}
sql = <<~SQL
@@ -151,31 +154,38 @@ class TrustLevel3Requirements
end
def topics_viewed_query
- TopicViewItem.where(user_id: @user.id)
+ TopicViewItem
+ .where(user_id: @user.id)
.joins(:topic)
.where("topics.archetype <> ?", Archetype.private_message)
.select("topic_id")
end
def topics_viewed
- topics_viewed_query.where('viewed_at > ?', time_period.days.ago).count
+ topics_viewed_query.where("viewed_at > ?", time_period.days.ago).count
end
def min_topics_viewed
[
- (TrustLevel3Requirements.num_topics_in_time_period.to_i * (SiteSetting.tl3_requires_topics_viewed.to_f / 100.0)).round,
- SiteSetting.tl3_requires_topics_viewed_cap
+ (
+ TrustLevel3Requirements.num_topics_in_time_period.to_i *
+ (SiteSetting.tl3_requires_topics_viewed.to_f / 100.0)
+ ).round,
+ SiteSetting.tl3_requires_topics_viewed_cap,
].min
end
def posts_read
- @user.user_visits.where('visited_at > ?', time_period.days.ago).pluck(:posts_read).sum
+ @user.user_visits.where("visited_at > ?", time_period.days.ago).pluck(:posts_read).sum
end
def min_posts_read
[
- (TrustLevel3Requirements.num_posts_in_time_period.to_i * (SiteSetting.tl3_requires_posts_read.to_f / 100.0)).round,
- SiteSetting.tl3_requires_posts_read_cap
+ (
+ TrustLevel3Requirements.num_posts_in_time_period.to_i *
+ (SiteSetting.tl3_requires_posts_read.to_f / 100.0)
+ ).round,
+ SiteSetting.tl3_requires_posts_read_cap,
].min
end
@@ -196,12 +206,14 @@ class TrustLevel3Requirements
end
def num_flagged_posts
- PostAction.with_deleted
+ PostAction
+ .with_deleted
.where(post_id: flagged_post_ids)
.where.not(user_id: @user.id)
.where.not(agreed_at: nil)
.pluck(:post_id)
- .uniq.count
+ .uniq
+ .count
end
def max_flagged_posts
@@ -209,12 +221,15 @@ class TrustLevel3Requirements
end
def num_flagged_by_users
- @_num_flagged_by_users ||= PostAction.with_deleted
- .where(post_id: flagged_post_ids)
- .where.not(user_id: @user.id)
- .where.not(agreed_at: nil)
- .pluck(:user_id)
- .uniq.count
+ @_num_flagged_by_users ||=
+ PostAction
+ .with_deleted
+ .where(post_id: flagged_post_ids)
+ .where.not(user_id: @user.id)
+ .where.not(agreed_at: nil)
+ .pluck(:user_id)
+ .uniq
+ .count
end
def max_flagged_by_users
@@ -222,7 +237,8 @@ class TrustLevel3Requirements
end
def num_likes_given
- UserAction.where(user_id: @user.id, action_type: UserAction::LIKE)
+ UserAction
+ .where(user_id: @user.id, action_type: UserAction::LIKE)
.where("user_actions.created_at > ?", time_period.days.ago)
.joins(:target_topic)
.where("topics.archetype <> ?", Archetype.private_message)
@@ -234,7 +250,8 @@ class TrustLevel3Requirements
end
def num_likes_received_query
- UserAction.where(user_id: @user.id, action_type: UserAction::WAS_LIKED)
+ UserAction
+ .where(user_id: @user.id, action_type: UserAction::WAS_LIKED)
.where("user_actions.created_at > ?", time_period.days.ago)
.joins(:target_topic)
.where("topics.archetype <> ?", Archetype.private_message)
@@ -250,7 +267,7 @@ class TrustLevel3Requirements
def num_likes_received_days
# don't do a COUNT(DISTINCT date(created_at)) here!
- num_likes_received_query.pluck('date(user_actions.created_at)').uniq.size
+ num_likes_received_query.pluck("date(user_actions.created_at)").uniq.size
end
def min_likes_received_days
@@ -275,28 +292,36 @@ class TrustLevel3Requirements
CACHE_DURATION = 1.day.seconds - 60
NUM_TOPICS_KEY = "tl3_num_topics"
- NUM_POSTS_KEY = "tl3_num_posts"
+ NUM_POSTS_KEY = "tl3_num_posts"
def self.num_topics_in_time_period
- Discourse.redis.get(NUM_TOPICS_KEY) || begin
- count = Topic.listable_topics.visible.created_since(SiteSetting.tl3_time_period.days.ago).count
- Discourse.redis.setex NUM_TOPICS_KEY, CACHE_DURATION, count
- count
- end
+ Discourse.redis.get(NUM_TOPICS_KEY) ||
+ begin
+ count =
+ Topic.listable_topics.visible.created_since(SiteSetting.tl3_time_period.days.ago).count
+ Discourse.redis.setex NUM_TOPICS_KEY, CACHE_DURATION, count
+ count
+ end
end
def self.num_posts_in_time_period
- Discourse.redis.get(NUM_POSTS_KEY) || begin
- count = Post.public_posts.visible.created_since(SiteSetting.tl3_time_period.days.ago).count
- Discourse.redis.setex NUM_POSTS_KEY, CACHE_DURATION, count
- count
- end
+ Discourse.redis.get(NUM_POSTS_KEY) ||
+ begin
+ count = Post.public_posts.visible.created_since(SiteSetting.tl3_time_period.days.ago).count
+ Discourse.redis.setex NUM_POSTS_KEY, CACHE_DURATION, count
+ count
+ end
end
def flagged_post_ids
- @_flagged_post_ids ||= @user.posts
- .with_deleted
- .where('created_at > ? AND (spam_count > 0 OR inappropriate_count > 0)', time_period.days.ago)
- .pluck(:id)
+ @_flagged_post_ids ||=
+ @user
+ .posts
+ .with_deleted
+ .where(
+ "created_at > ? AND (spam_count > 0 OR inappropriate_count > 0)",
+ time_period.days.ago,
+ )
+ .pluck(:id)
end
end
diff --git a/app/models/trust_level_and_staff_and_disabled_setting.rb b/app/models/trust_level_and_staff_and_disabled_setting.rb
index 3b1a4336c28..4edc2c9519f 100644
--- a/app/models/trust_level_and_staff_and_disabled_setting.rb
+++ b/app/models/trust_level_and_staff_and_disabled_setting.rb
@@ -6,12 +6,12 @@ class TrustLevelAndStaffAndDisabledSetting < TrustLevelAndStaffSetting
end
def self.valid_values
- ['disabled'] + TrustLevel.valid_range.to_a + special_groups
+ ["disabled"] + TrustLevel.valid_range.to_a + special_groups
end
def self.translation(value)
- if value == 'disabled'
- I18n.t('site_settings.disabled')
+ if value == "disabled"
+ I18n.t("site_settings.disabled")
else
super
end
@@ -19,11 +19,11 @@ class TrustLevelAndStaffAndDisabledSetting < TrustLevelAndStaffSetting
def self.matches?(value, user)
case value
- when 'disabled'
+ when "disabled"
false
- when 'staff'
+ when "staff"
user.staff?
- when 'admin'
+ when "admin"
user.admin?
else
user.has_trust_level?(value.to_i) || user.staff?
diff --git a/app/models/trust_level_and_staff_setting.rb b/app/models/trust_level_and_staff_setting.rb
index a72f6346673..17cc8bead7d 100644
--- a/app/models/trust_level_and_staff_setting.rb
+++ b/app/models/trust_level_and_staff_setting.rb
@@ -2,9 +2,7 @@
class TrustLevelAndStaffSetting < TrustLevelSetting
def self.valid_value?(val)
- special_group?(val) ||
- (val.to_i.to_s == val.to_s &&
- valid_values.any? { |v| v == val.to_i })
+ special_group?(val) || (val.to_i.to_s == val.to_s && valid_values.any? { |v| v == val.to_i })
end
def self.valid_values
@@ -16,7 +14,7 @@ class TrustLevelAndStaffSetting < TrustLevelSetting
end
def self.special_groups
- ['staff', 'admin']
+ %w[staff admin]
end
def self.translation(value)
diff --git a/app/models/trust_level_setting.rb b/app/models/trust_level_setting.rb
index fc48bf8a10d..e1d4f2c0ce1 100644
--- a/app/models/trust_level_setting.rb
+++ b/app/models/trust_level_setting.rb
@@ -1,16 +1,12 @@
# frozen_string_literal: true
class TrustLevelSetting < EnumSiteSetting
-
def self.valid_value?(val)
- val.to_i.to_s == val.to_s &&
- valid_values.any? { |v| v == val.to_i }
+ val.to_i.to_s == val.to_s && valid_values.any? { |v| v == val.to_i }
end
def self.values
- valid_values.map do |value|
- { name: translation(value), value: value }
- end
+ valid_values.map { |value| { name: translation(value), value: value } }
end
def self.valid_values
@@ -18,11 +14,7 @@ class TrustLevelSetting < EnumSiteSetting
end
def self.translation(value)
- I18n.t(
- "js.trust_levels.detailed_name",
- level: value,
- name: TrustLevel.name(value)
- )
+ I18n.t("js.trust_levels.detailed_name", level: value, name: TrustLevel.name(value))
end
private_class_method :valid_values
diff --git a/app/models/unsubscribe_key.rb b/app/models/unsubscribe_key.rb
index da81fdfb33c..fbc199e169d 100644
--- a/app/models/unsubscribe_key.rb
+++ b/app/models/unsubscribe_key.rb
@@ -7,9 +7,9 @@ class UnsubscribeKey < ActiveRecord::Base
before_create :generate_random_key
- ALL_TYPE = 'all'
- DIGEST_TYPE = 'digest'
- TOPIC_TYPE = 'topic'
+ ALL_TYPE = "all"
+ DIGEST_TYPE = "digest"
+ TOPIC_TYPE = "topic"
class << self
def create_key_for(user, type, post: nil)
@@ -32,7 +32,7 @@ class UnsubscribeKey < ActiveRecord::Base
strategies = {
DIGEST_TYPE => EmailControllerHelper::DigestEmailUnsubscriber,
TOPIC_TYPE => EmailControllerHelper::TopicEmailUnsubscriber,
- ALL_TYPE => EmailControllerHelper::BaseEmailUnsubscriber
+ ALL_TYPE => EmailControllerHelper::BaseEmailUnsubscriber,
}
DiscoursePluginRegistry.email_unsubscribers.each do |unsubcriber|
diff --git a/app/models/upload.rb b/app/models/upload.rb
index ad004f6e668..964ef52d1dd 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -8,12 +8,12 @@ class Upload < ActiveRecord::Base
SHA1_LENGTH = 40
SEEDED_ID_THRESHOLD = 0
- URL_REGEX ||= /(\/original\/\dX[\/\.\w]*\/(\h+)[\.\w]*)/
+ URL_REGEX ||= %r{(/original/\dX[/\.\w]*/(\h+)[\.\w]*)}
MAX_IDENTIFY_SECONDS = 5
DOMINANT_COLOR_COMMAND_TIMEOUT_SECONDS = 5
belongs_to :user
- belongs_to :access_control_post, class_name: 'Post'
+ belongs_to :access_control_post, class_name: "Post"
# when we access this post we don't care if the post
# is deleted
@@ -25,7 +25,7 @@ class Upload < ActiveRecord::Base
has_many :optimized_images, dependent: :destroy
has_many :user_uploads, dependent: :destroy
has_many :upload_references, dependent: :destroy
- has_many :posts, through: :upload_references, source: :target, source_type: 'Post'
+ has_many :posts, through: :upload_references, source: :target, source_type: "Post"
has_many :topic_thumbnails
attr_accessor :for_group_message
@@ -44,7 +44,9 @@ class Upload < ActiveRecord::Base
before_destroy do
UserProfile.where(card_background_upload_id: self.id).update_all(card_background_upload_id: nil)
- UserProfile.where(profile_background_upload_id: self.id).update_all(profile_background_upload_id: nil)
+ UserProfile.where(profile_background_upload_id: self.id).update_all(
+ profile_background_upload_id: nil,
+ )
end
after_destroy do
@@ -56,11 +58,7 @@ class Upload < ActiveRecord::Base
scope :by_users, -> { where("uploads.id > ?", SEEDED_ID_THRESHOLD) }
def self.verification_statuses
- @verification_statuses ||= Enum.new(
- unchecked: 1,
- verified: 2,
- invalid_etag: 3
- )
+ @verification_statuses ||= Enum.new(unchecked: 1, verified: 2, invalid_etag: 3)
end
def self.add_unused_callback(&block)
@@ -88,9 +86,9 @@ class Upload < ActiveRecord::Base
end
def self.with_no_non_post_relations
- self
- .joins("LEFT JOIN upload_references ur ON ur.upload_id = uploads.id AND ur.target_type != 'Post'")
- .where("ur.upload_id IS NULL")
+ self.joins(
+ "LEFT JOIN upload_references ur ON ur.upload_id = uploads.id AND ur.target_type != 'Post'",
+ ).where("ur.upload_id IS NULL")
end
def initialize(*args)
@@ -114,18 +112,14 @@ class Upload < ActiveRecord::Base
return unless SiteSetting.create_thumbnails?
opts ||= {}
- if get_optimized_image(width, height, opts)
- save(validate: false)
- end
+ save(validate: false) if get_optimized_image(width, height, opts)
end
# this method attempts to correct old incorrect extensions
def get_optimized_image(width, height, opts = nil)
opts ||= {}
- if (!extension || extension.length == 0)
- fix_image_extension
- end
+ fix_image_extension if (!extension || extension.length == 0)
opts = opts.merge(raise_on_error: true)
begin
@@ -152,9 +146,7 @@ class Upload < ActiveRecord::Base
File.read(original_path)
ensure
- if external_copy
- File.unlink(external_copy.path)
- end
+ File.unlink(external_copy.path) if external_copy
end
def fix_image_extension
@@ -164,18 +156,28 @@ class Upload < ActiveRecord::Base
# this is relatively cheap once cached
original_path = Discourse.store.path_for(self)
if original_path.blank?
- external_copy = Discourse.store.download(self) rescue nil
+ external_copy =
+ begin
+ Discourse.store.download(self)
+ rescue StandardError
+ nil
+ end
original_path = external_copy.try(:path)
end
- image_info = FastImage.new(original_path) rescue nil
+ image_info =
+ begin
+ FastImage.new(original_path)
+ rescue StandardError
+ nil
+ end
new_extension = image_info&.type&.to_s || "unknown"
if new_extension != self.extension
self.update_columns(extension: new_extension)
true
end
- rescue
+ rescue StandardError
self.update_columns(extension: "unknown")
true
end
@@ -211,7 +213,9 @@ class Upload < ActiveRecord::Base
def self.consider_for_reuse(upload, post)
return upload if !SiteSetting.secure_uploads? || upload.blank? || post.blank?
- return nil if !upload.matching_access_control_post?(post) || upload.uploaded_before_secure_uploads_enabled?
+ if !upload.matching_access_control_post?(post) || upload.uploaded_before_secure_uploads_enabled?
+ return nil
+ end
upload
end
@@ -220,7 +224,8 @@ class Upload < ActiveRecord::Base
# have secure-uploads in the URL e.g. /t/secure-uploads-are-cool/223452
route = UrlHelper.rails_route_from_url(url)
return false if route.blank?
- route[:action] == "show_secure" && route[:controller] == "uploads" && FileHelper.is_supported_media?(url)
+ route[:action] == "show_secure" && route[:controller] == "uploads" &&
+ FileHelper.is_supported_media?(url)
rescue ActionController::RoutingError
false
end
@@ -239,17 +244,14 @@ class Upload < ActiveRecord::Base
controller: "uploads",
action: "show_secure",
path: uri.path[1..-1],
- only_path: true
+ only_path: true,
)
end
def self.short_path(sha1:, extension:)
@url_helpers ||= Rails.application.routes.url_helpers
- @url_helpers.upload_short_path(
- base62: self.base62_sha1(sha1),
- extension: extension
- )
+ @url_helpers.upload_short_path(base62: self.base62_sha1(sha1), extension: extension)
end
def self.base62_sha1(sha1)
@@ -261,7 +263,7 @@ class Upload < ActiveRecord::Base
end
def local?
- !(url =~ /^(https?:)?\/\//)
+ !(url =~ %r{^(https?:)?//})
end
def fix_dimensions!
@@ -275,8 +277,19 @@ class Upload < ActiveRecord::Base
end
begin
- if extension == 'svg'
- w, h = Discourse::Utils.execute_command("identify", "-format", "%w %h", path, timeout: MAX_IDENTIFY_SECONDS).split(' ') rescue [0, 0]
+ if extension == "svg"
+ w, h =
+ begin
+ Discourse::Utils.execute_command(
+ "identify",
+ "-format",
+ "%w %h",
+ path,
+ timeout: MAX_IDENTIFY_SECONDS,
+ ).split(" ")
+ rescue StandardError
+ [0, 0]
+ end
else
w, h = FastImage.new(path, raise_on_failure: true).size
end
@@ -290,7 +303,7 @@ class Upload < ActiveRecord::Base
width: width,
height: height,
thumbnail_width: thumbnail_width,
- thumbnail_height: thumbnail_height
+ thumbnail_height: thumbnail_height,
)
rescue => e
Discourse.warn_exception(e, message: "Error getting image dimensions")
@@ -337,9 +350,7 @@ class Upload < ActiveRecord::Base
def calculate_dominant_color!(local_path = nil)
color = nil
- if !FileHelper.is_supported_image?("image.#{extension}") || extension == "svg"
- color = ""
- end
+ color = "" if !FileHelper.is_supported_image?("image.#{extension}") || extension == "svg"
if color.nil?
local_path ||=
@@ -360,37 +371,39 @@ class Upload < ActiveRecord::Base
color = ""
end
- color ||= begin
- data = Discourse::Utils.execute_command(
- "nice",
- "-n",
- "10",
- "convert",
- local_path,
- "-resize",
- "1x1",
- "-define",
- "histogram:unique-colors=true",
- "-format",
- "%c",
- "histogram:info:",
- timeout: DOMINANT_COLOR_COMMAND_TIMEOUT_SECONDS
- )
+ color ||=
+ begin
+ data =
+ Discourse::Utils.execute_command(
+ "nice",
+ "-n",
+ "10",
+ "convert",
+ local_path,
+ "-resize",
+ "1x1",
+ "-define",
+ "histogram:unique-colors=true",
+ "-format",
+ "%c",
+ "histogram:info:",
+ timeout: DOMINANT_COLOR_COMMAND_TIMEOUT_SECONDS,
+ )
- # Output format:
- # 1: (110.873,116.226,93.8821) #6F745E srgb(43.4798%,45.5789%,36.8165%)
+ # Output format:
+ # 1: (110.873,116.226,93.8821) #6F745E srgb(43.4798%,45.5789%,36.8165%)
- color = data[/#([0-9A-F]{6})/, 1]
+ color = data[/#([0-9A-F]{6})/, 1]
- raise "Calculated dominant color but unable to parse output:\n#{data}" if color.nil?
+ raise "Calculated dominant color but unable to parse output:\n#{data}" if color.nil?
- color
- rescue Discourse::Utils::CommandError => e
- # Timeout or unable to parse image
- # This can happen due to bad user input - ignore and save
- # an empty string to prevent re-evaluation
- ""
- end
+ color
+ rescue Discourse::Utils::CommandError => e
+ # Timeout or unable to parse image
+ # This can happen due to bad user input - ignore and save
+ # an empty string to prevent re-evaluation
+ ""
+ end
end
if persisted?
@@ -401,23 +414,28 @@ class Upload < ActiveRecord::Base
end
def target_image_quality(local_path, test_quality)
- @file_quality ||= Discourse::Utils.execute_command("identify", "-format", "%Q", local_path, timeout: MAX_IDENTIFY_SECONDS).to_i rescue 0
+ @file_quality ||=
+ begin
+ Discourse::Utils.execute_command(
+ "identify",
+ "-format",
+ "%Q",
+ local_path,
+ timeout: MAX_IDENTIFY_SECONDS,
+ ).to_i
+ rescue StandardError
+ 0
+ end
- if @file_quality == 0 || @file_quality > test_quality
- test_quality
- end
+ test_quality if @file_quality == 0 || @file_quality > test_quality
end
def self.sha1_from_short_path(path)
- if path =~ /(\/uploads\/short-url\/)([a-zA-Z0-9]+)(\..*)?/
- self.sha1_from_base62_encoded($2)
- end
+ self.sha1_from_base62_encoded($2) if path =~ %r{(/uploads/short-url/)([a-zA-Z0-9]+)(\..*)?}
end
def self.sha1_from_short_url(url)
- if url =~ /(upload:\/\/)?([a-zA-Z0-9]+)(\..*)?/
- self.sha1_from_base62_encoded($2)
- end
+ self.sha1_from_base62_encoded($2) if url =~ %r{(upload://)?([a-zA-Z0-9]+)(\..*)?}
end
def self.sha1_from_base62_encoded(encoded_sha1)
@@ -426,7 +444,7 @@ class Upload < ActiveRecord::Base
if sha1.length > SHA1_LENGTH
nil
else
- sha1.rjust(SHA1_LENGTH, '0')
+ sha1.rjust(SHA1_LENGTH, "0")
end
end
@@ -457,7 +475,10 @@ class Upload < ActiveRecord::Base
begin
Discourse.store.update_upload_ACL(self)
rescue Aws::S3::Errors::NotImplemented => err
- Discourse.warn_exception(err, message: "The file store object storage provider does not support setting ACLs")
+ Discourse.warn_exception(
+ err,
+ message: "The file store object storage provider does not support setting ACLs",
+ )
end
end
@@ -468,7 +489,7 @@ class Upload < ActiveRecord::Base
{
secure: secure,
security_last_changed_reason: reason + " | source: #{source}",
- security_last_changed_at: Time.zone.now
+ security_last_changed_at: Time.zone.now,
}
end
@@ -479,15 +500,17 @@ class Upload < ActiveRecord::Base
if SiteSetting.migrate_to_new_scheme
max_file_size_kb = [
SiteSetting.max_image_size_kb,
- SiteSetting.max_attachment_size_kb
+ SiteSetting.max_attachment_size_kb,
].max.kilobytes
local_store = FileStore::LocalStore.new
db = RailsMultisite::ConnectionManagement.current_db
- scope = Upload.by_users
- .where("url NOT LIKE '%/original/_X/%' AND url LIKE ?", "%/uploads/#{db}%")
- .order(id: :desc)
+ scope =
+ Upload
+ .by_users
+ .where("url NOT LIKE '%/original/_X/%' AND url LIKE ?", "%/uploads/#{db}%")
+ .order(id: :desc)
scope = scope.limit(limit) if limit
@@ -503,7 +526,7 @@ class Upload < ActiveRecord::Base
# keep track of the url
previous_url = upload.url.dup
# where is the file currently stored?
- external = previous_url =~ /^\/\//
+ external = previous_url =~ %r{^//}
# download if external
if external
url = SiteSetting.scheme + ":" + previous_url
@@ -511,12 +534,13 @@ class Upload < ActiveRecord::Base
begin
retries ||= 0
- file = FileHelper.download(
- url,
- max_file_size: max_file_size_kb,
- tmp_file_name: "discourse",
- follow_redirect: true
- )
+ file =
+ FileHelper.download(
+ url,
+ max_file_size: max_file_size_kb,
+ tmp_file_name: "discourse",
+ follow_redirect: true,
+ )
rescue OpenURI::HTTPError
retry if (retries += 1) < 1
next
@@ -527,9 +551,7 @@ class Upload < ActiveRecord::Base
path = local_store.path_for(upload)
end
# compute SHA if missing
- if upload.sha1.blank?
- upload.sha1 = Upload.generate_digest(path)
- end
+ upload.sha1 = Upload.generate_digest(path) if upload.sha1.blank?
# store to new location & update the filesize
File.open(path) do |f|
@@ -543,7 +565,7 @@ class Upload < ActiveRecord::Base
DbHelper.remap(
previous_url,
upload.url,
- excluded_tables: %w{
+ excluded_tables: %w[
posts
post_search_data
incoming_emails
@@ -555,28 +577,32 @@ class Upload < ActiveRecord::Base
user_emails
draft_sequences
optimized_images
- }
+ ],
)
- remap_scope ||= begin
- Post.with_deleted
- .where("raw ~ '/uploads/#{db}/\\d+/' OR raw ~ '/uploads/#{db}/original/(\\d|[a-z])/'")
- .select(:id, :raw, :cooked)
- .all
- end
+ remap_scope ||=
+ begin
+ Post
+ .with_deleted
+ .where(
+ "raw ~ '/uploads/#{db}/\\d+/' OR raw ~ '/uploads/#{db}/original/(\\d|[a-z])/'",
+ )
+ .select(:id, :raw, :cooked)
+ .all
+ end
remap_scope.each do |post|
post.raw.gsub!(previous_url, upload.url)
post.cooked.gsub!(previous_url, upload.url)
- Post.with_deleted.where(id: post.id).update_all(raw: post.raw, cooked: post.cooked) if post.changed?
+ if post.changed?
+ Post.with_deleted.where(id: post.id).update_all(raw: post.raw, cooked: post.cooked)
+ end
end
upload.optimized_images.find_each(&:destroy!)
upload.rebake_posts_on_old_scheme
# remove the old file (when local)
- unless external
- FileUtils.rm(path, force: true)
- end
+ FileUtils.rm(path, force: true) unless external
rescue => e
problems << { upload: upload, ex: e }
ensure
@@ -595,21 +621,21 @@ class Upload < ActiveRecord::Base
sha1s = []
- raw.scan(/\/(\h{40})/).each do |match|
- sha1s << match[0]
- end
+ raw.scan(/\/(\h{40})/).each { |match| sha1s << match[0] }
- raw.scan(/\/([a-zA-Z0-9]+)/).each do |match|
- sha1s << Upload.sha1_from_base62_encoded(match[0])
- end
+ raw
+ .scan(%r{/([a-zA-Z0-9]+)})
+ .each { |match| sha1s << Upload.sha1_from_base62_encoded(match[0]) }
Upload.where(sha1: sha1s.uniq).pluck(:id)
end
def self.backfill_dominant_colors!(count)
- Upload.where(dominant_color: nil).order("id desc").first(count).each do |upload|
- upload.calculate_dominant_color!
- end
+ Upload
+ .where(dominant_color: nil)
+ .order("id desc")
+ .first(count)
+ .each { |upload| upload.calculate_dominant_color! }
end
private
@@ -617,7 +643,6 @@ class Upload < ActiveRecord::Base
def short_url_basename
"#{Upload.base62_sha1(sha1)}#{extension.present? ? ".#{extension}" : ""}"
end
-
end
# == Schema Information
diff --git a/app/models/upload_reference.rb b/app/models/upload_reference.rb
index 58cf8f86d19..73de830f545 100644
--- a/app/models/upload_reference.rb
+++ b/app/models/upload_reference.rb
@@ -5,7 +5,9 @@ class UploadReference < ActiveRecord::Base
belongs_to :target, polymorphic: true
def self.ensure_exist!(upload_ids: [], target: nil, target_type: nil, target_id: nil)
- raise "target OR target_type and target_id are required" if !target && !(target_type && target_id)
+ if !target && !(target_type && target_id)
+ raise "target OR target_type and target_id are required"
+ end
if target.present?
target_type = target.class
@@ -16,22 +18,21 @@ class UploadReference < ActiveRecord::Base
target_type = target_type.to_s
if upload_ids.empty?
- UploadReference
- .where(target_type: target_type, target_id: target_id)
- .delete_all
+ UploadReference.where(target_type: target_type, target_id: target_id).delete_all
return
end
- rows = upload_ids.map do |upload_id|
- {
- upload_id: upload_id,
- target_type: target_type,
- target_id: target_id,
- created_at: Time.zone.now,
- updated_at: Time.zone.now,
- }
- end
+ rows =
+ upload_ids.map do |upload_id|
+ {
+ upload_id: upload_id,
+ target_type: target_type,
+ target_id: target_id,
+ created_at: Time.zone.now,
+ updated_at: Time.zone.now,
+ }
+ end
UploadReference.transaction do |transaction|
UploadReference
diff --git a/app/models/user.rb b/app/models/user.rb
index 54d358ec737..d0d9846a433 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -34,22 +34,40 @@ class User < ActiveRecord::Base
has_many :user_warnings, dependent: :destroy
has_many :api_keys, dependent: :destroy
has_many :push_subscriptions, dependent: :destroy
- has_many :acting_group_histories, dependent: :destroy, foreign_key: :acting_user_id, class_name: 'GroupHistory'
- has_many :targeted_group_histories, dependent: :destroy, foreign_key: :target_user_id, class_name: 'GroupHistory'
+ has_many :acting_group_histories,
+ dependent: :destroy,
+ foreign_key: :acting_user_id,
+ class_name: "GroupHistory"
+ has_many :targeted_group_histories,
+ dependent: :destroy,
+ foreign_key: :target_user_id,
+ class_name: "GroupHistory"
has_many :reviewable_scores, dependent: :destroy
has_many :invites, foreign_key: :invited_by_id, dependent: :destroy
has_many :user_custom_fields, dependent: :destroy
has_many :user_associated_groups, dependent: :destroy
- has_many :pending_posts, -> { merge(Reviewable.pending) }, class_name: 'ReviewableQueuedPost', foreign_key: :created_by_id
+ has_many :pending_posts,
+ -> { merge(Reviewable.pending) },
+ class_name: "ReviewableQueuedPost",
+ foreign_key: :created_by_id
has_one :user_option, dependent: :destroy
has_one :user_avatar, dependent: :destroy
- has_one :primary_email, -> { where(primary: true) }, class_name: 'UserEmail', dependent: :destroy, autosave: true, validate: false
+ has_one :primary_email,
+ -> { where(primary: true) },
+ class_name: "UserEmail",
+ dependent: :destroy,
+ autosave: true,
+ validate: false
has_one :user_stat, dependent: :destroy
has_one :user_profile, dependent: :destroy, inverse_of: :user
has_one :single_sign_on_record, dependent: :destroy
- has_one :anonymous_user_master, class_name: 'AnonymousUser', dependent: :destroy
- has_one :anonymous_user_shadow, ->(record) { where(active: true) }, foreign_key: :master_user_id, class_name: 'AnonymousUser', dependent: :destroy
+ has_one :anonymous_user_master, class_name: "AnonymousUser", dependent: :destroy
+ has_one :anonymous_user_shadow,
+ ->(record) { where(active: true) },
+ foreign_key: :master_user_id,
+ class_name: "AnonymousUser",
+ dependent: :destroy
has_one :invited_user, dependent: :destroy
has_one :user_notification_schedule, dependent: :destroy
@@ -61,8 +79,8 @@ class User < ActiveRecord::Base
has_many :user_visits, dependent: :delete_all
has_many :user_auth_token_logs, dependent: :delete_all
has_many :group_requests, dependent: :delete_all
- has_many :muted_user_records, class_name: 'MutedUser', dependent: :delete_all
- has_many :ignored_user_records, class_name: 'IgnoredUser', dependent: :delete_all
+ has_many :muted_user_records, class_name: "MutedUser", dependent: :delete_all
+ has_many :ignored_user_records, class_name: "IgnoredUser", dependent: :delete_all
has_many :do_not_disturb_timings, dependent: :delete_all
has_one :user_status, dependent: :destroy
@@ -72,16 +90,22 @@ class User < ActiveRecord::Base
has_many :post_timings
has_many :directory_items
has_many :email_logs
- has_many :security_keys, -> {
- where(enabled: true)
- }, class_name: "UserSecurityKey"
+ has_many :security_keys, -> { where(enabled: true) }, class_name: "UserSecurityKey"
has_many :badges, through: :user_badges
- has_many :default_featured_user_badges, -> {
- max_featured_rank = SiteSetting.max_favorite_badges > 0 ? SiteSetting.max_favorite_badges + 1
- : DEFAULT_FEATURED_BADGE_COUNT
- for_enabled_badges.grouped_with_count.where("featured_rank <= ?", max_featured_rank)
- }, class_name: "UserBadge"
+ has_many :default_featured_user_badges,
+ -> {
+ max_featured_rank =
+ (
+ if SiteSetting.max_favorite_badges > 0
+ SiteSetting.max_favorite_badges + 1
+ else
+ DEFAULT_FEATURED_BADGE_COUNT
+ end
+ )
+ for_enabled_badges.grouped_with_count.where("featured_rank <= ?", max_featured_rank)
+ },
+ class_name: "UserBadge"
has_many :topics_allowed, through: :topic_allowed_users, source: :topic
has_many :groups, through: :group_users
@@ -89,27 +113,32 @@ class User < ActiveRecord::Base
has_many :associated_groups, through: :user_associated_groups, dependent: :destroy
# deleted in user_second_factors relationship
- has_many :totps, -> {
- where(method: UserSecondFactor.methods[:totp], enabled: true)
- }, class_name: "UserSecondFactor"
+ has_many :totps,
+ -> { where(method: UserSecondFactor.methods[:totp], enabled: true) },
+ class_name: "UserSecondFactor"
has_one :master_user, through: :anonymous_user_master
has_one :shadow_user, through: :anonymous_user_shadow, source: :user
has_one :profile_background_upload, through: :user_profile
has_one :card_background_upload, through: :user_profile
- belongs_to :approved_by, class_name: 'User'
- belongs_to :primary_group, class_name: 'Group'
- belongs_to :flair_group, class_name: 'Group'
+ belongs_to :approved_by, class_name: "User"
+ belongs_to :primary_group, class_name: "Group"
+ belongs_to :flair_group, class_name: "Group"
has_many :muted_users, through: :muted_user_records
has_many :ignored_users, through: :ignored_user_records
- belongs_to :uploaded_avatar, class_name: 'Upload'
+ belongs_to :uploaded_avatar, class_name: "Upload"
has_many :sidebar_section_links, dependent: :delete_all
- has_many :category_sidebar_section_links, -> { where(linkable_type: "Category") }, class_name: 'SidebarSectionLink'
- has_many :custom_sidebar_tags, through: :sidebar_section_links, source: :linkable, source_type: "Tag"
+ has_many :category_sidebar_section_links,
+ -> { where(linkable_type: "Category") },
+ class_name: "SidebarSectionLink"
+ has_many :custom_sidebar_tags,
+ through: :sidebar_section_links,
+ source: :linkable,
+ source_type: "Tag"
delegate :last_sent_email_address, to: :email_logs
@@ -121,7 +150,8 @@ class User < ActiveRecord::Base
validates :ip_address, allowed_ip_address: { on: :create, message: :signup_not_allowed }
validates :primary_email, presence: true
validates :validatable_user_fields_values, watched_words: true, unless: :custom_fields_clean?
- validates_associated :primary_email, message: -> (_, user_email) { user_email[:value]&.errors[:email]&.first }
+ validates_associated :primary_email,
+ message: ->(_, user_email) { user_email[:value]&.errors[:email]&.first }
after_initialize :add_trust_level
@@ -137,17 +167,12 @@ class User < ActiveRecord::Base
after_create :set_default_tags_preferences
after_create :add_default_sidebar_section_links
- after_update :update_default_sidebar_section_links, if: Proc.new {
- self.saved_change_to_admin?
- }
+ after_update :update_default_sidebar_section_links, if: Proc.new { self.saved_change_to_admin? }
- after_update :add_default_sidebar_section_links, if: Proc.new {
- self.saved_change_to_staged?
- }
+ after_update :add_default_sidebar_section_links, if: Proc.new { self.saved_change_to_staged? }
- after_update :trigger_user_updated_event, if: Proc.new {
- self.human? && self.saved_change_to_uploaded_avatar_id?
- }
+ after_update :trigger_user_updated_event,
+ if: Proc.new { self.human? && self.saved_change_to_uploaded_avatar_id? }
after_update :trigger_user_automatic_group_refresh, if: :saved_change_to_staged?
@@ -178,7 +203,10 @@ class User < ActiveRecord::Base
# These tables don't have primary keys, so destroying them with activerecord is tricky:
PostTiming.where(user_id: self.id).delete_all
TopicViewItem.where(user_id: self.id).delete_all
- UserAction.where('user_id = :user_id OR target_user_id = :user_id OR acting_user_id = :user_id', user_id: self.id).delete_all
+ UserAction.where(
+ "user_id = :user_id OR target_user_id = :user_id OR acting_user_id = :user_id",
+ user_id: self.id,
+ ).delete_all
# we need to bypass the default scope here, which appears not bypassed for :delete_all
# however :destroy it is bypassed
@@ -186,8 +214,9 @@ class User < ActiveRecord::Base
# This is a perf optimisation to ensure we hit the index
# without this we need to scan a much larger number of rows
- DirectoryItem.where(user_id: self.id)
- .where('period_type in (?)', DirectoryItem.period_types.values)
+ DirectoryItem
+ .where(user_id: self.id)
+ .where("period_type in (?)", DirectoryItem.period_types.values)
.delete_all
# our relationship filters on enabled, this makes sure everything is deleted
@@ -216,70 +245,95 @@ class User < ActiveRecord::Base
# Cache for user custom fields. Currently it is used to display quick search results
attr_accessor :custom_data
- scope :with_email, ->(email) do
- joins(:user_emails).where("lower(user_emails.email) IN (?)", email)
- end
+ scope :with_email,
+ ->(email) { joins(:user_emails).where("lower(user_emails.email) IN (?)", email) }
- scope :with_primary_email, ->(email) do
- joins(:user_emails).where("lower(user_emails.email) IN (?) AND user_emails.primary", email)
- end
+ scope :with_primary_email,
+ ->(email) {
+ joins(:user_emails).where(
+ "lower(user_emails.email) IN (?) AND user_emails.primary",
+ email,
+ )
+ }
- scope :human_users, -> { where('users.id > 0') }
+ scope :human_users, -> { where("users.id > 0") }
# excluding fake users like the system user or anonymous users
- scope :real, -> { human_users.where('NOT EXISTS(
+ scope :real,
+ -> {
+ human_users.where(
+ "NOT EXISTS(
SELECT 1
FROM anonymous_users a
WHERE a.user_id = users.id
- )') }
+ )",
+ )
+ }
# TODO-PERF: There is no indexes on any of these
# and NotifyMailingListSubscribers does a select-all-and-loop
# may want to create an index on (active, silence, suspended_till)?
scope :silenced, -> { where("silenced_till IS NOT NULL AND silenced_till > ?", Time.zone.now) }
scope :not_silenced, -> { where("silenced_till IS NULL OR silenced_till <= ?", Time.zone.now) }
- scope :suspended, -> { where('suspended_till IS NOT NULL AND suspended_till > ?', Time.zone.now) }
- scope :not_suspended, -> { where('suspended_till IS NULL OR suspended_till <= ?', Time.zone.now) }
+ scope :suspended, -> { where("suspended_till IS NOT NULL AND suspended_till > ?", Time.zone.now) }
+ scope :not_suspended, -> { where("suspended_till IS NULL OR suspended_till <= ?", Time.zone.now) }
scope :activated, -> { where(active: true) }
scope :not_staged, -> { where(staged: false) }
- scope :filter_by_username, ->(filter) do
- if filter.is_a?(Array)
- where('username_lower ~* ?', "(#{filter.join('|')})")
- else
- where('username_lower ILIKE ?', "%#{filter}%")
- end
- end
+ scope :filter_by_username,
+ ->(filter) {
+ if filter.is_a?(Array)
+ where("username_lower ~* ?", "(#{filter.join("|")})")
+ else
+ where("username_lower ILIKE ?", "%#{filter}%")
+ end
+ }
- scope :filter_by_username_or_email, ->(filter) do
- if filter.is_a?(String) && filter =~ /.+@.+/
- # probably an email so try the bypass
- if user_id = UserEmail.where("lower(email) = ?", filter.downcase).pluck_first(:user_id)
- return where('users.id = ?', user_id)
- end
- end
+ scope :filter_by_username_or_email,
+ ->(filter) {
+ if filter.is_a?(String) && filter =~ /.+@.+/
+ # probably an email so try the bypass
+ if user_id = UserEmail.where("lower(email) = ?", filter.downcase).pluck_first(:user_id)
+ return where("users.id = ?", user_id)
+ end
+ end
- users = joins(:primary_email)
+ users = joins(:primary_email)
- if filter.is_a?(Array)
- users.where(
- 'username_lower ~* :filter OR lower(user_emails.email) SIMILAR TO :filter',
- filter: "(#{filter.join('|')})"
- )
- else
- users.where(
- 'username_lower ILIKE :filter OR lower(user_emails.email) ILIKE :filter',
- filter: "%#{filter}%"
- )
- end
- end
+ if filter.is_a?(Array)
+ users.where(
+ "username_lower ~* :filter OR lower(user_emails.email) SIMILAR TO :filter",
+ filter: "(#{filter.join("|")})",
+ )
+ else
+ users.where(
+ "username_lower ILIKE :filter OR lower(user_emails.email) ILIKE :filter",
+ filter: "%#{filter}%",
+ )
+ end
+ }
- scope :watching_topic, ->(topic) do
- joins(DB.sql_fragment("LEFT JOIN category_users ON category_users.user_id = users.id AND category_users.category_id = :category_id", category_id: topic.category_id))
- .joins(DB.sql_fragment("LEFT JOIN topic_users ON topic_users.user_id = users.id AND topic_users.topic_id = :topic_id", topic_id: topic.id))
- .joins("LEFT JOIN tag_users ON tag_users.user_id = users.id AND tag_users.tag_id IN (#{topic.tag_ids.join(",").presence || 'NULL'})")
- .where("category_users.notification_level > 0 OR topic_users.notification_level > 0 OR tag_users.notification_level > 0")
- end
+ scope :watching_topic,
+ ->(topic) {
+ joins(
+ DB.sql_fragment(
+ "LEFT JOIN category_users ON category_users.user_id = users.id AND category_users.category_id = :category_id",
+ category_id: topic.category_id,
+ ),
+ )
+ .joins(
+ DB.sql_fragment(
+ "LEFT JOIN topic_users ON topic_users.user_id = users.id AND topic_users.topic_id = :topic_id",
+ topic_id: topic.id,
+ ),
+ )
+ .joins(
+ "LEFT JOIN tag_users ON tag_users.user_id = users.id AND tag_users.tag_id IN (#{topic.tag_ids.join(",").presence || "NULL"})",
+ )
+ .where(
+ "category_users.notification_level > 0 OR topic_users.notification_level > 0 OR tag_users.notification_level > 0",
+ )
+ }
module NewTopicDuration
ALWAYS = -1
@@ -289,13 +343,14 @@ class User < ActiveRecord::Base
MAX_STAFF_DELETE_POST_COUNT ||= 5
def self.user_tips
- @user_tips ||= Enum.new(
- first_notification: 1,
- topic_timeline: 2,
- post_menu: 3,
- topic_notification_levels: 4,
- suggested_topics: 5,
- )
+ @user_tips ||=
+ Enum.new(
+ first_notification: 1,
+ topic_timeline: 2,
+ post_menu: 3,
+ topic_notification_levels: 4,
+ suggested_topics: 5,
+ )
end
def visible_sidebar_tags(user_guardian = nil)
@@ -318,10 +373,18 @@ class User < ActiveRecord::Base
def self.username_available?(username, email = nil, allow_reserved_username: false)
lower = normalize_username(username)
return false if !allow_reserved_username && reserved_username?(lower)
- return true if !username_exists?(lower)
+ return true if !username_exists?(lower)
# staged users can use the same username since they will take over the account
- email.present? && User.joins(:user_emails).exists?(staged: true, username_lower: lower, user_emails: { primary: true, email: email })
+ email.present? &&
+ User.joins(:user_emails).exists?(
+ staged: true,
+ username_lower: lower,
+ user_emails: {
+ primary: true,
+ email: email,
+ },
+ )
end
def self.reserved_username?(username)
@@ -329,9 +392,11 @@ class User < ActiveRecord::Base
return true if SiteSetting.here_mention == username
- SiteSetting.reserved_usernames.unicode_normalize.split("|").any? do |reserved|
- username.match?(/^#{Regexp.escape(reserved).gsub('\*', '.*')}$/)
- end
+ SiteSetting
+ .reserved_usernames
+ .unicode_normalize
+ .split("|")
+ .any? { |reserved| username.match?(/^#{Regexp.escape(reserved).gsub('\*', ".*")}$/) }
end
def self.editable_user_custom_fields(by_staff: false)
@@ -348,12 +413,12 @@ class User < ActiveRecord::Base
fields.push(*DiscoursePluginRegistry.public_user_custom_fields)
if SiteSetting.public_user_custom_fields.present?
- fields.push(*SiteSetting.public_user_custom_fields.split('|'))
+ fields.push(*SiteSetting.public_user_custom_fields.split("|"))
end
if guardian.is_staff?
if SiteSetting.staff_user_custom_fields.present?
- fields.push(*SiteSetting.staff_user_custom_fields.split('|'))
+ fields.push(*SiteSetting.staff_user_custom_fields.split("|"))
end
fields.push(*DiscoursePluginRegistry.staff_user_custom_fields)
@@ -386,7 +451,7 @@ class User < ActiveRecord::Base
bookmarks.where(bookmarkable_type: type)
end
- EMAIL = %r{([^@]+)@([^\.]+)}
+ EMAIL = /([^@]+)@([^\.]+)/
FROM_STAGED = "from_staged"
def self.new_from_params(params)
@@ -417,7 +482,7 @@ class User < ActiveRecord::Base
end
def self.find_by_username_or_email(username_or_email)
- if username_or_email.include?('@')
+ if username_or_email.include?("@")
find_by_email(username_or_email)
else
find_by_username(username_or_email)
@@ -445,10 +510,7 @@ class User < ActiveRecord::Base
end
def group_granted_trust_level
- GroupUser
- .where(user_id: id)
- .includes(:group)
- .maximum("groups.grant_trust_level")
+ GroupUser.where(user_id: id).includes(:group).maximum("groups.grant_trust_level")
end
def visible_groups
@@ -477,10 +539,10 @@ class User < ActiveRecord::Base
Jobs.enqueue(
:send_system_message,
user_id: id,
- message_type: 'welcome_staff',
+ message_type: "welcome_staff",
message_options: {
- role: role.to_s
- }
+ role: role.to_s,
+ },
)
end
@@ -501,7 +563,8 @@ class User < ActiveRecord::Base
end
def invited_by
- used_invite = Invite.with_deleted.joins(:invited_users).where("invited_users.user_id = ?", self.id).first
+ used_invite =
+ Invite.with_deleted.joins(:invited_users).where("invited_users.user_id = ?", self.id).first
used_invite.try(:invited_by)
end
@@ -605,7 +668,7 @@ class User < ActiveRecord::Base
args = {
user_id: self.id,
seen_notification_id: self.seen_notification_id,
- private_message: Notification.types[:private_message]
+ private_message: Notification.types[:private_message],
}
DB.query_single(<<~SQL, args).first
@@ -632,9 +695,10 @@ class User < ActiveRecord::Base
end
def unread_notifications
- @unread_notifications ||= begin
- # perf critical, much more efficient than AR
- sql = <<~SQL
+ @unread_notifications ||=
+ begin
+ # perf critical, much more efficient than AR
+ sql = <<~SQL
SELECT COUNT(*) FROM (
SELECT 1 FROM
notifications n
@@ -648,17 +712,21 @@ class User < ActiveRecord::Base
) AS X
SQL
- DB.query_single(sql,
- user_id: id,
- seen_notification_id: seen_notification_id,
- limit: User.max_unread_notifications
- )[0].to_i
- end
+ DB.query_single(
+ sql,
+ user_id: id,
+ seen_notification_id: seen_notification_id,
+ limit: User.max_unread_notifications,
+ )[
+ 0
+ ].to_i
+ end
end
def all_unread_notifications_count
- @all_unread_notifications_count ||= begin
- sql = <<~SQL
+ @all_unread_notifications_count ||=
+ begin
+ sql = <<~SQL
SELECT COUNT(*) FROM (
SELECT 1 FROM
notifications n
@@ -671,12 +739,15 @@ class User < ActiveRecord::Base
) AS X
SQL
- DB.query_single(sql,
- user_id: id,
- seen_notification_id: seen_notification_id,
- limit: User.max_unread_notifications
- )[0].to_i
- end
+ DB.query_single(
+ sql,
+ user_id: id,
+ seen_notification_id: seen_notification_id,
+ limit: User.max_unread_notifications,
+ )[
+ 0
+ ].to_i
+ end
end
def total_unread_notifications
@@ -684,10 +755,7 @@ class User < ActiveRecord::Base
end
def reviewable_count
- Reviewable.list_for(
- self,
- include_claimed_by_others: !redesigned_user_menu_enabled?
- ).count
+ Reviewable.list_for(self, include_claimed_by_others: !redesigned_user_menu_enabled?).count
end
def saw_notification_id(notification_id)
@@ -704,9 +772,7 @@ class User < ActiveRecord::Base
def bump_last_seen_notification!
query = self.notifications.visible
- if seen_notification_id
- query = query.where("notifications.id > ?", seen_notification_id)
- end
+ query = query.where("notifications.id > ?", seen_notification_id) if seen_notification_id
if max_notification_id = query.maximum(:id)
update!(seen_notification_id: max_notification_id)
true
@@ -718,9 +784,7 @@ class User < ActiveRecord::Base
def bump_last_seen_reviewable!
query = Reviewable.unseen_list_for(self, preload: false)
- if last_seen_reviewable_id
- query = query.where("reviewables.id > ?", last_seen_reviewable_id)
- end
+ query = query.where("reviewables.id > ?", last_seen_reviewable_id) if last_seen_reviewable_id
max_reviewable_id = query.maximum(:id)
if max_reviewable_id
@@ -732,7 +796,7 @@ class User < ActiveRecord::Base
def publish_reviewable_counts(extra_data = nil)
data = {
reviewable_count: self.reviewable_count,
- unseen_reviewable_count: Reviewable.unseen_reviewable_count(self)
+ unseen_reviewable_count: Reviewable.unseen_reviewable_count(self),
}
data.merge!(extra_data) if extra_data.present?
MessageBus.publish("/reviewable_counts/#{self.id}", data, user_ids: [self.id])
@@ -741,10 +805,13 @@ class User < ActiveRecord::Base
TRACK_FIRST_NOTIFICATION_READ_DURATION = 1.week.to_i
def read_first_notification?
- if (trust_level > TrustLevel[1] ||
- (first_seen_at.present? && first_seen_at < TRACK_FIRST_NOTIFICATION_READ_DURATION.seconds.ago) ||
- user_option.skip_new_user_tips)
-
+ if (
+ trust_level > TrustLevel[1] ||
+ (
+ first_seen_at.present? &&
+ first_seen_at < TRACK_FIRST_NOTIFICATION_READ_DURATION.seconds.ago
+ ) || user_option.skip_new_user_tips
+ )
return true
end
@@ -755,7 +822,7 @@ class User < ActiveRecord::Base
return if !self.allow_live_notifications?
# publish last notification json with the message so we can apply an update
- notification = notifications.visible.order('notifications.created_at desc').first
+ notification = notifications.visible.order("notifications.created_at desc").first
json = NotificationSerializer.new(notification).as_json if notification
sql = (<<~SQL)
@@ -783,9 +850,7 @@ class User < ActiveRecord::Base
) AS y
SQL
- recent = DB.query(sql, user_id: id).map! do |r|
- [r.id, r.read]
- end
+ recent = DB.query(sql, user_id: id).map! { |r| [r.id, r.read] }
payload = {
unread_notifications: unread_notifications,
@@ -800,7 +865,9 @@ class User < ActiveRecord::Base
if self.redesigned_user_menu_enabled?
payload[:all_unread_notifications_count] = all_unread_notifications_count
payload[:grouped_unread_notifications] = grouped_unread_notifications
- payload[:new_personal_messages_notifications_count] = new_personal_messages_notifications_count
+ payload[
+ :new_personal_messages_notifications_count
+ ] = new_personal_messages_notifications_count
end
MessageBus.publish("/notification/#{id}", payload, user_ids: [id])
@@ -815,24 +882,26 @@ class User < ActiveRecord::Base
payload = {
description: status.description,
emoji: status.emoji,
- ends_at: status.ends_at&.iso8601
+ ends_at: status.ends_at&.iso8601,
}
else
payload = nil
end
- MessageBus.publish("/user-status", { id => payload }, group_ids: [Group::AUTO_GROUPS[:trust_level_0]])
+ MessageBus.publish(
+ "/user-status",
+ { id => payload },
+ group_ids: [Group::AUTO_GROUPS[:trust_level_0]],
+ )
end
def password=(password)
# special case for passwordless accounts
- unless password.blank?
- @raw_password = password
- end
+ @raw_password = password unless password.blank?
end
def password
- '' # so that validator doesn't complain that a password attribute doesn't exist
+ "" # so that validator doesn't complain that a password attribute doesn't exist
end
# Indicate that this is NOT a passwordless account for the purposes of validation
@@ -862,14 +931,15 @@ class User < ActiveRecord::Base
end
def new_user_posting_on_first_day?
- !staff? &&
- trust_level < TrustLevel[2] &&
- (trust_level == TrustLevel[0] || self.first_post_created_at.nil? || self.first_post_created_at >= 24.hours.ago)
+ !staff? && trust_level < TrustLevel[2] &&
+ (
+ trust_level == TrustLevel[0] || self.first_post_created_at.nil? ||
+ self.first_post_created_at >= 24.hours.ago
+ )
end
def new_user?
- (created_at >= 24.hours.ago || trust_level == TrustLevel[0]) &&
- trust_level < TrustLevel[2] &&
+ (created_at >= 24.hours.ago || trust_level == TrustLevel[0]) && trust_level < TrustLevel[2] &&
!staff?
end
@@ -883,7 +953,11 @@ class User < ActiveRecord::Base
def create_visit_record!(date, opts = {})
user_stat.update_column(:days_visited, user_stat.days_visited + 1)
- user_visits.create!(visited_at: date, posts_read: opts[:posts_read] || 0, mobile: opts[:mobile] || false)
+ user_visits.create!(
+ visited_at: date,
+ posts_read: opts[:posts_read] || 0,
+ mobile: opts[:mobile] || false,
+ )
end
def visit_record_for(date)
@@ -898,9 +972,7 @@ class User < ActiveRecord::Base
return if timezone.blank? || !TimezoneValidator.valid?(timezone)
# we only want to update the user's timezone if they have not set it themselves
- UserOption
- .where(user_id: self.id, timezone: nil)
- .update_all(timezone: timezone)
+ UserOption.where(user_id: self.id, timezone: nil).update_all(timezone: timezone)
end
def update_posts_read!(num_posts, opts = {})
@@ -927,7 +999,6 @@ class User < ActiveRecord::Base
def self.update_ip_address!(user_id, new_ip:, old_ip:)
unless old_ip == new_ip || new_ip.blank?
-
DB.exec(<<~SQL, user_id: user_id, ip_address: new_ip)
UPDATE users
SET ip_address = :ip_address
@@ -979,9 +1050,10 @@ class User < ActiveRecord::Base
return true if SiteSetting.active_user_rate_limit_secs <= 0
Discourse.redis.set(
- last_seen_redis_key(user_id, now), "1",
+ last_seen_redis_key(user_id, now),
+ "1",
nx: true,
- ex: SiteSetting.active_user_rate_limit_secs
+ ex: SiteSetting.active_user_rate_limit_secs,
)
end
@@ -1015,9 +1087,12 @@ class User < ActiveRecord::Base
end
def self.username_hash(username)
- username.each_char.reduce(0) do |result, char|
- [((result << 5) - result) + char.ord].pack('L').unpack('l').first
- end.abs
+ username
+ .each_char
+ .reduce(0) do |result, char|
+ [((result << 5) - result) + char.ord].pack("L").unpack("l").first
+ end
+ .abs
end
def self.default_template(username)
@@ -1042,10 +1117,11 @@ class User < ActiveRecord::Base
# TODO it may be worth caching this in a distributed cache, should be benched
if SiteSetting.external_system_avatars_enabled
url = SiteSetting.external_system_avatars_url.dup
- url = +"#{Discourse.base_path}#{url}" unless url =~ /^https?:\/\//
+ url = +"#{Discourse.base_path}#{url}" unless url =~ %r{^https?://}
url.gsub! "{color}", letter_avatar_color(normalized_username)
url.gsub! "{username}", UrlHelper.encode_component(username)
- url.gsub! "{first_letter}", UrlHelper.encode_component(normalized_username.grapheme_clusters.first)
+ url.gsub! "{first_letter}",
+ UrlHelper.encode_component(normalized_username.grapheme_clusters.first)
url.gsub! "{hostname}", Discourse.current_hostname
url
else
@@ -1064,7 +1140,7 @@ class User < ActiveRecord::Base
colors[index, hex_length]
else
color = LetterAvatar::COLORS[color_index(username, LetterAvatar::COLORS.length)]
- color.map { |c| c.to_s(16).rjust(2, '0') }.join
+ color.map { |c| c.to_s(16).rjust(2, "0") }.join
end
end
@@ -1077,8 +1153,8 @@ class User < ActiveRecord::Base
end
def avatar_template
- use_small_logo = is_system_user? &&
- SiteSetting.logo_small && SiteSetting.use_site_small_logo_as_system_avatar
+ use_small_logo =
+ is_system_user? && SiteSetting.logo_small && SiteSetting.use_site_small_logo_as_system_avatar
if use_small_logo
Discourse.store.cdn_url(SiteSetting.logo_small.url)
@@ -1110,7 +1186,10 @@ class User < ActiveRecord::Base
end
def flags_given_count
- PostAction.where(user_id: id, post_action_type_id: PostActionType.flag_types_without_custom.values).count
+ PostAction.where(
+ user_id: id,
+ post_action_type_id: PostActionType.flag_types_without_custom.values,
+ ).count
end
def warnings_received_count
@@ -1118,7 +1197,10 @@ class User < ActiveRecord::Base
end
def flags_received_count
- posts.includes(:post_actions).where('post_actions.post_action_type_id' => PostActionType.flag_types_without_custom.values).count
+ posts
+ .includes(:post_actions)
+ .where("post_actions.post_action_type_id" => PostActionType.flag_types_without_custom.values)
+ .count
end
def private_topics_count
@@ -1134,7 +1216,7 @@ class User < ActiveRecord::Base
last_action_in_topic = UserAction.last_action_in_topic(id, topic_id)
since_reply = Post.where(user_id: id, topic_id: topic_id)
- since_reply = since_reply.where('id > ?', last_action_in_topic) if last_action_in_topic
+ since_reply = since_reply.where("id > ?", last_action_in_topic) if last_action_in_topic
(since_reply.count >= SiteSetting.newuser_max_replies_per_topic)
end
@@ -1144,9 +1226,10 @@ class User < ActiveRecord::Base
Reviewable.where(created_by_id: id).delete_all
- posts.order("post_number desc").limit(batch_size).each do |p|
- PostDestroyer.new(guardian.user, p).destroy
- end
+ posts
+ .order("post_number desc")
+ .limit(batch_size)
+ .each { |p| PostDestroyer.new(guardian.user, p).destroy }
end
def suspended?
@@ -1158,7 +1241,7 @@ class User < ActiveRecord::Base
end
def silenced_record
- UserHistory.for(self, :silence_user).order('id DESC').first
+ UserHistory.for(self, :silence_user).order("id DESC").first
end
def silence_reason
@@ -1174,7 +1257,7 @@ class User < ActiveRecord::Base
end
def suspend_record
- UserHistory.for(self, :suspend_user).order('id DESC').first
+ UserHistory.for(self, :suspend_user).order("id DESC").first
end
def full_suspend_reason
@@ -1201,9 +1284,11 @@ class User < ActiveRecord::Base
end
end
- I18n.t(message,
- date: I18n.l(suspended_till, format: :date_only),
- reason: Rack::Utils.escape_html(suspend_reason))
+ I18n.t(
+ message,
+ date: I18n.l(suspended_till, format: :date_only),
+ reason: Rack::Utils.escape_html(suspend_reason),
+ )
end
def suspended_forever?
@@ -1213,16 +1298,14 @@ class User < ActiveRecord::Base
# Use this helper to determine if the user has a particular trust level.
# Takes into account admin, etc.
def has_trust_level?(level)
- unless TrustLevel.valid?(level)
- raise InvalidTrustLevel.new("Invalid trust level #{level}")
- end
+ raise InvalidTrustLevel.new("Invalid trust level #{level}") unless TrustLevel.valid?(level)
admin? || moderator? || staged? || TrustLevel.compare(trust_level, level)
end
def has_trust_level_or_staff?(level)
- return admin? if level.to_s == 'admin'
- return staff? if level.to_s == 'staff'
+ return admin? if level.to_s == "admin"
+ return staff? if level.to_s == "staff"
has_trust_level?(level.to_i)
end
@@ -1236,13 +1319,12 @@ class User < ActiveRecord::Base
end
def username_format_validator
- UsernameValidator.perform_validation(self, 'username')
+ UsernameValidator.perform_validation(self, "username")
end
def email_confirmed?
- email_tokens.where(email: email, confirmed: true).present? ||
- email_tokens.empty? ||
- single_sign_on_record&.external_email&.downcase == email
+ email_tokens.where(email: email, confirmed: true).present? || email_tokens.empty? ||
+ single_sign_on_record&.external_email&.downcase == email
end
def activate
@@ -1297,11 +1379,16 @@ class User < ActiveRecord::Base
end
def self.count_by_first_post(start_date = nil, end_date = nil)
- result = joins('INNER JOIN user_stats AS us ON us.user_id = users.id')
+ result = joins("INNER JOIN user_stats AS us ON us.user_id = users.id")
if start_date && end_date
result = result.group("date(us.first_post_created_at)")
- result = result.where("us.first_post_created_at > ? AND us.first_post_created_at < ?", start_date, end_date)
+ result =
+ result.where(
+ "us.first_post_created_at > ? AND us.first_post_created_at < ?",
+ start_date,
+ end_date,
+ )
result = result.order("date(us.first_post_created_at)")
end
@@ -1316,7 +1403,7 @@ class User < ActiveRecord::Base
secure_categories.references(:categories)
end
- cats.pluck('categories.id').sort
+ cats.pluck("categories.id").sort
end
def topic_create_allowed_category_ids
@@ -1327,21 +1414,24 @@ class User < ActiveRecord::Base
def flag_linked_posts_as_spam
results = []
- disagreed_flag_post_ids = PostAction.where(post_action_type_id: PostActionType.types[:spam])
- .where.not(disagreed_at: nil)
- .pluck(:post_id)
+ disagreed_flag_post_ids =
+ PostAction
+ .where(post_action_type_id: PostActionType.types[:spam])
+ .where.not(disagreed_at: nil)
+ .pluck(:post_id)
- topic_links.includes(:post)
+ topic_links
+ .includes(:post)
.where.not(post_id: disagreed_flag_post_ids)
.each do |tl|
-
- message = I18n.t(
- 'flag_reason.spam_hosts',
- base_path: Discourse.base_path,
- locale: SiteSetting.default_locale
- )
- results << PostActionCreator.create(Discourse.system_user, tl.post, :spam, message: message)
- end
+ message =
+ I18n.t(
+ "flag_reason.spam_hosts",
+ base_path: Discourse.base_path,
+ locale: SiteSetting.default_locale,
+ )
+ results << PostActionCreator.create(Discourse.system_user, tl.post, :spam, message: message)
+ end
results
end
@@ -1351,7 +1441,12 @@ class User < ActiveRecord::Base
end
def find_email
- last_sent_email_address.present? && EmailAddressValidator.valid_value?(last_sent_email_address) ? last_sent_email_address : email
+ if last_sent_email_address.present? &&
+ EmailAddressValidator.valid_value?(last_sent_email_address)
+ last_sent_email_address
+ else
+ email
+ end
end
def tl3_requirements
@@ -1361,8 +1456,9 @@ class User < ActiveRecord::Base
def on_tl3_grace_period?
return true if SiteSetting.tl3_promotion_min_duration.to_i.days.ago.year < 2013
- UserHistory.for(self, :auto_trust_level_change)
- .where('created_at >= ?', SiteSetting.tl3_promotion_min_duration.to_i.days.ago)
+ UserHistory
+ .for(self, :auto_trust_level_change)
+ .where("created_at >= ?", SiteSetting.tl3_promotion_min_duration.to_i.days.ago)
.where(previous_value: TrustLevel[2].to_s)
.where(new_value: TrustLevel[3].to_s)
.exists?
@@ -1373,10 +1469,8 @@ class User < ActiveRecord::Base
avatar = user_avatar || create_user_avatar
- if self.primary_email.present? &&
- SiteSetting.automatically_download_gravatars? &&
- !avatar.last_gravatar_download_attempt
-
+ if self.primary_email.present? && SiteSetting.automatically_download_gravatars? &&
+ !avatar.last_gravatar_download_attempt
Jobs.cancel_scheduled_job(:update_gravatar, user_id: self.id, avatar_id: avatar.id)
Jobs.enqueue_in(1.second, :update_gravatar, user_id: self.id, avatar_id: avatar.id)
end
@@ -1395,10 +1489,7 @@ class User < ActiveRecord::Base
Discourse.authenticators.each do |authenticator|
account_description = authenticator.description_for_user(self)
unless account_description.empty?
- result << {
- name: authenticator.name,
- description: account_description,
- }
+ result << { name: authenticator.name, description: account_description }
end
end
@@ -1408,14 +1499,12 @@ class User < ActiveRecord::Base
USER_FIELD_PREFIX ||= "user_field_"
def user_fields(field_ids = nil)
- if field_ids.nil?
- field_ids = (@all_user_field_ids ||= UserField.pluck(:id))
- end
+ field_ids = (@all_user_field_ids ||= UserField.pluck(:id)) if field_ids.nil?
@user_fields_cache ||= {}
# Memoize based on requested fields
- @user_fields_cache[field_ids.join(':')] ||= {}.tap do |hash|
+ @user_fields_cache[field_ids.join(":")] ||= {}.tap do |hash|
field_ids.each do |fid|
# The hash keys are strings for backwards compatibility
hash[fid.to_s] = custom_fields["#{USER_FIELD_PREFIX}#{fid}"]
@@ -1439,16 +1528,14 @@ class User < ActiveRecord::Base
def validatable_user_fields
# ignore multiselect fields since they are admin-set and thus not user generated content
- @public_user_field_ids ||= UserField.public_fields.where.not(field_type: 'multiselect').pluck(:id)
+ @public_user_field_ids ||=
+ UserField.public_fields.where.not(field_type: "multiselect").pluck(:id)
user_fields(@public_user_field_ids)
end
def number_of_deleted_posts
- Post.with_deleted
- .where(user_id: self.id)
- .where.not(deleted_at: nil)
- .count
+ Post.with_deleted.where(user_id: self.id).where.not(deleted_at: nil).count
end
def number_of_flagged_posts
@@ -1456,14 +1543,12 @@ class User < ActiveRecord::Base
end
def number_of_rejected_posts
- ReviewableQueuedPost
- .rejected
- .where(created_by_id: self.id)
- .count
+ ReviewableQueuedPost.rejected.where(created_by_id: self.id).count
end
def number_of_flags_given
- PostAction.where(user_id: self.id)
+ PostAction
+ .where(user_id: self.id)
.where(disagreed_at: nil)
.where(post_action_type_id: PostActionType.notify_flag_type_ids)
.count
@@ -1487,9 +1572,7 @@ class User < ActiveRecord::Base
end
def anonymous?
- SiteSetting.allow_anonymous_posting &&
- trust_level >= 1 &&
- !!anonymous_user_master
+ SiteSetting.allow_anonymous_posting && trust_level >= 1 && !!anonymous_user_master
end
def is_singular_admin?
@@ -1504,25 +1587,23 @@ class User < ActiveRecord::Base
def logged_in
DiscourseEvent.trigger(:user_logged_in, self)
- if !self.seen_before?
- DiscourseEvent.trigger(:user_first_logged_in, self)
- end
+ DiscourseEvent.trigger(:user_first_logged_in, self) if !self.seen_before?
end
def set_automatic_groups
return if !active || staged || !email_confirmed?
- Group.where(automatic: false)
+ Group
+ .where(automatic: false)
.where("LENGTH(COALESCE(automatic_membership_email_domains, '')) > 0")
.each do |group|
+ domains = group.automatic_membership_email_domains.gsub(".", '\.')
- domains = group.automatic_membership_email_domains.gsub('.', '\.')
-
- if email =~ Regexp.new("@(#{domains})$", true) && !group.users.include?(self)
- group.add(self)
- GroupActionLogger.new(Discourse.system_user, group).log_add_user_to_group(self)
+ if email =~ Regexp.new("@(#{domains})$", true) && !group.users.include?(self)
+ group.add(self)
+ GroupActionLogger.new(Discourse.system_user, group).log_add_user_to_group(self)
+ end
end
- end
@belonging_to_group_ids = nil
end
@@ -1540,7 +1621,10 @@ class User < ActiveRecord::Base
build_primary_email email: new_email, skip_validate_email: !should_validate_email_address?
end
- if secondary_match = user_emails.detect { |ue| !ue.primary && Email.downcase(ue.email) == Email.downcase(new_email) }
+ if secondary_match =
+ user_emails.detect { |ue|
+ !ue.primary && Email.downcase(ue.email) == Email.downcase(new_email)
+ }
secondary_match.mark_for_destruction
primary_email.skip_validate_unique_email = true
end
@@ -1557,16 +1641,21 @@ class User < ActiveRecord::Base
end
def unconfirmed_emails
- self.email_change_requests.where.not(change_state: EmailChangeRequest.states[:complete]).pluck(:new_email)
+ self
+ .email_change_requests
+ .where.not(change_state: EmailChangeRequest.states[:complete])
+ .pluck(:new_email)
end
RECENT_TIME_READ_THRESHOLD ||= 60.days
def self.preload_recent_time_read(users)
- times = UserVisit.where(user_id: users.map(&:id))
- .where('visited_at >= ?', RECENT_TIME_READ_THRESHOLD.ago)
- .group(:user_id)
- .sum(:time_read)
+ times =
+ UserVisit
+ .where(user_id: users.map(&:id))
+ .where("visited_at >= ?", RECENT_TIME_READ_THRESHOLD.ago)
+ .group(:user_id)
+ .sum(:time_read)
users.each { |u| u.preload_recent_time_read(times[u.id] || 0) }
end
@@ -1575,7 +1664,8 @@ class User < ActiveRecord::Base
end
def recent_time_read
- @recent_time_read ||= self.user_visits.where('visited_at >= ?', RECENT_TIME_READ_THRESHOLD.ago).sum(:time_read)
+ @recent_time_read ||=
+ self.user_visits.where("visited_at >= ?", RECENT_TIME_READ_THRESHOLD.ago).sum(:time_read)
end
def from_staged?
@@ -1588,7 +1678,8 @@ class User < ActiveRecord::Base
def next_best_title
group_titles_query = groups.where("groups.title <> ''")
- group_titles_query = group_titles_query.order("groups.id = #{primary_group_id} DESC") if primary_group_id
+ group_titles_query =
+ group_titles_query.order("groups.id = #{primary_group_id} DESC") if primary_group_id
group_titles_query = group_titles_query.order("groups.primary_group DESC").limit(1)
if next_best_group_title = group_titles_query.pluck_first(:title)
@@ -1661,7 +1752,7 @@ class User < ActiveRecord::Base
def active_do_not_disturb_timings
now = Time.zone.now
- do_not_disturb_timings.where('starts_at <= ? AND ends_at > ?', now, now)
+ do_not_disturb_timings.where("starts_at <= ? AND ends_at > ?", now, now)
end
def do_not_disturb_until
@@ -1698,12 +1789,7 @@ class User < ActiveRecord::Base
end
def set_status!(description, emoji, ends_at = nil)
- status = {
- description: description,
- emoji: emoji,
- set_at: Time.zone.now,
- ends_at: ends_at
- }
+ status = { description: description, emoji: emoji, set_at: Time.zone.now, ends_at: ends_at }
if user_status
user_status.update!(status)
@@ -1730,7 +1816,7 @@ class User < ActiveRecord::Base
def expire_old_email_tokens
if saved_change_to_password_hash? && !saved_change_to_id?
- email_tokens.where('not expired').update_all(expired: true)
+ email_tokens.where("not expired").update_all(expired: true)
end
end
@@ -1785,7 +1871,12 @@ class User < ActiveRecord::Base
def hash_password(password, salt)
raise StandardError.new("password is too long") if password.size > User.max_password_length
- Pbkdf2.hash_password(password, salt, Rails.configuration.pbkdf2_iterations, Rails.configuration.pbkdf2_algorithm)
+ Pbkdf2.hash_password(
+ password,
+ salt,
+ Rails.configuration.pbkdf2_iterations,
+ Rails.configuration.pbkdf2_algorithm,
+ )
end
def add_trust_level
@@ -1815,25 +1906,22 @@ class User < ActiveRecord::Base
end
def username_validator
- username_format_validator || begin
- if will_save_change_to_username?
- existing = DB.query(
- USERNAME_EXISTS_SQL,
- username: self.class.normalize_username(username)
- )
+ username_format_validator ||
+ begin
+ if will_save_change_to_username?
+ existing =
+ DB.query(USERNAME_EXISTS_SQL, username: self.class.normalize_username(username))
- user_id = existing.select { |u| u.is_user }.first&.id
- same_user = user_id && user_id == self.id
+ user_id = existing.select { |u| u.is_user }.first&.id
+ same_user = user_id && user_id == self.id
- if existing.present? && !same_user
- errors.add(:username, I18n.t(:'user.username.unique'))
- end
+ errors.add(:username, I18n.t(:"user.username.unique")) if existing.present? && !same_user
- if confirm_password?(username) || confirm_password?(username.downcase)
- errors.add(:username, :same_as_password)
+ if confirm_password?(username) || confirm_password?(username.downcase)
+ errors.add(:username, :same_as_password)
+ end
end
end
- end
end
def name_validator
@@ -1858,14 +1946,14 @@ class User < ActiveRecord::Base
# * default_categories_watching_first_post
# * default_categories_normal
# * default_categories_muted
- %w{watching watching_first_post tracking normal muted}.each do |setting|
+ %w[watching watching_first_post tracking normal muted].each do |setting|
category_ids = SiteSetting.get("default_categories_#{setting}").split("|").map(&:to_i)
category_ids.each do |category_id|
next if category_id == 0
values << {
user_id: self.id,
category_id: category_id,
- notification_level: CategoryUser.notification_levels[setting.to_sym]
+ notification_level: CategoryUser.notification_levels[setting.to_sym],
}
end
end
@@ -1885,19 +1973,22 @@ class User < ActiveRecord::Base
# * default_tags_tracking
# * default_tags_watching_first_post
# * default_tags_muted
- %w{watching watching_first_post tracking muted}.each do |setting|
+ %w[watching watching_first_post tracking muted].each do |setting|
tag_names = SiteSetting.get("default_tags_#{setting}").split("|")
now = Time.zone.now
- Tag.where(name: tag_names).pluck(:id).each do |tag_id|
- values << {
- user_id: self.id,
- tag_id: tag_id,
- notification_level: TagUser.notification_levels[setting.to_sym],
- created_at: now,
- updated_at: now
- }
- end
+ Tag
+ .where(name: tag_names)
+ .pluck(:id)
+ .each do |tag_id|
+ values << {
+ user_id: self.id,
+ tag_id: tag_id,
+ notification_level: TagUser.notification_levels[setting.to_sym],
+ created_at: now,
+ updated_at: now,
+ }
+ end
end
TagUser.insert_all!(values) if values.present?
@@ -1912,20 +2003,24 @@ class User < ActiveRecord::Base
.where(active: false)
.where("created_at < ?", SiteSetting.purge_unactivated_users_grace_period_days.days.ago)
.where("NOT admin AND NOT moderator")
- .where("NOT EXISTS
+ .where(
+ "NOT EXISTS
(SELECT 1 FROM topic_allowed_users tu JOIN topics t ON t.id = tu.topic_id AND t.user_id > 0 WHERE tu.user_id = users.id LIMIT 1)
- ")
- .where("NOT EXISTS
+ ",
+ )
+ .where(
+ "NOT EXISTS
(SELECT 1 FROM posts p WHERE p.user_id = users.id LIMIT 1)
- ")
+ ",
+ )
.limit(200)
.find_each do |user|
- begin
- destroyer.destroy(user, context: I18n.t(:purge_reason))
- rescue Discourse::InvalidAccess
- # keep going
+ begin
+ destroyer.destroy(user, context: I18n.t(:purge_reason))
+ rescue Discourse::InvalidAccess
+ # keep going
+ end
end
- end
end
def match_primary_group_changes
@@ -1935,16 +2030,15 @@ class User < ActiveRecord::Base
self.title = primary_group&.title
end
- if flair_group_id == primary_group_id_was
- self.flair_group_id = primary_group&.id
- end
+ self.flair_group_id = primary_group&.id if flair_group_id == primary_group_id_was
end
def self.first_login_admin_id
- User.where(admin: true)
+ User
+ .where(admin: true)
.human_users
.joins(:user_auth_tokens)
- .order('user_auth_tokens.created_at')
+ .order("user_auth_tokens.created_at")
.pluck_first(:id)
end
@@ -1958,15 +2052,18 @@ class User < ActiveRecord::Base
categories_to_update = SiteSetting.default_sidebar_categories.split("|")
if update
- filtered_default_category_ids = Category.secured(self.guardian).where(id: categories_to_update).pluck(:id)
- existing_category_ids = SidebarSectionLink.where(user: self, linkable_type: 'Category').pluck(:linkable_id)
+ filtered_default_category_ids =
+ Category.secured(self.guardian).where(id: categories_to_update).pluck(:id)
+ existing_category_ids =
+ SidebarSectionLink.where(user: self, linkable_type: "Category").pluck(:linkable_id)
- categories_to_update = existing_category_ids + (filtered_default_category_ids & self.secure_category_ids)
+ categories_to_update =
+ existing_category_ids + (filtered_default_category_ids & self.secure_category_ids)
end
SidebarSectionLinksUpdater.update_category_section_links(
self,
- category_ids: categories_to_update
+ category_ids: categories_to_update,
)
end
@@ -1975,18 +2072,24 @@ class User < ActiveRecord::Base
if update
default_tag_ids = Tag.where(name: tags_to_update).pluck(:id)
- filtered_default_tags = DiscourseTagging.filter_visible(Tag, self.guardian).where(id: default_tag_ids).pluck(:name)
+ filtered_default_tags =
+ DiscourseTagging
+ .filter_visible(Tag, self.guardian)
+ .where(id: default_tag_ids)
+ .pluck(:name)
- existing_tag_ids = SidebarSectionLink.where(user: self, linkable_type: 'Tag').pluck(:linkable_id)
- existing_tags = DiscourseTagging.filter_visible(Tag, self.guardian).where(id: existing_tag_ids).pluck(:name)
+ existing_tag_ids =
+ SidebarSectionLink.where(user: self, linkable_type: "Tag").pluck(:linkable_id)
+ existing_tags =
+ DiscourseTagging
+ .filter_visible(Tag, self.guardian)
+ .where(id: existing_tag_ids)
+ .pluck(:name)
tags_to_update = existing_tags + (filtered_default_tags & DiscourseTagging.hidden_tag_names)
end
- SidebarSectionLinksUpdater.update_tag_section_links(
- self,
- tag_names: tags_to_update
- )
+ SidebarSectionLinksUpdater.update_tag_section_links(self, tag_names: tags_to_update)
end
end
@@ -2003,9 +2106,7 @@ class User < ActiveRecord::Base
end
def trigger_user_automatic_group_refresh
- if !staged
- Group.user_trust_level_change!(id, trust_level)
- end
+ Group.user_trust_level_change!(id, trust_level) if !staged
true
end
@@ -2016,12 +2117,14 @@ class User < ActiveRecord::Base
def check_if_title_is_badged_granted
if title_changed? && !new_record? && user_profile
- badge_matching_title = title && badges.find do |badge|
- badge.allow_title? && (badge.display_name == title || badge.name == title)
- end
+ badge_matching_title =
+ title &&
+ badges.find do |badge|
+ badge.allow_title? && (badge.display_name == title || badge.name == title)
+ end
user_profile.update(
badge_granted_title: badge_matching_title.present?,
- granted_title_badge_id: badge_matching_title&.id
+ granted_title_badge_id: badge_matching_title&.id,
)
end
end
@@ -2032,9 +2135,7 @@ class User < ActiveRecord::Base
def update_previous_visit(timestamp)
update_visit_record!(timestamp.to_date)
- if previous_visit_at_update_required?(timestamp)
- update_column(:previous_visit_at, last_seen_at)
- end
+ update_column(:previous_visit_at, last_seen_at) if previous_visit_at_update_required?(timestamp)
end
def trigger_user_created_event
@@ -2048,16 +2149,14 @@ class User < ActiveRecord::Base
end
def set_skip_validate_email
- if self.primary_email
- self.primary_email.skip_validate_email = !should_validate_email_address?
- end
+ self.primary_email.skip_validate_email = !should_validate_email_address? if self.primary_email
true
end
def check_site_contact_username
if (saved_change_to_admin? || saved_change_to_moderator?) &&
- self.username == SiteSetting.site_contact_username && !staff?
+ self.username == SiteSetting.site_contact_username && !staff?
SiteSetting.set_and_log(:site_contact_username, SiteSetting.defaults[:site_contact_username])
end
end
diff --git a/app/models/user_action.rb b/app/models/user_action.rb
index 25eabac3ff4..d605324de47 100644
--- a/app/models/user_action.rb
+++ b/app/models/user_action.rb
@@ -21,59 +21,58 @@ class UserAction < ActiveRecord::Base
SOLVED = 15
ASSIGNED = 16
- ORDER = Hash[*[
- GOT_PRIVATE_MESSAGE,
- NEW_PRIVATE_MESSAGE,
- NEW_TOPIC,
- REPLY,
- RESPONSE,
- LIKE,
- WAS_LIKED,
- MENTION,
- QUOTE,
- EDIT,
- SOLVED,
- ASSIGNED,
- ].each_with_index.to_a.flatten]
+ ORDER =
+ Hash[
+ *[
+ GOT_PRIVATE_MESSAGE,
+ NEW_PRIVATE_MESSAGE,
+ NEW_TOPIC,
+ REPLY,
+ RESPONSE,
+ LIKE,
+ WAS_LIKED,
+ MENTION,
+ QUOTE,
+ EDIT,
+ SOLVED,
+ ASSIGNED,
+ ].each_with_index.to_a.flatten
+ ]
USER_ACTED_TYPES = [LIKE, NEW_TOPIC, REPLY, NEW_PRIVATE_MESSAGE]
def self.types
- @types ||= Enum.new(
- like: 1,
- was_liked: 2,
- # NOTE: Previously type 3 was bookmark but this was removed when we
- # changed to using the Bookmark model.
- new_topic: 4,
- reply: 5,
- response: 6,
- mention: 7,
- quote: 9,
- edit: 11,
- new_private_message: 12,
- got_private_message: 13,
- solved: 15,
- assigned: 16)
+ @types ||=
+ Enum.new(
+ like: 1,
+ was_liked: 2,
+ # NOTE: Previously type 3 was bookmark but this was removed when we
+ # changed to using the Bookmark model.
+ new_topic: 4,
+ reply: 5,
+ response: 6,
+ mention: 7,
+ quote: 9,
+ edit: 11,
+ new_private_message: 12,
+ got_private_message: 13,
+ solved: 15,
+ assigned: 16,
+ )
end
def self.private_types
- @private_types ||= [
- WAS_LIKED,
- RESPONSE,
- MENTION,
- QUOTE,
- EDIT
- ]
+ @private_types ||= [WAS_LIKED, RESPONSE, MENTION, QUOTE, EDIT]
end
def self.last_action_in_topic(user_id, topic_id)
- UserAction.where(user_id: user_id,
- target_topic_id: topic_id,
- action_type: [RESPONSE, MENTION, QUOTE]).order('created_at DESC').pluck_first(:target_post_id)
+ UserAction
+ .where(user_id: user_id, target_topic_id: topic_id, action_type: [RESPONSE, MENTION, QUOTE])
+ .order("created_at DESC")
+ .pluck_first(:target_post_id)
end
def self.stats(user_id, guardian)
-
# Sam: I tried this in AR and it got complex
builder = DB.build <<~SQL
@@ -87,7 +86,7 @@ class UserAction < ActiveRecord::Base
GROUP BY action_type
SQL
- builder.where('a.user_id = :user_id', user_id: user_id)
+ builder.where("a.user_id = :user_id", user_id: user_id)
apply_common_filters(builder, user_id, guardian)
@@ -128,23 +127,20 @@ class UserAction < ActiveRecord::Base
result = { all: all, mine: mine, unread: unread }
- DB.query(sql, user_id: user_id).each do |row|
- (result[:groups] ||= []) << { name: row.name, count: row.count.to_i }
- end
+ DB
+ .query(sql, user_id: user_id)
+ .each { |row| (result[:groups] ||= []) << { name: row.name, count: row.count.to_i } }
result
-
end
def self.count_daily_engaged_users(start_date = nil, end_date = nil)
- result = select(:user_id)
- .distinct
- .where(action_type: USER_ACTED_TYPES)
+ result = select(:user_id).distinct.where(action_type: USER_ACTED_TYPES)
if start_date && end_date
- result = result.group('date(created_at)')
- result = result.where('created_at > ? AND created_at < ?', start_date, end_date)
- result = result.order('date(created_at)')
+ result = result.group("date(created_at)")
+ result = result.where("created_at > ? AND created_at < ?", start_date, end_date)
+ result = result.order("date(created_at)")
end
result.count
@@ -154,28 +150,29 @@ class UserAction < ActiveRecord::Base
stream(action_id: action_id, guardian: guardian).first
end
- NULL_QUEUED_STREAM_COLS = %i{
- cooked
- uploaded_avatar_id
- acting_name
- acting_username
- acting_user_id
- target_name
- target_username
- target_user_id
- post_number
- post_id
- deleted
- hidden
- post_type
- action_type
- action_code
- action_code_who
- action_code_path
- topic_closed
- topic_id
- topic_archived
- }.map! { |s| "NULL as #{s}" }.join(", ")
+ NULL_QUEUED_STREAM_COLS =
+ %i[
+ cooked
+ uploaded_avatar_id
+ acting_name
+ acting_username
+ acting_user_id
+ target_name
+ target_username
+ target_user_id
+ post_number
+ post_id
+ deleted
+ hidden
+ post_type
+ action_type
+ action_code
+ action_code_who
+ action_code_path
+ topic_closed
+ topic_id
+ topic_archived
+ ].map! { |s| "NULL as #{s}" }.join(", ")
def self.stream(opts = nil)
opts ||= {}
@@ -191,13 +188,10 @@ class UserAction < ActiveRecord::Base
# Acting user columns. Can be extended by plugins to include custom avatar
# columns
- acting_cols = [
- 'u.id AS acting_user_id',
- 'u.name AS acting_name'
- ]
+ acting_cols = ["u.id AS acting_user_id", "u.name AS acting_name"]
UserLookup.lookup_columns.each do |c|
- next if c == :id || c['.']
+ next if c == :id || c["."]
acting_cols << "u.#{c} AS acting_#{c}"
end
@@ -213,7 +207,7 @@ class UserAction < ActiveRecord::Base
p.reply_to_post_number,
pu.username, pu.name, pu.id user_id,
pu.uploaded_avatar_id,
- #{acting_cols.join(', ')},
+ #{acting_cols.join(", ")},
coalesce(p.cooked, p2.cooked) cooked,
CASE WHEN coalesce(p.deleted_at, p2.deleted_at, t.deleted_at) IS NULL THEN false ELSE true END deleted,
p.hidden,
@@ -245,11 +239,14 @@ class UserAction < ActiveRecord::Base
builder.where("a.id = :id", id: action_id.to_i)
else
builder.where("a.user_id = :user_id", user_id: user_id.to_i)
- builder.where("a.action_type in (:action_types)", action_types: action_types) if action_types && action_types.length > 0
+ if action_types && action_types.length > 0
+ builder.where("a.action_type in (:action_types)", action_types: action_types)
+ end
if acting_username
- builder.where("u.username_lower = :acting_username",
- acting_username: acting_username.downcase
+ builder.where(
+ "u.username_lower = :acting_username",
+ acting_username: acting_username.downcase,
)
end
@@ -257,17 +254,14 @@ class UserAction < ActiveRecord::Base
builder.where("a.action_type <> :mention_type", mention_type: UserAction::MENTION)
end
- builder
- .order_by("a.created_at desc")
- .offset(offset.to_i)
- .limit(limit.to_i)
+ builder.order_by("a.created_at desc").offset(offset.to_i).limit(limit.to_i)
end
builder.query
end
def self.log_action!(hash)
- required_parameters = [:action_type, :user_id, :acting_user_id]
+ required_parameters = %i[action_type user_id acting_user_id]
required_parameters << :target_post_id
required_parameters << :target_topic_id
@@ -284,18 +278,14 @@ class UserAction < ActiveRecord::Base
action = self.new(hash)
- if hash[:created_at]
- action.created_at = hash[:created_at]
- end
+ action.created_at = hash[:created_at] if hash[:created_at]
action.save!
user_id = hash[:user_id]
topic = Topic.includes(:category).find_by(id: hash[:target_topic_id])
- if topic && !topic.private_message?
- update_like_count(user_id, hash[:action_type], 1)
- end
+ update_like_count(user_id, hash[:action_type], 1) if topic && !topic.private_message?
group_ids = nil
if topic && topic.category && topic.category.read_restricted
@@ -304,11 +294,15 @@ class UserAction < ActiveRecord::Base
end
if action.user
- MessageBus.publish("/u/#{action.user.username_lower}", action.id, user_ids: [user_id], group_ids: group_ids)
+ MessageBus.publish(
+ "/u/#{action.user.username_lower}",
+ action.id,
+ user_ids: [user_id],
+ group_ids: group_ids,
+ )
end
action
-
rescue ActiveRecord::RecordNotUnique
# can happen, don't care already logged
raise ActiveRecord::Rollback
@@ -317,7 +311,14 @@ class UserAction < ActiveRecord::Base
end
def self.remove_action!(hash)
- require_parameters(hash, :action_type, :user_id, :acting_user_id, :target_topic_id, :target_post_id)
+ require_parameters(
+ hash,
+ :action_type,
+ :user_id,
+ :acting_user_id,
+ :target_topic_id,
+ :target_post_id,
+ )
if action = UserAction.find_by(hash.except(:created_at))
action.destroy
MessageBus.publish("/user/#{hash[:user_id]}", user_action_id: action.id, remove: true)
@@ -329,7 +330,6 @@ class UserAction < ActiveRecord::Base
end
def self.synchronize_target_topic_ids(post_ids = nil, limit: nil)
-
# nuke all dupes, using magic
builder = DB.build <<~SQL
DELETE FROM user_actions USING user_actions ua2
@@ -345,19 +345,15 @@ class UserAction < ActiveRecord::Base
user_actions.id > ua2.id
SQL
- if limit
- builder.where(<<~SQL, limit: limit)
+ builder.where(<<~SQL, limit: limit) if limit
user_actions.target_post_id IN (
SELECT target_post_id
FROM user_actions
WHERE created_at > :limit
)
SQL
- end
- if post_ids
- builder.where("user_actions.target_post_id in (:post_ids)", post_ids: post_ids)
- end
+ builder.where("user_actions.target_post_id in (:post_ids)", post_ids: post_ids) if post_ids
builder.exec
@@ -368,19 +364,15 @@ class UserAction < ActiveRecord::Base
SQL
builder.where("target_topic_id <> (select topic_id from posts where posts.id = target_post_id)")
- if post_ids
- builder.where("target_post_id in (:post_ids)", post_ids: post_ids)
- end
+ builder.where("target_post_id in (:post_ids)", post_ids: post_ids) if post_ids
- if limit
- builder.where(<<~SQL, limit: limit)
+ builder.where(<<~SQL, limit: limit) if limit
target_post_id IN (
SELECT target_post_id
FROM user_actions
WHERE created_at > :limit
)
SQL
- end
builder.exec
end
@@ -407,11 +399,17 @@ class UserAction < ActiveRecord::Base
current_user_id = -2
current_user_id = guardian.user.id if guardian.user
- builder.where("NOT COALESCE(p.hidden, false) OR p.user_id = :current_user_id", current_user_id: current_user_id)
+ builder.where(
+ "NOT COALESCE(p.hidden, false) OR p.user_id = :current_user_id",
+ current_user_id: current_user_id,
+ )
end
visible_post_types = Topic.visible_post_types(guardian.user)
- builder.where("COALESCE(p.post_type, p2.post_type) IN (:visible_post_types)", visible_post_types: visible_post_types)
+ builder.where(
+ "COALESCE(p.post_type, p2.post_type) IN (:visible_post_types)",
+ visible_post_types: visible_post_types,
+ )
unless (guardian.user && guardian.user.id == user_id) || guardian.is_staff?
builder.where("t.visible")
@@ -423,7 +421,7 @@ class UserAction < ActiveRecord::Base
def self.filter_private_messages(builder, user_id, guardian, ignore_private_messages = false)
if !guardian.can_see_private_messages?(user_id) || ignore_private_messages || !guardian.user
- builder.where("t.archetype <> :private_message", private_message: Archetype::private_message)
+ builder.where("t.archetype <> :private_message", private_message: Archetype.private_message)
else
unless guardian.is_admin?
sql = <<~SQL
@@ -438,7 +436,11 @@ class UserAction < ActiveRecord::Base
)
SQL
- builder.where(sql, private_message: Archetype::private_message, current_user_id: guardian.user.id)
+ builder.where(
+ sql,
+ private_message: Archetype.private_message,
+ current_user_id: guardian.user.id,
+ )
end
end
builder
@@ -448,9 +450,12 @@ class UserAction < ActiveRecord::Base
unless guardian.is_admin?
allowed = guardian.secure_category_ids
if allowed.present?
- builder.where("( c.read_restricted IS NULL OR
+ builder.where(
+ "( c.read_restricted IS NULL OR
NOT c.read_restricted OR
- (c.read_restricted and c.id in (:cats)) )", cats: guardian.secure_category_ids)
+ (c.read_restricted and c.id in (:cats)) )",
+ cats: guardian.secure_category_ids,
+ )
else
builder.where("(c.read_restricted IS NULL OR NOT c.read_restricted)")
end
@@ -459,9 +464,7 @@ class UserAction < ActiveRecord::Base
end
def self.require_parameters(data, *params)
- params.each do |p|
- raise Discourse::InvalidParameters.new(p) if data[p].nil?
- end
+ params.each { |p| raise Discourse::InvalidParameters.new(p) if data[p].nil? }
end
end
diff --git a/app/models/user_api_key.rb b/app/models/user_api_key.rb
index d0238781bc7..59815a5c70c 100644
--- a/app/models/user_api_key.rb
+++ b/app/models/user_api_key.rb
@@ -2,7 +2,7 @@
class UserApiKey < ActiveRecord::Base
self.ignored_columns = [
- "scopes" # TODO(2020-12-18): remove
+ "scopes", # TODO(2020-12-18): remove
]
REVOKE_MATCHER = RouteMatcher.new(actions: "user_api_keys#revoke", methods: :post, params: [:id])
@@ -23,7 +23,9 @@ class UserApiKey < ActiveRecord::Base
end
def key
- raise ApiKey::KeyAccessError.new "API key is only accessible immediately after creation" unless key_available?
+ unless key_available?
+ raise ApiKey::KeyAccessError.new "API key is only accessible immediately after creation"
+ end
@key
end
@@ -41,7 +43,7 @@ class UserApiKey < ActiveRecord::Base
# invalidate old dupe api key for client if needed
UserApiKey
.where(client_id: client_id, user_id: self.user_id)
- .where('id <> ?', self.id)
+ .where("id <> ?", self.id)
.destroy_all
update_args[:client_id] = client_id
@@ -59,8 +61,7 @@ class UserApiKey < ActiveRecord::Base
end
def has_push?
- scopes.any? { |s| s.name == "push" || s.name == "notifications" } &&
- push_url.present? &&
+ scopes.any? { |s| s.name == "push" || s.name == "notifications" } && push_url.present? &&
SiteSetting.allowed_user_api_push_urls.include?(push_url)
end
@@ -69,8 +70,9 @@ class UserApiKey < ActiveRecord::Base
end
def self.invalid_auth_redirect?(auth_redirect)
- SiteSetting.allowed_user_api_auth_redirects
- .split('|')
+ SiteSetting
+ .allowed_user_api_auth_redirects
+ .split("|")
.none? { |u| WildcardUrlChecker.check_url(u, auth_redirect) }
end
diff --git a/app/models/user_api_key_scope.rb b/app/models/user_api_key_scope.rb
index d2f0c408a36..0ea94279649 100644
--- a/app/models/user_api_key_scope.rb
+++ b/app/models/user_api_key_scope.rb
@@ -2,26 +2,33 @@
class UserApiKeyScope < ActiveRecord::Base
SCOPES = {
- read: [ RouteMatcher.new(methods: :get) ],
- write: [ RouteMatcher.new(methods: [:get, :post, :patch, :put, :delete]) ],
- message_bus: [ RouteMatcher.new(methods: :post, actions: 'message_bus') ],
+ read: [RouteMatcher.new(methods: :get)],
+ write: [RouteMatcher.new(methods: %i[get post patch put delete])],
+ message_bus: [RouteMatcher.new(methods: :post, actions: "message_bus")],
push: [],
one_time_password: [],
notifications: [
- RouteMatcher.new(methods: :post, actions: 'message_bus'),
- RouteMatcher.new(methods: :get, actions: 'notifications#index'),
- RouteMatcher.new(methods: :put, actions: 'notifications#mark_read')
+ RouteMatcher.new(methods: :post, actions: "message_bus"),
+ RouteMatcher.new(methods: :get, actions: "notifications#index"),
+ RouteMatcher.new(methods: :put, actions: "notifications#mark_read"),
],
session_info: [
- RouteMatcher.new(methods: :get, actions: 'session#current'),
- RouteMatcher.new(methods: :get, actions: 'users#topic_tracking_state')
+ RouteMatcher.new(methods: :get, actions: "session#current"),
+ RouteMatcher.new(methods: :get, actions: "users#topic_tracking_state"),
+ ],
+ bookmarks_calendar: [
+ RouteMatcher.new(
+ methods: :get,
+ actions: "users#bookmarks",
+ formats: :ics,
+ params: %i[username],
+ ),
],
- bookmarks_calendar: [ RouteMatcher.new(methods: :get, actions: 'users#bookmarks', formats: :ics, params: %i[username]) ],
user_status: [
- RouteMatcher.new(methods: :get, actions: 'user_status#get'),
- RouteMatcher.new(methods: :put, actions: 'user_status#set'),
- RouteMatcher.new(methods: :delete, actions: 'user_status#clear')
- ]
+ RouteMatcher.new(methods: :get, actions: "user_status#get"),
+ RouteMatcher.new(methods: :put, actions: "user_status#set"),
+ RouteMatcher.new(methods: :delete, actions: "user_status#clear"),
+ ],
}
def self.all_scopes
diff --git a/app/models/user_archived_message.rb b/app/models/user_archived_message.rb
index 2410f50e2e2..787209c702c 100644
--- a/app/models/user_archived_message.rb
+++ b/app/models/user_archived_message.rb
@@ -7,11 +7,15 @@ class UserArchivedMessage < ActiveRecord::Base
def self.move_to_inbox!(user_id, topic)
topic_id = topic.id
- return if (TopicUser.where(
- user_id: user_id,
- topic_id: topic_id,
- notification_level: TopicUser.notification_levels[:muted]
- ).exists?)
+ if (
+ TopicUser.where(
+ user_id: user_id,
+ topic_id: topic_id,
+ notification_level: TopicUser.notification_levels[:muted],
+ ).exists?
+ )
+ return
+ end
UserArchivedMessage.where(user_id: user_id, topic_id: topic_id).destroy_all
trigger(:move_to_inbox, user_id, topic_id)
@@ -29,9 +33,7 @@ class UserArchivedMessage < ActiveRecord::Base
def self.trigger(event, user_id, topic_id)
user = User.find_by(id: user_id)
topic = Topic.find_by(id: topic_id)
- if user && topic
- DiscourseEvent.trigger(event, user: user, topic: topic)
- end
+ DiscourseEvent.trigger(event, user: user, topic: topic) if user && topic
end
end
diff --git a/app/models/user_associated_group.rb b/app/models/user_associated_group.rb
index 1413efb7c67..815309d1aaa 100644
--- a/app/models/user_associated_group.rb
+++ b/app/models/user_associated_group.rb
@@ -4,7 +4,7 @@ class UserAssociatedGroup < ActiveRecord::Base
belongs_to :user
belongs_to :associated_group
- after_commit :add_to_associated_groups, on: [:create, :update]
+ after_commit :add_to_associated_groups, on: %i[create update]
before_destroy :remove_from_associated_groups
def add_to_associated_groups
@@ -14,7 +14,9 @@ class UserAssociatedGroup < ActiveRecord::Base
end
def remove_from_associated_groups
- Group.where("NOT EXISTS(
+ Group
+ .where(
+ "NOT EXISTS(
SELECT 1
FROM user_associated_groups uag
JOIN group_associated_groups gag
@@ -22,9 +24,11 @@ class UserAssociatedGroup < ActiveRecord::Base
WHERE uag.user_id = :user_id
AND uag.id != :uag_id
AND gag.group_id = groups.id
- )", uag_id: id, user_id: user_id).each do |group|
- group.remove_automatically(user, subject: associated_group.label)
- end
+ )",
+ uag_id: id,
+ user_id: user_id,
+ )
+ .each { |group| group.remove_automatically(user, subject: associated_group.label) }
end
end
diff --git a/app/models/user_auth_token.rb b/app/models/user_auth_token.rb
index 6566371b206..97eb0372ff7 100644
--- a/app/models/user_auth_token.rb
+++ b/app/models/user_auth_token.rb
@@ -1,5 +1,5 @@
# frozen_string_literal: true
-require 'digest/sha1'
+require "digest/sha1"
class UserAuthToken < ActiveRecord::Base
belongs_to :user
@@ -11,13 +11,13 @@ class UserAuthToken < ActiveRecord::Base
MAX_SESSION_COUNT = 60
- USER_ACTIONS = ['generate']
+ USER_ACTIONS = ["generate"]
attr_accessor :unhashed_auth_token
before_destroy do
UserAuthToken.log_verbose(
- action: 'destroy',
+ action: "destroy",
user_auth_token_id: self.id,
user_id: self.user_id,
user_agent: self.user_agent,
@@ -31,9 +31,7 @@ class UserAuthToken < ActiveRecord::Base
end
def self.log_verbose(info)
- if SiteSetting.verbose_auth_token_logging
- log(info)
- end
+ log(info) if SiteSetting.verbose_auth_token_logging
end
RAD_PER_DEG = Math::PI / 180
@@ -49,8 +47,10 @@ class UserAuthToken < ActiveRecord::Base
lat1_rad, lon1_rad = loc1[0] * RAD_PER_DEG, loc1[1] * RAD_PER_DEG
lat2_rad, lon2_rad = loc2[0] * RAD_PER_DEG, loc2[1] * RAD_PER_DEG
- a = Math.sin((lat2_rad - lat1_rad) / 2)**2 + Math.cos(lat1_rad) * Math.cos(lat2_rad) * Math.sin((lon2_rad - lon1_rad) / 2)**2
- c = 2 * Math::atan2(Math::sqrt(a), Math::sqrt(1 - a))
+ a =
+ Math.sin((lat2_rad - lat1_rad) / 2)**2 +
+ Math.cos(lat1_rad) * Math.cos(lat2_rad) * Math.sin((lon2_rad - lon1_rad) / 2)**2
+ c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a))
c * EARTH_RADIUS_KM
end
@@ -72,21 +72,29 @@ class UserAuthToken < ActiveRecord::Base
end
end
- def self.generate!(user_id: , user_agent: nil, client_ip: nil, path: nil, staff: nil, impersonate: false)
+ def self.generate!(
+ user_id:,
+ user_agent: nil,
+ client_ip: nil,
+ path: nil,
+ staff: nil,
+ impersonate: false
+ )
token = SecureRandom.hex(16)
hashed_token = hash_token(token)
- user_auth_token = UserAuthToken.create!(
- user_id: user_id,
- user_agent: user_agent,
- client_ip: client_ip,
- auth_token: hashed_token,
- prev_auth_token: hashed_token,
- rotated_at: Time.zone.now
- )
+ user_auth_token =
+ UserAuthToken.create!(
+ user_id: user_id,
+ user_agent: user_agent,
+ client_ip: client_ip,
+ auth_token: hashed_token,
+ prev_auth_token: hashed_token,
+ rotated_at: Time.zone.now,
+ )
user_auth_token.unhashed_auth_token = token
log(
- action: 'generate',
+ action: "generate",
user_auth_token_id: user_auth_token.id,
user_id: user_id,
user_agent: user_agent,
@@ -96,10 +104,12 @@ class UserAuthToken < ActiveRecord::Base
)
if staff && !impersonate
- Jobs.enqueue(:suspicious_login,
+ Jobs.enqueue(
+ :suspicious_login,
user_id: user_id,
client_ip: client_ip,
- user_agent: user_agent)
+ user_agent: user_agent,
+ )
end
user_auth_token
@@ -111,12 +121,15 @@ class UserAuthToken < ActiveRecord::Base
token = hash_token(unhashed_token)
expire_before = SiteSetting.maximum_session_age.hours.ago
- user_token = find_by("(auth_token = :token OR
+ user_token =
+ find_by(
+ "(auth_token = :token OR
prev_auth_token = :token) AND rotated_at > :expire_before",
- token: token, expire_before: expire_before)
+ token: token,
+ expire_before: expire_before,
+ )
if !user_token
-
log_verbose(
action: "miss token",
user_id: nil,
@@ -129,11 +142,13 @@ class UserAuthToken < ActiveRecord::Base
return nil
end
- if user_token.auth_token != token && user_token.prev_auth_token == token && user_token.auth_token_seen
- changed_rows = UserAuthToken
- .where("rotated_at < ?", 1.minute.ago)
- .where(id: user_token.id, prev_auth_token: token)
- .update_all(auth_token_seen: false)
+ if user_token.auth_token != token && user_token.prev_auth_token == token &&
+ user_token.auth_token_seen
+ changed_rows =
+ UserAuthToken
+ .where("rotated_at < ?", 1.minute.ago)
+ .where(id: user_token.id, prev_auth_token: token)
+ .update_all(auth_token_seen: false)
# not updating AR model cause we want to give it one more req
# with wrong cookie
@@ -144,15 +159,17 @@ class UserAuthToken < ActiveRecord::Base
auth_token: user_token.auth_token,
user_agent: opts && opts[:user_agent],
path: opts && opts[:path],
- client_ip: opts && opts[:client_ip]
+ client_ip: opts && opts[:client_ip],
)
end
if mark_seen && user_token && !user_token.auth_token_seen && user_token.auth_token == token
# we must protect against concurrency issues here
- changed_rows = UserAuthToken
- .where(id: user_token.id, auth_token: token)
- .update_all(auth_token_seen: true, seen_at: Time.zone.now)
+ changed_rows =
+ UserAuthToken.where(id: user_token.id, auth_token: token).update_all(
+ auth_token_seen: true,
+ seen_at: Time.zone.now,
+ )
if changed_rows == 1
# not doing a reload so we don't risk loading a rotated token
@@ -179,15 +196,17 @@ class UserAuthToken < ActiveRecord::Base
end
def self.cleanup!
-
if SiteSetting.verbose_auth_token_logging
- UserAuthTokenLog.where('created_at < :time',
- time: SiteSetting.maximum_session_age.hours.ago - ROTATE_TIME).delete_all
+ UserAuthTokenLog.where(
+ "created_at < :time",
+ time: SiteSetting.maximum_session_age.hours.ago - ROTATE_TIME,
+ ).delete_all
end
- where('rotated_at < :time',
- time: SiteSetting.maximum_session_age.hours.ago - ROTATE_TIME).delete_all
-
+ where(
+ "rotated_at < :time",
+ time: SiteSetting.maximum_session_age.hours.ago - ROTATE_TIME,
+ ).delete_all
end
def rotate!(info = nil)
@@ -196,7 +215,9 @@ class UserAuthToken < ActiveRecord::Base
token = SecureRandom.hex(16)
- result = DB.exec("
+ result =
+ DB.exec(
+ "
UPDATE user_auth_tokens
SET
auth_token_seen = false,
@@ -207,13 +228,14 @@ class UserAuthToken < ActiveRecord::Base
auth_token = :new_token,
rotated_at = :now
WHERE id = :id AND (auth_token_seen or rotated_at < :safeguard_time)
-", id: self.id,
- user_agent: user_agent,
- client_ip: client_ip&.to_s,
- now: Time.zone.now,
- new_token: UserAuthToken.hash_token(token),
- safeguard_time: 30.seconds.ago
- )
+",
+ id: self.id,
+ user_agent: user_agent,
+ client_ip: client_ip&.to_s,
+ now: Time.zone.now,
+ new_token: UserAuthToken.hash_token(token),
+ safeguard_time: 30.seconds.ago,
+ )
if result > 0
reload
@@ -226,20 +248,21 @@ class UserAuthToken < ActiveRecord::Base
auth_token: auth_token,
user_agent: user_agent,
client_ip: client_ip,
- path: info && info[:path]
+ path: info && info[:path],
)
true
else
false
end
-
end
def self.enforce_session_count_limit!(user_id)
- tokens_to_destroy = where(user_id: user_id).
- where('rotated_at > ?', SiteSetting.maximum_session_age.hours.ago).
- order("rotated_at DESC").offset(MAX_SESSION_COUNT)
+ tokens_to_destroy =
+ where(user_id: user_id)
+ .where("rotated_at > ?", SiteSetting.maximum_session_age.hours.ago)
+ .order("rotated_at DESC")
+ .offset(MAX_SESSION_COUNT)
tokens_to_destroy.delete_all # Returns the number of deleted rows
end
diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb
index 349509d0149..20f0e1d21bb 100644
--- a/app/models/user_avatar.rb
+++ b/app/models/user_avatar.rb
@@ -2,8 +2,8 @@
class UserAvatar < ActiveRecord::Base
belongs_to :user
- belongs_to :gravatar_upload, class_name: 'Upload'
- belongs_to :custom_upload, class_name: 'Upload'
+ belongs_to :gravatar_upload, class_name: "Upload"
+ belongs_to :custom_upload, class_name: "Upload"
has_many :upload_references, as: :target, dependent: :destroy
after_save do
@@ -14,7 +14,7 @@ class UserAvatar < ActiveRecord::Base
end
@@custom_user_gravatar_email_hash = {
- Discourse::SYSTEM_USER_ID => User.email_hash("info@discourse.org")
+ Discourse::SYSTEM_USER_ID => User.email_hash("info@discourse.org"),
}
def self.register_custom_user_gravatar_email_hash(user_id, email)
@@ -36,33 +36,36 @@ class UserAvatar < ActiveRecord::Base
return if user.blank? || user.primary_email.blank?
email_hash = @@custom_user_gravatar_email_hash[user_id] || user.email_hash
- gravatar_url = "https://#{SiteSetting.gravatar_base_url}/avatar/#{email_hash}.png?s=#{max}&d=404&reset_cache=#{SecureRandom.urlsafe_base64(5)}"
+ gravatar_url =
+ "https://#{SiteSetting.gravatar_base_url}/avatar/#{email_hash}.png?s=#{max}&d=404&reset_cache=#{SecureRandom.urlsafe_base64(5)}"
if SiteSetting.verbose_upload_logging
Rails.logger.warn("Verbose Upload Logging: Downloading gravatar from #{gravatar_url}")
end
# follow redirects in case gravatar change rules on us
- tempfile = FileHelper.download(
- gravatar_url,
- max_file_size: SiteSetting.max_image_size_kb.kilobytes,
- tmp_file_name: "gravatar",
- skip_rate_limit: true,
- verbose: false,
- follow_redirect: true
- )
+ tempfile =
+ FileHelper.download(
+ gravatar_url,
+ max_file_size: SiteSetting.max_image_size_kb.kilobytes,
+ tmp_file_name: "gravatar",
+ skip_rate_limit: true,
+ verbose: false,
+ follow_redirect: true,
+ )
if tempfile
ext = File.extname(tempfile)
- ext = '.png' if ext.blank?
+ ext = ".png" if ext.blank?
- upload = UploadCreator.new(
- tempfile,
- "gravatar#{ext}",
- origin: gravatar_url,
- type: "avatar",
- for_gravatar: true
- ).create_for(user_id)
+ upload =
+ UploadCreator.new(
+ tempfile,
+ "gravatar#{ext}",
+ origin: gravatar_url,
+ type: "avatar",
+ for_gravatar: true,
+ ).create_for(user_id)
if gravatar_upload_id != upload.id
User.transaction do
@@ -75,9 +78,7 @@ class UserAvatar < ActiveRecord::Base
end
end
rescue OpenURI::HTTPError => e
- if e.io&.status[0].to_i != 404
- raise e
- end
+ raise e if e.io&.status[0].to_i != 404
ensure
tempfile&.close!
end
@@ -111,19 +112,26 @@ class UserAvatar < ActiveRecord::Base
Rails.logger.warn("Verbose Upload Logging: Downloading sso-avatar from #{avatar_url}")
end
- tempfile = FileHelper.download(
- avatar_url,
- max_file_size: SiteSetting.max_image_size_kb.kilobytes,
- tmp_file_name: "sso-avatar",
- follow_redirect: true
- )
+ tempfile =
+ FileHelper.download(
+ avatar_url,
+ max_file_size: SiteSetting.max_image_size_kb.kilobytes,
+ tmp_file_name: "sso-avatar",
+ follow_redirect: true,
+ )
return unless tempfile
ext = FastImage.type(tempfile).to_s
tempfile.rewind
- upload = UploadCreator.new(tempfile, "external-avatar." + ext, origin: avatar_url, type: "avatar").create_for(user.id)
+ upload =
+ UploadCreator.new(
+ tempfile,
+ "external-avatar." + ext,
+ origin: avatar_url,
+ type: "avatar",
+ ).create_for(user.id)
user.create_user_avatar! unless user.user_avatar
@@ -132,13 +140,10 @@ class UserAvatar < ActiveRecord::Base
override_gravatar = !options || options[:override_gravatar]
if user.uploaded_avatar_id.nil? ||
- !user.user_avatar.contains_upload?(user.uploaded_avatar_id) ||
- override_gravatar
-
+ !user.user_avatar.contains_upload?(user.uploaded_avatar_id) || override_gravatar
user.update!(uploaded_avatar_id: upload.id)
end
end
-
rescue Net::ReadTimeout, OpenURI::HTTPError
# skip saving, we are not connected to the net
ensure
diff --git a/app/models/user_badge.rb b/app/models/user_badge.rb
index ec820a18089..dd919156314 100644
--- a/app/models/user_badge.rb
+++ b/app/models/user_badge.rb
@@ -3,49 +3,49 @@
class UserBadge < ActiveRecord::Base
belongs_to :badge
belongs_to :user
- belongs_to :granted_by, class_name: 'User'
+ belongs_to :granted_by, class_name: "User"
belongs_to :notification, dependent: :destroy
belongs_to :post
- BOOLEAN_ATTRIBUTES = %w(is_favorite)
+ BOOLEAN_ATTRIBUTES = %w[is_favorite]
- scope :grouped_with_count, -> {
- group(:badge_id, :user_id)
- .select_for_grouping
- .order('MAX(featured_rank) ASC')
- .includes(:user, :granted_by, { badge: :badge_type }, post: :topic)
- }
+ scope :grouped_with_count,
+ -> {
+ group(:badge_id, :user_id)
+ .select_for_grouping
+ .order("MAX(featured_rank) ASC")
+ .includes(:user, :granted_by, { badge: :badge_type }, post: :topic)
+ }
- scope :select_for_grouping, -> {
- select(
- UserBadge.attribute_names.map do |name|
- operation = BOOLEAN_ATTRIBUTES.include?(name) ? "BOOL_OR" : "MAX"
- "#{operation}(user_badges.#{name}) AS #{name}"
- end,
- 'COUNT(*) AS "count"'
- )
- }
+ scope :select_for_grouping,
+ -> {
+ select(
+ UserBadge.attribute_names.map do |name|
+ operation = BOOLEAN_ATTRIBUTES.include?(name) ? "BOOL_OR" : "MAX"
+ "#{operation}(user_badges.#{name}) AS #{name}"
+ end,
+ 'COUNT(*) AS "count"',
+ )
+ }
- scope :for_enabled_badges, -> { where('user_badges.badge_id IN (SELECT id FROM badges WHERE enabled)') }
+ scope :for_enabled_badges,
+ -> { where("user_badges.badge_id IN (SELECT id FROM badges WHERE enabled)") }
- validates :badge_id,
- presence: true,
- uniqueness: { scope: :user_id },
- if: :single_grant_badge?
+ validates :badge_id, presence: true, uniqueness: { scope: :user_id }, if: :single_grant_badge?
validates :user_id, presence: true
validates :granted_at, presence: true
validates :granted_by, presence: true
after_create do
- Badge.increment_counter 'grant_count', self.badge_id
+ Badge.increment_counter "grant_count", self.badge_id
UserStat.update_distinct_badge_count self.user_id
UserBadge.update_featured_ranks! self.user_id
self.trigger_user_badge_granted_event
end
after_destroy do
- Badge.decrement_counter 'grant_count', self.badge_id
+ Badge.decrement_counter "grant_count", self.badge_id
UserStat.update_distinct_badge_count self.user_id
UserBadge.update_featured_ranks! self.user_id
DiscourseEvent.trigger(:user_badge_removed, self.badge_id, self.user_id)
diff --git a/app/models/user_badges.rb b/app/models/user_badges.rb
index 4b0f8588307..65de5a66162 100644
--- a/app/models/user_badges.rb
+++ b/app/models/user_badges.rb
@@ -2,7 +2,7 @@
# view model for user badges
class UserBadges
- alias :read_attribute_for_serialization :send
+ alias read_attribute_for_serialization send
attr_accessor :user_badges, :username, :grant_count
diff --git a/app/models/user_custom_field.rb b/app/models/user_custom_field.rb
index a4f757536e8..92255cc5648 100644
--- a/app/models/user_custom_field.rb
+++ b/app/models/user_custom_field.rb
@@ -3,7 +3,12 @@
class UserCustomField < ActiveRecord::Base
belongs_to :user
- scope :searchable, -> { joins("INNER JOIN user_fields ON user_fields.id = REPLACE(user_custom_fields.name, 'user_field_', '')::INTEGER AND user_fields.searchable IS TRUE AND user_custom_fields.name like 'user_field_%'") }
+ scope :searchable,
+ -> {
+ joins(
+ "INNER JOIN user_fields ON user_fields.id = REPLACE(user_custom_fields.name, 'user_field_', '')::INTEGER AND user_fields.searchable IS TRUE AND user_custom_fields.name like 'user_field_%'",
+ )
+ }
end
# == Schema Information
diff --git a/app/models/user_email.rb b/app/models/user_email.rb
index 50ee27318b2..ff175a9bfd9 100644
--- a/app/models/user_email.rb
+++ b/app/models/user_email.rb
@@ -12,22 +12,23 @@ class UserEmail < ActiveRecord::Base
validates :email, presence: true
validates :email, email: true, if: :validate_email?
- validates :primary, uniqueness: { scope: [:user_id] }, if: [:user_id, :primary]
+ validates :primary, uniqueness: { scope: [:user_id] }, if: %i[user_id primary]
validate :user_id_not_changed, if: :primary
validate :unique_email, if: :validate_unique_email?
scope :secondary, -> { where(primary: false) }
- before_save ->() { destroy_email_tokens(self.email_was) }, if: :will_save_change_to_email?
+ before_save -> { destroy_email_tokens(self.email_was) }, if: :will_save_change_to_email?
after_destroy { destroy_email_tokens(self.email) }
def normalize_email
- self.normalized_email = if self.email.present?
- username, domain = self.email.split('@', 2)
- username = username.gsub('.', '').gsub(/\+.*/, '')
- "#{username}@#{domain}"
- end
+ self.normalized_email =
+ if self.email.present?
+ username, domain = self.email.split("@", 2)
+ username = username.gsub(".", "").gsub(/\+.*/, "")
+ "#{username}@#{domain}"
+ end
end
private
@@ -50,19 +51,26 @@ class UserEmail < ActiveRecord::Base
end
def unique_email
- email_exists = if SiteSetting.normalize_emails?
- self.class.where("lower(email) = ? OR lower(normalized_email) = ?", email, normalized_email).exists?
- else
- self.class.where("lower(email) = ?", email).exists?
- end
+ email_exists =
+ if SiteSetting.normalize_emails?
+ self
+ .class
+ .where("lower(email) = ? OR lower(normalized_email) = ?", email, normalized_email)
+ .exists?
+ else
+ self.class.where("lower(email) = ?", email).exists?
+ end
self.errors.add(:email, :taken) if email_exists
end
def user_id_not_changed
if self.will_save_change_to_user_id? && self.persisted?
- self.errors.add(:user_id, I18n.t(
- 'active_record.errors.model.user_email.attributes.user_id.reassigning_primary_email')
+ self.errors.add(
+ :user_id,
+ I18n.t(
+ "active_record.errors.model.user_email.attributes.user_id.reassigning_primary_email",
+ ),
)
end
end
diff --git a/app/models/user_export.rb b/app/models/user_export.rb
index 35059147250..32fcca5f75a 100644
--- a/app/models/user_export.rb
+++ b/app/models/user_export.rb
@@ -16,22 +16,31 @@ class UserExport < ActiveRecord::Base
DESTROY_CREATED_BEFORE = 2.days.ago
def self.remove_old_exports
- UserExport.where('created_at < ?', DESTROY_CREATED_BEFORE).find_each do |user_export|
- UserExport.transaction do
- begin
- Post.where(topic_id: user_export.topic_id).find_each { |p| p.destroy! }
- user_export.destroy!
- rescue => e
- Rails.logger.warn("Failed to remove user_export record with id #{user_export.id}: #{e.message}\n#{e.backtrace.join("\n")}")
+ UserExport
+ .where("created_at < ?", DESTROY_CREATED_BEFORE)
+ .find_each do |user_export|
+ UserExport.transaction do
+ begin
+ Post.where(topic_id: user_export.topic_id).find_each { |p| p.destroy! }
+ user_export.destroy!
+ rescue => e
+ Rails.logger.warn(
+ "Failed to remove user_export record with id #{user_export.id}: #{e.message}\n#{e.backtrace.join("\n")}",
+ )
+ end
end
end
- end
end
def self.base_directory
- File.join(Rails.root, "public", "uploads", "csv_exports", RailsMultisite::ConnectionManagement.current_db)
+ File.join(
+ Rails.root,
+ "public",
+ "uploads",
+ "csv_exports",
+ RailsMultisite::ConnectionManagement.current_db,
+ )
end
-
end
# == Schema Information
diff --git a/app/models/user_field.rb b/app/models/user_field.rb
index a872af740f5..3d492ab28ed 100644
--- a/app/models/user_field.rb
+++ b/app/models/user_field.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class UserField < ActiveRecord::Base
-
include AnonCacheInvalidator
include HasSanitizableFields
@@ -21,14 +20,16 @@ class UserField < ActiveRecord::Base
end
def queue_index_search
- SearchIndexer.queue_users_reindex(UserCustomField.where(name: "user_field_#{self.id}").pluck(:user_id))
+ SearchIndexer.queue_users_reindex(
+ UserCustomField.where(name: "user_field_#{self.id}").pluck(:user_id),
+ )
end
private
def sanitize_description
if description_changed?
- self.description = sanitize_field(self.description, additional_attributes: ['target'])
+ self.description = sanitize_field(self.description, additional_attributes: ["target"])
end
end
end
diff --git a/app/models/user_history.rb b/app/models/user_history.rb
index 1ddde529e94..e3a98fe9b27 100644
--- a/app/models/user_history.rb
+++ b/app/models/user_history.rb
@@ -4,8 +4,8 @@
# like deleting users, changing site settings, dismissing notifications, etc.
# Use other classes, like StaffActionLogger, to log records to this table.
class UserHistory < ActiveRecord::Base
- belongs_to :acting_user, class_name: 'User'
- belongs_to :target_user, class_name: 'User'
+ belongs_to :acting_user, class_name: "User"
+ belongs_to :target_user, class_name: "User"
belongs_to :post
belongs_to :topic
@@ -18,200 +18,201 @@ class UserHistory < ActiveRecord::Base
before_save :set_admin_only
def self.actions
- @actions ||= Enum.new(
- delete_user: 1,
- change_trust_level: 2,
- change_site_setting: 3,
- change_theme: 4,
- delete_theme: 5,
- checked_for_custom_avatar: 6, # not used anymore
- notified_about_avatar: 7,
- notified_about_sequential_replies: 8,
- notified_about_dominating_topic: 9,
- suspend_user: 10,
- unsuspend_user: 11,
- facebook_no_email: 12, # not used anymore
- grant_badge: 13,
- revoke_badge: 14,
- auto_trust_level_change: 15,
- check_email: 16,
- delete_post: 17,
- delete_topic: 18,
- impersonate: 19,
- roll_up: 20,
- change_username: 21,
- custom: 22,
- custom_staff: 23,
- anonymize_user: 24,
- reviewed_post: 25,
- change_category_settings: 26,
- delete_category: 27,
- create_category: 28,
- change_site_text: 29,
- silence_user: 30,
- unsilence_user: 31,
- grant_admin: 32,
- revoke_admin: 33,
- grant_moderation: 34,
- revoke_moderation: 35,
- backup_create: 36,
- rate_limited_like: 37, # not used anymore
- revoke_email: 38,
- deactivate_user: 39,
- wizard_step: 40,
- lock_trust_level: 41,
- unlock_trust_level: 42,
- activate_user: 43,
- change_readonly_mode: 44,
- backup_download: 45,
- backup_destroy: 46,
- notified_about_get_a_room: 47,
- change_name: 48,
- post_locked: 49,
- post_unlocked: 50,
- check_personal_message: 51,
- disabled_second_factor: 52,
- post_edit: 53,
- topic_published: 54,
- recover_topic: 55,
- post_approved: 56,
- create_badge: 57,
- change_badge: 58,
- delete_badge: 59,
- removed_silence_user: 60,
- removed_suspend_user: 61,
- removed_unsilence_user: 62,
- removed_unsuspend_user: 63,
- post_rejected: 64,
- merge_user: 65,
- entity_export: 66,
- change_password: 67,
- topic_timestamps_changed: 68,
- approve_user: 69,
- web_hook_create: 70,
- web_hook_update: 71,
- web_hook_destroy: 72,
- embeddable_host_create: 73,
- embeddable_host_update: 74,
- embeddable_host_destroy: 75,
- web_hook_deactivate: 76,
- change_theme_setting: 77,
- disable_theme_component: 78,
- enable_theme_component: 79,
- api_key_create: 80,
- api_key_update: 81,
- api_key_destroy: 82,
- revoke_title: 83,
- change_title: 84,
- override_upload_secure_status: 85,
- page_published: 86,
- page_unpublished: 87,
- add_email: 88,
- update_email: 89,
- destroy_email: 90,
- topic_closed: 91,
- topic_opened: 92,
- topic_archived: 93,
- topic_unarchived: 94,
- post_staff_note_create: 95,
- post_staff_note_destroy: 96,
- watched_word_create: 97,
- watched_word_destroy: 98,
- delete_group: 99
- )
+ @actions ||=
+ Enum.new(
+ delete_user: 1,
+ change_trust_level: 2,
+ change_site_setting: 3,
+ change_theme: 4,
+ delete_theme: 5,
+ checked_for_custom_avatar: 6, # not used anymore
+ notified_about_avatar: 7,
+ notified_about_sequential_replies: 8,
+ notified_about_dominating_topic: 9,
+ suspend_user: 10,
+ unsuspend_user: 11,
+ facebook_no_email: 12, # not used anymore
+ grant_badge: 13,
+ revoke_badge: 14,
+ auto_trust_level_change: 15,
+ check_email: 16,
+ delete_post: 17,
+ delete_topic: 18,
+ impersonate: 19,
+ roll_up: 20,
+ change_username: 21,
+ custom: 22,
+ custom_staff: 23,
+ anonymize_user: 24,
+ reviewed_post: 25,
+ change_category_settings: 26,
+ delete_category: 27,
+ create_category: 28,
+ change_site_text: 29,
+ silence_user: 30,
+ unsilence_user: 31,
+ grant_admin: 32,
+ revoke_admin: 33,
+ grant_moderation: 34,
+ revoke_moderation: 35,
+ backup_create: 36,
+ rate_limited_like: 37, # not used anymore
+ revoke_email: 38,
+ deactivate_user: 39,
+ wizard_step: 40,
+ lock_trust_level: 41,
+ unlock_trust_level: 42,
+ activate_user: 43,
+ change_readonly_mode: 44,
+ backup_download: 45,
+ backup_destroy: 46,
+ notified_about_get_a_room: 47,
+ change_name: 48,
+ post_locked: 49,
+ post_unlocked: 50,
+ check_personal_message: 51,
+ disabled_second_factor: 52,
+ post_edit: 53,
+ topic_published: 54,
+ recover_topic: 55,
+ post_approved: 56,
+ create_badge: 57,
+ change_badge: 58,
+ delete_badge: 59,
+ removed_silence_user: 60,
+ removed_suspend_user: 61,
+ removed_unsilence_user: 62,
+ removed_unsuspend_user: 63,
+ post_rejected: 64,
+ merge_user: 65,
+ entity_export: 66,
+ change_password: 67,
+ topic_timestamps_changed: 68,
+ approve_user: 69,
+ web_hook_create: 70,
+ web_hook_update: 71,
+ web_hook_destroy: 72,
+ embeddable_host_create: 73,
+ embeddable_host_update: 74,
+ embeddable_host_destroy: 75,
+ web_hook_deactivate: 76,
+ change_theme_setting: 77,
+ disable_theme_component: 78,
+ enable_theme_component: 79,
+ api_key_create: 80,
+ api_key_update: 81,
+ api_key_destroy: 82,
+ revoke_title: 83,
+ change_title: 84,
+ override_upload_secure_status: 85,
+ page_published: 86,
+ page_unpublished: 87,
+ add_email: 88,
+ update_email: 89,
+ destroy_email: 90,
+ topic_closed: 91,
+ topic_opened: 92,
+ topic_archived: 93,
+ topic_unarchived: 94,
+ post_staff_note_create: 95,
+ post_staff_note_destroy: 96,
+ watched_word_create: 97,
+ watched_word_destroy: 98,
+ delete_group: 99,
+ )
end
# Staff actions is a subset of all actions, used to audit actions taken by staff users.
def self.staff_actions
- @staff_actions ||= [
- :delete_user,
- :change_trust_level,
- :change_site_setting,
- :change_theme,
- :delete_theme,
- :change_site_text,
- :suspend_user,
- :unsuspend_user,
- :removed_suspend_user,
- :removed_unsuspend_user,
- :grant_badge,
- :revoke_badge,
- :check_email,
- :delete_post,
- :delete_topic,
- :impersonate,
- :roll_up,
- :change_username,
- :custom_staff,
- :anonymize_user,
- :reviewed_post,
- :change_category_settings,
- :delete_category,
- :create_category,
- :silence_user,
- :unsilence_user,
- :removed_silence_user,
- :removed_unsilence_user,
- :grant_admin,
- :revoke_admin,
- :grant_moderation,
- :revoke_moderation,
- :backup_create,
- :revoke_email,
- :deactivate_user,
- :lock_trust_level,
- :unlock_trust_level,
- :activate_user,
- :change_readonly_mode,
- :backup_download,
- :backup_destroy,
- :post_locked,
- :post_unlocked,
- :check_personal_message,
- :disabled_second_factor,
- :post_edit,
- :topic_published,
- :recover_topic,
- :post_approved,
- :create_badge,
- :change_badge,
- :delete_badge,
- :post_rejected,
- :merge_user,
- :entity_export,
- :change_name,
- :topic_timestamps_changed,
- :approve_user,
- :web_hook_create,
- :web_hook_update,
- :web_hook_destroy,
- :web_hook_deactivate,
- :embeddable_host_create,
- :embeddable_host_update,
- :embeddable_host_destroy,
- :change_theme_setting,
- :disable_theme_component,
- :enable_theme_component,
- :revoke_title,
- :change_title,
- :api_key_create,
- :api_key_update,
- :api_key_destroy,
- :override_upload_secure_status,
- :page_published,
- :page_unpublished,
- :add_email,
- :update_email,
- :destroy_email,
- :topic_closed,
- :topic_opened,
- :topic_archived,
- :topic_unarchived,
- :post_staff_note_create,
- :post_staff_note_destroy,
- :watched_word_create,
- :watched_word_destroy,
- :delete_group
+ @staff_actions ||= %i[
+ delete_user
+ change_trust_level
+ change_site_setting
+ change_theme
+ delete_theme
+ change_site_text
+ suspend_user
+ unsuspend_user
+ removed_suspend_user
+ removed_unsuspend_user
+ grant_badge
+ revoke_badge
+ check_email
+ delete_post
+ delete_topic
+ impersonate
+ roll_up
+ change_username
+ custom_staff
+ anonymize_user
+ reviewed_post
+ change_category_settings
+ delete_category
+ create_category
+ silence_user
+ unsilence_user
+ removed_silence_user
+ removed_unsilence_user
+ grant_admin
+ revoke_admin
+ grant_moderation
+ revoke_moderation
+ backup_create
+ revoke_email
+ deactivate_user
+ lock_trust_level
+ unlock_trust_level
+ activate_user
+ change_readonly_mode
+ backup_download
+ backup_destroy
+ post_locked
+ post_unlocked
+ check_personal_message
+ disabled_second_factor
+ post_edit
+ topic_published
+ recover_topic
+ post_approved
+ create_badge
+ change_badge
+ delete_badge
+ post_rejected
+ merge_user
+ entity_export
+ change_name
+ topic_timestamps_changed
+ approve_user
+ web_hook_create
+ web_hook_update
+ web_hook_destroy
+ web_hook_deactivate
+ embeddable_host_create
+ embeddable_host_update
+ embeddable_host_destroy
+ change_theme_setting
+ disable_theme_component
+ enable_theme_component
+ revoke_title
+ change_title
+ api_key_create
+ api_key_update
+ api_key_destroy
+ override_upload_secure_status
+ page_published
+ page_unpublished
+ add_email
+ update_email
+ destroy_email
+ topic_closed
+ topic_opened
+ topic_archived
+ topic_unarchived
+ post_staff_note_create
+ post_staff_note_destroy
+ watched_word_create
+ watched_word_destroy
+ delete_group
]
end
@@ -228,7 +229,7 @@ class UserHistory < ActiveRecord::Base
query = query.where(action: filters[:action_id]) if filters[:action_id].present?
query = query.where(custom_type: filters[:custom_type]) if filters[:custom_type].present?
- [:acting_user, :target_user].each do |key|
+ %i[acting_user target_user].each do |key|
if filters[key] && (obj_id = User.where(username_lower: filters[key].downcase).pluck(:id))
query = query.where("#{key}_id = ?", obj_id)
end
@@ -249,7 +250,7 @@ class UserHistory < ActiveRecord::Base
end
def self.staff_filters
- [:action_id, :custom_type, :acting_user, :target_user, :subject, :action_name]
+ %i[action_id custom_type acting_user target_user subject action_name]
end
def self.staff_action_records(viewer, opts = nil)
@@ -262,11 +263,12 @@ class UserHistory < ActiveRecord::Base
opts[:action_id] = self.actions[opts[:action_name].to_sym] if opts[:action_name]
end
- query = self
- .with_filters(opts.slice(*staff_filters))
- .only_staff_actions
- .order('id DESC')
- .includes(:acting_user, :target_user)
+ query =
+ self
+ .with_filters(opts.slice(*staff_filters))
+ .only_staff_actions
+ .order("id DESC")
+ .includes(:acting_user, :target_user)
query = query.where(admin_only: false) unless viewer && viewer.admin?
query
end
diff --git a/app/models/user_notification_schedule.rb b/app/models/user_notification_schedule.rb
index b80b4406a53..4a2bfac0fef 100644
--- a/app/models/user_notification_schedule.rb
+++ b/app/models/user_notification_schedule.rb
@@ -3,17 +3,17 @@
class UserNotificationSchedule < ActiveRecord::Base
belongs_to :user
- DEFAULT = -> {
+ DEFAULT = -> do
attrs = { enabled: false }
7.times do |n|
attrs["day_#{n}_start_time".to_sym] = 480
attrs["day_#{n}_end_time".to_sym] = 1020
end
attrs
- }.call
+ end.call
validate :has_valid_times
- validates :enabled, inclusion: { in: [ true, false ] }
+ validates :enabled, inclusion: { in: [true, false] }
scope :enabled, -> { where(enabled: true) }
@@ -37,9 +37,7 @@ class UserNotificationSchedule < ActiveRecord::Base
errors.add(start_key, "is invalid")
end
- if self[end_key].nil? || self[end_key] > 1440
- errors.add(end_key, "is invalid")
- end
+ errors.add(end_key, "is invalid") if self[end_key].nil? || self[end_key] > 1440
if self[start_key] && self[end_key] && self[start_key] > self[end_key]
errors.add(start_key, "is after end time")
diff --git a/app/models/user_option.rb b/app/models/user_option.rb
index 1bf0062d202..70d80d80522 100644
--- a/app/models/user_option.rb
+++ b/app/models/user_option.rb
@@ -11,10 +11,15 @@ class UserOption < ActiveRecord::Base
after_save :update_tracked_topics
- scope :human_users, -> { where('user_id > 0') }
+ scope :human_users, -> { where("user_id > 0") }
enum default_calendar: { none_selected: 0, ics: 1, google: 2 }, _scopes: false
- enum sidebar_list_destination: { none_selected: 0, default: 0, unread_new: 1 }, _prefix: "sidebar_list"
+ enum sidebar_list_destination: {
+ none_selected: 0,
+ default: 0,
+ unread_new: 1,
+ },
+ _prefix: "sidebar_list"
def self.ensure_consistency!
sql = <<~SQL
@@ -23,9 +28,7 @@ class UserOption < ActiveRecord::Base
WHERE o.user_id IS NULL
SQL
- DB.query_single(sql).each do |id|
- UserOption.create(user_id: id)
- end
+ DB.query_single(sql).each { |id| UserOption.create(user_id: id) }
end
def self.previous_replies_type
@@ -33,7 +36,8 @@ class UserOption < ActiveRecord::Base
end
def self.like_notification_frequency_type
- @like_notification_frequency_type ||= Enum.new(always: 0, first_time_and_daily: 1, first_time: 2, never: 3)
+ @like_notification_frequency_type ||=
+ Enum.new(always: 0, first_time_and_daily: 1, first_time: 2, never: 3)
end
def self.text_sizes
@@ -70,7 +74,8 @@ class UserOption < ActiveRecord::Base
self.new_topic_duration_minutes = SiteSetting.default_other_new_topic_duration_minutes
self.auto_track_topics_after_msecs = SiteSetting.default_other_auto_track_topics_after_msecs
- self.notification_level_when_replying = SiteSetting.default_other_notification_level_when_replying
+ self.notification_level_when_replying =
+ SiteSetting.default_other_notification_level_when_replying
self.like_notification_frequency = SiteSetting.default_other_like_notification_frequency
@@ -111,7 +116,12 @@ class UserOption < ActiveRecord::Base
Discourse.redis.expire(key, delay)
# delay the update
- Jobs.enqueue_in(delay / 2, :update_top_redirection, user_id: self.user_id, redirected_at: Time.zone.now.to_s)
+ Jobs.enqueue_in(
+ delay / 2,
+ :update_top_redirection,
+ user_id: self.user_id,
+ redirected_at: Time.zone.now.to_s,
+ )
end
def should_be_redirected_to_top
@@ -133,16 +143,10 @@ class UserOption < ActiveRecord::Base
if !user.seen_before? || (user.trust_level == 0 && !redirected_to_top_yet?)
update_last_redirected_to_top!
- return {
- reason: I18n.t('redirected_to_top_reasons.new_user'),
- period: period
- }
+ return { reason: I18n.t("redirected_to_top_reasons.new_user"), period: period }
elsif user.last_seen_at < 1.month.ago
update_last_redirected_to_top!
- return {
- reason: I18n.t('redirected_to_top_reasons.not_seen_in_a_month'),
- period: period
- }
+ return { reason: I18n.t("redirected_to_top_reasons.not_seen_in_a_month"), period: period }
end
# don't redirect to top
@@ -150,7 +154,8 @@ class UserOption < ActiveRecord::Base
end
def treat_as_new_topic_start_date
- duration = new_topic_duration_minutes || SiteSetting.default_other_new_topic_duration_minutes.to_i
+ duration =
+ new_topic_duration_minutes || SiteSetting.default_other_new_topic_duration_minutes.to_i
times = [
case duration
when User::NewTopicDuration::ALWAYS
@@ -161,7 +166,7 @@ class UserOption < ActiveRecord::Base
duration.minutes.ago
end,
user.created_at,
- Time.at(SiteSetting.min_new_topics_time).to_datetime
+ Time.at(SiteSetting.min_new_topics_time).to_datetime,
]
times.max
@@ -169,14 +174,22 @@ class UserOption < ActiveRecord::Base
def homepage
case homepage_id
- when 1 then "latest"
- when 2 then "categories"
- when 3 then "unread"
- when 4 then "new"
- when 5 then "top"
- when 6 then "bookmarks"
- when 7 then "unseen"
- else SiteSetting.homepage
+ when 1
+ "latest"
+ when 2
+ "categories"
+ when 3
+ "unread"
+ when 4
+ "new"
+ when 5
+ "top"
+ when 6
+ "bookmarks"
+ when 7
+ "unseen"
+ else
+ SiteSetting.homepage
end
end
@@ -197,9 +210,7 @@ class UserOption < ActiveRecord::Base
end
def unsubscribed_from_all?
- !mailing_list_mode &&
- !email_digests &&
- email_level == UserOption.email_level_types[:never] &&
+ !mailing_list_mode && !email_digests && email_level == UserOption.email_level_types[:never] &&
email_messages_level == UserOption.email_level_types[:never]
end
@@ -208,14 +219,16 @@ class UserOption < ActiveRecord::Base
end
def self.user_tzinfo(user_id)
- timezone = UserOption.where(user_id: user_id).pluck(:timezone).first || 'UTC'
+ timezone = UserOption.where(user_id: user_id).pluck(:timezone).first || "UTC"
tzinfo = nil
begin
tzinfo = ActiveSupport::TimeZone.find_tzinfo(timezone)
rescue TZInfo::InvalidTimezoneIdentifier
- Rails.logger.warn("#{User.find_by(id: user_id)&.username} has the timezone #{timezone} set, we do not know how to parse it in Rails, fallback to UTC")
- tzinfo = ActiveSupport::TimeZone.find_tzinfo('UTC')
+ Rails.logger.warn(
+ "#{User.find_by(id: user_id)&.username} has the timezone #{timezone} set, we do not know how to parse it in Rails, fallback to UTC",
+ )
+ tzinfo = ActiveSupport::TimeZone.find_tzinfo("UTC")
end
tzinfo
@@ -227,7 +240,6 @@ class UserOption < ActiveRecord::Base
return unless saved_change_to_auto_track_topics_after_msecs?
TrackedTopicsUpdater.new(id, auto_track_topics_after_msecs).call
end
-
end
# == Schema Information
diff --git a/app/models/user_profile.rb b/app/models/user_profile.rb
index e3136c65261..2ed6d1b0279 100644
--- a/app/models/user_profile.rb
+++ b/app/models/user_profile.rb
@@ -7,13 +7,19 @@ class UserProfile < ActiveRecord::Base
belongs_to :card_background_upload, class_name: "Upload"
belongs_to :profile_background_upload, class_name: "Upload"
belongs_to :granted_title_badge, class_name: "Badge"
- belongs_to :featured_topic, class_name: 'Topic'
+ belongs_to :featured_topic, class_name: "Topic"
has_many :upload_references, as: :target, dependent: :destroy
has_many :user_profile_views, dependent: :destroy
validates :bio_raw, length: { maximum: 3000 }, watched_words: true
- validates :website, url: true, length: { maximum: 3000 }, allow_blank: true, if: :validate_website?
+ validates :website,
+ url: true,
+ length: {
+ maximum: 3000,
+ },
+ allow_blank: true,
+ if: :validate_website?
validates :location, length: { maximum: 3000 }, watched_words: true
validates :user, presence: true
@@ -26,8 +32,11 @@ class UserProfile < ActiveRecord::Base
after_save :pull_hotlinked_image
after_save do
- if saved_change_to_profile_background_upload_id? || saved_change_to_card_background_upload_id? || saved_change_to_bio_raw?
- upload_ids = [self.profile_background_upload_id, self.card_background_upload_id] + Upload.extract_upload_ids(self.bio_raw)
+ if saved_change_to_profile_background_upload_id? ||
+ saved_change_to_card_background_upload_id? || saved_change_to_bio_raw?
+ upload_ids =
+ [self.profile_background_upload_id, self.card_background_upload_id] +
+ Upload.extract_upload_ids(self.bio_raw)
UploadReference.ensure_exist!(upload_ids: upload_ids, target: self)
end
end
@@ -36,13 +45,15 @@ class UserProfile < ActiveRecord::Base
def bio_excerpt(length = 350, opts = {})
return nil if bio_cooked.blank?
- excerpt = PrettyText.excerpt(bio_cooked, length, opts).sub(/
$/, '')
+ excerpt = PrettyText.excerpt(bio_cooked, length, opts).sub(/
$/, "")
return excerpt if excerpt.blank? || (user.has_trust_level?(TrustLevel[1]) && !user.suspended?)
PrettyText.strip_links(excerpt)
end
def bio_processed
- return bio_cooked if bio_cooked.blank? || (user.has_trust_level?(TrustLevel[1]) && !user.suspended?)
+ if bio_cooked.blank? || (user.has_trust_level?(TrustLevel[1]) && !user.suspended?)
+ return bio_cooked
+ end
PrettyText.strip_links(bio_cooked)
end
@@ -73,14 +84,16 @@ class UserProfile < ActiveRecord::Base
def self.rebake_old(limit)
problems = []
- UserProfile.where('bio_cooked_version IS NULL OR bio_cooked_version < ?', BAKED_VERSION)
- .limit(limit).each do |p|
- begin
- p.rebake!
- rescue => e
- problems << { profile: p, ex: e }
+ UserProfile
+ .where("bio_cooked_version IS NULL OR bio_cooked_version < ?", BAKED_VERSION)
+ .limit(limit)
+ .each do |p|
+ begin
+ p.rebake!
+ rescue => e
+ problems << { profile: p, ex: e }
+ end
end
- end
problems
end
@@ -90,15 +103,18 @@ class UserProfile < ActiveRecord::Base
def self.import_url_for_user(background_url, user, options = nil)
if SiteSetting.verbose_upload_logging
- Rails.logger.warn("Verbose Upload Logging: Downloading profile background from #{background_url}")
+ Rails.logger.warn(
+ "Verbose Upload Logging: Downloading profile background from #{background_url}",
+ )
end
- tempfile = FileHelper.download(
- background_url,
- max_file_size: SiteSetting.max_image_size_kb.kilobytes,
- tmp_file_name: "sso-profile-background",
- follow_redirect: true
- )
+ tempfile =
+ FileHelper.download(
+ background_url,
+ max_file_size: SiteSetting.max_image_size_kb.kilobytes,
+ tmp_file_name: "sso-profile-background",
+ follow_redirect: true,
+ )
return unless tempfile
@@ -108,14 +124,19 @@ class UserProfile < ActiveRecord::Base
is_card_background = !options || options[:is_card_background]
type = is_card_background ? "card_background" : "profile_background"
- upload = UploadCreator.new(tempfile, "external-profile-background." + ext, origin: background_url, type: type).create_for(user.id)
+ upload =
+ UploadCreator.new(
+ tempfile,
+ "external-profile-background." + ext,
+ origin: background_url,
+ type: type,
+ ).create_for(user.id)
if (is_card_background)
user.user_profile.upload_card_background(upload)
else
user.user_profile.upload_profile_background(upload)
end
-
rescue Net::ReadTimeout, OpenURI::HTTPError
# skip saving, we are not connected to the net
ensure
@@ -133,7 +154,7 @@ class UserProfile < ActiveRecord::Base
Jobs.enqueue_in(
SiteSetting.editing_grace_period,
:pull_user_profile_hotlinked_images,
- user_id: self.user_id
+ user_id: self.user_id,
)
end
end
@@ -146,7 +167,10 @@ class UserProfile < ActiveRecord::Base
def cooked
if self.bio_raw.present?
- PrettyText.cook(self.bio_raw, omit_nofollow: user.has_trust_level?(TrustLevel[3]) && !SiteSetting.tl3_links_no_follow)
+ PrettyText.cook(
+ self.bio_raw,
+ omit_nofollow: user.has_trust_level?(TrustLevel[3]) && !SiteSetting.tl3_links_no_follow,
+ )
else
nil
end
@@ -171,11 +195,20 @@ class UserProfile < ActiveRecord::Base
allowed_domains = SiteSetting.allowed_user_website_domains
return if (allowed_domains.blank? || self.website.blank?)
- domain = begin
- URI.parse(self.website).host
- rescue URI::Error
+ domain =
+ begin
+ URI.parse(self.website).host
+ rescue URI::Error
+ end
+ unless allowed_domains.split("|").include?(domain)
+ self.errors.add :base,
+ (
+ I18n.t(
+ "user.website.domain_not_allowed",
+ domains: allowed_domains.split("|").join(", "),
+ )
+ )
end
- self.errors.add :base, (I18n.t('user.website.domain_not_allowed', domains: allowed_domains.split('|').join(", "))) unless allowed_domains.split('|').include?(domain)
end
def validate_website?
diff --git a/app/models/user_profile_view.rb b/app/models/user_profile_view.rb
index 5bc6acbe145..0648b75eb0b 100644
--- a/app/models/user_profile_view.rb
+++ b/app/models/user_profile_view.rb
@@ -16,11 +16,13 @@ class UserProfileView < ActiveRecord::Base
redis_key << ":ip-#{ip}"
end
- if skip_redis || Discourse.redis.setnx(redis_key, '1')
- skip_redis || Discourse.redis.expire(redis_key, SiteSetting.user_profile_view_duration_hours.hours)
+ if skip_redis || Discourse.redis.setnx(redis_key, "1")
+ skip_redis ||
+ Discourse.redis.expire(redis_key, SiteSetting.user_profile_view_duration_hours.hours)
self.transaction do
- sql = "INSERT INTO user_profile_views (user_profile_id, ip_address, viewed_at, user_id)
+ sql =
+ "INSERT INTO user_profile_views (user_profile_id, ip_address, viewed_at, user_id)
SELECT :user_profile_id, :ip_address, :viewed_at, :user_id
WHERE NOT EXISTS (
SELECT 1 FROM user_profile_views
@@ -30,16 +32,24 @@ class UserProfileView < ActiveRecord::Base
builder = DB.build(sql)
if !user_id
- builder.where("viewed_at = :viewed_at AND ip_address = :ip_address AND user_profile_id = :user_profile_id AND user_id IS NULL")
+ builder.where(
+ "viewed_at = :viewed_at AND ip_address = :ip_address AND user_profile_id = :user_profile_id AND user_id IS NULL",
+ )
else
- builder.where("viewed_at = :viewed_at AND user_id = :user_id AND user_profile_id = :user_profile_id")
+ builder.where(
+ "viewed_at = :viewed_at AND user_id = :user_id AND user_profile_id = :user_profile_id",
+ )
end
- result = builder.exec(user_profile_id: user_profile_id, ip_address: ip, viewed_at: at, user_id: user_id)
+ result =
+ builder.exec(
+ user_profile_id: user_profile_id,
+ ip_address: ip,
+ viewed_at: at,
+ user_id: user_id,
+ )
- if result > 0
- UserProfile.find(user_profile_id).increment!(:views)
- end
+ UserProfile.find(user_profile_id).increment!(:views) if result > 0
end
end
end
@@ -47,8 +57,10 @@ class UserProfileView < ActiveRecord::Base
def self.profile_views_by_day(start_date, end_date, group_id = nil)
profile_views = self.where("viewed_at >= ? AND viewed_at < ?", start_date, end_date + 1.day)
if group_id
- profile_views = profile_views.joins("INNER JOIN users ON users.id = user_profile_views.user_id")
- profile_views = profile_views.joins("INNER JOIN group_users ON group_users.user_id = users.id")
+ profile_views =
+ profile_views.joins("INNER JOIN users ON users.id = user_profile_views.user_id")
+ profile_views =
+ profile_views.joins("INNER JOIN group_users ON group_users.user_id = users.id")
profile_views = profile_views.where("group_users.group_id = ?", group_id)
end
profile_views.group("date(viewed_at)").order("date(viewed_at)").count
diff --git a/app/models/user_search.rb b/app/models/user_search.rb
index baa25dfffac..7b21ff6b7fe 100644
--- a/app/models/user_search.rb
+++ b/app/models/user_search.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class UserSearch
-
MAX_SIZE_PRIORITY_MENTION ||= 500
def initialize(term, opts = {})
@@ -31,17 +30,16 @@ class UserSearch
users = users.not_suspended unless @searching_user&.staff?
if @groups
- users = users
- .joins(:group_users)
- .where("group_users.group_id IN (?)", @groups.map(&:id))
+ users = users.joins(:group_users).where("group_users.group_id IN (?)", @groups.map(&:id))
end
# Only show users who have access to private topic
if @topic_allowed_users == "true" && @topic&.category&.read_restricted
- users = users
- .references(:categories)
- .includes(:secure_categories)
- .where("users.admin OR categories.id = ?", @topic.category_id)
+ users =
+ users
+ .references(:categories)
+ .includes(:secure_categories)
+ .where("users.admin OR categories.id = ?", @topic.category_id)
end
users
@@ -70,27 +68,27 @@ class UserSearch
exact_matches = scoped_users.where(username_lower: @term)
# don't pollute mentions with users who haven't shown up in over a year
- exact_matches = exact_matches.where('last_seen_at > ?', 1.year.ago) if @topic_id || @category_id
+ exact_matches = exact_matches.where("last_seen_at > ?", 1.year.ago) if @topic_id ||
+ @category_id
- exact_matches
- .limit(@limit)
- .pluck(:id)
- .each { |id| users << id }
+ exact_matches.limit(@limit).pluck(:id).each { |id| users << id }
end
return users.to_a if users.size >= @limit
# 2. in topic
if @topic_id
- in_topic = filtered_by_term_users
- .where('users.id IN (SELECT user_id FROM posts WHERE topic_id = ? AND post_type = ? AND deleted_at IS NULL)', @topic_id, Post.types[:regular])
+ in_topic =
+ filtered_by_term_users.where(
+ "users.id IN (SELECT user_id FROM posts WHERE topic_id = ? AND post_type = ? AND deleted_at IS NULL)",
+ @topic_id,
+ Post.types[:regular],
+ )
- if @searching_user.present?
- in_topic = in_topic.where('users.id <> ?', @searching_user.id)
- end
+ in_topic = in_topic.where("users.id <> ?", @searching_user.id) if @searching_user.present?
in_topic
- .order('last_seen_at DESC NULLS LAST')
+ .order("last_seen_at DESC NULLS LAST")
.limit(@limit - users.size)
.pluck(:id)
.each { |id| users << id }
@@ -131,8 +129,7 @@ class UserSearch
category_groups = category_groups.members_visible_groups(@searching_user)
end
- in_category = filtered_by_term_users
- .where(<<~SQL, category_groups.pluck(:id))
+ in_category = filtered_by_term_users.where(<<~SQL, category_groups.pluck(:id))
users.id IN (
SELECT gu.user_id
FROM group_users gu
@@ -142,11 +139,11 @@ class UserSearch
SQL
if @searching_user.present?
- in_category = in_category.where('users.id <> ?', @searching_user.id)
+ in_category = in_category.where("users.id <> ?", @searching_user.id)
end
in_category
- .order('last_seen_at DESC NULLS LAST')
+ .order("last_seen_at DESC NULLS LAST")
.limit(@limit - users.size)
.pluck(:id)
.each { |id| users << id }
@@ -157,7 +154,7 @@ class UserSearch
# 4. global matches
if @term.present?
filtered_by_term_users
- .order('last_seen_at DESC NULLS LAST')
+ .order("last_seen_at DESC NULLS LAST")
.limit(@limit - users.size)
.pluck(:id)
.each { |id| users << id }
@@ -166,7 +163,7 @@ class UserSearch
# 5. last seen users (for search auto-suggestions)
if @last_seen_users
scoped_users
- .order('last_seen_at DESC NULLS LAST')
+ .order("last_seen_at DESC NULLS LAST")
.limit(@limit - users.size)
.pluck(:id)
.each { |id| users << id }
@@ -179,16 +176,15 @@ class UserSearch
ids = search_ids
return User.where("0=1") if ids.empty?
- results = User.joins("JOIN (SELECT unnest uid, row_number() OVER () AS rn
+ results =
+ User.joins(
+ "JOIN (SELECT unnest uid, row_number() OVER () AS rn
FROM unnest('{#{ids.join(",")}}'::int[])
- ) x on uid = users.id")
- .order("rn")
+ ) x on uid = users.id",
+ ).order("rn")
- if SiteSetting.enable_user_status
- results = results.includes(:user_status)
- end
+ results = results.includes(:user_status) if SiteSetting.enable_user_status
results
end
-
end
diff --git a/app/models/user_second_factor.rb b/app/models/user_second_factor.rb
index 7846f27ad86..3c71c6b65e7 100644
--- a/app/models/user_second_factor.rb
+++ b/app/models/user_second_factor.rb
@@ -4,24 +4,14 @@ class UserSecondFactor < ActiveRecord::Base
include SecondFactorManager
belongs_to :user
- scope :backup_codes, -> do
- where(method: UserSecondFactor.methods[:backup_codes], enabled: true)
- end
+ scope :backup_codes, -> { where(method: UserSecondFactor.methods[:backup_codes], enabled: true) }
- scope :totps, -> do
- where(method: UserSecondFactor.methods[:totp], enabled: true)
- end
+ scope :totps, -> { where(method: UserSecondFactor.methods[:totp], enabled: true) }
- scope :all_totps, -> do
- where(method: UserSecondFactor.methods[:totp])
- end
+ scope :all_totps, -> { where(method: UserSecondFactor.methods[:totp]) }
def self.methods
- @methods ||= Enum.new(
- totp: 1,
- backup_codes: 2,
- security_key: 3,
- )
+ @methods ||= Enum.new(totp: 1, backup_codes: 2, security_key: 3)
end
def totp_object
@@ -31,7 +21,6 @@ class UserSecondFactor < ActiveRecord::Base
def totp_provisioning_uri
totp_object.provisioning_uri(user.email)
end
-
end
# == Schema Information
diff --git a/app/models/user_security_key.rb b/app/models/user_security_key.rb
index 229dbbdf968..5447ee23adc 100644
--- a/app/models/user_security_key.rb
+++ b/app/models/user_security_key.rb
@@ -3,16 +3,11 @@
class UserSecurityKey < ActiveRecord::Base
belongs_to :user
- scope :second_factors, -> do
- where(factor_type: UserSecurityKey.factor_types[:second_factor], enabled: true)
- end
+ scope :second_factors,
+ -> { where(factor_type: UserSecurityKey.factor_types[:second_factor], enabled: true) }
def self.factor_types
- @factor_types ||= Enum.new(
- second_factor: 0,
- first_factor: 1,
- multi_factor: 2,
- )
+ @factor_types ||= Enum.new(second_factor: 0, first_factor: 1, multi_factor: 2)
end
end
diff --git a/app/models/user_stat.rb b/app/models/user_stat.rb
index e6a86c91152..894a888c1f4 100644
--- a/app/models/user_stat.rb
+++ b/app/models/user_stat.rb
@@ -1,6 +1,5 @@
# frozen_string_literal: true
class UserStat < ActiveRecord::Base
-
belongs_to :user
after_save :trigger_badges
@@ -21,7 +20,8 @@ class UserStat < ActiveRecord::Base
def self.update_first_unread_pm(last_seen, limit: UPDATE_UNREAD_USERS_LIMIT)
whisperers_group_ids = SiteSetting.whispers_allowed_group_ids
- DB.exec(<<~SQL, archetype: Archetype.private_message, now: UPDATE_UNREAD_MINUTES_AGO.minutes.ago, last_seen: last_seen, limit: limit, whisperers_group_ids: whisperers_group_ids)
+ DB.exec(
+ <<~SQL,
UPDATE user_stats us
SET first_unread_pm_at = COALESCE(Z.min_date, :now)
FROM (
@@ -37,11 +37,11 @@ class UserStat < ActiveRecord::Base
INNER JOIN topics t ON t.id = tau.topic_id
INNER JOIN users u ON u.id = tau.user_id
LEFT JOIN topic_users tu ON t.id = tu.topic_id AND tu.user_id = tau.user_id
- #{whisperers_group_ids.present? ? 'LEFT JOIN group_users gu ON gu.group_id IN (:whisperers_group_ids) AND gu.user_id = u.id' : ''}
+ #{whisperers_group_ids.present? ? "LEFT JOIN group_users gu ON gu.group_id IN (:whisperers_group_ids) AND gu.user_id = u.id" : ""}
WHERE t.deleted_at IS NULL
AND t.archetype = :archetype
AND tu.last_read_post_number < CASE
- WHEN u.admin OR u.moderator #{whisperers_group_ids.present? ? 'OR gu.id IS NOT NULL' : ''}
+ WHEN u.admin OR u.moderator #{whisperers_group_ids.present? ? "OR gu.id IS NOT NULL" : ""}
THEN t.highest_staff_post_number
ELSE t.highest_post_number
END
@@ -67,6 +67,12 @@ class UserStat < ActiveRecord::Base
) AS Z
WHERE us.user_id = Z.user_id
SQL
+ archetype: Archetype.private_message,
+ now: UPDATE_UNREAD_MINUTES_AGO.minutes.ago,
+ last_seen: last_seen,
+ limit: limit,
+ whisperers_group_ids: whisperers_group_ids,
+ )
end
def self.update_first_unread(last_seen, limit: UPDATE_UNREAD_USERS_LIMIT)
@@ -140,14 +146,14 @@ class UserStat < ActiveRecord::Base
end
def self.reset_bounce_scores
- UserStat.where("reset_bounce_score_after < now()")
+ UserStat
+ .where("reset_bounce_score_after < now()")
.where("bounce_score > 0")
.update_all(bounce_score: 0)
end
# Updates the denormalized view counts for all users
def self.update_view_counts(last_seen = 1.hour.ago)
-
# NOTE: we only update the counts for users we have seen in the last hour
# this avoids a very expensive query that may run on the entire user base
# we also ensure we only touch the table if data changes
@@ -210,7 +216,8 @@ class UserStat < ActiveRecord::Base
def self.update_draft_count(user_id = nil)
if user_id.present?
- draft_count, has_topic_draft = DB.query_single <<~SQL, user_id: user_id, new_topic: Draft::NEW_TOPIC
+ draft_count, has_topic_draft =
+ DB.query_single <<~SQL, user_id: user_id, new_topic: Draft::NEW_TOPIC
UPDATE user_stats
SET draft_count = (SELECT COUNT(*) FROM drafts WHERE user_id = :user_id)
WHERE user_id = :user_id
@@ -219,11 +226,8 @@ class UserStat < ActiveRecord::Base
MessageBus.publish(
"/user-drafts/#{user_id}",
- {
- draft_count: draft_count,
- has_topic_draft: !!has_topic_draft
- },
- user_ids: [user_id]
+ { draft_count: draft_count, has_topic_draft: !!has_topic_draft },
+ user_ids: [user_id],
)
else
DB.exec <<~SQL
@@ -249,7 +253,7 @@ class UserStat < ActiveRecord::Base
AND topics.user_id <> posts.user_id
AND posts.deleted_at IS NULL AND topics.deleted_at IS NULL
AND topics.archetype <> 'private_message'
- #{start_time.nil? ? '' : 'AND posts.created_at > ?'}
+ #{start_time.nil? ? "" : "AND posts.created_at > ?"}
SQL
if start_time.nil?
DB.query_single(sql, self.user_id).first
@@ -303,7 +307,7 @@ class UserStat < ActiveRecord::Base
"/u/#{user.username_lower}/counters",
{ pending_posts_count: pending_posts_count },
user_ids: [user.id],
- group_ids: [Group::AUTO_GROUPS[:staff]]
+ group_ids: [Group::AUTO_GROUPS[:staff]],
)
end
diff --git a/app/models/user_summary.rb b/app/models/user_summary.rb
index f30507117d0..c5e4c93fee0 100644
--- a/app/models/user_summary.rb
+++ b/app/models/user_summary.rb
@@ -3,11 +3,10 @@
# ViewModel used on Summary tab on User page
class UserSummary
-
MAX_SUMMARY_RESULTS = 6
MAX_BADGES = 6
- alias :read_attribute_for_serialization :send
+ alias read_attribute_for_serialization send
def initialize(user, guardian)
@user = user
@@ -20,14 +19,14 @@ class UserSummary
.listable_topics
.visible
.where(user: @user)
- .order('like_count DESC, created_at DESC')
+ .order("like_count DESC, created_at DESC")
.limit(MAX_SUMMARY_RESULTS)
end
def replies
post_query
- .where('post_number > 1')
- .order('posts.like_count DESC, posts.created_at DESC')
+ .where("post_number > 1")
+ .order("posts.like_count DESC, posts.created_at DESC")
.limit(MAX_SUMMARY_RESULTS)
end
@@ -36,11 +35,11 @@ class UserSummary
.joins(:topic, :post)
.where(posts: { user_id: @user.id })
.includes(:topic, :post)
- .where('posts.post_type IN (?)', Topic.visible_post_types(@guardian && @guardian.user))
+ .where("posts.post_type IN (?)", Topic.visible_post_types(@guardian && @guardian.user))
.merge(Topic.listable_topics.visible.secured(@guardian))
.where(user: @user)
.where(internal: false, reflection: false, quote: false)
- .order('clicks DESC, topic_links.created_at DESC')
+ .order("clicks DESC, topic_links.created_at DESC")
.limit(MAX_SUMMARY_RESULTS)
end
@@ -50,14 +49,15 @@ class UserSummary
def most_liked_by_users
likers = {}
- UserAction.joins(:target_topic, :target_post)
+ UserAction
+ .joins(:target_topic, :target_post)
.merge(Topic.listable_topics.visible.secured(@guardian))
.where(user: @user)
.where(action_type: UserAction::WAS_LIKED)
.group(:acting_user_id)
- .order('COUNT(*) DESC')
+ .order("COUNT(*) DESC")
.limit(MAX_SUMMARY_RESULTS)
- .pluck('acting_user_id, COUNT(*)')
+ .pluck("acting_user_id, COUNT(*)")
.each { |l| likers[l[0]] = l[1] }
user_counts(likers)
@@ -65,14 +65,15 @@ class UserSummary
def most_liked_users
liked_users = {}
- UserAction.joins(:target_topic, :target_post)
+ UserAction
+ .joins(:target_topic, :target_post)
.merge(Topic.listable_topics.visible.secured(@guardian))
.where(action_type: UserAction::WAS_LIKED)
.where(acting_user_id: @user.id)
.group(:user_id)
- .order('COUNT(*) DESC')
+ .order("COUNT(*) DESC")
.limit(MAX_SUMMARY_RESULTS)
- .pluck('user_actions.user_id, COUNT(*)')
+ .pluck("user_actions.user_id, COUNT(*)")
.each { |l| liked_users[l[0]] = l[1] }
user_counts(liked_users)
@@ -84,12 +85,14 @@ class UserSummary
replied_users = {}
post_query
- .joins('JOIN posts replies ON posts.topic_id = replies.topic_id AND posts.reply_to_post_number = replies.post_number')
- .where('replies.user_id <> ?', @user.id)
- .group('replies.user_id')
- .order('COUNT(*) DESC')
+ .joins(
+ "JOIN posts replies ON posts.topic_id = replies.topic_id AND posts.reply_to_post_number = replies.post_number",
+ )
+ .where("replies.user_id <> ?", @user.id)
+ .group("replies.user_id")
+ .order("COUNT(*) DESC")
.limit(MAX_SUMMARY_RESULTS)
- .pluck('replies.user_id, COUNT(*)')
+ .pluck("replies.user_id, COUNT(*)")
.each { |r| replied_users[r[0]] = r[1] }
user_counts(replied_users)
@@ -121,44 +124,42 @@ class UserSummary
class CategoryWithCounts < OpenStruct
include ActiveModel::SerializerSupport
- KEYS = [:id, :name, :color, :text_color, :slug, :read_restricted, :parent_category_id]
+ KEYS = %i[id name color text_color slug read_restricted parent_category_id]
end
def top_categories
- post_count_query = post_query.group('topics.category_id')
+ post_count_query = post_query.group("topics.category_id")
top_categories = {}
- Category.where(id: post_count_query.order("count(*) DESC").limit(MAX_SUMMARY_RESULTS).pluck('category_id'))
+ Category
+ .where(
+ id: post_count_query.order("count(*) DESC").limit(MAX_SUMMARY_RESULTS).pluck("category_id"),
+ )
.pluck(:id, :name, :color, :text_color, :slug, :read_restricted, :parent_category_id)
.each do |c|
top_categories[c[0].to_i] = CategoryWithCounts.new(
- Hash[CategoryWithCounts::KEYS.zip(c)].merge(
- topic_count: 0,
- post_count: 0
- )
+ Hash[CategoryWithCounts::KEYS.zip(c)].merge(topic_count: 0, post_count: 0),
)
end
- post_count_query.where('post_number > 1')
- .where('topics.category_id in (?)', top_categories.keys)
- .pluck('category_id, COUNT(*)')
- .each do |r|
- top_categories[r[0].to_i].post_count = r[1]
- end
+ post_count_query
+ .where("post_number > 1")
+ .where("topics.category_id in (?)", top_categories.keys)
+ .pluck("category_id, COUNT(*)")
+ .each { |r| top_categories[r[0].to_i].post_count = r[1] }
- Topic.listable_topics.visible.secured(@guardian)
- .where('topics.category_id in (?)', top_categories.keys)
+ Topic
+ .listable_topics
+ .visible
+ .secured(@guardian)
+ .where("topics.category_id in (?)", top_categories.keys)
.where(user: @user)
- .group('topics.category_id')
- .pluck('category_id, COUNT(*)')
- .each do |r|
- top_categories[r[0].to_i].topic_count = r[1]
- end
+ .group("topics.category_id")
+ .pluck("category_id, COUNT(*)")
+ .each { |r| top_categories[r[0].to_i].topic_count = r[1] }
- top_categories.values.sort_by do |r|
- -(r[:post_count] + r[:topic_count])
- end
+ top_categories.values.sort_by { |r| -(r[:post_count] + r[:topic_count]) }
end
delegate :likes_given,
@@ -171,37 +172,42 @@ class UserSummary
:time_read,
to: :user_stat
-protected
+ protected
def user_counts(user_hash)
user_ids = user_hash.keys
lookup = UserLookup.new(user_ids)
- user_ids.map do |user_id|
- lookup_hash = lookup[user_id]
+ user_ids
+ .map do |user_id|
+ lookup_hash = lookup[user_id]
- if lookup_hash.present?
- primary_group = lookup.primary_groups[user_id]
- flair_group = lookup.flair_groups[user_id]
+ if lookup_hash.present?
+ primary_group = lookup.primary_groups[user_id]
+ flair_group = lookup.flair_groups[user_id]
- UserWithCount.new(
- lookup_hash.attributes.merge(
- count: user_hash[user_id],
- primary_group: primary_group,
- flair_group: flair_group
+ UserWithCount.new(
+ lookup_hash.attributes.merge(
+ count: user_hash[user_id],
+ primary_group: primary_group,
+ flair_group: flair_group,
+ ),
)
- )
+ end
end
- end.compact.sort_by { |u| -u[:count] }
+ .compact
+ .sort_by { |u| -u[:count] }
end
def post_query
Post
.joins(:topic)
.includes(:topic)
- .where('posts.post_type IN (?)', Topic.visible_post_types(@guardian&.user, include_moderator_actions: false))
+ .where(
+ "posts.post_type IN (?)",
+ Topic.visible_post_types(@guardian&.user, include_moderator_actions: false),
+ )
.merge(Topic.listable_topics.visible.secured(@guardian))
.where(user: @user)
end
-
end
diff --git a/app/models/user_visit.rb b/app/models/user_visit.rb
index ca08bc67477..57353a91a9d 100644
--- a/app/models/user_visit.rb
+++ b/app/models/user_visit.rb
@@ -2,7 +2,7 @@
class UserVisit < ActiveRecord::Base
def self.counts_by_day_query(start_date, end_date, group_id = nil)
- result = where('visited_at >= ? and visited_at <= ?', start_date.to_date, end_date.to_date)
+ result = where("visited_at >= ? and visited_at <= ?", start_date.to_date, end_date.to_date)
if group_id
result = result.joins("INNER JOIN users ON users.id = user_visits.user_id")
diff --git a/app/models/user_warning.rb b/app/models/user_warning.rb
index b11bff29949..11602880416 100644
--- a/app/models/user_warning.rb
+++ b/app/models/user_warning.rb
@@ -3,7 +3,7 @@
class UserWarning < ActiveRecord::Base
belongs_to :user
belongs_to :topic
- belongs_to :created_by, class_name: 'User'
+ belongs_to :created_by, class_name: "User"
end
# == Schema Information
diff --git a/app/models/username_validator.rb b/app/models/username_validator.rb
index 747eb2f777e..8c82653b205 100644
--- a/app/models/username_validator.rb
+++ b/app/models/username_validator.rb
@@ -54,16 +54,14 @@ class UsernameValidator
def username_present?
return unless errors.empty?
- if username.blank?
- self.errors << I18n.t(:'user.username.blank')
- end
+ self.errors << I18n.t(:"user.username.blank") if username.blank?
end
def username_length_min?
return unless errors.empty?
if username_grapheme_clusters.size < User.username_length.begin
- self.errors << I18n.t(:'user.username.short', min: User.username_length.begin)
+ self.errors << I18n.t(:"user.username.short", min: User.username_length.begin)
end
end
@@ -71,9 +69,9 @@ class UsernameValidator
return unless errors.empty?
if username_grapheme_clusters.size > User.username_length.end
- self.errors << I18n.t(:'user.username.long', max: User.username_length.end)
+ self.errors << I18n.t(:"user.username.long", max: User.username_length.end)
elsif username.length > MAX_CHARS
- self.errors << I18n.t(:'user.username.too_long')
+ self.errors << I18n.t(:"user.username.too_long")
end
end
@@ -81,7 +79,7 @@ class UsernameValidator
return unless errors.empty?
if self.class.invalid_char_pattern.match?(username)
- self.errors << I18n.t(:'user.username.characters')
+ self.errors << I18n.t(:"user.username.characters")
end
end
@@ -89,7 +87,7 @@ class UsernameValidator
return unless errors.empty? && self.class.char_allowlist_exists?
if username.chars.any? { |c| !self.class.allowed_char?(c) }
- self.errors << I18n.t(:'user.username.characters')
+ self.errors << I18n.t(:"user.username.characters")
end
end
@@ -97,7 +95,7 @@ class UsernameValidator
return unless errors.empty?
if INVALID_LEADING_CHAR_PATTERN.match?(username_grapheme_clusters.first)
- self.errors << I18n.t(:'user.username.must_begin_with_alphanumeric_or_underscore')
+ self.errors << I18n.t(:"user.username.must_begin_with_alphanumeric_or_underscore")
end
end
@@ -105,7 +103,7 @@ class UsernameValidator
return unless errors.empty?
if INVALID_TRAILING_CHAR_PATTERN.match?(username_grapheme_clusters.last)
- self.errors << I18n.t(:'user.username.must_end_with_alphanumeric')
+ self.errors << I18n.t(:"user.username.must_end_with_alphanumeric")
end
end
@@ -113,7 +111,7 @@ class UsernameValidator
return unless errors.empty?
if REPEATED_SPECIAL_CHAR_PATTERN.match?(username)
- self.errors << I18n.t(:'user.username.must_not_contain_two_special_chars_in_seq')
+ self.errors << I18n.t(:"user.username.must_not_contain_two_special_chars_in_seq")
end
end
@@ -121,7 +119,7 @@ class UsernameValidator
return unless errors.empty?
if CONFUSING_EXTENSIONS.match?(username)
- self.errors << I18n.t(:'user.username.must_not_end_with_confusing_suffix')
+ self.errors << I18n.t(:"user.username.must_not_end_with_confusing_suffix")
end
end
diff --git a/app/models/watched_word.rb b/app/models/watched_word.rb
index e396544e87d..e493f50e416 100644
--- a/app/models/watched_word.rb
+++ b/app/models/watched_word.rb
@@ -1,30 +1,31 @@
# frozen_string_literal: true
class WatchedWord < ActiveRecord::Base
-
def self.actions
- @actions ||= Enum.new(
- block: 1,
- censor: 2,
- require_approval: 3,
- flag: 4,
- link: 8,
- replace: 5,
- tag: 6,
- silence: 7,
- )
+ @actions ||=
+ Enum.new(
+ block: 1,
+ censor: 2,
+ require_approval: 3,
+ flag: 4,
+ link: 8,
+ replace: 5,
+ tag: 6,
+ silence: 7,
+ )
end
MAX_WORDS_PER_ACTION = 2000
before_validation do
self.word = self.class.normalize_word(self.word)
- if self.action == WatchedWord.actions[:link] && !(self.replacement =~ /^https?:\/\//)
- self.replacement = "#{Discourse.base_url}#{self.replacement&.starts_with?("/") ? "" : "/"}#{self.replacement}"
+ if self.action == WatchedWord.actions[:link] && !(self.replacement =~ %r{^https?://})
+ self.replacement =
+ "#{Discourse.base_url}#{self.replacement&.starts_with?("/") ? "" : "/"}#{self.replacement}"
end
end
- validates :word, presence: true, uniqueness: true, length: { maximum: 100 }
+ validates :word, presence: true, uniqueness: true, length: { maximum: 100 }
validates :action, presence: true
validate :replacement_is_url, if: -> { action == WatchedWord.actions[:link] }
@@ -36,26 +37,28 @@ class WatchedWord < ActiveRecord::Base
end
end
- after_save :clear_cache
+ after_save :clear_cache
after_destroy :clear_cache
scope :by_action, -> { order("action ASC, word ASC") }
- scope :for, ->(word:) do
- where("(word ILIKE :word AND case_sensitive = 'f') OR (word LIKE :word AND case_sensitive = 't')", word: word)
- end
+ scope :for,
+ ->(word:) {
+ where(
+ "(word ILIKE :word AND case_sensitive = 'f') OR (word LIKE :word AND case_sensitive = 't')",
+ word: word,
+ )
+ }
def self.normalize_word(w)
- w.strip.squeeze('*')
+ w.strip.squeeze("*")
end
def replacement_is_url
- if !(replacement =~ URI::regexp)
- errors.add(:base, :invalid_url)
- end
+ errors.add(:base, :invalid_url) if !(replacement =~ URI.regexp)
end
def replacement_is_tag_list
- tag_list = replacement&.split(',')
+ tag_list = replacement&.split(",")
tags = Tag.where(name: tag_list)
if (tag_list.blank? || tags.empty? || tag_list.size != tags.size)
errors.add(:base, :invalid_tag_list)
diff --git a/app/models/web_crawler_request.rb b/app/models/web_crawler_request.rb
index 7f7ceff9874..c1660f65555 100644
--- a/app/models/web_crawler_request.rb
+++ b/app/models/web_crawler_request.rb
@@ -16,8 +16,9 @@ class WebCrawlerRequest < ActiveRecord::Base
end
def self.write_cache!(user_agent, count, date)
- where(id: request_id(date: date, user_agent: user_agent))
- .update_all(["count = count + ?", count])
+ where(id: request_id(date: date, user_agent: user_agent)).update_all(
+ ["count = count + ?", count],
+ )
end
protected
@@ -25,14 +26,13 @@ class WebCrawlerRequest < ActiveRecord::Base
def self.request_id(date:, user_agent:, retries: 0)
id = where(date: date, user_agent: user_agent).pluck_first(:id)
id ||= create!({ date: date, user_agent: user_agent }.merge(count: 0)).id
- rescue # primary key violation
+ rescue StandardError # primary key violation
if retries == 0
request_id(date: date, user_agent: user_agent, retries: 1)
else
raise
end
end
-
end
# == Schema Information
diff --git a/app/models/web_hook.rb b/app/models/web_hook.rb
index d14a0dddad2..7ebfd01de10 100644
--- a/app/models/web_hook.rb
+++ b/app/models/web_hook.rb
@@ -8,9 +8,9 @@ class WebHook < ActiveRecord::Base
has_many :web_hook_events, dependent: :destroy
- default_scope { order('id ASC') }
+ default_scope { order("id ASC") }
- validates :payload_url, presence: true, format: URI::regexp(%w(http https))
+ validates :payload_url, presence: true, format: URI.regexp(%w[http https])
validates :secret, length: { minimum: 12 }, allow_blank: true
validates_presence_of :content_type
validates_presence_of :last_delivery_status
@@ -24,15 +24,11 @@ class WebHook < ActiveRecord::Base
end
def self.content_types
- @content_types ||= Enum.new('application/json' => 1,
- 'application/x-www-form-urlencoded' => 2)
+ @content_types ||= Enum.new("application/json" => 1, "application/x-www-form-urlencoded" => 2)
end
def self.last_delivery_statuses
- @last_delivery_statuses ||= Enum.new(inactive: 1,
- failed: 2,
- successful: 3,
- disabled: 4)
+ @last_delivery_statuses ||= Enum.new(inactive: 1, failed: 2, successful: 3, disabled: 4)
end
def self.default_event_types
@@ -44,7 +40,8 @@ class WebHook < ActiveRecord::Base
end
def self.active_web_hooks(type)
- WebHook.where(active: true)
+ WebHook
+ .where(active: true)
.joins(:web_hook_event_types)
.where("web_hooks.wildcard_web_hook = ? OR web_hook_event_types.name = ?", true, type.to_s)
.distinct
@@ -52,9 +49,10 @@ class WebHook < ActiveRecord::Base
def self.enqueue_hooks(type, event, opts = {})
active_web_hooks(type).each do |web_hook|
- Jobs.enqueue(:emit_web_hook_event, opts.merge(
- web_hook_id: web_hook.id, event_name: event.to_s, event_type: type.to_s
- ))
+ Jobs.enqueue(
+ :emit_web_hook_event,
+ opts.merge(web_hook_id: web_hook.id, event_name: event.to_s, event_type: type.to_s),
+ )
end
end
@@ -62,39 +60,40 @@ class WebHook < ActiveRecord::Base
if active_web_hooks(type).exists?
payload = WebHook.generate_payload(type, object, serializer)
- WebHook.enqueue_hooks(type, event, opts.merge(
- id: object.id,
- payload: payload
- )
- )
+ WebHook.enqueue_hooks(type, event, opts.merge(id: object.id, payload: payload))
end
end
def self.enqueue_topic_hooks(event, topic, payload = nil)
- if active_web_hooks('topic').exists? && topic.present?
- payload ||= begin
- topic_view = TopicView.new(topic.id, Discourse.system_user)
- WebHook.generate_payload(:topic, topic_view, WebHookTopicViewSerializer)
- end
+ if active_web_hooks("topic").exists? && topic.present?
+ payload ||=
+ begin
+ topic_view = TopicView.new(topic.id, Discourse.system_user)
+ WebHook.generate_payload(:topic, topic_view, WebHookTopicViewSerializer)
+ end
- WebHook.enqueue_hooks(:topic, event,
+ WebHook.enqueue_hooks(
+ :topic,
+ event,
id: topic.id,
category_id: topic.category_id,
tag_ids: topic.tags.pluck(:id),
- payload: payload
+ payload: payload,
)
end
end
def self.enqueue_post_hooks(event, post, payload = nil)
- if active_web_hooks('post').exists? && post.present?
+ if active_web_hooks("post").exists? && post.present?
payload ||= WebHook.generate_payload(:post, post)
- WebHook.enqueue_hooks(:post, event,
+ WebHook.enqueue_hooks(
+ :post,
+ event,
id: post.id,
category_id: post.topic&.category_id,
tag_ids: post.topic&.tags&.pluck(:id),
- payload: payload
+ payload: payload,
)
end
end
@@ -103,10 +102,7 @@ class WebHook < ActiveRecord::Base
serializer ||= TagSerializer if type == :tag
serializer ||= "WebHook#{type.capitalize}Serializer".constantize
- serializer.new(object,
- scope: self.guardian,
- root: false
- ).to_json
+ serializer.new(object, scope: self.guardian, root: false).to_json
end
private
@@ -121,15 +117,14 @@ class WebHook < ActiveRecord::Base
return if payload_url.blank?
uri = URI(payload_url.strip)
- allowed = begin
- FinalDestination::SSRFDetector.lookup_and_filter_ips(uri.hostname).present?
- rescue FinalDestination::SSRFDetector::DisallowedIpError
- false
- end
+ allowed =
+ begin
+ FinalDestination::SSRFDetector.lookup_and_filter_ips(uri.hostname).present?
+ rescue FinalDestination::SSRFDetector::DisallowedIpError
+ false
+ end
- if !allowed
- self.errors.add(:base, I18n.t("webhooks.payload_url.blocked_or_internal"))
- end
+ self.errors.add(:base, I18n.t("webhooks.payload_url.blocked_or_internal")) if !allowed
end
end
diff --git a/app/models/web_hook_event.rb b/app/models/web_hook_event.rb
index 9e7ac9cc601..d9a53041f29 100644
--- a/app/models/web_hook_event.rb
+++ b/app/models/web_hook_event.rb
@@ -5,12 +5,10 @@ class WebHookEvent < ActiveRecord::Base
after_save :update_web_hook_delivery_status
- default_scope { order('created_at DESC') }
+ default_scope { order("created_at DESC") }
def self.purge_old
- where(
- 'created_at < ?', SiteSetting.retain_web_hook_events_period_days.days.ago
- ).delete_all
+ where("created_at < ?", SiteSetting.retain_web_hook_events_period_days.days.ago).delete_all
end
def update_web_hook_delivery_status
diff --git a/app/models/web_hook_event_type.rb b/app/models/web_hook_event_type.rb
index a8852aeeb97..df3274802b4 100644
--- a/app/models/web_hook_event_type.rb
+++ b/app/models/web_hook_event_type.rb
@@ -18,18 +18,21 @@ class WebHookEventType < ActiveRecord::Base
has_and_belongs_to_many :web_hooks
- default_scope { order('id ASC') }
+ default_scope { order("id ASC") }
validates :name, presence: true, uniqueness: true
def self.active
ids_to_exclude = []
- ids_to_exclude << SOLVED unless defined?(SiteSetting.solved_enabled) && SiteSetting.solved_enabled
- ids_to_exclude << ASSIGN unless defined?(SiteSetting.assign_enabled) && SiteSetting.assign_enabled
+ unless defined?(SiteSetting.solved_enabled) && SiteSetting.solved_enabled
+ ids_to_exclude << SOLVED
+ end
+ unless defined?(SiteSetting.assign_enabled) && SiteSetting.assign_enabled
+ ids_to_exclude << ASSIGN
+ end
self.where.not(id: ids_to_exclude)
end
-
end
# == Schema Information
diff --git a/app/serializers/about_serializer.rb b/app/serializers/about_serializer.rb
index f55bdd34767..7a26822d299 100644
--- a/app/serializers/about_serializer.rb
+++ b/app/serializers/about_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class AboutSerializer < ApplicationSerializer
-
class UserAboutSerializer < BasicUserSerializer
attributes :title, :last_seen_at
end
diff --git a/app/serializers/admin_detailed_user_serializer.rb b/app/serializers/admin_detailed_user_serializer.rb
index 525036512bf..e82bf8ac346 100644
--- a/app/serializers/admin_detailed_user_serializer.rb
+++ b/app/serializers/admin_detailed_user_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class AdminDetailedUserSerializer < AdminUserSerializer
-
attributes :moderator,
:can_grant_admin,
:can_revoke_admin,
@@ -108,11 +107,11 @@ class AdminDetailedUserSerializer < AdminUserSerializer
def next_penalty
step_number = penalty_counts.total
- steps = SiteSetting.penalty_step_hours.split('|')
+ steps = SiteSetting.penalty_step_hours.split("|")
step_number = [step_number, steps.length].min
penalty_hours = steps[step_number]
Integer(penalty_hours, 10).hours.from_now
- rescue
+ rescue StandardError
nil
end
diff --git a/app/serializers/admin_email_template_serializer.rb b/app/serializers/admin_email_template_serializer.rb
index 07bfa929915..d48256dcaba 100644
--- a/app/serializers/admin_email_template_serializer.rb
+++ b/app/serializers/admin_email_template_serializer.rb
@@ -11,7 +11,7 @@ class AdminEmailTemplateSerializer < ApplicationSerializer
if I18n.exists?("#{object}.title")
I18n.t("#{object}.title")
else
- object.gsub(/.*\./, '').titleize
+ object.gsub(/.*\./, "").titleize
end
end
diff --git a/app/serializers/admin_user_action_serializer.rb b/app/serializers/admin_user_action_serializer.rb
index 1bff61203db..a07f99b594f 100644
--- a/app/serializers/admin_user_action_serializer.rb
+++ b/app/serializers/admin_user_action_serializer.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require_relative 'post_item_excerpt'
+require_relative "post_item_excerpt"
class AdminUserActionSerializer < ApplicationSerializer
include PostItemExcerpt
@@ -24,7 +24,7 @@ class AdminUserActionSerializer < ApplicationSerializer
:deleted_at,
:deleted_by,
:reply_to_post_number,
- :action_type
+ :action_type,
)
def post_id
@@ -64,7 +64,8 @@ class AdminUserActionSerializer < ApplicationSerializer
end
def moderator_action
- object.post_type == Post.types[:moderator_action] || object.post_type == Post.types[:small_action]
+ object.post_type == Post.types[:moderator_action] ||
+ object.post_type == Post.types[:small_action]
end
def deleted_by
@@ -76,9 +77,12 @@ class AdminUserActionSerializer < ApplicationSerializer
end
def action_type
- object.user_actions.select { |ua| ua.user_id = object.user_id }
+ object
+ .user_actions
+ .select { |ua| ua.user_id = object.user_id }
.select { |ua| [UserAction::REPLY, UserAction::RESPONSE].include? ua.action_type }
- .first.try(:action_type)
+ .first
+ .try(:action_type)
end
# we need this to handle deleted topics which aren't loaded via
diff --git a/app/serializers/admin_user_list_serializer.rb b/app/serializers/admin_user_list_serializer.rb
index dd9ce3f6f04..9a6be3c71ab 100644
--- a/app/serializers/admin_user_list_serializer.rb
+++ b/app/serializers/admin_user_list_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class AdminUserListSerializer < BasicUserSerializer
-
attributes :email,
:secondary_emails,
:active,
@@ -28,7 +27,7 @@ class AdminUserListSerializer < BasicUserSerializer
:staged,
:second_factor_enabled
- [:days_visited, :posts_read_count, :topics_entered, :post_count].each do |sym|
+ %i[days_visited posts_read_count topics_entered post_count].each do |sym|
attributes sym
define_method sym do
object.user_stat.public_send(sym)
@@ -106,13 +105,11 @@ class AdminUserListSerializer < BasicUserSerializer
end
def include_second_factor_enabled?
- !SiteSetting.enable_discourse_connect &&
- SiteSetting.enable_local_logins &&
+ !SiteSetting.enable_discourse_connect && SiteSetting.enable_local_logins &&
object.has_any_second_factor_methods_enabled?
end
def second_factor_enabled
true
end
-
end
diff --git a/app/serializers/admin_user_serializer.rb b/app/serializers/admin_user_serializer.rb
index e864578f919..fc396fc4bdd 100644
--- a/app/serializers/admin_user_serializer.rb
+++ b/app/serializers/admin_user_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class AdminUserSerializer < AdminUserListSerializer
-
attributes :name,
:associated_accounts,
:can_send_activation_email,
@@ -40,5 +39,4 @@ class AdminUserSerializer < AdminUserListSerializer
def registration_ip_address
object.registration_ip_address.try(:to_s)
end
-
end
diff --git a/app/serializers/admin_web_hook_serializer.rb b/app/serializers/admin_web_hook_serializer.rb
index cf3134188b2..1fa79e384e9 100644
--- a/app/serializers/admin_web_hook_serializer.rb
+++ b/app/serializers/admin_web_hook_serializer.rb
@@ -12,7 +12,12 @@ class AdminWebHookSerializer < ApplicationSerializer
:web_hook_event_types
has_many :categories, serializer: BasicCategorySerializer, embed: :ids, include: false
- has_many :tags, key: :tag_names, serializer: TagSerializer, embed: :ids, embed_key: :name, include: false
+ has_many :tags,
+ key: :tag_names,
+ serializer: TagSerializer,
+ embed: :ids,
+ embed_key: :name,
+ include: false
has_many :groups, serializer: BasicGroupSerializer, embed: :ids, include: false
def web_hook_event_types
diff --git a/app/serializers/api_key_scope_serializer.rb b/app/serializers/api_key_scope_serializer.rb
index f874efcf204..3386ab387a4 100644
--- a/app/serializers/api_key_scope_serializer.rb
+++ b/app/serializers/api_key_scope_serializer.rb
@@ -1,13 +1,7 @@
# frozen_string_literal: true
class ApiKeyScopeSerializer < ApplicationSerializer
-
- attributes :resource,
- :action,
- :parameters,
- :urls,
- :allowed_parameters,
- :key
+ attributes :resource, :action, :parameters, :urls, :allowed_parameters, :key
def parameters
ApiKeyScope.scope_mappings.dig(object.resource.to_sym, object.action.to_sym, :params).to_a
@@ -18,7 +12,7 @@ class ApiKeyScopeSerializer < ApplicationSerializer
end
def action
- object.action.to_s.gsub('_', ' ')
+ object.action.to_s.gsub("_", " ")
end
def key
diff --git a/app/serializers/api_key_serializer.rb b/app/serializers/api_key_serializer.rb
index ab2a7a2e4d5..d1ccac58de0 100644
--- a/app/serializers/api_key_serializer.rb
+++ b/app/serializers/api_key_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class ApiKeySerializer < ApplicationSerializer
-
attributes :id,
:key,
:truncated_key,
diff --git a/app/serializers/application_serializer.rb b/app/serializers/application_serializer.rb
index 40ee57b0622..aeecb045916 100644
--- a/app/serializers/application_serializer.rb
+++ b/app/serializers/application_serializer.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'distributed_cache'
+require "distributed_cache"
class ApplicationSerializer < ActiveModel::Serializer
embed :ids, include: true
@@ -19,7 +19,9 @@ class ApplicationSerializer < ActiveModel::Serializer
when String
fragment_cache.delete(name_or_regexp)
when Regexp
- fragment_cache.hash.keys
+ fragment_cache
+ .hash
+ .keys
.select { |k| k =~ name_or_regexp }
.each { |k| fragment_cache.delete(k) }
end
diff --git a/app/serializers/archetype_serializer.rb b/app/serializers/archetype_serializer.rb
index 469b1195f3b..8b74d5140a6 100644
--- a/app/serializers/archetype_serializer.rb
+++ b/app/serializers/archetype_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class ArchetypeSerializer < ApplicationSerializer
-
attributes :id, :name, :options
def options
@@ -10,7 +9,7 @@ class ArchetypeSerializer < ApplicationSerializer
key: k,
title: I18n.t("archetypes.#{object.id}.options.#{k}.title"),
description: I18n.t("archetypes.#{object.id}.options.#{k}.description"),
- option_type: object.options[k]
+ option_type: object.options[k],
}
end
end
@@ -18,5 +17,4 @@ class ArchetypeSerializer < ApplicationSerializer
def name
I18n.t("archetypes.#{object.id}.title")
end
-
end
diff --git a/app/serializers/associated_group_serializer.rb b/app/serializers/associated_group_serializer.rb
index db7dec87238..121afd7d0ba 100644
--- a/app/serializers/associated_group_serializer.rb
+++ b/app/serializers/associated_group_serializer.rb
@@ -1,8 +1,5 @@
# frozen_string_literal: true
class AssociatedGroupSerializer < ApplicationSerializer
- attributes :id,
- :name,
- :provider_name,
- :label
+ attributes :id, :name, :provider_name, :label
end
diff --git a/app/serializers/auth_provider_serializer.rb b/app/serializers/auth_provider_serializer.rb
index 78cfcffd0b9..d7bc83afc29 100644
--- a/app/serializers/auth_provider_serializer.rb
+++ b/app/serializers/auth_provider_serializer.rb
@@ -1,9 +1,14 @@
# frozen_string_literal: true
class AuthProviderSerializer < ApplicationSerializer
-
- attributes :name, :custom_url, :pretty_name_override, :title_override,
- :frame_width, :frame_height, :can_connect, :can_revoke,
+ attributes :name,
+ :custom_url,
+ :pretty_name_override,
+ :title_override,
+ :frame_width,
+ :frame_height,
+ :can_connect,
+ :can_revoke,
:icon
def title_override
@@ -15,5 +20,4 @@ class AuthProviderSerializer < ApplicationSerializer
return SiteSetting.get(object.pretty_name_setting) if object.pretty_name_setting
object.pretty_name
end
-
end
diff --git a/app/serializers/backup_file_serializer.rb b/app/serializers/backup_file_serializer.rb
index 1ccab21a15a..239c8952c9f 100644
--- a/app/serializers/backup_file_serializer.rb
+++ b/app/serializers/backup_file_serializer.rb
@@ -1,7 +1,5 @@
# frozen_string_literal: true
class BackupFileSerializer < ApplicationSerializer
- attributes :filename,
- :size,
- :last_modified
+ attributes :filename, :size, :last_modified
end
diff --git a/app/serializers/badge_index_serializer.rb b/app/serializers/badge_index_serializer.rb
index 81e58b3d9e0..127bec384ab 100644
--- a/app/serializers/badge_index_serializer.rb
+++ b/app/serializers/badge_index_serializer.rb
@@ -11,5 +11,4 @@ class BadgeIndexSerializer < BadgeSerializer
def has_badge
@options[:user_badges].include?(object.id)
end
-
end
diff --git a/app/serializers/badge_serializer.rb b/app/serializers/badge_serializer.rb
index cd837ac1cd9..004f0193230 100644
--- a/app/serializers/badge_serializer.rb
+++ b/app/serializers/badge_serializer.rb
@@ -1,9 +1,22 @@
# frozen_string_literal: true
class BadgeSerializer < ApplicationSerializer
- attributes :id, :name, :description, :grant_count, :allow_title,
- :multiple_grant, :icon, :image_url, :listable, :enabled, :badge_grouping_id,
- :system, :long_description, :slug, :has_badge, :manually_grantable?
+ attributes :id,
+ :name,
+ :description,
+ :grant_count,
+ :allow_title,
+ :multiple_grant,
+ :icon,
+ :image_url,
+ :listable,
+ :enabled,
+ :badge_grouping_id,
+ :system,
+ :long_description,
+ :slug,
+ :has_badge,
+ :manually_grantable?
has_one :badge_type
diff --git a/app/serializers/basic_category_serializer.rb b/app/serializers/basic_category_serializer.rb
index fe1b8cd2f71..06dfa9628eb 100644
--- a/app/serializers/basic_category_serializer.rb
+++ b/app/serializers/basic_category_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class BasicCategorySerializer < ApplicationSerializer
-
attributes :id,
:name,
:color,
@@ -42,19 +41,35 @@ class BasicCategorySerializer < ApplicationSerializer
end
def name
- object.uncategorized? ? I18n.t('uncategorized_category_name', locale: SiteSetting.default_locale) : object.name
+ if object.uncategorized?
+ I18n.t("uncategorized_category_name", locale: SiteSetting.default_locale)
+ else
+ object.name
+ end
end
def description_text
- object.uncategorized? ? I18n.t('category.uncategorized_description', locale: SiteSetting.default_locale) : object.description_text
+ if object.uncategorized?
+ I18n.t("category.uncategorized_description", locale: SiteSetting.default_locale)
+ else
+ object.description_text
+ end
end
def description
- object.uncategorized? ? I18n.t('category.uncategorized_description', locale: SiteSetting.default_locale) : object.description
+ if object.uncategorized?
+ I18n.t("category.uncategorized_description", locale: SiteSetting.default_locale)
+ else
+ object.description
+ end
end
def description_excerpt
- object.uncategorized? ? I18n.t('category.uncategorized_description', locale: SiteSetting.default_locale) : object.description_excerpt
+ if object.uncategorized?
+ I18n.t("category.uncategorized_description", locale: SiteSetting.default_locale)
+ else
+ object.description_excerpt
+ end
end
def can_edit
diff --git a/app/serializers/basic_group_history_serializer.rb b/app/serializers/basic_group_history_serializer.rb
index afd1c60f709..40518bd8ec8 100644
--- a/app/serializers/basic_group_history_serializer.rb
+++ b/app/serializers/basic_group_history_serializer.rb
@@ -1,11 +1,7 @@
# frozen_string_literal: true
class BasicGroupHistorySerializer < ApplicationSerializer
- attributes :action,
- :subject,
- :prev_value,
- :new_value,
- :created_at
+ attributes :action, :subject, :prev_value, :new_value, :created_at
has_one :acting_user, embed: :objects, serializer: BasicUserSerializer
has_one :target_user, embed: :objects, serializer: BasicUserSerializer
diff --git a/app/serializers/basic_group_serializer.rb b/app/serializers/basic_group_serializer.rb
index e51e6000022..ab64df800a1 100644
--- a/app/serializers/basic_group_serializer.rb
+++ b/app/serializers/basic_group_serializer.rb
@@ -44,7 +44,9 @@ class BasicGroupSerializer < ApplicationSerializer
end
def bio_excerpt
- PrettyText.excerpt(object.bio_cooked, 110, keep_emoji_images: true) if object.bio_cooked.present?
+ if object.bio_cooked.present?
+ PrettyText.excerpt(object.bio_cooked, 110, keep_emoji_images: true)
+ end
end
def include_incoming_email?
diff --git a/app/serializers/basic_post_serializer.rb b/app/serializers/basic_post_serializer.rb
index 3486c47bc2c..029b04bdbf6 100644
--- a/app/serializers/basic_post_serializer.rb
+++ b/app/serializers/basic_post_serializer.rb
@@ -2,13 +2,7 @@
# The most basic attributes of a topic that we need to create a link for it.
class BasicPostSerializer < ApplicationSerializer
- attributes :id,
- :name,
- :username,
- :avatar_template,
- :created_at,
- :cooked,
- :cooked_hidden
+ attributes :id, :name, :username, :avatar_template, :created_at, :cooked, :cooked_hidden
attr_accessor :topic_view
@@ -35,9 +29,9 @@ class BasicPostSerializer < ApplicationSerializer
def cooked
if cooked_hidden
if scope.current_user && object.user_id == scope.current_user.id
- I18n.t('flagging.you_must_edit', path: "/my/messages")
+ I18n.t("flagging.you_must_edit", path: "/my/messages")
else
- I18n.t('flagging.user_must_edit')
+ I18n.t("flagging.user_must_edit")
end
else
object.filter_quotes(@parent_post)
@@ -49,11 +43,11 @@ class BasicPostSerializer < ApplicationSerializer
end
def post_custom_fields
- @post_custom_fields ||= if @topic_view
- (@topic_view.post_custom_fields || {})[object.id] || {}
- else
- object.custom_fields
- end
+ @post_custom_fields ||=
+ if @topic_view
+ (@topic_view.post_custom_fields || {})[object.id] || {}
+ else
+ object.custom_fields
+ end
end
-
end
diff --git a/app/serializers/basic_user_serializer.rb b/app/serializers/basic_user_serializer.rb
index fc580931f60..769002d0f00 100644
--- a/app/serializers/basic_user_serializer.rb
+++ b/app/serializers/basic_user_serializer.rb
@@ -28,9 +28,9 @@ class BasicUserSerializer < ApplicationSerializer
end
def categories_with_notification_level(lookup_level)
- category_user_notification_levels.select do |id, level|
- level == CategoryUser.notification_levels[lookup_level]
- end.keys
+ category_user_notification_levels
+ .select { |id, level| level == CategoryUser.notification_levels[lookup_level] }
+ .keys
end
def category_user_notification_levels
diff --git a/app/serializers/category_and_topic_lists_serializer.rb b/app/serializers/category_and_topic_lists_serializer.rb
index 863164fb108..55983ebc4a8 100644
--- a/app/serializers/category_and_topic_lists_serializer.rb
+++ b/app/serializers/category_and_topic_lists_serializer.rb
@@ -7,9 +7,7 @@ class CategoryAndTopicListsSerializer < ApplicationSerializer
has_many :primary_groups, serializer: PrimaryGroupSerializer, embed: :objects
def users
- users = object.topic_list.topics.map do |t|
- t.posters.map { |poster| poster.try(:user) }
- end
+ users = object.topic_list.topics.map { |t| t.posters.map { |poster| poster.try(:user) } }
users.flatten!
users.compact!
users.uniq!(&:id)
@@ -17,13 +15,11 @@ class CategoryAndTopicListsSerializer < ApplicationSerializer
end
def primary_groups
- groups = object.topic_list.topics.map do |t|
- t.posters.map { |poster| poster.try(:primary_group) }
- end
+ groups =
+ object.topic_list.topics.map { |t| t.posters.map { |poster| poster.try(:primary_group) } }
groups.flatten!
groups.compact!
groups.uniq!(&:id)
groups
end
-
end
diff --git a/app/serializers/category_detailed_serializer.rb b/app/serializers/category_detailed_serializer.rb
index 1349cd44aa8..39197008e2b 100644
--- a/app/serializers/category_detailed_serializer.rb
+++ b/app/serializers/category_detailed_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class CategoryDetailedSerializer < BasicCategorySerializer
-
attributes :topic_count,
:post_count,
:topics_day,
@@ -14,7 +13,10 @@ class CategoryDetailedSerializer < BasicCategorySerializer
has_many :displayable_topics, serializer: ListableTopicSerializer, embed: :objects, key: :topics
- has_many :subcategory_list, serializer: CategoryDetailedSerializer, embed: :objects, key: :subcategory_list
+ has_many :subcategory_list,
+ serializer: CategoryDetailedSerializer,
+ embed: :objects,
+ key: :subcategory_list
def include_displayable_topics?
displayable_topics.present?
@@ -55,11 +57,8 @@ class CategoryDetailedSerializer < BasicCategorySerializer
def count_with_subcategories(method)
count = object.public_send(method) || 0
- object.subcategories.each do |category|
- count += (category.public_send(method) || 0)
- end
+ object.subcategories.each { |category| count += (category.public_send(method) || 0) }
count
end
-
end
diff --git a/app/serializers/category_list_serializer.rb b/app/serializers/category_list_serializer.rb
index 1fe73e2229e..9f159e6fe16 100644
--- a/app/serializers/category_list_serializer.rb
+++ b/app/serializers/category_list_serializer.rb
@@ -1,9 +1,7 @@
# frozen_string_literal: true
class CategoryListSerializer < ApplicationSerializer
-
- attributes :can_create_category,
- :can_create_topic
+ attributes :can_create_category, :can_create_topic
has_many :categories, serializer: CategoryDetailedSerializer, embed: :objects
@@ -14,5 +12,4 @@ class CategoryListSerializer < ApplicationSerializer
def can_create_topic
scope.can_create?(Topic)
end
-
end
diff --git a/app/serializers/category_serializer.rb b/app/serializers/category_serializer.rb
index b7ab43b5806..d2bfbb16121 100644
--- a/app/serializers/category_serializer.rb
+++ b/app/serializers/category_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class CategorySerializer < SiteCategorySerializer
-
attributes :read_restricted,
:available_groups,
:auto_close_hours,
@@ -32,25 +31,25 @@ class CategorySerializer < SiteCategorySerializer
end
def group_permissions
- @group_permissions ||= begin
- perms = object
- .category_groups
- .joins(:group)
- .includes(:group)
- .merge(Group.visible_groups(scope&.user, "groups.name ASC", include_everyone: true))
- .map do |cg|
- {
- permission_type: cg.permission_type,
- group_name: cg.group.name
+ @group_permissions ||=
+ begin
+ perms =
+ object
+ .category_groups
+ .joins(:group)
+ .includes(:group)
+ .merge(Group.visible_groups(scope&.user, "groups.name ASC", include_everyone: true))
+ .map { |cg| { permission_type: cg.permission_type, group_name: cg.group.name } }
+
+ if perms.length == 0 && !object.read_restricted
+ perms << {
+ permission_type: CategoryGroup.permission_types[:full],
+ group_name: Group[:everyone]&.name.presence || :everyone,
}
end
- if perms.length == 0 && !object.read_restricted
- perms << { permission_type: CategoryGroup.permission_types[:full], group_name: Group[:everyone]&.name.presence || :everyone }
+ perms
end
-
- perms
- end
end
def include_group_permissions?
@@ -70,8 +69,11 @@ class CategorySerializer < SiteCategorySerializer
end
def include_is_special?
- [SiteSetting.meta_category_id, SiteSetting.staff_category_id, SiteSetting.uncategorized_category_id]
- .include? object.id
+ [
+ SiteSetting.meta_category_id,
+ SiteSetting.staff_category_id,
+ SiteSetting.uncategorized_category_id,
+ ].include? object.id
end
def is_special
@@ -101,8 +103,8 @@ class CategorySerializer < SiteCategorySerializer
def notification_level
user = scope && scope.user
object.notification_level ||
- (user && CategoryUser.where(user: user, category: object).first.try(:notification_level)) ||
- CategoryUser.default_notification_level
+ (user && CategoryUser.where(user: user, category: object).first.try(:notification_level)) ||
+ CategoryUser.default_notification_level
end
def custom_fields
diff --git a/app/serializers/concerns/email_logs_mixin.rb b/app/serializers/concerns/email_logs_mixin.rb
index f0fe239309a..4f76679f746 100644
--- a/app/serializers/concerns/email_logs_mixin.rb
+++ b/app/serializers/concerns/email_logs_mixin.rb
@@ -3,12 +3,12 @@
module EmailLogsMixin
def self.included(klass)
klass.attributes :id,
- :to_address,
- :email_type,
- :user_id,
- :created_at,
- :post_url,
- :post_description
+ :to_address,
+ :email_type,
+ :user_id,
+ :created_at,
+ :post_url,
+ :post_description
klass.has_one :user, serializer: BasicUserSerializer, embed: :objects
end
diff --git a/app/serializers/concerns/topic_tags_mixin.rb b/app/serializers/concerns/topic_tags_mixin.rb
index 5c39cd5a5d4..2704ba33611 100644
--- a/app/serializers/concerns/topic_tags_mixin.rb
+++ b/app/serializers/concerns/topic_tags_mixin.rb
@@ -27,10 +27,15 @@ module TopicTagsMixin
def all_tags
return @tags if defined?(@tags)
# Calling method `pluck` or `order` along with `includes` causing N+1 queries
- tags = (SiteSetting.tags_sort_alphabetically ? topic.tags.sort_by(&:name) : topic.tags.sort_by(&:topic_count).reverse)
- if !scope.is_staff?
- tags = tags.reject { |tag| scope.hidden_tag_names.include?(tag[:name]) }
- end
+ tags =
+ (
+ if SiteSetting.tags_sort_alphabetically
+ topic.tags.sort_by(&:name)
+ else
+ topic.tags.sort_by(&:topic_count).reverse
+ end
+ )
+ tags = tags.reject { |tag| scope.hidden_tag_names.include?(tag[:name]) } if !scope.is_staff?
@tags = tags
end
end
diff --git a/app/serializers/concerns/user_auth_tokens_mixin.rb b/app/serializers/concerns/user_auth_tokens_mixin.rb
index 8e963f7fadb..aaa0b752eaa 100644
--- a/app/serializers/concerns/user_auth_tokens_mixin.rb
+++ b/app/serializers/concerns/user_auth_tokens_mixin.rb
@@ -3,16 +3,7 @@
module UserAuthTokensMixin
extend ActiveSupport::Concern
- included do
- attributes :id,
- :client_ip,
- :location,
- :browser,
- :device,
- :os,
- :icon,
- :created_at
- end
+ included { attributes :id, :client_ip, :location, :browser, :device, :os, :icon, :created_at }
def client_ip
object.client_ip.to_s
@@ -20,7 +11,7 @@ module UserAuthTokensMixin
def location
ipinfo = DiscourseIpInfo.get(client_ip, locale: I18n.locale)
- ipinfo[:location].presence || I18n.t('staff_action_logs.unknown')
+ ipinfo[:location].presence || I18n.t("staff_action_logs.unknown")
end
def browser
@@ -41,17 +32,17 @@ module UserAuthTokensMixin
def icon
case BrowserDetection.os(object.user_agent)
when :android
- 'fab-android'
+ "fab-android"
when :chromeos
- 'fab-chrome'
+ "fab-chrome"
when :macos, :ios
- 'fab-apple'
+ "fab-apple"
when :linux
- 'fab-linux'
+ "fab-linux"
when :windows
- 'fab-windows'
+ "fab-windows"
else
- 'question'
+ "question"
end
end
end
diff --git a/app/serializers/concerns/user_primary_group_mixin.rb b/app/serializers/concerns/user_primary_group_mixin.rb
index 65441ebba47..0bd2538b1eb 100644
--- a/app/serializers/concerns/user_primary_group_mixin.rb
+++ b/app/serializers/concerns/user_primary_group_mixin.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
module UserPrimaryGroupMixin
-
def self.included(klass)
klass.attributes :primary_group_name,
:flair_name,
diff --git a/app/serializers/concerns/user_sidebar_mixin.rb b/app/serializers/concerns/user_sidebar_mixin.rb
index 1149b639602..cd872195858 100644
--- a/app/serializers/concerns/user_sidebar_mixin.rb
+++ b/app/serializers/concerns/user_sidebar_mixin.rb
@@ -2,13 +2,11 @@
module UserSidebarMixin
def sidebar_tags
- object.visible_sidebar_tags(scope)
+ object
+ .visible_sidebar_tags(scope)
.pluck(:name, :topic_count, :pm_topic_count)
.reduce([]) do |tags, sidebar_tag|
- tags.push(
- name: sidebar_tag[0],
- pm_only: sidebar_tag[1] == 0 && sidebar_tag[2] > 0
- )
+ tags.push(name: sidebar_tag[0], pm_only: sidebar_tag[1] == 0 && sidebar_tag[2] > 0)
end
end
@@ -33,7 +31,11 @@ module UserSidebarMixin
end
def sidebar_list_destination
- object.user_option.sidebar_list_none_selected? ? SiteSetting.default_sidebar_list_destination : object.user_option.sidebar_list_destination
+ if object.user_option.sidebar_list_none_selected?
+ SiteSetting.default_sidebar_list_destination
+ else
+ object.user_option.sidebar_list_destination
+ end
end
def include_sidebar_list_destination?
diff --git a/app/serializers/concerns/user_tag_notifications_mixin.rb b/app/serializers/concerns/user_tag_notifications_mixin.rb
index dfa367d6165..74c56ec1db7 100644
--- a/app/serializers/concerns/user_tag_notifications_mixin.rb
+++ b/app/serializers/concerns/user_tag_notifications_mixin.rb
@@ -22,9 +22,9 @@ module UserTagNotificationsMixin
end
def tags_with_notification_level(lookup_level)
- tag_user_notification_levels.select do |id, level|
- level == TagUser.notification_levels[lookup_level]
- end.keys
+ tag_user_notification_levels
+ .select { |id, level| level == TagUser.notification_levels[lookup_level] }
+ .keys
end
def tag_user_notification_levels
diff --git a/app/serializers/current_user_option_serializer.rb b/app/serializers/current_user_option_serializer.rb
index edfabcf3d6c..f3223f79243 100644
--- a/app/serializers/current_user_option_serializer.rb
+++ b/app/serializers/current_user_option_serializer.rb
@@ -18,10 +18,9 @@ class CurrentUserOptionSerializer < ApplicationSerializer
:should_be_redirected_to_top,
:redirected_to_top,
:treat_as_new_topic_start_date,
-
- def likes_notifications_disabled
- object.likes_notifications_disabled?
- end
+ def likes_notifications_disabled
+ object.likes_notifications_disabled?
+ end
def include_redirected_to_top?
object.redirected_to_top.present?
diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
index cb4153edefc..9a7cb1d9f11 100644
--- a/app/serializers/current_user_serializer.rb
+++ b/app/serializers/current_user_serializer.rb
@@ -79,11 +79,14 @@ class CurrentUserSerializer < BasicUserSerializer
def groups
owned_group_ids = GroupUser.where(user_id: id, owner: true).pluck(:group_id).to_set
- object.visible_groups.pluck(:id, :name, :has_messages).map do |id, name, has_messages|
- group = { id: id, name: name, has_messages: has_messages }
- group[:owner] = true if owned_group_ids.include?(id)
- group
- end
+ object
+ .visible_groups
+ .pluck(:id, :name, :has_messages)
+ .map do |id, name, has_messages|
+ group = { id: id, name: name, has_messages: has_messages }
+ group[:owner] = true if owned_group_ids.include?(id)
+ group
+ end
end
def link_posting_access
@@ -141,7 +144,7 @@ class CurrentUserSerializer < BasicUserSerializer
def custom_fields
fields = nil
if SiteSetting.public_user_custom_fields.present?
- fields = SiteSetting.public_user_custom_fields.split('|')
+ fields = SiteSetting.public_user_custom_fields.split("|")
end
DiscoursePluginRegistry.serialized_current_user_fields.each do |f|
fields ||= []
@@ -184,15 +187,21 @@ class CurrentUserSerializer < BasicUserSerializer
end
def top_category_ids
- omitted_notification_levels = [CategoryUser.notification_levels[:muted], CategoryUser.notification_levels[:regular]]
- CategoryUser.where(user_id: object.id)
+ omitted_notification_levels = [
+ CategoryUser.notification_levels[:muted],
+ CategoryUser.notification_levels[:regular],
+ ]
+ CategoryUser
+ .where(user_id: object.id)
.where.not(notification_level: omitted_notification_levels)
- .order("
+ .order(
+ "
CASE
WHEN notification_level = 3 THEN 1
WHEN notification_level = 2 THEN 2
WHEN notification_level = 4 THEN 3
- END")
+ END",
+ )
.pluck(:category_id)
.slice(0, SiteSetting.header_dropdown_category_count)
end
@@ -293,7 +302,9 @@ class CurrentUserSerializer < BasicUserSerializer
def redesigned_topic_timeline_enabled
if SiteSetting.enable_experimental_topic_timeline_groups.present?
- object.in_any_groups?(SiteSetting.enable_experimental_topic_timeline_groups.split("|").map(&:to_i))
+ object.in_any_groups?(
+ SiteSetting.enable_experimental_topic_timeline_groups.split("|").map(&:to_i),
+ )
else
false
end
diff --git a/app/serializers/detailed_tag_serializer.rb b/app/serializers/detailed_tag_serializer.rb
index 79354be61fb..83570c3d5e0 100644
--- a/app/serializers/detailed_tag_serializer.rb
+++ b/app/serializers/detailed_tag_serializer.rb
@@ -28,9 +28,8 @@ class DetailedTagSerializer < TagSerializer
private
def category_ids
- @_category_ids ||= object.categories.pluck(:id) +
- object.tag_groups.includes(:categories).map do |tg|
- tg.categories.map(&:id)
- end.flatten
+ @_category_ids ||=
+ object.categories.pluck(:id) +
+ object.tag_groups.includes(:categories).map { |tg| tg.categories.map(&:id) }.flatten
end
end
diff --git a/app/serializers/detailed_user_badge_serializer.rb b/app/serializers/detailed_user_badge_serializer.rb
index e31d8f8e8a7..693ceffb0e1 100644
--- a/app/serializers/detailed_user_badge_serializer.rb
+++ b/app/serializers/detailed_user_badge_serializer.rb
@@ -33,7 +33,7 @@ class DetailedUserBadgeSerializer < BasicUserBadgeSerializer
def can_favorite
SiteSetting.max_favorite_badges > 0 &&
- (scope.current_user.present? && object.user_id == scope.current_user.id) &&
- !(1..4).include?(object.badge_id)
+ (scope.current_user.present? && object.user_id == scope.current_user.id) &&
+ !(1..4).include?(object.badge_id)
end
end
diff --git a/app/serializers/directory_column_serializer.rb b/app/serializers/directory_column_serializer.rb
index 4e172d3e9e6..608ec4d2ddf 100644
--- a/app/serializers/directory_column_serializer.rb
+++ b/app/serializers/directory_column_serializer.rb
@@ -1,12 +1,7 @@
# frozen_string_literal: true
class DirectoryColumnSerializer < ApplicationSerializer
- attributes :id,
- :name,
- :type,
- :position,
- :icon,
- :user_field_id
+ attributes :id, :name, :type, :position, :icon, :user_field_id
def name
object.name || object.user_field.name
diff --git a/app/serializers/directory_item_serializer.rb b/app/serializers/directory_item_serializer.rb
index c4923cbbd10..bd218f982bf 100644
--- a/app/serializers/directory_item_serializer.rb
+++ b/app/serializers/directory_item_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class DirectoryItemSerializer < ApplicationSerializer
-
class UserSerializer < UserNameSerializer
include UserPrimaryGroupMixin
@@ -12,9 +11,7 @@ class DirectoryItemSerializer < ApplicationSerializer
object.user_custom_fields.each do |cuf|
user_field_id = @options[:user_custom_field_map][cuf.name]
- if user_field_id
- fields[user_field_id] = cuf.value
- end
+ fields[user_field_id] = cuf.value if user_field_id
end
fields
@@ -38,9 +35,7 @@ class DirectoryItemSerializer < ApplicationSerializer
def attributes
hash = super
- @options[:attributes].each do |attr|
- hash.merge!("#{attr}": object[attr])
- end
+ @options[:attributes].each { |attr| hash.merge!("#{attr}": object[attr]) }
if object.period_type == DirectoryItem.period_types[:all]
hash.merge!(time_read: object.user_stat.time_read)
diff --git a/app/serializers/draft_serializer.rb b/app/serializers/draft_serializer.rb
index bcdfa257fcf..8ca8111ccfb 100644
--- a/app/serializers/draft_serializer.rb
+++ b/app/serializers/draft_serializer.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require_relative 'post_item_excerpt'
+require_relative "post_item_excerpt"
class DraftSerializer < ApplicationSerializer
include PostItemExcerpt
@@ -24,7 +24,7 @@ class DraftSerializer < ApplicationSerializer
:archived
def cooked
- object.parsed_data['reply'] || ""
+ object.parsed_data["reply"] || ""
end
def draft_username
@@ -86,5 +86,4 @@ class DraftSerializer < ApplicationSerializer
def include_category_id?
object.topic&.category_id&.present?
end
-
end
diff --git a/app/serializers/edit_directory_column_serializer.rb b/app/serializers/edit_directory_column_serializer.rb
index 7c703d59659..ac9824c5000 100644
--- a/app/serializers/edit_directory_column_serializer.rb
+++ b/app/serializers/edit_directory_column_serializer.rb
@@ -1,8 +1,7 @@
# frozen_string_literal: true
class EditDirectoryColumnSerializer < DirectoryColumnSerializer
- attributes :enabled,
- :automatic_position
+ attributes :enabled, :automatic_position
has_one :user_field, serializer: UserFieldSerializer, embed: :objects
end
diff --git a/app/serializers/email_log_serializer.rb b/app/serializers/email_log_serializer.rb
index 803a55c2e56..0e8640bc16e 100644
--- a/app/serializers/email_log_serializer.rb
+++ b/app/serializers/email_log_serializer.rb
@@ -3,10 +3,7 @@
class EmailLogSerializer < ApplicationSerializer
include EmailLogsMixin
- attributes :reply_key,
- :bounced,
- :has_bounce_key,
- :smtp_transaction_response
+ attributes :reply_key, :bounced, :has_bounce_key, :smtp_transaction_response
has_one :user, serializer: BasicUserSerializer, embed: :objects
diff --git a/app/serializers/embeddable_host_serializer.rb b/app/serializers/embeddable_host_serializer.rb
index 28bf3e905bc..d6a36de5c27 100644
--- a/app/serializers/embeddable_host_serializer.rb
+++ b/app/serializers/embeddable_host_serializer.rb
@@ -1,13 +1,9 @@
# frozen_string_literal: true
class EmbeddableHostSerializer < ApplicationSerializer
-
- TO_SERIALIZE = [:id, :host, :allowed_paths, :class_name, :category_id]
+ TO_SERIALIZE = %i[id host allowed_paths class_name category_id]
attributes *TO_SERIALIZE
- TO_SERIALIZE.each do |attr|
- define_method(attr) { object.public_send(attr) }
- end
-
+ TO_SERIALIZE.each { |attr| define_method(attr) { object.public_send(attr) } }
end
diff --git a/app/serializers/flagged_topic_summary_serializer.rb b/app/serializers/flagged_topic_summary_serializer.rb
index 0679e1ac4b0..251bcd4ca1c 100644
--- a/app/serializers/flagged_topic_summary_serializer.rb
+++ b/app/serializers/flagged_topic_summary_serializer.rb
@@ -1,13 +1,7 @@
# frozen_string_literal: true
class FlaggedTopicSummarySerializer < ActiveModel::Serializer
-
- attributes(
- :id,
- :flag_counts,
- :user_ids,
- :last_flag_at
- )
+ attributes(:id, :flag_counts, :user_ids, :last_flag_at)
has_one :topic, serializer: FlaggedTopicSerializer
diff --git a/app/serializers/flagged_user_serializer.rb b/app/serializers/flagged_user_serializer.rb
index 92a383559aa..ed98e77ac12 100644
--- a/app/serializers/flagged_user_serializer.rb
+++ b/app/serializers/flagged_user_serializer.rb
@@ -39,11 +39,8 @@ class FlaggedUserSerializer < BasicUserSerializer
fields = User.allowed_user_custom_fields(scope)
result = {}
- fields.each do |k|
- result[k] = object.custom_fields[k] if object.custom_fields[k].present?
- end
+ fields.each { |k| result[k] = object.custom_fields[k] if object.custom_fields[k].present? }
result
end
-
end
diff --git a/app/serializers/group_post_serializer.rb b/app/serializers/group_post_serializer.rb
index 1176fc36094..0eed59b7a63 100644
--- a/app/serializers/group_post_serializer.rb
+++ b/app/serializers/group_post_serializer.rb
@@ -1,18 +1,11 @@
# frozen_string_literal: true
-require_relative 'post_item_excerpt'
+require_relative "post_item_excerpt"
class GroupPostSerializer < ApplicationSerializer
include PostItemExcerpt
- attributes :id,
- :created_at,
- :title,
- :url,
- :category_id,
- :post_number,
- :topic_id,
- :post_type
+ attributes :id, :created_at, :title, :url, :category_id, :post_number, :topic_id, :post_type
has_one :user, serializer: GroupPostUserSerializer, embed: :object
has_one :topic, serializer: BasicTopicSerializer, embed: :object
diff --git a/app/serializers/group_show_serializer.rb b/app/serializers/group_show_serializer.rb
index f3b520d19ac..f70c379a4a2 100644
--- a/app/serializers/group_show_serializer.rb
+++ b/app/serializers/group_show_serializer.rb
@@ -1,7 +1,13 @@
# frozen_string_literal: true
class GroupShowSerializer < BasicGroupSerializer
- attributes :is_group_user, :is_group_owner, :is_group_owner_display, :mentionable, :messageable, :flair_icon, :flair_type
+ attributes :is_group_user,
+ :is_group_owner,
+ :is_group_owner_display,
+ :mentionable,
+ :messageable,
+ :flair_icon,
+ :flair_type
def self.admin_attributes(*attrs)
attributes(*attrs)
@@ -108,19 +114,16 @@ class GroupShowSerializer < BasicGroupSerializer
flair_type.present? && (is_group_owner || scope.is_admin?)
end
- [:watching, :regular, :tracking, :watching_first_post, :muted].each do |level|
+ %i[watching regular tracking watching_first_post muted].each do |level|
define_method("#{level}_category_ids") do
group_category_notifications[NotificationLevels.all[level]] || []
end
define_method("include_#{level}_tags?") do
- SiteSetting.tagging_enabled? &&
- scope.is_admin? || (include_is_group_owner? && is_group_owner)
+ SiteSetting.tagging_enabled? && scope.is_admin? || (include_is_group_owner? && is_group_owner)
end
- define_method("#{level}_tags") do
- group_tag_notifications[NotificationLevels.all[level]] || []
- end
+ define_method("#{level}_tags") { group_tag_notifications[NotificationLevels.all[level]] || [] }
end
def associated_group_ids
@@ -144,7 +147,8 @@ class GroupShowSerializer < BasicGroupSerializer
def group_category_notifications
@group_category_notification_defaults ||=
- GroupCategoryNotificationDefault.where(group_id: object.id)
+ GroupCategoryNotificationDefault
+ .where(group_id: object.id)
.pluck(:notification_level, :category_id)
.inject({}) do |h, arr|
h[arr[0]] ||= []
@@ -155,7 +159,8 @@ class GroupShowSerializer < BasicGroupSerializer
def group_tag_notifications
@group_tag_notification_defaults ||=
- GroupTagNotificationDefault.where(group_id: object.id)
+ GroupTagNotificationDefault
+ .where(group_id: object.id)
.joins(:tag)
.pluck(:notification_level, :name)
.inject({}) do |h, arr|
diff --git a/app/serializers/group_user_serializer.rb b/app/serializers/group_user_serializer.rb
index fa5bbda7867..bc286d109b7 100644
--- a/app/serializers/group_user_serializer.rb
+++ b/app/serializers/group_user_serializer.rb
@@ -3,13 +3,7 @@
class GroupUserSerializer < BasicUserSerializer
include UserPrimaryGroupMixin
- attributes :name,
- :title,
- :last_posted_at,
- :last_seen_at,
- :added_at,
- :timezone,
- :status
+ attributes :name, :title, :last_posted_at, :last_seen_at, :added_at, :timezone, :status
def timezone
user.user_option.timezone
diff --git a/app/serializers/grouped_screened_url_serializer.rb b/app/serializers/grouped_screened_url_serializer.rb
index 9e2a4a1ff71..5117420070c 100644
--- a/app/serializers/grouped_screened_url_serializer.rb
+++ b/app/serializers/grouped_screened_url_serializer.rb
@@ -1,13 +1,9 @@
# frozen_string_literal: true
class GroupedScreenedUrlSerializer < ApplicationSerializer
- attributes :domain,
- :action,
- :match_count,
- :last_match_at,
- :created_at
+ attributes :domain, :action, :match_count, :last_match_at, :created_at
def action
- 'do_nothing'
+ "do_nothing"
end
end
diff --git a/app/serializers/grouped_search_result_serializer.rb b/app/serializers/grouped_search_result_serializer.rb
index 653ac70ac84..66c49602693 100644
--- a/app/serializers/grouped_search_result_serializer.rb
+++ b/app/serializers/grouped_search_result_serializer.rb
@@ -6,7 +6,14 @@ class GroupedSearchResultSerializer < ApplicationSerializer
has_many :categories, serializer: BasicCategorySerializer
has_many :tags, serializer: TagSerializer
has_many :groups, serializer: BasicGroupSerializer
- attributes :more_posts, :more_users, :more_categories, :term, :search_log_id, :more_full_page_results, :can_create_topic, :error
+ attributes :more_posts,
+ :more_users,
+ :more_categories,
+ :term,
+ :search_log_id,
+ :more_full_page_results,
+ :can_create_topic,
+ :error
def search_log_id
object.search_log_id
@@ -23,5 +30,4 @@ class GroupedSearchResultSerializer < ApplicationSerializer
def can_create_topic
scope.can_create?(Topic)
end
-
end
diff --git a/app/serializers/hidden_profile_serializer.rb b/app/serializers/hidden_profile_serializer.rb
index f2a04db807b..f0b8e00d3b6 100644
--- a/app/serializers/hidden_profile_serializer.rb
+++ b/app/serializers/hidden_profile_serializer.rb
@@ -1,11 +1,7 @@
# frozen_string_literal: true
class HiddenProfileSerializer < BasicUserSerializer
- attributes(
- :profile_hidden?,
- :title,
- :primary_group_name
- )
+ attributes(:profile_hidden?, :title, :primary_group_name)
def profile_hidden?
true
diff --git a/app/serializers/incoming_email_details_serializer.rb b/app/serializers/incoming_email_details_serializer.rb
index d248a3ac588..490b692e88f 100644
--- a/app/serializers/incoming_email_details_serializer.rb
+++ b/app/serializers/incoming_email_details_serializer.rb
@@ -1,13 +1,7 @@
# frozen_string_literal: true
class IncomingEmailDetailsSerializer < ApplicationSerializer
-
- attributes :error,
- :error_description,
- :rejection_message,
- :headers,
- :subject,
- :body
+ attributes :error, :error_description, :rejection_message, :headers, :subject, :body
def initialize(incoming_email, opts)
super
@@ -39,15 +33,30 @@ class IncomingEmailDetailsSerializer < ApplicationSerializer
end
def body
- body = @mail.text_part.decoded rescue nil
- body ||= @mail.html_part.decoded rescue nil
- body ||= @mail.body.decoded rescue nil
+ body =
+ begin
+ @mail.text_part.decoded
+ rescue StandardError
+ nil
+ end
+ body ||=
+ begin
+ @mail.html_part.decoded
+ rescue StandardError
+ nil
+ end
+ body ||=
+ begin
+ @mail.body.decoded
+ rescue StandardError
+ nil
+ end
return I18n.t("emails.incoming.no_body") if body.blank?
- body.encode("utf-8", invalid: :replace, undef: :replace, replace: "")
+ body
+ .encode("utf-8", invalid: :replace, undef: :replace, replace: "")
.strip
.truncate_words(100, escape: false)
end
-
end
diff --git a/app/serializers/incoming_email_serializer.rb b/app/serializers/incoming_email_serializer.rb
index 54830995a12..116c36a43a5 100644
--- a/app/serializers/incoming_email_serializer.rb
+++ b/app/serializers/incoming_email_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class IncomingEmailSerializer < ApplicationSerializer
-
attributes :id,
:created_at,
:from_address,
@@ -34,5 +33,4 @@ class IncomingEmailSerializer < ApplicationSerializer
def error
@object.error.presence || I18n.t("emails.incoming.unrecognized_error")
end
-
end
diff --git a/app/serializers/invite_link_serializer.rb b/app/serializers/invite_link_serializer.rb
index 21a64509189..8f454f87274 100644
--- a/app/serializers/invite_link_serializer.rb
+++ b/app/serializers/invite_link_serializer.rb
@@ -1,7 +1,13 @@
# frozen_string_literal: true
class InviteLinkSerializer < ApplicationSerializer
- attributes :id, :invite_key, :created_at, :max_redemptions_allowed, :redemption_count, :expires_at, :group_names
+ attributes :id,
+ :invite_key,
+ :created_at,
+ :max_redemptions_allowed,
+ :redemption_count,
+ :expires_at,
+ :group_names
def group_names
object.groups.pluck(:name).join(", ")
diff --git a/app/serializers/invited_serializer.rb b/app/serializers/invited_serializer.rb
index a0f76017e44..c1acf056b2f 100644
--- a/app/serializers/invited_serializer.rb
+++ b/app/serializers/invited_serializer.rb
@@ -6,10 +6,17 @@ class InvitedSerializer < ApplicationSerializer
def invites
ActiveModel::ArraySerializer.new(
object.invite_list,
- each_serializer: object.type == "pending" || object.type == "expired" ? InviteSerializer : InvitedUserSerializer,
+ each_serializer:
+ (
+ if object.type == "pending" || object.type == "expired"
+ InviteSerializer
+ else
+ InvitedUserSerializer
+ end
+ ),
scope: scope,
root: false,
- show_emails: object.show_emails
+ show_emails: object.show_emails,
).as_json
end
diff --git a/app/serializers/invited_user_record_serializer.rb b/app/serializers/invited_user_record_serializer.rb
index 027e8f60da2..66cd1e5d202 100644
--- a/app/serializers/invited_user_record_serializer.rb
+++ b/app/serializers/invited_user_record_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class InvitedUserRecordSerializer < BasicUserSerializer
-
attributes :topics_entered,
:posts_read_count,
:last_seen_at,
@@ -56,5 +55,4 @@ class InvitedUserRecordSerializer < BasicUserSerializer
def can_see_invite_details?
@can_see_invite_details ||= scope.can_see_invite_details?(invited_by)
end
-
end
diff --git a/app/serializers/listable_topic_serializer.rb b/app/serializers/listable_topic_serializer.rb
index afcbb6fa6c1..de117bc1026 100644
--- a/app/serializers/listable_topic_serializer.rb
+++ b/app/serializers/listable_topic_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class ListableTopicSerializer < BasicTopicSerializer
-
attributes :reply_count,
:highest_post_number,
:image_url,
@@ -114,29 +113,30 @@ class ListableTopicSerializer < BasicTopicSerializer
object.excerpt
end
- alias :include_last_read_post_number? :has_user_data
+ alias include_last_read_post_number? has_user_data
# TODO: For backwards compatibility with themes,
# Remove once Discourse 2.8 is released
def unread
0
end
- alias :include_unread? :has_user_data
+ alias include_unread? has_user_data
# TODO: For backwards compatibility with themes,
# Remove once Discourse 2.8 is released
def new_posts
unread_helper.unread_posts
end
- alias :include_new_posts? :has_user_data
+ alias include_new_posts? has_user_data
def unread_posts
unread_helper.unread_posts
end
- alias :include_unread_posts? :has_user_data
+ alias include_unread_posts? has_user_data
def include_excerpt?
- pinned || SiteSetting.always_include_topic_excerpts || theme_modifier_helper.serialize_topic_excerpts
+ pinned || SiteSetting.always_include_topic_excerpts ||
+ theme_modifier_helper.serialize_topic_excerpts
end
def pinned
@@ -170,5 +170,4 @@ class ListableTopicSerializer < BasicTopicSerializer
def theme_modifier_helper
@theme_modifier_helper ||= ThemeModifierHelper.new(request: scope.request)
end
-
end
diff --git a/app/serializers/new_post_result_serializer.rb b/app/serializers/new_post_result_serializer.rb
index e15af2fad14..f5ad629c808 100644
--- a/app/serializers/new_post_result_serializer.rb
+++ b/app/serializers/new_post_result_serializer.rb
@@ -1,14 +1,7 @@
# frozen_string_literal: true
class NewPostResultSerializer < ApplicationSerializer
- attributes :action,
- :post,
- :errors,
- :success,
- :pending_count,
- :reason,
- :message,
- :route_to
+ attributes :action, :post, :errors, :success, :pending_count, :reason, :message, :route_to
has_one :pending_post, serializer: TopicPendingPostSerializer, root: false, embed: :objects
@@ -81,5 +74,4 @@ class NewPostResultSerializer < ApplicationSerializer
def include_message?
object.message.present?
end
-
end
diff --git a/app/serializers/notification_serializer.rb b/app/serializers/notification_serializer.rb
index 40ff319b762..63092363f28 100644
--- a/app/serializers/notification_serializer.rb
+++ b/app/serializers/notification_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class NotificationSerializer < ApplicationSerializer
-
attributes :id,
:user_id,
:external_id,
@@ -47,5 +46,4 @@ class NotificationSerializer < ApplicationSerializer
def include_external_id?
SiteSetting.enable_discourse_connect
end
-
end
diff --git a/app/serializers/permalink_serializer.rb b/app/serializers/permalink_serializer.rb
index 78b46fd9a76..7aa66affa29 100644
--- a/app/serializers/permalink_serializer.rb
+++ b/app/serializers/permalink_serializer.rb
@@ -1,10 +1,22 @@
# frozen_string_literal: true
class PermalinkSerializer < ApplicationSerializer
- attributes :id, :url, :topic_id, :topic_title, :topic_url,
- :post_id, :post_url, :post_number, :post_topic_title,
- :category_id, :category_name, :category_url, :external_url,
- :tag_id, :tag_name, :tag_url
+ attributes :id,
+ :url,
+ :topic_id,
+ :topic_title,
+ :topic_url,
+ :post_id,
+ :post_url,
+ :post_number,
+ :post_topic_title,
+ :category_id,
+ :category_name,
+ :category_url,
+ :external_url,
+ :tag_id,
+ :tag_name,
+ :tag_url
def topic_title
object&.topic&.title
diff --git a/app/serializers/post_action_type_serializer.rb b/app/serializers/post_action_type_serializer.rb
index 915edb4da1a..a829d91fd8e 100644
--- a/app/serializers/post_action_type_serializer.rb
+++ b/app/serializers/post_action_type_serializer.rb
@@ -1,16 +1,7 @@
# frozen_string_literal: true
class PostActionTypeSerializer < ApplicationSerializer
-
- attributes(
- :id,
- :name_key,
- :name,
- :description,
- :short_description,
- :is_flag,
- :is_custom_flag
- )
+ attributes(:id, :name_key, :name, :description, :short_description, :is_flag, :is_custom_flag)
include ConfigurableUrls
@@ -23,15 +14,15 @@ class PostActionTypeSerializer < ApplicationSerializer
end
def name
- i18n('title')
+ i18n("title")
end
def description
- i18n('description', tos_url: tos_path, base_path: Discourse.base_path)
+ i18n("description", tos_url: tos_path, base_path: Discourse.base_path)
end
def short_description
- i18n('short_description', tos_url: tos_path, base_path: Discourse.base_path)
+ i18n("short_description", tos_url: tos_path, base_path: Discourse.base_path)
end
def name_key
diff --git a/app/serializers/post_action_user_serializer.rb b/app/serializers/post_action_user_serializer.rb
index 40d81451ac5..b58a5723e3f 100644
--- a/app/serializers/post_action_user_serializer.rb
+++ b/app/serializers/post_action_user_serializer.rb
@@ -1,9 +1,7 @@
# frozen_string_literal: true
class PostActionUserSerializer < BasicUserSerializer
- attributes :post_url,
- :username_lower,
- :unknown
+ attributes :post_url, :username_lower, :unknown
def id
object.user.id
@@ -32,5 +30,4 @@ class PostActionUserSerializer < BasicUserSerializer
def include_unknown?
(@options[:unknown_user_ids] || []).include?(object.user.id)
end
-
end
diff --git a/app/serializers/post_item_excerpt.rb b/app/serializers/post_item_excerpt.rb
index e7f9f004153..164eb861dec 100644
--- a/app/serializers/post_item_excerpt.rb
+++ b/app/serializers/post_item_excerpt.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
module PostItemExcerpt
-
def self.included(base)
base.attributes(:excerpt, :truncated)
end
@@ -22,5 +21,4 @@ module PostItemExcerpt
def include_truncated?
cooked.length > 300
end
-
end
diff --git a/app/serializers/post_revision_serializer.rb b/app/serializers/post_revision_serializer.rb
index de4430fafc3..46c2835ff09 100644
--- a/app/serializers/post_revision_serializer.rb
+++ b/app/serializers/post_revision_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class PostRevisionSerializer < ApplicationSerializer
-
attributes :created_at,
:post_id,
# which revision is hidden
@@ -35,13 +34,9 @@ class PostRevisionSerializer < ApplicationSerializer
changes_name = "#{field}_changes".to_sym
self.attributes changes_name
- define_method(changes_name) do
- { previous: previous[field], current: current[field] }
- end
+ define_method(changes_name) { { previous: previous[field], current: current[field] } }
- define_method("include_#{changes_name}?") do
- previous[field] != current[field]
- end
+ define_method("include_#{changes_name}?") { previous[field] != current[field] }
end
add_compared_field :wiki
@@ -59,9 +54,12 @@ class PostRevisionSerializer < ApplicationSerializer
end
def previous_revision
- @previous_revision ||= revisions.select { |r| r["revision"] >= first_revision }
- .select { |r| r["revision"] < current_revision }
- .last.try(:[], "revision")
+ @previous_revision ||=
+ revisions
+ .select { |r| r["revision"] >= first_revision }
+ .select { |r| r["revision"] < current_revision }
+ .last
+ .try(:[], "revision")
end
def current_revision
@@ -69,9 +67,12 @@ class PostRevisionSerializer < ApplicationSerializer
end
def next_revision
- @next_revision ||= revisions.select { |r| r["revision"] <= last_revision }
- .select { |r| r["revision"] > current_revision }
- .first.try(:[], "revision")
+ @next_revision ||=
+ revisions
+ .select { |r| r["revision"] <= last_revision }
+ .select { |r| r["revision"] > current_revision }
+ .first
+ .try(:[], "revision")
end
def last_revision
@@ -108,8 +109,9 @@ class PostRevisionSerializer < ApplicationSerializer
def edit_reason
# only show 'edit_reason' when revisions are consecutive
- current["edit_reason"] if scope.can_view_hidden_post_revisions? ||
- current["revision"] == previous["revision"] + 1
+ if scope.can_view_hidden_post_revisions? || current["revision"] == previous["revision"] + 1
+ current["edit_reason"]
+ end
end
def body_changes
@@ -119,23 +121,20 @@ class PostRevisionSerializer < ApplicationSerializer
{
inline: cooked_diff.inline_html,
side_by_side: cooked_diff.side_by_side_html,
- side_by_side_markdown: raw_diff.side_by_side_markdown
+ side_by_side_markdown: raw_diff.side_by_side_markdown,
}
end
def title_changes
- prev = "#{previous["title"] && CGI::escapeHTML(previous["title"])}
"
- cur = "#{current["title"] && CGI::escapeHTML(current["title"])}
"
+ prev = "#{previous["title"] && CGI.escapeHTML(previous["title"])}
"
+ cur = "#{current["title"] && CGI.escapeHTML(current["title"])}
"
# always show the title for post_number == 1
return if object.post.post_number > 1 && prev == cur
diff = DiscourseDiff.new(prev, cur)
- {
- inline: diff.inline_html,
- side_by_side: diff.side_by_side_html
- }
+ { inline: diff.inline_html, side_by_side: diff.side_by_side_html }
end
def user_changes
@@ -148,23 +147,23 @@ class PostRevisionSerializer < ApplicationSerializer
current = User.find_by(id: cur) || Discourse.system_user
{
- previous: {
- username: previous.username_lower,
- display_username: previous.username,
- avatar_template: previous.avatar_template
- },
- current: {
- username: current.username_lower,
- display_username: current.username,
- avatar_template: current.avatar_template
- }
+ previous: {
+ username: previous.username_lower,
+ display_username: previous.username,
+ avatar_template: previous.avatar_template,
+ },
+ current: {
+ username: current.username_lower,
+ display_username: current.username,
+ avatar_template: current.avatar_template,
+ },
}
end
def tags_changes
changes = {
previous: filter_visible_tags(previous["tags"]),
- current: filter_visible_tags(current["tags"])
+ current: filter_visible_tags(current["tags"]),
}
changes[:previous] == changes[:current] ? nil : changes
end
@@ -184,18 +183,15 @@ class PostRevisionSerializer < ApplicationSerializer
end
def revisions
- @revisions ||= all_revisions.select { |r| scope.can_view_hidden_post_revisions? || !r["hidden"] }
+ @revisions ||=
+ all_revisions.select { |r| scope.can_view_hidden_post_revisions? || !r["hidden"] }
end
def all_revisions
return @all_revisions if @all_revisions
- post_revisions = PostRevision
- .where(post_id: object.post_id)
- .order(number: :desc)
- .limit(99)
- .to_a
- .reverse
+ post_revisions =
+ PostRevision.where(post_id: object.post_id).order(number: :desc).limit(99).to_a.reverse
latest_modifications = {
"raw" => [post.raw],
@@ -203,24 +199,24 @@ class PostRevisionSerializer < ApplicationSerializer
"edit_reason" => [post.edit_reason],
"wiki" => [post.wiki],
"post_type" => [post.post_type],
- "user_id" => [post.user_id]
+ "user_id" => [post.user_id],
}
# Retrieve any `tracked_topic_fields`
PostRevisor.tracked_topic_fields.each_key do |field|
next if field == :tags # Special handling below
- if topic.respond_to?(field)
- latest_modifications[field.to_s] = [topic.public_send(field)]
- end
+ latest_modifications[field.to_s] = [topic.public_send(field)] if topic.respond_to?(field)
end
- latest_modifications["featured_link"] = [post.topic.featured_link] if SiteSetting.topic_featured_link_enabled
+ latest_modifications["featured_link"] = [
+ post.topic.featured_link,
+ ] if SiteSetting.topic_featured_link_enabled
latest_modifications["tags"] = [topic.tags.pluck(:name)] if scope.can_see_tags?(topic)
post_revisions << PostRevision.new(
number: post_revisions.last.number + 1,
hidden: post.hidden,
- modifications: latest_modifications
+ modifications: latest_modifications,
)
@all_revisions = []
@@ -231,22 +227,20 @@ class PostRevisionSerializer < ApplicationSerializer
revision[:revision] = pr.number
revision[:hidden] = pr.hidden
- pr.modifications.each_key do |field|
- revision[field] = pr.modifications[field][0]
- end
+ pr.modifications.each_key { |field| revision[field] = pr.modifications[field][0] }
@all_revisions << revision
end
# waterfall
- (@all_revisions.count - 1).downto(1).each do |r|
- cur = @all_revisions[r]
- prev = @all_revisions[r - 1]
+ (@all_revisions.count - 1)
+ .downto(1)
+ .each do |r|
+ cur = @all_revisions[r]
+ prev = @all_revisions[r - 1]
- cur.each_key do |field|
- prev[field] = prev.has_key?(field) ? prev[field] : cur[field]
+ cur.each_key { |field| prev[field] = prev.has_key?(field) ? prev[field] : cur[field] }
end
- end
@all_revisions
end
@@ -272,5 +266,4 @@ class PostRevisionSerializer < ApplicationSerializer
tags
end
end
-
end
diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
index 426c31f220a..78e559c031a 100644
--- a/app/serializers/post_serializer.rb
+++ b/app/serializers/post_serializer.rb
@@ -1,22 +1,19 @@
# frozen_string_literal: true
class PostSerializer < BasicPostSerializer
-
# To pass in additional information we might need
- INSTANCE_VARS ||= [
- :parent_post,
- :add_raw,
- :add_title,
- :single_post_link_counts,
- :draft_sequence,
- :post_actions,
- :all_post_actions,
- :add_excerpt
+ INSTANCE_VARS ||= %i[
+ parent_post
+ add_raw
+ add_title
+ single_post_link_counts
+ draft_sequence
+ post_actions
+ all_post_actions
+ add_excerpt
]
- INSTANCE_VARS.each do |v|
- self.public_send(:attr_accessor, v)
- end
+ INSTANCE_VARS.each { |v| self.public_send(:attr_accessor, v) }
attributes :post_number,
:post_type,
@@ -95,9 +92,7 @@ class PostSerializer < BasicPostSerializer
super(object, opts)
PostSerializer::INSTANCE_VARS.each do |name|
- if opts.include? name
- self.public_send("#{name}=", opts[name])
- end
+ self.public_send("#{name}=", opts[name]) if opts.include? name
end
end
@@ -150,13 +145,14 @@ class PostSerializer < BasicPostSerializer
end
def include_group_moderator?
- @group_moderator ||= begin
- if @topic_view
- @topic_view.category_group_moderator_user_ids.include?(object.user_id)
- else
- object&.user&.guardian&.is_category_group_moderator?(object&.topic&.category)
+ @group_moderator ||=
+ begin
+ if @topic_view
+ @topic_view.category_group_moderator_user_ids.include?(object.user_id)
+ else
+ object&.user&.guardian&.is_category_group_moderator?(object&.topic&.category)
+ end
end
- end
end
def yours
@@ -260,7 +256,7 @@ class PostSerializer < BasicPostSerializer
{
username: object.reply_to_user.username,
name: object.reply_to_user.name,
- avatar_template: object.reply_to_user.avatar_template
+ avatar_template: object.reply_to_user.avatar_template,
}
end
@@ -290,16 +286,22 @@ class PostSerializer < BasicPostSerializer
count = object.public_send(count_col) if object.respond_to?(count_col)
summary = { id: id, count: count }
- if scope.post_can_act?(object, sym, opts: { taken_actions: actions }, can_see_post: can_see_post)
+ if scope.post_can_act?(
+ object,
+ sym,
+ opts: {
+ taken_actions: actions,
+ },
+ can_see_post: can_see_post,
+ )
summary[:can_act] = true
end
if sym == :notify_user &&
- (
- (scope.current_user.present? && scope.current_user == object.user) ||
- (object.user && object.user.bot?)
- )
-
+ (
+ (scope.current_user.present? && scope.current_user == object.user) ||
+ (object.user && object.user.bot?)
+ )
summary.delete(:can_act)
end
@@ -316,9 +318,7 @@ class PostSerializer < BasicPostSerializer
summary.delete(:count) if summary[:count] == 0
# Only include it if the user can do it or it has a count
- if summary[:can_act] || summary[:count]
- result << summary
- end
+ result << summary if summary[:can_act] || summary[:count]
end
result
@@ -339,7 +339,8 @@ class PostSerializer < BasicPostSerializer
def include_link_counts?
return true if @single_post_link_counts.present?
- @topic_view.present? && @topic_view.link_counts.present? && @topic_view.link_counts[object.id].present?
+ @topic_view.present? && @topic_view.link_counts.present? &&
+ @topic_view.link_counts[object.id].present?
end
def include_read?
@@ -496,9 +497,7 @@ class PostSerializer < BasicPostSerializer
end
def include_last_wiki_edit?
- object.wiki &&
- object.post_number == 1 &&
- object.revisions.size > 0
+ object.wiki && object.post_number == 1 && object.revisions.size > 0
end
def include_hidden_reason_id?
@@ -563,9 +562,7 @@ class PostSerializer < BasicPostSerializer
def mentioned_users
if @topic_view && (mentions = @topic_view.mentions[object.id])
- users = mentions
- .map { |username| @topic_view.mentioned_users[username] }
- .compact
+ users = mentions.map { |username| @topic_view.mentioned_users[username] }.compact
else
users = User.where(username: object.mentions)
end
@@ -573,7 +570,7 @@ class PostSerializer < BasicPostSerializer
users.map { |user| BasicUserWithStatusSerializer.new(user, root: false) }
end
-private
+ private
def can_review_topic?
return @can_review_topic unless @can_review_topic.nil?
diff --git a/app/serializers/post_stream_serializer_mixin.rb b/app/serializers/post_stream_serializer_mixin.rb
index 662e187b82c..e3e8612aab5 100644
--- a/app/serializers/post_stream_serializer_mixin.rb
+++ b/app/serializers/post_stream_serializer_mixin.rb
@@ -42,17 +42,17 @@ module PostStreamSerializerMixin
end
def posts
- @posts ||= begin
- (object.posts || []).map do |post|
- post.topic = object.topic
+ @posts ||=
+ begin
+ (object.posts || []).map do |post|
+ post.topic = object.topic
- serializer = PostSerializer.new(post, scope: scope, root: false)
- serializer.add_raw = true if @options[:include_raw]
- serializer.topic_view = object
+ serializer = PostSerializer.new(post, scope: scope, root: false)
+ serializer.add_raw = true if @options[:include_raw]
+ serializer.topic_view = object
- serializer.as_json
+ serializer.as_json
+ end
end
- end
end
-
end
diff --git a/app/serializers/post_wordpress_serializer.rb b/app/serializers/post_wordpress_serializer.rb
index a415d225833..d8839115d66 100644
--- a/app/serializers/post_wordpress_serializer.rb
+++ b/app/serializers/post_wordpress_serializer.rb
@@ -11,5 +11,4 @@ class PostWordpressSerializer < BasicPostSerializer
nil
end
end
-
end
diff --git a/app/serializers/queued_post_serializer.rb b/app/serializers/queued_post_serializer.rb
index f9dc0dcdefd..91d64f26bfb 100644
--- a/app/serializers/queued_post_serializer.rb
+++ b/app/serializers/queued_post_serializer.rb
@@ -14,13 +14,13 @@ class QueuedPostSerializer < ApplicationSerializer
:post_options,
:created_at,
:category_id,
- :can_delete_user
+ :can_delete_user,
)
has_one :created_by, serializer: AdminUserListSerializer, root: :users
has_one :topic, serializer: BasicTopicSerializer
def queue
- 'default'
+ "default"
end
def user_id
@@ -40,11 +40,11 @@ class QueuedPostSerializer < ApplicationSerializer
end
def raw
- object.payload['raw']
+ object.payload["raw"]
end
def post_options
- object.payload.except('raw')
+ object.payload.except("raw")
end
def can_delete_user
@@ -58,9 +58,6 @@ class QueuedPostSerializer < ApplicationSerializer
private
def post_history
- object.
- reviewable_histories.
- transitioned.
- order(:created_at)
+ object.reviewable_histories.transitioned.order(:created_at)
end
end
diff --git a/app/serializers/reviewable_action_serializer.rb b/app/serializers/reviewable_action_serializer.rb
index fbba925f27d..469164bc26d 100644
--- a/app/serializers/reviewable_action_serializer.rb
+++ b/app/serializers/reviewable_action_serializer.rb
@@ -1,7 +1,15 @@
# frozen_string_literal: true
class ReviewableActionSerializer < ApplicationSerializer
- attributes :id, :icon, :button_class, :label, :confirm_message, :description, :client_action, :require_reject_reason, :custom_modal
+ attributes :id,
+ :icon,
+ :button_class,
+ :label,
+ :confirm_message,
+ :description,
+ :client_action,
+ :require_reject_reason,
+ :custom_modal
def label
I18n.t(object.label)
diff --git a/app/serializers/reviewable_bundled_action_serializer.rb b/app/serializers/reviewable_bundled_action_serializer.rb
index 45875ac2bdb..e55241af05d 100644
--- a/app/serializers/reviewable_bundled_action_serializer.rb
+++ b/app/serializers/reviewable_bundled_action_serializer.rb
@@ -2,7 +2,7 @@
class ReviewableBundledActionSerializer < ApplicationSerializer
attributes :id, :icon, :label
- has_many :actions, serializer: ReviewableActionSerializer, root: 'actions'
+ has_many :actions, serializer: ReviewableActionSerializer, root: "actions"
def label
I18n.t(object.label, default: nil)
diff --git a/app/serializers/reviewable_conversation_post_serializer.rb b/app/serializers/reviewable_conversation_post_serializer.rb
index cccd746b364..e6608db5f8e 100644
--- a/app/serializers/reviewable_conversation_post_serializer.rb
+++ b/app/serializers/reviewable_conversation_post_serializer.rb
@@ -2,5 +2,5 @@
class ReviewableConversationPostSerializer < ApplicationSerializer
attributes :id, :excerpt
- has_one :user, serializer: BasicUserSerializer, root: 'users'
+ has_one :user, serializer: BasicUserSerializer, root: "users"
end
diff --git a/app/serializers/reviewable_explanation_serializer.rb b/app/serializers/reviewable_explanation_serializer.rb
index f268d12794a..d2cc51c6062 100644
--- a/app/serializers/reviewable_explanation_serializer.rb
+++ b/app/serializers/reviewable_explanation_serializer.rb
@@ -1,13 +1,7 @@
# frozen_string_literal: true
class ReviewableExplanationSerializer < ApplicationSerializer
- attributes(
- :id,
- :total_score,
- :scores,
- :min_score_visibility,
- :hide_post_score
- )
+ attributes(:id, :total_score, :scores, :min_score_visibility, :hide_post_score)
has_many :scores, serializer: ReviewableScoreExplanationSerializer, embed: :objects
diff --git a/app/serializers/reviewable_history_serializer.rb b/app/serializers/reviewable_history_serializer.rb
index d4ae2e78383..30feff77301 100644
--- a/app/serializers/reviewable_history_serializer.rb
+++ b/app/serializers/reviewable_history_serializer.rb
@@ -6,5 +6,5 @@ class ReviewableHistorySerializer < ApplicationSerializer
attribute :reviewable_history_type_for_database, key: :reviewable_history_type
attribute :status_for_database, key: :status
- has_one :created_by, serializer: BasicUserSerializer, root: 'users'
+ has_one :created_by, serializer: BasicUserSerializer, root: "users"
end
diff --git a/app/serializers/reviewable_perform_result_serializer.rb b/app/serializers/reviewable_perform_result_serializer.rb
index b5ff078fe84..84b8974fa6d 100644
--- a/app/serializers/reviewable_perform_result_serializer.rb
+++ b/app/serializers/reviewable_perform_result_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class ReviewablePerformResultSerializer < ApplicationSerializer
-
attributes(
:success,
:transition_to,
@@ -11,7 +10,7 @@ class ReviewablePerformResultSerializer < ApplicationSerializer
:remove_reviewable_ids,
:version,
:reviewable_count,
- :unseen_reviewable_count
+ :unseen_reviewable_count,
)
def success
diff --git a/app/serializers/reviewable_queued_post_serializer.rb b/app/serializers/reviewable_queued_post_serializer.rb
index c2ce6fecf22..94a7918a238 100644
--- a/app/serializers/reviewable_queued_post_serializer.rb
+++ b/app/serializers/reviewable_queued_post_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class ReviewableQueuedPostSerializer < ReviewableSerializer
-
attributes :reply_to_post_number
payload_attributes(
@@ -18,15 +17,14 @@ class ReviewableQueuedPostSerializer < ReviewableSerializer
:composer_open_duration_msecs,
:tags,
:via_email,
- :raw_email
+ :raw_email,
)
def reply_to_post_number
- object.payload['reply_to_post_number'].to_i
+ object.payload["reply_to_post_number"].to_i
end
def include_reply_to_post_number?
- object.payload.present? && object.payload['reply_to_post_number'].present?
+ object.payload.present? && object.payload["reply_to_post_number"].present?
end
-
end
diff --git a/app/serializers/reviewable_score_explanation_serializer.rb b/app/serializers/reviewable_score_explanation_serializer.rb
index f0082022883..0c100c23929 100644
--- a/app/serializers/reviewable_score_explanation_serializer.rb
+++ b/app/serializers/reviewable_score_explanation_serializer.rb
@@ -10,6 +10,6 @@ class ReviewableScoreExplanationSerializer < ApplicationSerializer
:flags_disagreed,
:flags_ignored,
:user_accuracy_bonus,
- :score
+ :score,
)
end
diff --git a/app/serializers/reviewable_score_serializer.rb b/app/serializers/reviewable_score_serializer.rb
index 5a4d1f05ded..bbf26b62ce8 100644
--- a/app/serializers/reviewable_score_serializer.rb
+++ b/app/serializers/reviewable_score_serializer.rb
@@ -2,33 +2,33 @@
class ReviewableScoreSerializer < ApplicationSerializer
REASONS_AND_SETTINGS = {
- post_count: 'approve_post_count',
- trust_level: 'approve_unless_trust_level',
- new_topics_unless_trust_level: 'approve_new_topics_unless_trust_level',
- fast_typer: 'min_first_post_typing_time',
- auto_silence_regex: 'auto_silence_first_post_regex',
- staged: 'approve_unless_staged',
- must_approve_users: 'must_approve_users',
- invite_only: 'invite_only',
- email_spam: 'email_in_spam_header',
- suspect_user: 'approve_suspect_users',
- contains_media: 'review_media_unless_trust_level',
+ post_count: "approve_post_count",
+ trust_level: "approve_unless_trust_level",
+ new_topics_unless_trust_level: "approve_new_topics_unless_trust_level",
+ fast_typer: "min_first_post_typing_time",
+ auto_silence_regex: "auto_silence_first_post_regex",
+ staged: "approve_unless_staged",
+ must_approve_users: "must_approve_users",
+ invite_only: "invite_only",
+ email_spam: "email_in_spam_header",
+ suspect_user: "approve_suspect_users",
+ contains_media: "review_media_unless_trust_level",
}
attributes :id, :score, :agree_stats, :reason, :created_at, :reviewed_at
attribute :status_for_database, key: :status
- has_one :user, serializer: BasicUserSerializer, root: 'users'
+ has_one :user, serializer: BasicUserSerializer, root: "users"
has_one :score_type, serializer: ReviewableScoreTypeSerializer
has_one :reviewable_conversation, serializer: ReviewableConversationSerializer
- has_one :reviewed_by, serializer: BasicUserSerializer, root: 'users'
+ has_one :reviewed_by, serializer: BasicUserSerializer, root: "users"
def agree_stats
{
agreed: user.user_stat.flags_agreed,
disagreed: user.user_stat.flags_disagreed,
- ignored: user.user_stat.flags_ignored
+ ignored: user.user_stat.flags_ignored,
}
end
@@ -69,9 +69,9 @@ class ReviewableScoreSerializer < ApplicationSerializer
def url_for(reason, text)
case reason
- when 'watched_word'
+ when "watched_word"
"#{Discourse.base_url}/admin/customize/watched_words"
- when 'category'
+ when "category"
"#{Discourse.base_url}/c/#{object.reviewable.category&.slug}/edit/settings"
else
"#{Discourse.base_url}/admin/site_settings/category/all_results?filter=#{text}"
@@ -79,8 +79,8 @@ class ReviewableScoreSerializer < ApplicationSerializer
end
def build_link_for(reason, text)
- return text.gsub('_', ' ') unless scope.is_staff?
+ return text.gsub("_", " ") unless scope.is_staff?
- "#{text.gsub('_', ' ')}"
+ "#{text.gsub("_", " ")}"
end
end
diff --git a/app/serializers/reviewable_score_type_serializer.rb b/app/serializers/reviewable_score_type_serializer.rb
index 60368ebcbce..e31e5fafd9a 100644
--- a/app/serializers/reviewable_score_type_serializer.rb
+++ b/app/serializers/reviewable_score_type_serializer.rb
@@ -20,5 +20,4 @@ class ReviewableScoreTypeSerializer < ApplicationSerializer
def icon
"flag"
end
-
end
diff --git a/app/serializers/reviewable_serializer.rb b/app/serializers/reviewable_serializer.rb
index 2260a4f9db1..20c02e4b72e 100644
--- a/app/serializers/reviewable_serializer.rb
+++ b/app/serializers/reviewable_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class ReviewableSerializer < ApplicationSerializer
-
class_attribute :_payload_for_serialization
attributes(
@@ -16,18 +15,18 @@ class ReviewableSerializer < ApplicationSerializer
:can_edit,
:score,
:version,
- :target_created_by_trust_level
+ :target_created_by_trust_level,
)
attribute :status_for_database, key: :status
- has_one :created_by, serializer: UserWithCustomFieldsSerializer, root: 'users'
- has_one :target_created_by, serializer: UserWithCustomFieldsSerializer, root: 'users'
+ has_one :created_by, serializer: UserWithCustomFieldsSerializer, root: "users"
+ has_one :target_created_by, serializer: UserWithCustomFieldsSerializer, root: "users"
has_one :topic, serializer: ListableTopicSerializer
has_many :editable_fields, serializer: ReviewableEditableFieldSerializer, embed: :objects
has_many :reviewable_scores, serializer: ReviewableScoreSerializer
has_many :bundled_actions, serializer: ReviewableBundledActionSerializer
- has_one :claimed_by, serializer: UserWithCustomFieldsSerializer, root: 'users'
+ has_one :claimed_by, serializer: UserWithCustomFieldsSerializer, root: "users"
# Used to keep track of our payload attributes
class_attribute :_payload_for_serialization
@@ -73,9 +72,7 @@ class ReviewableSerializer < ApplicationSerializer
# This is easier than creating an AMS method for each attribute
def self.target_attributes(*attributes)
- attributes.each do |a|
- create_attribute(a, "object.target&.#{a}")
- end
+ attributes.each { |a| create_attribute(a, "object.target&.#{a}") }
end
def self.payload_attributes(*attributes)
@@ -108,7 +105,9 @@ class ReviewableSerializer < ApplicationSerializer
end
def target_url
- return Discourse.base_url + object.target.url if object.target.is_a?(Post) && object.target.present?
+ if object.target.is_a?(Post) && object.target.present?
+ return Discourse.base_url + object.target.url
+ end
topic_url
end
@@ -135,5 +134,4 @@ class ReviewableSerializer < ApplicationSerializer
def target_created_by_trust_level
object&.target_created_by&.trust_level
end
-
end
diff --git a/app/serializers/reviewable_settings_serializer.rb b/app/serializers/reviewable_settings_serializer.rb
index f2a34e4e962..5b21101000a 100644
--- a/app/serializers/reviewable_settings_serializer.rb
+++ b/app/serializers/reviewable_settings_serializer.rb
@@ -14,8 +14,6 @@ class ReviewableSettingsSerializer < ApplicationSerializer
end
def reviewable_priorities
- Reviewable.priorities.map do |p|
- { id: p[1], name: I18n.t("reviewables.priorities.#{p[0]}") }
- end
+ Reviewable.priorities.map { |p| { id: p[1], name: I18n.t("reviewables.priorities.#{p[0]}") } }
end
end
diff --git a/app/serializers/reviewable_topic_serializer.rb b/app/serializers/reviewable_topic_serializer.rb
index 70e0d7fa036..59bf143f869 100644
--- a/app/serializers/reviewable_topic_serializer.rb
+++ b/app/serializers/reviewable_topic_serializer.rb
@@ -12,10 +12,10 @@ class ReviewableTopicSerializer < ApplicationSerializer
:archetype,
:relative_url,
:stats,
- :reviewable_score
+ :reviewable_score,
)
- has_one :claimed_by, serializer: BasicUserSerializer, root: 'users'
+ has_one :claimed_by, serializer: BasicUserSerializer, root: "users"
def stats
@options[:stats][object.id]
@@ -28,5 +28,4 @@ class ReviewableTopicSerializer < ApplicationSerializer
def include_claimed_by?
@options[:claimed_topics]
end
-
end
diff --git a/app/serializers/reviewable_user_serializer.rb b/app/serializers/reviewable_user_serializer.rb
index 5841899cfd3..c5173382012 100644
--- a/app/serializers/reviewable_user_serializer.rb
+++ b/app/serializers/reviewable_user_serializer.rb
@@ -1,16 +1,9 @@
# frozen_string_literal: true
class ReviewableUserSerializer < ReviewableSerializer
-
attributes :link_admin, :user_fields, :reject_reason
- payload_attributes(
- :username,
- :email,
- :name,
- :bio,
- :website
- )
+ payload_attributes(:username, :email, :name, :bio, :website)
def link_admin
scope.is_staff? && object.target.present?
@@ -23,5 +16,4 @@ class ReviewableUserSerializer < ReviewableSerializer
def include_user_fields?
object.target.present? && object.target.user_fields.present?
end
-
end
diff --git a/app/serializers/screened_email_serializer.rb b/app/serializers/screened_email_serializer.rb
index bb38bd9093e..799d122a3f1 100644
--- a/app/serializers/screened_email_serializer.rb
+++ b/app/serializers/screened_email_serializer.rb
@@ -1,13 +1,7 @@
# frozen_string_literal: true
class ScreenedEmailSerializer < ApplicationSerializer
- attributes :email,
- :action,
- :match_count,
- :last_match_at,
- :created_at,
- :ip_address,
- :id
+ attributes :email, :action, :match_count, :last_match_at, :created_at, :ip_address, :id
def action
ScreenedEmail.actions.key(object.action_type).to_s
@@ -16,5 +10,4 @@ class ScreenedEmailSerializer < ApplicationSerializer
def ip_address
object.ip_address.try(:to_s)
end
-
end
diff --git a/app/serializers/screened_ip_address_serializer.rb b/app/serializers/screened_ip_address_serializer.rb
index f833e0b5fd2..75853a2aaab 100644
--- a/app/serializers/screened_ip_address_serializer.rb
+++ b/app/serializers/screened_ip_address_serializer.rb
@@ -1,12 +1,7 @@
# frozen_string_literal: true
class ScreenedIpAddressSerializer < ApplicationSerializer
- attributes :id,
- :ip_address,
- :action_name,
- :match_count,
- :last_match_at,
- :created_at
+ attributes :id, :ip_address, :action_name, :match_count, :last_match_at, :created_at
def action_name
ScreenedIpAddress.actions.key(object.action_type).to_s
@@ -15,5 +10,4 @@ class ScreenedIpAddressSerializer < ApplicationSerializer
def ip_address
object.ip_address_with_mask
end
-
end
diff --git a/app/serializers/screened_url_serializer.rb b/app/serializers/screened_url_serializer.rb
index 7c071349fae..c4f561071ec 100644
--- a/app/serializers/screened_url_serializer.rb
+++ b/app/serializers/screened_url_serializer.rb
@@ -1,13 +1,7 @@
# frozen_string_literal: true
class ScreenedUrlSerializer < ApplicationSerializer
- attributes :url,
- :domain,
- :action,
- :match_count,
- :last_match_at,
- :created_at,
- :ip_address
+ attributes :url, :domain, :action, :match_count, :last_match_at, :created_at, :ip_address
def action
ScreenedUrl.actions.key(object.action_type).to_s
@@ -16,5 +10,4 @@ class ScreenedUrlSerializer < ApplicationSerializer
def ip_address
object.ip_address.try(:to_s)
end
-
end
diff --git a/app/serializers/search_logs_serializer.rb b/app/serializers/search_logs_serializer.rb
index 81f70e0694c..910aeb66069 100644
--- a/app/serializers/search_logs_serializer.rb
+++ b/app/serializers/search_logs_serializer.rb
@@ -1,7 +1,5 @@
# frozen_string_literal: true
class SearchLogsSerializer < ApplicationSerializer
- attributes :term,
- :searches,
- :ctr
+ attributes :term, :searches, :ctr
end
diff --git a/app/serializers/similar_admin_user_serializer.rb b/app/serializers/similar_admin_user_serializer.rb
index 3f343ed8416..542d4885c28 100644
--- a/app/serializers/similar_admin_user_serializer.rb
+++ b/app/serializers/similar_admin_user_serializer.rb
@@ -1,8 +1,7 @@
# frozen_string_literal: true
class SimilarAdminUserSerializer < AdminUserListSerializer
- attributes :can_be_suspended,
- :can_be_silenced
+ attributes :can_be_suspended, :can_be_silenced
def can_be_suspended
scope.can_suspend?(object)
diff --git a/app/serializers/similar_topic_serializer.rb b/app/serializers/similar_topic_serializer.rb
index 68d6ec73744..7c73730f2ba 100644
--- a/app/serializers/similar_topic_serializer.rb
+++ b/app/serializers/similar_topic_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class SimilarTopicSerializer < ApplicationSerializer
-
has_one :topic, serializer: TopicListItemSerializer, embed: :ids
attributes :id, :blurb, :created_at, :url
diff --git a/app/serializers/single_sign_on_record_serializer.rb b/app/serializers/single_sign_on_record_serializer.rb
index 55af0fb7bcb..5bc88037159 100644
--- a/app/serializers/single_sign_on_record_serializer.rb
+++ b/app/serializers/single_sign_on_record_serializer.rb
@@ -1,9 +1,12 @@
# frozen_string_literal: true
class SingleSignOnRecordSerializer < ApplicationSerializer
- attributes :user_id, :external_id,
- :created_at, :updated_at,
- :external_username, :external_name,
+ attributes :user_id,
+ :external_id,
+ :created_at,
+ :updated_at,
+ :external_username,
+ :external_name,
:external_avatar_url,
:external_profile_background_url,
:external_card_background_url
diff --git a/app/serializers/site_category_serializer.rb b/app/serializers/site_category_serializer.rb
index 1d29b7c7af0..869e9b7868a 100644
--- a/app/serializers/site_category_serializer.rb
+++ b/app/serializers/site_category_serializer.rb
@@ -1,11 +1,7 @@
# frozen_string_literal: true
class SiteCategorySerializer < BasicCategorySerializer
-
- attributes :allowed_tags,
- :allowed_tag_groups,
- :allow_global_tags,
- :read_only_banner
+ attributes :allowed_tags, :allowed_tag_groups, :allow_global_tags, :read_only_banner
has_many :category_required_tag_groups, key: :required_tag_groups, embed: :objects
diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb
index 0ddc329fd8e..4aa21862328 100644
--- a/app/serializers/site_serializer.rb
+++ b/app/serializers/site_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class SiteSerializer < ApplicationSerializer
-
attributes(
:default_archetype,
:notification_types,
@@ -40,7 +39,7 @@ class SiteSerializer < ApplicationSerializer
:displayed_about_plugin_stat_groups,
:show_welcome_topic_banner,
:anonymous_default_sidebar_tags,
- :whispers_allowed_groups_names
+ :whispers_allowed_groups_names,
)
has_many :archetypes, embed: :objects, serializer: ArchetypeSerializer
@@ -49,19 +48,29 @@ class SiteSerializer < ApplicationSerializer
def user_themes
cache_fragment("user_themes") do
- Theme.where('id = :default OR user_selectable',
- default: SiteSetting.default_theme_id)
+ Theme
+ .where("id = :default OR user_selectable", default: SiteSetting.default_theme_id)
.order("lower(name)")
.pluck(:id, :name, :color_scheme_id)
- .map { |id, n, cs| { theme_id: id, name: n, default: id == SiteSetting.default_theme_id, color_scheme_id: cs } }
+ .map do |id, n, cs|
+ {
+ theme_id: id,
+ name: n,
+ default: id == SiteSetting.default_theme_id,
+ color_scheme_id: cs,
+ }
+ end
.as_json
end
end
def user_color_schemes
cache_fragment("user_color_schemes") do
- schemes = ColorScheme.includes(:color_scheme_colors).where('user_selectable').order(:name)
- ActiveModel::ArraySerializer.new(schemes, each_serializer: ColorSchemeSelectableSerializer).as_json
+ schemes = ColorScheme.includes(:color_scheme_colors).where("user_selectable").order(:name)
+ ActiveModel::ArraySerializer.new(
+ schemes,
+ each_serializer: ColorSchemeSelectableSerializer,
+ ).as_json
end
end
@@ -71,7 +80,9 @@ class SiteSerializer < ApplicationSerializer
def groups
cache_anon_fragment("group_names") do
- object.groups.order(:name)
+ object
+ .groups
+ .order(:name)
.select(:id, :name, :flair_icon, :flair_upload_id, :flair_bg_color, :flair_color)
.map do |g|
{
@@ -81,7 +92,8 @@ class SiteSerializer < ApplicationSerializer
flair_bg_color: g.flair_bg_color,
flair_color: g.flair_color,
}
- end.as_json
+ end
+ .as_json
end
end
@@ -244,7 +256,8 @@ class SiteSerializer < ApplicationSerializer
end
def include_anonymous_default_sidebar_tags?
- scope.anonymous? && !SiteSetting.legacy_navigation_menu? && SiteSetting.tagging_enabled && SiteSetting.default_sidebar_tags.present?
+ scope.anonymous? && !SiteSetting.legacy_navigation_menu? && SiteSetting.tagging_enabled &&
+ SiteSetting.default_sidebar_tags.present?
end
def whispers_allowed_groups_names
diff --git a/app/serializers/suggested_topic_serializer.rb b/app/serializers/suggested_topic_serializer.rb
index f2ad535fbbe..5796ede9121 100644
--- a/app/serializers/suggested_topic_serializer.rb
+++ b/app/serializers/suggested_topic_serializer.rb
@@ -10,7 +10,12 @@ class SuggestedTopicSerializer < ListableTopicSerializer
has_one :user, serializer: BasicUserSerializer, embed: :objects
end
- attributes :archetype, :like_count, :views, :category_id, :featured_link, :featured_link_root_domain
+ attributes :archetype,
+ :like_count,
+ :views,
+ :category_id,
+ :featured_link,
+ :featured_link_root_domain
has_many :posters, serializer: SuggestedPosterSerializer, embed: :objects
def posters
diff --git a/app/serializers/suggested_topics_mixin.rb b/app/serializers/suggested_topics_mixin.rb
index cf0de7b4a10..a899d73f7d1 100644
--- a/app/serializers/suggested_topics_mixin.rb
+++ b/app/serializers/suggested_topics_mixin.rb
@@ -26,10 +26,12 @@ module SuggestedTopicsMixin
return if object.topic.topic_allowed_users.exists?(user_id: scope.user.id)
if object.topic_allowed_group_ids.present?
- Group.joins(:group_users)
+ Group
+ .joins(:group_users)
.where(
"group_users.group_id IN (?) AND group_users.user_id = ?",
- object.topic_allowed_group_ids, scope.user.id
+ object.topic_allowed_group_ids,
+ scope.user.id,
)
.pluck_first(:name)
end
diff --git a/app/serializers/tag_group_serializer.rb b/app/serializers/tag_group_serializer.rb
index db61936fceb..6ccdd3e2d66 100644
--- a/app/serializers/tag_group_serializer.rb
+++ b/app/serializers/tag_group_serializer.rb
@@ -12,17 +12,22 @@ class TagGroupSerializer < ApplicationSerializer
end
def permissions
- @permissions ||= begin
- h = {}
+ @permissions ||=
+ begin
+ h = {}
- object.tag_group_permissions.joins(:group).includes(:group).find_each do |tgp|
- name = Group::AUTO_GROUP_IDS.fetch(tgp.group_id, tgp.group.name).to_s
- h[name] = tgp.permission_type
+ object
+ .tag_group_permissions
+ .joins(:group)
+ .includes(:group)
+ .find_each do |tgp|
+ name = Group::AUTO_GROUP_IDS.fetch(tgp.group_id, tgp.group.name).to_s
+ h[name] = tgp.permission_type
+ end
+
+ h["everyone"] = TagGroupPermission.permission_types[:full] if h.empty?
+
+ h
end
-
- h["everyone"] = TagGroupPermission.permission_types[:full] if h.empty?
-
- h
- end
end
end
diff --git a/app/serializers/theme_serializer.rb b/app/serializers/theme_serializer.rb
index b0edeaa7c4d..d3307a6825d 100644
--- a/app/serializers/theme_serializer.rb
+++ b/app/serializers/theme_serializer.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require 'base64'
+require "base64"
class ThemeFieldSerializer < ApplicationSerializer
attributes :name, :target, :value, :error, :type_id, :upload_id, :url, :filename
@@ -47,9 +47,23 @@ class BasicThemeSerializer < ApplicationSerializer
end
class RemoteThemeSerializer < ApplicationSerializer
- attributes :id, :remote_url, :remote_version, :local_version, :commits_behind, :branch,
- :remote_updated_at, :updated_at, :github_diff_link, :last_error_text, :is_git?,
- :license_url, :about_url, :authors, :theme_version, :minimum_discourse_version, :maximum_discourse_version
+ attributes :id,
+ :remote_url,
+ :remote_version,
+ :local_version,
+ :commits_behind,
+ :branch,
+ :remote_updated_at,
+ :updated_at,
+ :github_diff_link,
+ :last_error_text,
+ :is_git?,
+ :license_url,
+ :about_url,
+ :authors,
+ :theme_version,
+ :minimum_discourse_version,
+ :maximum_discourse_version
# wow, AMS has some pretty nutty logic where it tries to find the path here
# from action dispatch, tell it not to
@@ -63,9 +77,17 @@ class RemoteThemeSerializer < ApplicationSerializer
end
class ThemeSerializer < BasicThemeSerializer
- attributes :color_scheme, :color_scheme_id, :user_selectable, :auto_update,
- :remote_theme_id, :settings, :errors, :supported?, :description,
- :enabled?, :disabled_at
+ attributes :color_scheme,
+ :color_scheme_id,
+ :user_selectable,
+ :auto_update,
+ :remote_theme_id,
+ :settings,
+ :errors,
+ :supported?,
+ :description,
+ :enabled?,
+ :disabled_at
has_one :user, serializer: UserNameSerializer, embed: :object
has_one :disabled_by, serializer: UserNameSerializer, embed: :object
@@ -80,9 +102,7 @@ class ThemeSerializer < BasicThemeSerializer
super
@errors = []
- object.theme_fields.each do |o|
- @errors << o.error if o.error
- end
+ object.theme_fields.each { |o| @errors << o.error if o.error }
end
def child_themes
@@ -113,7 +133,7 @@ class ThemeSerializer < BasicThemeSerializer
end
def description
- object.internal_translations.find { |t| t.key == "theme_metadata.description" } &.value
+ object.internal_translations.find { |t| t.key == "theme_metadata.description" }&.value
end
def include_disabled_at?
diff --git a/app/serializers/theme_settings_serializer.rb b/app/serializers/theme_settings_serializer.rb
index 987003d06a1..cbd01da5a87 100644
--- a/app/serializers/theme_settings_serializer.rb
+++ b/app/serializers/theme_settings_serializer.rb
@@ -1,8 +1,15 @@
# frozen_string_literal: true
class ThemeSettingsSerializer < ApplicationSerializer
- attributes :setting, :type, :default, :value, :description, :valid_values,
- :list_type, :textarea, :json_schema
+ attributes :setting,
+ :type,
+ :default,
+ :value,
+ :description,
+ :valid_values,
+ :list_type,
+ :textarea,
+ :json_schema
def setting
object.name
@@ -21,7 +28,12 @@ class ThemeSettingsSerializer < ApplicationSerializer
end
def description
- locale_file_description = object.theme.internal_translations.find { |t| t.key == "theme_metadata.settings.#{setting}" } &.value
+ locale_file_description =
+ object
+ .theme
+ .internal_translations
+ .find { |t| t.key == "theme_metadata.settings.#{setting}" }
+ &.value
locale_file_description || object.description
end
diff --git a/app/serializers/topic_embed_serializer.rb b/app/serializers/topic_embed_serializer.rb
index d31ab6e89a9..928d3ec5d04 100644
--- a/app/serializers/topic_embed_serializer.rb
+++ b/app/serializers/topic_embed_serializer.rb
@@ -1,11 +1,7 @@
# frozen_string_literal: true
class TopicEmbedSerializer < ApplicationSerializer
- attributes \
- :topic_id,
- :post_id,
- :topic_slug,
- :comment_count
+ attributes :topic_id, :post_id, :topic_slug, :comment_count
def topic_slug
object.topic.slug
diff --git a/app/serializers/topic_flag_type_serializer.rb b/app/serializers/topic_flag_type_serializer.rb
index 6532f4918db..ccee54a0aaf 100644
--- a/app/serializers/topic_flag_type_serializer.rb
+++ b/app/serializers/topic_flag_type_serializer.rb
@@ -1,12 +1,10 @@
# frozen_string_literal: true
class TopicFlagTypeSerializer < PostActionTypeSerializer
-
protected
def i18n(field, vars = nil)
key = "topic_flag_types.#{name_key}.#{field}"
vars ? I18n.t(key, vars) : I18n.t(key)
end
-
end
diff --git a/app/serializers/topic_link_serializer.rb b/app/serializers/topic_link_serializer.rb
index d3d3fb686c4..d4b814d2c98 100644
--- a/app/serializers/topic_link_serializer.rb
+++ b/app/serializers/topic_link_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class TopicLinkSerializer < ApplicationSerializer
-
attributes :url,
:title,
# :fancy_title,
@@ -12,10 +11,9 @@ class TopicLinkSerializer < ApplicationSerializer
:user_id,
:domain,
:root_domain,
-
- def attachment
- Discourse.store.has_been_uploaded?(object.url)
- end
+ def attachment
+ Discourse.store.has_been_uploaded?(object.url)
+ end
def include_user_id?
object.user_id.present?
@@ -24,5 +22,4 @@ class TopicLinkSerializer < ApplicationSerializer
def root_domain
MiniSuffix.domain(domain)
end
-
end
diff --git a/app/serializers/topic_list_item_serializer.rb b/app/serializers/topic_list_item_serializer.rb
index 4a8f12b37c8..3d43c0848a8 100644
--- a/app/serializers/topic_list_item_serializer.rb
+++ b/app/serializers/topic_list_item_serializer.rb
@@ -32,7 +32,6 @@ class TopicListItemSerializer < ListableTopicSerializer
end
def category_id
-
# If it's a shared draft, show the destination topic instead
if object.includes_destination_category && object.shared_draft
return object.shared_draft.category_id
@@ -50,8 +49,7 @@ class TopicListItemSerializer < ListableTopicSerializer
end
def include_post_action?(action)
- object.user_data &&
- object.user_data.post_action_data &&
+ object.user_data && object.user_data.post_action_data &&
object.user_data.post_action_data.key?(PostActionType.types[action])
end
@@ -86,5 +84,4 @@ class TopicListItemSerializer < ListableTopicSerializer
def include_allowed_user_count?
object.private_message?
end
-
end
diff --git a/app/serializers/topic_list_serializer.rb b/app/serializers/topic_list_serializer.rb
index a3ece4822f2..5e78f344a3e 100644
--- a/app/serializers/topic_list_serializer.rb
+++ b/app/serializers/topic_list_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class TopicListSerializer < ApplicationSerializer
-
attributes :can_create_topic,
:more_topics_url,
:for_period,
diff --git a/app/serializers/topic_pending_post_serializer.rb b/app/serializers/topic_pending_post_serializer.rb
index c07fc479e5e..da02c073583 100644
--- a/app/serializers/topic_pending_post_serializer.rb
+++ b/app/serializers/topic_pending_post_serializer.rb
@@ -4,11 +4,10 @@ class TopicPendingPostSerializer < ApplicationSerializer
attributes :id, :raw, :created_at
def raw
- object.payload['raw']
+ object.payload["raw"]
end
def include_raw?
- object.payload && object.payload['raw'].present?
+ object.payload && object.payload["raw"].present?
end
-
end
diff --git a/app/serializers/topic_post_count_serializer.rb b/app/serializers/topic_post_count_serializer.rb
index 90f5a89fa49..4495019bec5 100644
--- a/app/serializers/topic_post_count_serializer.rb
+++ b/app/serializers/topic_post_count_serializer.rb
@@ -1,14 +1,18 @@
# frozen_string_literal: true
class TopicPostCountSerializer < BasicUserSerializer
-
- attributes :post_count, :primary_group_name,
- :flair_name, :flair_url, :flair_color, :flair_bg_color,
- :admin, :moderator, :trust_level,
-
- def id
- object[:user].id
- end
+ attributes :post_count,
+ :primary_group_name,
+ :flair_name,
+ :flair_url,
+ :flair_color,
+ :flair_bg_color,
+ :admin,
+ :moderator,
+ :trust_level,
+ def id
+ object[:user].id
+ end
def username
object[:user].username
@@ -58,5 +62,4 @@ class TopicPostCountSerializer < BasicUserSerializer
def trust_level
object[:user].trust_level
end
-
end
diff --git a/app/serializers/topic_timer_serializer.rb b/app/serializers/topic_timer_serializer.rb
index b7f3b88788d..9f9934f6342 100644
--- a/app/serializers/topic_timer_serializer.rb
+++ b/app/serializers/topic_timer_serializer.rb
@@ -1,12 +1,7 @@
# frozen_string_literal: true
class TopicTimerSerializer < ApplicationSerializer
- attributes :id,
- :execute_at,
- :duration_minutes,
- :based_on_last_post,
- :status_type,
- :category_id
+ attributes :id, :execute_at, :duration_minutes, :based_on_last_post, :status_type, :category_id
def status_type
TopicTimer.types[object.status_type]
diff --git a/app/serializers/topic_view_details_serializer.rb b/app/serializers/topic_view_details_serializer.rb
index ffe51d4db33..22ae968e3fb 100644
--- a/app/serializers/topic_view_details_serializer.rb
+++ b/app/serializers/topic_view_details_serializer.rb
@@ -1,29 +1,30 @@
# frozen_string_literal: true
class TopicViewDetailsSerializer < ApplicationSerializer
-
def self.can_attributes
- [:can_move_posts,
- :can_delete,
- :can_permanently_delete,
- :can_recover,
- :can_remove_allowed_users,
- :can_invite_to,
- :can_invite_via_email,
- :can_create_post,
- :can_reply_as_new_topic,
- :can_flag_topic,
- :can_convert_topic,
- :can_review_topic,
- :can_edit_tags,
- :can_publish_page,
- :can_close_topic,
- :can_archive_topic,
- :can_split_merge_topic,
- :can_edit_staff_notes,
- :can_toggle_topic_visibility,
- :can_pin_unpin_topic,
- :can_moderate_category]
+ %i[
+ can_move_posts
+ can_delete
+ can_permanently_delete
+ can_recover
+ can_remove_allowed_users
+ can_invite_to
+ can_invite_via_email
+ can_create_post
+ can_reply_as_new_topic
+ can_flag_topic
+ can_convert_topic
+ can_review_topic
+ can_edit_tags
+ can_publish_page
+ can_close_topic
+ can_archive_topic
+ can_split_merge_topic
+ can_edit_staff_notes
+ can_toggle_topic_visibility
+ can_pin_unpin_topic
+ can_moderate_category
+ ]
end
# NOTE: `can_edit` is defined as an attribute because we explicitly want
@@ -35,7 +36,7 @@ class TopicViewDetailsSerializer < ApplicationSerializer
*can_attributes,
:can_remove_self_id,
:participants,
- :allowed_users
+ :allowed_users,
)
has_one :created_by, serializer: BasicUserSerializer, embed: :objects
@@ -46,9 +47,10 @@ class TopicViewDetailsSerializer < ApplicationSerializer
has_many :allowed_groups, serializer: BasicGroupSerializer, embed: :objects
def participants
- object.post_counts_by_user.reject { |p| object.participants[p].blank? }.map do |pc|
- { user: object.participants[pc[0]], post_count: pc[1] }
- end
+ object
+ .post_counts_by_user
+ .reject { |p| object.participants[p].blank? }
+ .map { |pc| { user: object.participants[pc[0]], post_count: pc[1] } }
end
def include_participants?
@@ -88,9 +90,7 @@ class TopicViewDetailsSerializer < ApplicationSerializer
scope.can_remove_allowed_users?(object.topic, scope.user)
end
- can_attributes.each do |ca|
- define_method(ca) { true }
- end
+ can_attributes.each { |ca| define_method(ca) { true } }
# NOTE: A Category Group Moderator moving a topic to a different category
# may result in the 'can_edit?' result changing from `true` to `false`.
@@ -160,13 +160,14 @@ class TopicViewDetailsSerializer < ApplicationSerializer
end
def can_perform_action_available_to_group_moderators?
- @can_perform_action_available_to_group_moderators ||= scope.can_perform_action_available_to_group_moderators?(object.topic)
+ @can_perform_action_available_to_group_moderators ||=
+ scope.can_perform_action_available_to_group_moderators?(object.topic)
end
- alias :include_can_close_topic? :can_perform_action_available_to_group_moderators?
- alias :include_can_archive_topic? :can_perform_action_available_to_group_moderators?
- alias :include_can_split_merge_topic? :can_perform_action_available_to_group_moderators?
- alias :include_can_edit_staff_notes? :can_perform_action_available_to_group_moderators?
- alias :include_can_moderate_category? :can_perform_action_available_to_group_moderators?
+ alias include_can_close_topic? can_perform_action_available_to_group_moderators?
+ alias include_can_archive_topic? can_perform_action_available_to_group_moderators?
+ alias include_can_split_merge_topic? can_perform_action_available_to_group_moderators?
+ alias include_can_edit_staff_notes? can_perform_action_available_to_group_moderators?
+ alias include_can_moderate_category? can_perform_action_available_to_group_moderators?
def include_can_publish_page?
scope.can_publish_page?(object.topic)
@@ -189,5 +190,4 @@ class TopicViewDetailsSerializer < ApplicationSerializer
def include_allowed_groups?
object.personal_message
end
-
end
diff --git a/app/serializers/topic_view_posts_serializer.rb b/app/serializers/topic_view_posts_serializer.rb
index 8afcac3e9ff..8dbb4d2b059 100644
--- a/app/serializers/topic_view_posts_serializer.rb
+++ b/app/serializers/topic_view_posts_serializer.rb
@@ -21,5 +21,4 @@ class TopicViewPostsSerializer < ApplicationSerializer
def include_timeline_lookup?
false
end
-
end
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index 57bd35aaf48..91eb2a6f2f1 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -42,7 +42,7 @@ class TopicViewSerializer < ApplicationSerializer
:pinned_until,
:image_url,
:slow_mode_seconds,
- :external_id
+ :external_id,
)
attributes(
@@ -77,7 +77,7 @@ class TopicViewSerializer < ApplicationSerializer
:thumbnails,
:user_last_posted_at,
:is_shared_draft,
- :slow_mode_enabled_until
+ :slow_mode_enabled_until,
)
has_one :details, serializer: TopicViewDetailsSerializer, root: false, embed: :objects
@@ -247,7 +247,8 @@ class TopicViewSerializer < ApplicationSerializer
end
def include_destination_category_id?
- scope.can_see_shared_draft? && SiteSetting.shared_drafts_enabled? && object.topic.shared_draft.present?
+ scope.can_see_shared_draft? && SiteSetting.shared_drafts_enabled? &&
+ object.topic.shared_draft.present?
end
def is_shared_draft
@@ -276,20 +277,21 @@ class TopicViewSerializer < ApplicationSerializer
Group
.joins(:group_users)
.where(
- id: object.topic.custom_fields['requested_group_id'].to_i,
- group_users: { user_id: scope.user.id, owner: true }
+ id: object.topic.custom_fields["requested_group_id"].to_i,
+ group_users: {
+ user_id: scope.user.id,
+ owner: true,
+ },
)
.pluck_first(:name)
end
def include_requested_group_name?
- object.personal_message && object.topic.custom_fields['requested_group_id']
+ object.personal_message && object.topic.custom_fields["requested_group_id"]
end
def include_published_page?
- SiteSetting.enable_page_publishing? &&
- scope.is_staff? &&
- object.published_page.present? &&
+ SiteSetting.enable_page_publishing? && scope.is_staff? && object.published_page.present? &&
!SiteSetting.secure_uploads
end
diff --git a/app/serializers/topic_view_wordpress_serializer.rb b/app/serializers/topic_view_wordpress_serializer.rb
index b4e76103190..ce94b630b41 100644
--- a/app/serializers/topic_view_wordpress_serializer.rb
+++ b/app/serializers/topic_view_wordpress_serializer.rb
@@ -1,13 +1,8 @@
# frozen_string_literal: true
class TopicViewWordpressSerializer < ApplicationSerializer
-
# These attributes will be delegated to the topic
- attributes :id,
- :category_id,
- :posts_count,
- :filtered_posts_count,
- :posts
+ attributes :id, :category_id, :posts_count, :filtered_posts_count, :posts
has_many :participants, serializer: UserWordpressSerializer, embed: :objects
has_many :posts, serializer: PostWordpressSerializer, embed: :objects
@@ -35,5 +30,4 @@ class TopicViewWordpressSerializer < ApplicationSerializer
def posts
object.posts
end
-
end
diff --git a/app/serializers/trust_level3_requirements_serializer.rb b/app/serializers/trust_level3_requirements_serializer.rb
index 2cf83317595..690e9682391 100644
--- a/app/serializers/trust_level3_requirements_serializer.rb
+++ b/app/serializers/trust_level3_requirements_serializer.rb
@@ -1,25 +1,37 @@
# frozen_string_literal: true
class TrustLevel3RequirementsSerializer < ApplicationSerializer
-
has_one :penalty_counts, embed: :object, serializer: PenaltyCountsSerializer
attributes :time_period,
:requirements_met,
:requirements_lost,
- :trust_level_locked, :on_grace_period,
- :days_visited, :min_days_visited,
- :num_topics_replied_to, :min_topics_replied_to,
- :topics_viewed, :min_topics_viewed,
- :posts_read, :min_posts_read,
- :topics_viewed_all_time, :min_topics_viewed_all_time,
- :posts_read_all_time, :min_posts_read_all_time,
- :num_flagged_posts, :max_flagged_posts,
- :num_flagged_by_users, :max_flagged_by_users,
- :num_likes_given, :min_likes_given,
- :num_likes_received, :min_likes_received,
- :num_likes_received_days, :min_likes_received_days,
- :num_likes_received_users, :min_likes_received_users
+ :trust_level_locked,
+ :on_grace_period,
+ :days_visited,
+ :min_days_visited,
+ :num_topics_replied_to,
+ :min_topics_replied_to,
+ :topics_viewed,
+ :min_topics_viewed,
+ :posts_read,
+ :min_posts_read,
+ :topics_viewed_all_time,
+ :min_topics_viewed_all_time,
+ :posts_read_all_time,
+ :min_posts_read_all_time,
+ :num_flagged_posts,
+ :max_flagged_posts,
+ :num_flagged_by_users,
+ :max_flagged_by_users,
+ :num_likes_given,
+ :min_likes_given,
+ :num_likes_received,
+ :min_likes_received,
+ :num_likes_received_days,
+ :min_likes_received_days,
+ :num_likes_received_users,
+ :min_likes_received_users
def requirements_met
object.requirements_met?
diff --git a/app/serializers/upload_serializer.rb b/app/serializers/upload_serializer.rb
index 7626c0e1e23..eb32b011813 100644
--- a/app/serializers/upload_serializer.rb
+++ b/app/serializers/upload_serializer.rb
@@ -17,6 +17,10 @@ class UploadSerializer < ApplicationSerializer
:dominant_color
def url
- object.for_site_setting ? object.url : UrlHelper.cook_url(object.url, secure: SiteSetting.secure_uploads? && object.secure)
+ if object.for_site_setting
+ object.url
+ else
+ UrlHelper.cook_url(object.url, secure: SiteSetting.secure_uploads? && object.secure)
+ end
end
end
diff --git a/app/serializers/user_action_serializer.rb b/app/serializers/user_action_serializer.rb
index 29ed526dc06..0958de3d9dd 100644
--- a/app/serializers/user_action_serializer.rb
+++ b/app/serializers/user_action_serializer.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require_relative 'post_item_excerpt'
+require_relative "post_item_excerpt"
class UserActionSerializer < ApplicationSerializer
include PostItemExcerpt
@@ -98,5 +98,4 @@ class UserActionSerializer < ApplicationSerializer
def action_code_path
object.action_code_path
end
-
end
diff --git a/app/serializers/user_badge_serializer.rb b/app/serializers/user_badge_serializer.rb
index 4b2b536ef5a..752ae5c8341 100644
--- a/app/serializers/user_badge_serializer.rb
+++ b/app/serializers/user_badge_serializer.rb
@@ -6,9 +6,7 @@ class UserBadgeSerializer < ApplicationSerializer
class UserSerializer < BasicUserSerializer
include UserPrimaryGroupMixin
- attributes :name,
- :moderator,
- :admin
+ attributes :name, :moderator, :admin
end
attributes :id, :granted_at, :created_at, :count, :post_id, :post_number
@@ -26,7 +24,7 @@ class UserBadgeSerializer < ApplicationSerializer
include_post_attributes?
end
- alias :include_post_number? :include_post_id?
+ alias include_post_number? include_post_id?
def post_number
object.post && object.post.post_number
diff --git a/app/serializers/user_bookmark_list_serializer.rb b/app/serializers/user_bookmark_list_serializer.rb
index cefdd95114c..b70349a1e83 100644
--- a/app/serializers/user_bookmark_list_serializer.rb
+++ b/app/serializers/user_bookmark_list_serializer.rb
@@ -9,7 +9,7 @@ class UserBookmarkListSerializer < ApplicationSerializer
bm,
**object.bookmark_serializer_opts,
scope: scope,
- root: false
+ root: false,
)
end
end
diff --git a/app/serializers/user_card_serializer.rb b/app/serializers/user_card_serializer.rb
index 5e208169c7a..d2c32facdc9 100644
--- a/app/serializers/user_card_serializer.rb
+++ b/app/serializers/user_card_serializer.rb
@@ -73,11 +73,7 @@ class UserCardSerializer < BasicUserSerializer
:pending_posts_count,
:status
- untrusted_attributes :bio_excerpt,
- :website,
- :website_name,
- :location,
- :card_background_upload_url
+ untrusted_attributes :bio_excerpt, :website, :website_name, :location, :card_background_upload_url
staff_attributes :staged
@@ -91,8 +87,7 @@ class UserCardSerializer < BasicUserSerializer
end
def include_email?
- (object.id && object.id == scope.user.try(:id)) ||
- (scope.is_staff? && object.staged?)
+ (object.id && object.id == scope.user.try(:id)) || (scope.is_staff? && object.staged?)
end
alias_method :include_secondary_emails?, :include_email?
@@ -111,13 +106,14 @@ class UserCardSerializer < BasicUserSerializer
end
def website_name
- uri = begin
- URI(website.to_s)
- rescue URI::Error
- end
+ uri =
+ begin
+ URI(website.to_s)
+ rescue URI::Error
+ end
return if uri.nil? || uri.host.nil?
- uri.host.sub(/^www\./, '') + uri.path
+ uri.host.sub(/^www\./, "") + uri.path
end
def ignored
diff --git a/app/serializers/user_history_serializer.rb b/app/serializers/user_history_serializer.rb
index be3f26c97de..d188eccb99d 100644
--- a/app/serializers/user_history_serializer.rb
+++ b/app/serializers/user_history_serializer.rb
@@ -22,7 +22,7 @@ class UserHistorySerializer < ApplicationSerializer
def action_name
key = UserHistory.actions.key(object.action)
- [:custom, :custom_staff].include?(key) ? object.custom_type : key.to_s
+ %i[custom custom_staff].include?(key) ? object.custom_type : key.to_s
end
def new_value
diff --git a/app/serializers/user_option_serializer.rb b/app/serializers/user_option_serializer.rb
index 8cc65d1779f..bd16f075364 100644
--- a/app/serializers/user_option_serializer.rb
+++ b/app/serializers/user_option_serializer.rb
@@ -37,13 +37,14 @@ class UserOptionSerializer < ApplicationSerializer
:default_calendar,
:oldest_search_log_date,
:seen_popups,
-
- def auto_track_topics_after_msecs
- object.auto_track_topics_after_msecs || SiteSetting.default_other_auto_track_topics_after_msecs
- end
+ def auto_track_topics_after_msecs
+ object.auto_track_topics_after_msecs ||
+ SiteSetting.default_other_auto_track_topics_after_msecs
+ end
def notification_level_when_replying
- object.notification_level_when_replying || SiteSetting.default_other_notification_level_when_replying
+ object.notification_level_when_replying ||
+ SiteSetting.default_other_notification_level_when_replying
end
def new_topic_duration_minutes
diff --git a/app/serializers/user_post_topic_bookmark_base_serializer.rb b/app/serializers/user_post_topic_bookmark_base_serializer.rb
index ca5d50e684d..02798d061ad 100644
--- a/app/serializers/user_post_topic_bookmark_base_serializer.rb
+++ b/app/serializers/user_post_topic_bookmark_base_serializer.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require_relative 'post_item_excerpt'
+require_relative "post_item_excerpt"
class UserPostTopicBookmarkBaseSerializer < UserBookmarkBaseSerializer
include TopicTagsMixin
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index 505d7364544..eeda5132f68 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -31,9 +31,7 @@ class UserSerializer < UserCardSerializer
can_edit
end
- staff_attributes :post_count,
- :can_be_deleted,
- :can_delete_all_posts
+ staff_attributes :post_count, :can_be_deleted, :can_delete_all_posts
private_attributes :locale,
:muted_category_ids,
@@ -72,14 +70,13 @@ class UserSerializer < UserCardSerializer
untrusted_attributes :bio_raw,
:bio_cooked,
:profile_background_upload_url,
-
- ###
- ### ATTRIBUTES
- ###
- #
- def user_notification_schedule
- object.user_notification_schedule || UserNotificationSchedule::DEFAULT
- end
+ ###
+ ### ATTRIBUTES
+ ###
+ #
+ def user_notification_schedule
+ object.user_notification_schedule || UserNotificationSchedule::DEFAULT
+ end
def mailing_list_posts_per_day
val = Post.estimate_posts_per_day
@@ -87,8 +84,7 @@ class UserSerializer < UserCardSerializer
end
def groups
- object.groups.order(:id)
- .visible_groups(scope.user).members_visible_groups(scope.user)
+ object.groups.order(:id).visible_groups(scope.user).members_visible_groups(scope.user)
end
def group_users
@@ -144,15 +140,19 @@ class UserSerializer < UserCardSerializer
end
def user_api_keys
- keys = object.user_api_keys.where(revoked_at: nil).map do |k|
- {
- id: k.id,
- application_name: k.application_name,
- scopes: k.scopes.map { |s| I18n.t("user_api_key.scopes.#{s.name}") },
- created_at: k.created_at,
- last_used_at: k.last_used_at,
- }
- end
+ keys =
+ object
+ .user_api_keys
+ .where(revoked_at: nil)
+ .map do |k|
+ {
+ id: k.id,
+ application_name: k.application_name,
+ scopes: k.scopes.map { |s| I18n.t("user_api_key.scopes.#{s.name}") },
+ created_at: k.created_at,
+ last_used_at: k.last_used_at,
+ }
+ end
keys.sort! { |a, b| a[:last_used_at].to_time <=> b[:last_used_at].to_time }
keys.length > 0 ? keys : nil
@@ -162,7 +162,7 @@ class UserSerializer < UserCardSerializer
ActiveModel::ArraySerializer.new(
object.user_auth_tokens,
each_serializer: UserAuthTokenSerializer,
- scope: scope
+ scope: scope,
)
end
@@ -306,7 +306,8 @@ class UserSerializer < UserCardSerializer
end
def use_logo_small_as_avatar
- object.is_system_user? && SiteSetting.logo_small && SiteSetting.use_site_small_logo_as_system_avatar
+ object.is_system_user? && SiteSetting.logo_small &&
+ SiteSetting.use_site_small_logo_as_system_avatar
end
private
@@ -314,11 +315,8 @@ class UserSerializer < UserCardSerializer
def custom_field_keys
fields = super
- if scope.can_edit?(object)
- fields += DiscoursePluginRegistry.serialized_current_user_fields.to_a
- end
+ fields += DiscoursePluginRegistry.serialized_current_user_fields.to_a if scope.can_edit?(object)
fields
end
-
end
diff --git a/app/serializers/user_summary_serializer.rb b/app/serializers/user_summary_serializer.rb
index f6e87bb0559..03faf5b90f5 100644
--- a/app/serializers/user_summary_serializer.rb
+++ b/app/serializers/user_summary_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class UserSummarySerializer < ApplicationSerializer
-
class TopicSerializer < BasicTopicSerializer
attributes :category_id, :like_count, :created_at
end
@@ -65,9 +64,15 @@ class UserSummarySerializer < ApplicationSerializer
end
class CategoryWithCountsSerializer < ApplicationSerializer
- attributes :topic_count, :post_count,
- :id, :name, :color, :text_color, :slug,
- :read_restricted, :parent_category_id
+ attributes :topic_count,
+ :post_count,
+ :id,
+ :name,
+ :color,
+ :text_color,
+ :slug,
+ :read_restricted,
+ :parent_category_id
end
has_many :topics, serializer: TopicSerializer
diff --git a/app/serializers/user_tag_notifications_serializer.rb b/app/serializers/user_tag_notifications_serializer.rb
index d2d0766a3e3..e3967cf4d4e 100644
--- a/app/serializers/user_tag_notifications_serializer.rb
+++ b/app/serializers/user_tag_notifications_serializer.rb
@@ -3,11 +3,7 @@
class UserTagNotificationsSerializer < ApplicationSerializer
include UserTagNotificationsMixin
- attributes :watched_tags,
- :watching_first_post_tags,
- :tracked_tags,
- :muted_tags,
- :regular_tags
+ attributes :watched_tags, :watching_first_post_tags, :tracked_tags, :muted_tags, :regular_tags
def user
object
diff --git a/app/serializers/user_wordpress_serializer.rb b/app/serializers/user_wordpress_serializer.rb
index c43f91076fe..6f8510b1897 100644
--- a/app/serializers/user_wordpress_serializer.rb
+++ b/app/serializers/user_wordpress_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class UserWordpressSerializer < BasicUserSerializer
-
def avatar_template
if Hash === object
UrlHelper.absolute User.avatar_template(user[:username], user[:uploaded_avatar_id])
@@ -9,5 +8,4 @@ class UserWordpressSerializer < BasicUserSerializer
UrlHelper.absolute object.avatar_template
end
end
-
end
diff --git a/app/serializers/watched_word_list_serializer.rb b/app/serializers/watched_word_list_serializer.rb
index ec3cac72a90..4b47ce16f78 100644
--- a/app/serializers/watched_word_list_serializer.rb
+++ b/app/serializers/watched_word_list_serializer.rb
@@ -4,14 +4,15 @@ class WatchedWordListSerializer < ApplicationSerializer
attributes :actions, :words, :compiled_regular_expressions
def actions
- SiteSetting.tagging_enabled ? WatchedWord.actions.keys
- : WatchedWord.actions.keys.filter { |k| k != :tag }
+ if SiteSetting.tagging_enabled
+ WatchedWord.actions.keys
+ else
+ WatchedWord.actions.keys.filter { |k| k != :tag }
+ end
end
def words
- object.map do |word|
- WatchedWordSerializer.new(word, root: false)
- end
+ object.map { |word| WatchedWordSerializer.new(word, root: false) }
end
def compiled_regular_expressions
diff --git a/app/serializers/web_hook_category_serializer.rb b/app/serializers/web_hook_category_serializer.rb
index b7fd7ba79c9..dfbd8aa184c 100644
--- a/app/serializers/web_hook_category_serializer.rb
+++ b/app/serializers/web_hook_category_serializer.rb
@@ -1,15 +1,7 @@
# frozen_string_literal: true
class WebHookCategorySerializer < CategorySerializer
-
- %i{
- can_edit
- notification_level
- available_groups
- }.each do |attr|
- define_method("include_#{attr}?") do
- false
- end
+ %i[can_edit notification_level available_groups].each do |attr|
+ define_method("include_#{attr}?") { false }
end
-
end
diff --git a/app/serializers/web_hook_flag_serializer.rb b/app/serializers/web_hook_flag_serializer.rb
index ae2bf85754f..d37ca1d5a77 100644
--- a/app/serializers/web_hook_flag_serializer.rb
+++ b/app/serializers/web_hook_flag_serializer.rb
@@ -1,13 +1,7 @@
# frozen_string_literal: true
class WebHookFlagSerializer < ApplicationSerializer
- attributes :id,
- :post,
- :flag_type,
- :created_by,
- :created_at,
- :resolved_at,
- :resolved_by
+ attributes :id, :post, :flag_type, :created_by, :created_at, :resolved_at, :resolved_by
def post
WebHookPostSerializer.new(object.post, scope: scope, root: false).as_json
@@ -41,7 +35,7 @@ class WebHookFlagSerializer < ApplicationSerializer
disposed_by_id.present?
end
-protected
+ protected
def disposed_by_id
object.disagreed_by_id || object.agreed_by_id || object.deferred_by_id
diff --git a/app/serializers/web_hook_group_serializer.rb b/app/serializers/web_hook_group_serializer.rb
index d1947c2d848..e6134475054 100644
--- a/app/serializers/web_hook_group_serializer.rb
+++ b/app/serializers/web_hook_group_serializer.rb
@@ -1,14 +1,5 @@
# frozen_string_literal: true
class WebHookGroupSerializer < BasicGroupSerializer
-
- %i{
- is_group_user
- is_group_owner
- }.each do |attr|
- define_method("include_#{attr}?") do
- false
- end
- end
-
+ %i[is_group_user is_group_owner].each { |attr| define_method("include_#{attr}?") { false } }
end
diff --git a/app/serializers/web_hook_group_user_serializer.rb b/app/serializers/web_hook_group_user_serializer.rb
index 342b5a5412b..23a181a28e8 100644
--- a/app/serializers/web_hook_group_user_serializer.rb
+++ b/app/serializers/web_hook_group_user_serializer.rb
@@ -1,6 +1,5 @@
# frozen_string_literal: true
class WebHookGroupUserSerializer < BasicGroupUserSerializer
- attributes :id,
- :created_at
+ attributes :id, :created_at
end
diff --git a/app/serializers/web_hook_post_serializer.rb b/app/serializers/web_hook_post_serializer.rb
index beaa6738319..f804e00833e 100644
--- a/app/serializers/web_hook_post_serializer.rb
+++ b/app/serializers/web_hook_post_serializer.rb
@@ -1,11 +1,7 @@
# frozen_string_literal: true
class WebHookPostSerializer < PostSerializer
-
- attributes :topic_posts_count,
- :topic_filtered_posts_count,
- :topic_archetype,
- :category_slug
+ attributes :topic_posts_count, :topic_filtered_posts_count, :topic_archetype, :category_slug
def include_topic_title?
true
@@ -19,7 +15,7 @@ class WebHookPostSerializer < PostSerializer
true
end
- %i{
+ %i[
can_view
can_edit
can_delete
@@ -33,11 +29,7 @@ class WebHookPostSerializer < PostSerializer
flair_color
notice
mentioned_users
- }.each do |attr|
- define_method("include_#{attr}?") do
- false
- end
- end
+ ].each { |attr| define_method("include_#{attr}?") { false } }
def topic_posts_count
object.topic ? object.topic.posts_count : 0
@@ -48,7 +40,7 @@ class WebHookPostSerializer < PostSerializer
end
def topic_archetype
- object.topic ? object.topic.archetype : ''
+ object.topic ? object.topic.archetype : ""
end
def include_category_slug?
@@ -56,7 +48,7 @@ class WebHookPostSerializer < PostSerializer
end
def category_slug
- object.topic && object.topic.category ? object.topic.category.slug_for_url : ''
+ object.topic && object.topic.category ? object.topic.category.slug_for_url : ""
end
def include_readers_count?
diff --git a/app/serializers/web_hook_topic_view_serializer.rb b/app/serializers/web_hook_topic_view_serializer.rb
index 2098c7a67be..ff11424db15 100644
--- a/app/serializers/web_hook_topic_view_serializer.rb
+++ b/app/serializers/web_hook_topic_view_serializer.rb
@@ -1,10 +1,9 @@
# frozen_string_literal: true
class WebHookTopicViewSerializer < TopicViewSerializer
- attributes :created_by,
- :last_poster
+ attributes :created_by, :last_poster
- %i{
+ %i[
post_stream
timeline_lookup
pm_with_non_human_user
@@ -23,11 +22,7 @@ class WebHookTopicViewSerializer < TopicViewSerializer
slow_mode_seconds
slow_mode_enabled_until
bookmarks
- }.each do |attr|
- define_method("include_#{attr}?") do
- false
- end
- end
+ ].each { |attr| define_method("include_#{attr}?") { false } }
def include_show_read_indicator?
false
diff --git a/app/serializers/web_hook_user_serializer.rb b/app/serializers/web_hook_user_serializer.rb
index e077b191006..5de175413ef 100644
--- a/app/serializers/web_hook_user_serializer.rb
+++ b/app/serializers/web_hook_user_serializer.rb
@@ -7,7 +7,7 @@ class WebHookUserSerializer < UserSerializer
def staff_attributes(*attrs)
end
- %i{
+ %i[
unconfirmed_emails
can_edit
can_edit_username
@@ -38,11 +38,7 @@ class WebHookUserSerializer < UserSerializer
use_logo_small_as_avatar
pending_posts_count
status
- }.each do |attr|
- define_method("include_#{attr}?") do
- false
- end
- end
+ ].each { |attr| define_method("include_#{attr}?") { false } }
def include_email?
scope.is_admin?
@@ -57,5 +53,4 @@ class WebHookUserSerializer < UserSerializer
def external_id
object.single_sign_on_record.external_id
end
-
end
diff --git a/app/serializers/wizard_field_serializer.rb b/app/serializers/wizard_field_serializer.rb
index 12c3db2060d..b4cb8a3b563 100644
--- a/app/serializers/wizard_field_serializer.rb
+++ b/app/serializers/wizard_field_serializer.rb
@@ -1,7 +1,17 @@
# frozen_string_literal: true
class WizardFieldSerializer < ApplicationSerializer
- attributes :id, :type, :required, :value, :label, :placeholder, :description, :extra_description, :icon, :disabled, :show_in_sidebar
+ attributes :id,
+ :type,
+ :required,
+ :value,
+ :label,
+ :placeholder,
+ :description,
+ :extra_description,
+ :icon,
+ :disabled,
+ :show_in_sidebar
has_many :choices, serializer: WizardFieldChoiceSerializer, embed: :objects
def id
diff --git a/app/serializers/wizard_step_serializer.rb b/app/serializers/wizard_step_serializer.rb
index 802a1a4be97..76ec852124d 100644
--- a/app/serializers/wizard_step_serializer.rb
+++ b/app/serializers/wizard_step_serializer.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class WizardStepSerializer < ApplicationSerializer
-
attributes :id, :next, :previous, :description, :title, :index, :banner, :emoji
has_many :fields, serializer: WizardFieldSerializer, embed: :objects
@@ -68,5 +67,4 @@ class WizardStepSerializer < ApplicationSerializer
def emoji
object.emoji
end
-
end
diff --git a/app/services/anonymous_shadow_creator.rb b/app/services/anonymous_shadow_creator.rb
index 77d353b2f97..2a769c7a681 100644
--- a/app/services/anonymous_shadow_creator.rb
+++ b/app/services/anonymous_shadow_creator.rb
@@ -30,9 +30,8 @@ class AnonymousShadowCreator
shadow = user.shadow_user
- if shadow && (shadow.post_count + shadow.topic_count) > 0 &&
- shadow.last_posted_at &&
- shadow.last_posted_at < SiteSetting.anonymous_account_duration_minutes.minutes.ago
+ if shadow && (shadow.post_count + shadow.topic_count) > 0 && shadow.last_posted_at &&
+ shadow.last_posted_at < SiteSetting.anonymous_account_duration_minutes.minutes.ago
shadow = nil
end
@@ -45,23 +44,24 @@ class AnonymousShadowCreator
username = resolve_username
User.transaction do
- shadow = User.create!(
- password: SecureRandom.hex,
- email: "#{SecureRandom.hex}@anon.#{Discourse.current_hostname}",
- skip_email_validation: true,
- name: username, # prevents error when names are required
- username: username,
- active: true,
- trust_level: 1,
- manual_locked_trust_level: 1,
- approved: true,
- approved_at: 1.day.ago,
- created_at: 1.day.ago # bypass new user restrictions
- )
+ shadow =
+ User.create!(
+ password: SecureRandom.hex,
+ email: "#{SecureRandom.hex}@anon.#{Discourse.current_hostname}",
+ skip_email_validation: true,
+ name: username, # prevents error when names are required
+ username: username,
+ active: true,
+ trust_level: 1,
+ manual_locked_trust_level: 1,
+ approved: true,
+ approved_at: 1.day.ago,
+ created_at: 1.day.ago, # bypass new user restrictions
+ )
shadow.user_option.update_columns(
email_messages_level: UserOption.email_level_types[:never],
- email_digests: false
+ email_digests: false,
)
shadow.email_tokens.update_all(confirmed: true)
diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index da264036c66..f32d1321f33 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -1,7 +1,8 @@
# frozen_string_literal: true
class BadgeGranter
- class GrantError < StandardError; end
+ class GrantError < StandardError
+ end
def self.disable_queue
@queue_disabled = true
@@ -21,7 +22,12 @@ class BadgeGranter
BadgeGranter.new(badge, user, opts).grant
end
- def self.enqueue_mass_grant_for_users(badge, emails: [], usernames: [], ensure_users_have_badge_once: true)
+ def self.enqueue_mass_grant_for_users(
+ badge,
+ emails: [],
+ usernames: [],
+ ensure_users_have_badge_once: true
+ )
emails = emails.map(&:downcase)
usernames = usernames.map(&:downcase)
usernames_map_to_ids = {}
@@ -30,7 +36,7 @@ class BadgeGranter
usernames_map_to_ids = User.where(username_lower: usernames).pluck(:username_lower, :id).to_h
end
if emails.size > 0
- emails_map_to_ids = User.with_email(emails).pluck('LOWER(user_emails.email)', :id).to_h
+ emails_map_to_ids = User.with_email(emails).pluck("LOWER(user_emails.email)", :id).to_h
end
count_per_user = {}
@@ -57,18 +63,13 @@ class BadgeGranter
count_per_user.each do |user_id, count|
next if ensure_users_have_badge_once && existing_owners_ids.include?(user_id)
- Jobs.enqueue(
- :mass_award_badge,
- user: user_id,
- badge: badge.id,
- count: count
- )
+ Jobs.enqueue(:mass_award_badge, user: user_id, badge: badge.id, count: count)
end
{
unmatched_entries: unmatched.to_a,
matched_users_count: count_per_user.size,
- unmatched_entries_count: unmatched.size
+ unmatched_entries_count: unmatched.size,
}
end
@@ -78,7 +79,8 @@ class BadgeGranter
raise ArgumentError.new("count can't be less than 1") if count < 1
UserBadge.transaction do
- DB.exec(<<~SQL * count, now: Time.zone.now, system: Discourse.system_user.id, user_id: user.id, badge_id: badge.id)
+ DB.exec(
+ <<~SQL * count,
INSERT INTO user_badges
(granted_at, created_at, granted_by_id, user_id, badge_id, seq)
VALUES
@@ -95,6 +97,11 @@ class BadgeGranter
), 0)
);
SQL
+ now: Time.zone.now,
+ system: Discourse.system_user.id,
+ user_id: user.id,
+ badge_id: badge.id,
+ )
notification = send_notification(user.id, user.username, user.locale, badge)
DB.exec(<<~SQL, notification_id: notification.id, user_id: user.id, badge_id: badge.id)
@@ -114,9 +121,7 @@ class BadgeGranter
find_by = { badge_id: @badge.id, user_id: @user.id }
- if @badge.multiple_grant?
- find_by[:post_id] = @post_id
- end
+ find_by[:post_id] = @post_id if @badge.multiple_grant?
user_badge = UserBadge.find_by(find_by)
@@ -128,12 +133,15 @@ class BadgeGranter
seq = (seq || -1) + 1
end
- user_badge = UserBadge.create!(badge: @badge,
- user: @user,
- granted_by: @granted_by,
- granted_at: @opts[:created_at] || Time.now,
- post_id: @post_id,
- seq: seq)
+ user_badge =
+ UserBadge.create!(
+ badge: @badge,
+ user: @user,
+ granted_by: @granted_by,
+ granted_at: @opts[:created_at] || Time.now,
+ post_id: @post_id,
+ seq: seq,
+ )
return unless SiteSetting.enable_badges
@@ -143,7 +151,8 @@ class BadgeGranter
skip_new_user_tips = @user.user_option.skip_new_user_tips
unless self.class.suppress_notification?(@badge, user_badge.granted_at, skip_new_user_tips)
- notification = self.class.send_notification(@user.id, @user.username, @user.effective_locale, @badge)
+ notification =
+ self.class.send_notification(@user.id, @user.username, @user.effective_locale, @badge)
user_badge.update!(notification_id: notification.id)
end
end
@@ -160,16 +169,18 @@ class BadgeGranter
end
# If the user's title is the same as the badge name OR the custom badge name, remove their title.
- custom_badge_name = TranslationOverride.find_by(translation_key: user_badge.badge.translation_key)&.value
+ custom_badge_name =
+ TranslationOverride.find_by(translation_key: user_badge.badge.translation_key)&.value
user_title_is_badge_name = user_badge.user.title == user_badge.badge.name
- user_title_is_custom_badge_name = custom_badge_name.present? && user_badge.user.title == custom_badge_name
+ user_title_is_custom_badge_name =
+ custom_badge_name.present? && user_badge.user.title == custom_badge_name
if user_title_is_badge_name || user_title_is_custom_badge_name
if options[:revoked_by]
StaffActionLogger.new(options[:revoked_by]).log_title_revoke(
user_badge.user,
- revoke_reason: 'user title was same as revoked badge name or custom badge name',
- previous_value: user_badge.user.title
+ revoke_reason: "user title was same as revoked badge name or custom badge name",
+ previous_value: user_badge.user.title,
)
end
user_badge.user.title = nil
@@ -179,10 +190,15 @@ class BadgeGranter
end
def self.revoke_all(badge)
- custom_badge_names = TranslationOverride.where(translation_key: badge.translation_key).pluck(:value)
+ custom_badge_names =
+ TranslationOverride.where(translation_key: badge.translation_key).pluck(:value)
- users = User.joins(:user_badges).where(user_badges: { badge_id: badge.id }).where(title: badge.name)
- users = users.or(User.joins(:user_badges).where(title: custom_badge_names)) unless custom_badge_names.empty?
+ users =
+ User.joins(:user_badges).where(user_badges: { badge_id: badge.id }).where(title: badge.name)
+ users =
+ users.or(
+ User.joins(:user_badges).where(title: custom_badge_names),
+ ) unless custom_badge_names.empty?
users.update_all(title: nil)
UserBadge.where(badge: badge).delete_all
@@ -195,28 +211,16 @@ class BadgeGranter
case type
when Badge::Trigger::PostRevision
post = opt[:post]
- payload = {
- type: "PostRevision",
- post_ids: [post.id]
- }
+ payload = { type: "PostRevision", post_ids: [post.id] }
when Badge::Trigger::UserChange
user = opt[:user]
- payload = {
- type: "UserChange",
- user_ids: [user.id]
- }
+ payload = { type: "UserChange", user_ids: [user.id] }
when Badge::Trigger::TrustLevelChange
user = opt[:user]
- payload = {
- type: "TrustLevelChange",
- user_ids: [user.id]
- }
+ payload = { type: "TrustLevelChange", user_ids: [user.id] }
when Badge::Trigger::PostAction
action = opt[:post_action]
- payload = {
- type: "PostAction",
- post_ids: [action.post_id, action.related_post_id].compact!
- }
+ payload = { type: "PostAction", post_ids: [action.post_id, action.related_post_id].compact! }
end
Discourse.redis.lpush queue_key, payload.to_json if payload
@@ -242,9 +246,7 @@ class BadgeGranter
next unless post_ids.present? || user_ids.present?
- find_by_type(type).each do |badge|
- backfill(badge, post_ids: post_ids, user_ids: user_ids)
- end
+ find_by_type(type).each { |badge| backfill(badge, post_ids: post_ids, user_ids: user_ids) }
end
end
@@ -263,27 +265,47 @@ class BadgeGranter
return if sql.blank?
if Badge::Trigger.uses_post_ids?(opts[:trigger])
- raise("Contract violation:\nQuery triggers on posts, but does not reference the ':post_ids' array") unless sql.match(/:post_ids/)
- raise "Contract violation:\nQuery triggers on posts, but references the ':user_ids' array" if sql.match(/:user_ids/)
+ unless sql.match(/:post_ids/)
+ raise(
+ "Contract violation:\nQuery triggers on posts, but does not reference the ':post_ids' array",
+ )
+ end
+ if sql.match(/:user_ids/)
+ raise "Contract violation:\nQuery triggers on posts, but references the ':user_ids' array"
+ end
end
if Badge::Trigger.uses_user_ids?(opts[:trigger])
- raise "Contract violation:\nQuery triggers on users, but does not reference the ':user_ids' array" unless sql.match(/:user_ids/)
- raise "Contract violation:\nQuery triggers on users, but references the ':post_ids' array" if sql.match(/:post_ids/)
+ unless sql.match(/:user_ids/)
+ raise "Contract violation:\nQuery triggers on users, but does not reference the ':user_ids' array"
+ end
+ if sql.match(/:post_ids/)
+ raise "Contract violation:\nQuery triggers on users, but references the ':post_ids' array"
+ end
end
if opts[:trigger] && !Badge::Trigger.is_none?(opts[:trigger])
- raise "Contract violation:\nQuery is triggered, but does not reference the ':backfill' parameter.\n(Hint: if :backfill is TRUE, you should ignore the :post_ids/:user_ids)" unless sql.match(/:backfill/)
+ unless sql.match(/:backfill/)
+ raise "Contract violation:\nQuery is triggered, but does not reference the ':backfill' parameter.\n(Hint: if :backfill is TRUE, you should ignore the :post_ids/:user_ids)"
+ end
end
# TODO these three conditions have a lot of false negatives
if opts[:target_posts]
- raise "Contract violation:\nQuery targets posts, but does not return a 'post_id' column" unless sql.match(/post_id/)
+ unless sql.match(/post_id/)
+ raise "Contract violation:\nQuery targets posts, but does not return a 'post_id' column"
+ end
end
- raise "Contract violation:\nQuery does not return a 'user_id' column" unless sql.match(/user_id/)
- raise "Contract violation:\nQuery does not return a 'granted_at' column" unless sql.match(/granted_at/)
- raise "Contract violation:\nQuery ends with a semicolon. Remove the semicolon; your sql will be used in a subquery." if sql.match(/;\s*\z/)
+ unless sql.match(/user_id/)
+ raise "Contract violation:\nQuery does not return a 'user_id' column"
+ end
+ unless sql.match(/granted_at/)
+ raise "Contract violation:\nQuery does not return a 'granted_at' column"
+ end
+ if sql.match(/;\s*\z/)
+ raise "Contract violation:\nQuery ends with a semicolon. Remove the semicolon; your sql will be used in a subquery."
+ end
end
# Options:
@@ -305,8 +327,9 @@ class BadgeGranter
SQL
grant_count = DB.query_single(count_sql, params).first.to_i
- grants_sql = if opts[:target_posts]
- <<~SQL
+ grants_sql =
+ if opts[:target_posts]
+ <<~SQL
SELECT u.id, u.username, q.post_id, t.title, q.granted_at
FROM (
#{sql}
@@ -317,8 +340,8 @@ class BadgeGranter
WHERE :backfill = :backfill
LIMIT 10
SQL
- else
- <<~SQL
+ else
+ <<~SQL
SELECT u.id, u.username, q.granted_at
FROM (
#{sql}
@@ -327,7 +350,7 @@ class BadgeGranter
WHERE :backfill = :backfill
LIMIT 10
SQL
- end
+ end
query_plan = nil
# HACK: active record sanitization too flexible, force it to go down the sanitization path that cares not for % stuff
@@ -337,11 +360,17 @@ class BadgeGranter
sample = DB.query(grants_sql, params)
sample.each do |result|
- raise "Query returned a non-existent user ID:\n#{result.id}" unless User.exists?(id: result.id)
- raise "Query did not return a badge grant time\n(Try using 'current_timestamp granted_at')" unless result.granted_at
+ unless User.exists?(id: result.id)
+ raise "Query returned a non-existent user ID:\n#{result.id}"
+ end
+ unless result.granted_at
+ raise "Query did not return a badge grant time\n(Try using 'current_timestamp granted_at')"
+ end
if opts[:target_posts]
raise "Query did not return a post ID" unless result.post_id
- raise "Query returned a non-existent post ID:\n#{result.post_id}" unless Post.exists?(result.post_id).present?
+ unless Post.exists?(result.post_id).present?
+ raise "Query returned a non-existent post ID:\n#{result.post_id}"
+ end
end
end
@@ -362,7 +391,7 @@ class BadgeGranter
# safeguard fall back to full backfill if more than 200
if (post_ids && post_ids.size > MAX_ITEMS_FOR_DELTA) ||
- (user_ids && user_ids.size > MAX_ITEMS_FOR_DELTA)
+ (user_ids && user_ids.size > MAX_ITEMS_FOR_DELTA)
post_ids = nil
user_ids = nil
end
@@ -388,14 +417,16 @@ class BadgeGranter
)
SQL
- DB.exec(
- sql,
- id: badge.id,
- post_ids: [-1],
- user_ids: [-2],
- backfill: true,
- multiple_grant: true # cheat here, cause we only run on backfill and are deleting
- ) if badge.auto_revoke && full_backfill
+ if badge.auto_revoke && full_backfill
+ DB.exec(
+ sql,
+ id: badge.id,
+ post_ids: [-1],
+ user_ids: [-2],
+ backfill: true,
+ multiple_grant: true, # cheat here, cause we only run on backfill and are deleting
+ )
+ end
sql = <<~SQL
WITH w as (
@@ -434,25 +465,27 @@ class BadgeGranter
return
end
- builder.query(
- id: badge.id,
- multiple_grant: badge.multiple_grant,
- backfill: full_backfill,
- post_ids: post_ids || [-2],
- user_ids: user_ids || [-2]).each do |row|
-
- next if suppress_notification?(badge, row.granted_at, row.skip_new_user_tips)
- next if row.staff && badge.awarded_for_trust_level?
-
- notification = send_notification(row.user_id, row.username, row.locale, badge)
- UserBadge.trigger_user_badge_granted_event(badge.id, row.user_id)
-
- DB.exec(
- "UPDATE user_badges SET notification_id = :notification_id WHERE id = :id",
- notification_id: notification.id,
- id: row.id
+ builder
+ .query(
+ id: badge.id,
+ multiple_grant: badge.multiple_grant,
+ backfill: full_backfill,
+ post_ids: post_ids || [-2],
+ user_ids: user_ids || [-2],
)
- end
+ .each do |row|
+ next if suppress_notification?(badge, row.granted_at, row.skip_new_user_tips)
+ next if row.staff && badge.awarded_for_trust_level?
+
+ notification = send_notification(row.user_id, row.username, row.locale, badge)
+ UserBadge.trigger_user_badge_granted_event(badge.id, row.user_id)
+
+ DB.exec(
+ "UPDATE user_badges SET notification_id = :notification_id WHERE id = :id",
+ notification_id: notification.id,
+ id: row.id,
+ )
+ end
badge.reset_grant_count!
rescue => e
@@ -505,8 +538,8 @@ class BadgeGranter
badge_name: badge.display_name,
badge_slug: badge.slug,
badge_title: badge.allow_title,
- username: username
- }.to_json
+ username: username,
+ }.to_json,
)
end
end
diff --git a/app/services/base_bookmarkable.rb b/app/services/base_bookmarkable.rb
index 6976eece625..77c19c7147f 100644
--- a/app/services/base_bookmarkable.rb
+++ b/app/services/base_bookmarkable.rb
@@ -119,16 +119,17 @@ class BaseBookmarkable
# created.
# @return [void]
def self.send_reminder_notification(bookmark, notification_data)
- if notification_data[:data].blank? ||
- notification_data[:data][:bookmarkable_url].blank? ||
- notification_data[:data][:title].blank?
- raise Discourse::InvalidParameters.new("A `data` key must be present with at least `bookmarkable_url` and `title` entries.")
+ if notification_data[:data].blank? || notification_data[:data][:bookmarkable_url].blank? ||
+ notification_data[:data][:title].blank?
+ raise Discourse::InvalidParameters.new(
+ "A `data` key must be present with at least `bookmarkable_url` and `title` entries.",
+ )
end
notification_data[:data] = notification_data[:data].merge(
display_username: bookmark.user.username,
bookmark_name: bookmark.name,
- bookmark_id: bookmark.id
+ bookmark_id: bookmark.id,
).to_json
notification_data[:notification_type] = Notification.types[:bookmark_reminder]
bookmark.user.notifications.create!(notification_data)
diff --git a/app/services/color_scheme_revisor.rb b/app/services/color_scheme_revisor.rb
index 7515d513d3a..937c6bf7d45 100644
--- a/app/services/color_scheme_revisor.rb
+++ b/app/services/color_scheme_revisor.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class ColorSchemeRevisor
-
def initialize(color_scheme, params = {})
@color_scheme = color_scheme
@params = params
@@ -14,7 +13,9 @@ class ColorSchemeRevisor
def revise
ColorScheme.transaction do
@color_scheme.name = @params[:name] if @params.has_key?(:name)
- @color_scheme.user_selectable = @params[:user_selectable] if @params.has_key?(:user_selectable)
+ @color_scheme.user_selectable = @params[:user_selectable] if @params.has_key?(
+ :user_selectable,
+ )
@color_scheme.base_scheme_id = @params[:base_scheme_id] if @params.has_key?(:base_scheme_id)
has_colors = @params[:colors]
@@ -29,15 +30,12 @@ class ColorSchemeRevisor
@color_scheme.clear_colors_cache
end
- if has_colors ||
- @color_scheme.saved_change_to_name? ||
- @color_scheme.will_save_change_to_user_selectable? ||
- @color_scheme.saved_change_to_base_scheme_id?
-
+ if has_colors || @color_scheme.saved_change_to_name? ||
+ @color_scheme.will_save_change_to_user_selectable? ||
+ @color_scheme.saved_change_to_base_scheme_id?
@color_scheme.save
end
end
@color_scheme
end
-
end
diff --git a/app/services/destroy_task.rb b/app/services/destroy_task.rb
index d06a4ad7556..fda78c9583d 100644
--- a/app/services/destroy_task.rb
+++ b/app/services/destroy_task.rb
@@ -18,9 +18,7 @@ class DestroyTask
topics.find_each do |topic|
@io.puts "Deleting #{topic.slug}..."
first_post = topic.ordered_posts.first
- if first_post.nil?
- return @io.puts "Topic.ordered_posts.first was nil"
- end
+ return @io.puts "Topic.ordered_posts.first was nil" if first_post.nil?
@io.puts PostDestroyer.new(Discourse.system_user, first_post).destroy
end
end
@@ -45,17 +43,17 @@ class DestroyTask
def destroy_topics_all_categories
categories = Category.all
- categories.each do |c|
- @io.puts destroy_topics(c.slug, c.parent_category&.slug)
- end
+ categories.each { |c| @io.puts destroy_topics(c.slug, c.parent_category&.slug) }
end
def destroy_private_messages
- Topic.where(archetype: "private_message").find_each do |pm|
- @io.puts "Destroying #{pm.slug} pm"
- first_post = pm.ordered_posts.first
- @io.puts PostDestroyer.new(Discourse.system_user, first_post).destroy
- end
+ Topic
+ .where(archetype: "private_message")
+ .find_each do |pm|
+ @io.puts "Destroying #{pm.slug} pm"
+ first_post = pm.ordered_posts.first
+ @io.puts PostDestroyer.new(Discourse.system_user, first_post).destroy
+ end
end
def destroy_category(category_id, destroy_system_topics = false)
@@ -63,9 +61,7 @@ class DestroyTask
return @io.puts "A category with the id: #{category_id} could not be found" if c.nil?
subcategories = Category.where(parent_category_id: c.id)
@io.puts "There are #{subcategories.count} subcategories to delete" if subcategories
- subcategories.each do |s|
- category_topic_destroyer(s, destroy_system_topics)
- end
+ subcategories.each { |s| category_topic_destroyer(s, destroy_system_topics) }
category_topic_destroyer(c, destroy_system_topics)
end
@@ -78,21 +74,30 @@ class DestroyTask
end
def destroy_users
- User.human_users.where(admin: false).find_each do |user|
- begin
- if UserDestroyer.new(Discourse.system_user).destroy(user, delete_posts: true, context: "destroy task")
- @io.puts "#{user.username} deleted"
- else
- @io.puts "#{user.username} not deleted"
+ User
+ .human_users
+ .where(admin: false)
+ .find_each do |user|
+ begin
+ if UserDestroyer.new(Discourse.system_user).destroy(
+ user,
+ delete_posts: true,
+ context: "destroy task",
+ )
+ @io.puts "#{user.username} deleted"
+ else
+ @io.puts "#{user.username} not deleted"
+ end
+ rescue UserDestroyer::PostsExistError
+ raise Discourse::InvalidAccess.new(
+ "User #{user.username} has #{user.post_count} posts, so can't be deleted.",
+ )
+ rescue NoMethodError
+ @io.puts "#{user.username} could not be deleted"
+ rescue Discourse::InvalidAccess => e
+ @io.puts "#{user.username} #{e.message}"
end
- rescue UserDestroyer::PostsExistError
- raise Discourse::InvalidAccess.new("User #{user.username} has #{user.post_count} posts, so can't be deleted.")
- rescue NoMethodError
- @io.puts "#{user.username} could not be deleted"
- rescue Discourse::InvalidAccess => e
- @io.puts "#{user.username} #{e.message}"
end
- end
end
def destroy_stats
@@ -112,5 +117,4 @@ class DestroyTask
@io.puts "Destroying #{category.slug} category"
category.destroy
end
-
end
diff --git a/app/services/email_settings_exception_handler.rb b/app/services/email_settings_exception_handler.rb
index ddb3fb908b8..b85a9aaa95b 100644
--- a/app/services/email_settings_exception_handler.rb
+++ b/app/services/email_settings_exception_handler.rb
@@ -1,8 +1,8 @@
# frozen_string_literal: true
-require 'net/imap'
-require 'net/smtp'
-require 'net/pop'
+require "net/imap"
+require "net/smtp"
+require "net/pop"
class EmailSettingsExceptionHandler
EXPECTED_EXCEPTIONS = [
@@ -17,7 +17,7 @@ class EmailSettingsExceptionHandler
Net::OpenTimeout,
Net::ReadTimeout,
SocketError,
- Errno::ECONNREFUSED
+ Errno::ECONNREFUSED,
]
class GenericProvider
@@ -63,7 +63,10 @@ class EmailSettingsExceptionHandler
if @exception.message.match(/Invalid credentials/)
I18n.t("email_settings.imap_authentication_error")
else
- I18n.t("email_settings.imap_no_response_error", message: @exception.message.gsub(" (Failure)", ""))
+ I18n.t(
+ "email_settings.imap_no_response_error",
+ message: @exception.message.gsub(" (Failure)", ""),
+ )
end
end
diff --git a/app/services/email_settings_validator.rb b/app/services/email_settings_validator.rb
index 238b5869627..bd6dbccfe60 100644
--- a/app/services/email_settings_validator.rb
+++ b/app/services/email_settings_validator.rb
@@ -1,8 +1,8 @@
# frozen_string_literal: true
-require 'net/imap'
-require 'net/smtp'
-require 'net/pop'
+require "net/imap"
+require "net/smtp"
+require "net/pop"
# Usage:
#
@@ -84,15 +84,14 @@ class EmailSettingsValidator
debug: Rails.env.development?
)
begin
- port, enable_tls, enable_starttls_auto = provider_specific_ssl_overrides(
- host, port, enable_tls, enable_starttls_auto
- )
+ port, enable_tls, enable_starttls_auto =
+ provider_specific_ssl_overrides(host, port, enable_tls, enable_starttls_auto)
if enable_tls && enable_starttls_auto
raise ArgumentError, "TLS and STARTTLS are mutually exclusive"
end
- if ![:plain, :login, :cram_md5].include?(authentication.to_sym)
+ if !%i[plain login cram_md5].include?(authentication.to_sym)
raise ArgumentError, "Invalid authentication method. Must be plain, login, or cram_md5."
end
@@ -100,7 +99,6 @@ class EmailSettingsValidator
if Rails.env.development?
domain = "localhost"
else
-
# Because we are using the SMTP settings here to send emails,
# the domain should just be the TLD of the host.
domain = MiniSuffix.domain(host)
@@ -154,7 +152,11 @@ class EmailSettingsValidator
begin
imap = Net::IMAP.new(host, port: port, ssl: ssl, open_timeout: open_timeout)
imap.login(username, password)
- imap.logout rescue nil
+ begin
+ imap.logout
+ rescue StandardError
+ nil
+ end
imap.disconnect
rescue => err
log_and_raise(err, debug)
@@ -163,7 +165,9 @@ class EmailSettingsValidator
def self.log_and_raise(err, debug)
if debug
- Rails.logger.warn("[EmailSettingsValidator] Error encountered when validating email settings: #{err.message} #{err.backtrace.join("\n")}")
+ Rails.logger.warn(
+ "[EmailSettingsValidator] Error encountered when validating email settings: #{err.message} #{err.backtrace.join("\n")}",
+ )
end
raise err
end
diff --git a/app/services/email_style_updater.rb b/app/services/email_style_updater.rb
index d13e84b78d6..42ebb0b7040 100644
--- a/app/services/email_style_updater.rb
+++ b/app/services/email_style_updater.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class EmailStyleUpdater
-
attr_reader :errors
def initialize(user)
@@ -10,11 +9,8 @@ class EmailStyleUpdater
end
def update(attrs)
- if attrs.has_key?(:html) && !attrs[:html].include?('%{email_content}')
- @errors << I18n.t(
- 'email_style.html_missing_placeholder',
- placeholder: '%{email_content}'
- )
+ if attrs.has_key?(:html) && !attrs[:html].include?("%{email_content}")
+ @errors << I18n.t("email_style.html_missing_placeholder", placeholder: "%{email_content}")
end
if attrs.has_key?(:css)
diff --git a/app/services/external_upload_manager.rb b/app/services/external_upload_manager.rb
index cfeca323c72..23523ab4bc0 100644
--- a/app/services/external_upload_manager.rb
+++ b/app/services/external_upload_manager.rb
@@ -7,10 +7,14 @@ class ExternalUploadManager
UPLOAD_TYPES_EXCLUDED_FROM_UPLOAD_PROMOTION = ["backup"].freeze
- class ChecksumMismatchError < StandardError; end
- class DownloadFailedError < StandardError; end
- class CannotPromoteError < StandardError; end
- class SizeMismatchError < StandardError; end
+ class ChecksumMismatchError < StandardError
+ end
+ class DownloadFailedError < StandardError
+ end
+ class CannotPromoteError < StandardError
+ end
+ class SizeMismatchError < StandardError
+ end
attr_reader :external_upload_stub
@@ -24,51 +28,54 @@ class ExternalUploadManager
def self.create_direct_upload(current_user:, file_name:, file_size:, upload_type:, metadata: {})
store = store_for_upload_type(upload_type)
- url = store.signed_url_for_temporary_upload(
- file_name, metadata: metadata
- )
+ url = store.signed_url_for_temporary_upload(file_name, metadata: metadata)
key = store.s3_helper.path_from_url(url)
- upload_stub = ExternalUploadStub.create!(
- key: key,
- created_by: current_user,
- original_filename: file_name,
- upload_type: upload_type,
- filesize: file_size
- )
+ upload_stub =
+ ExternalUploadStub.create!(
+ key: key,
+ created_by: current_user,
+ original_filename: file_name,
+ upload_type: upload_type,
+ filesize: file_size,
+ )
{ url: url, key: key, unique_identifier: upload_stub.unique_identifier }
end
def self.create_direct_multipart_upload(
- current_user:, file_name:, file_size:, upload_type:, metadata: {}
+ current_user:,
+ file_name:,
+ file_size:,
+ upload_type:,
+ metadata: {}
)
content_type = MiniMime.lookup_by_filename(file_name)&.content_type
store = store_for_upload_type(upload_type)
- multipart_upload = store.create_multipart(
- file_name, content_type, metadata: metadata
- )
+ multipart_upload = store.create_multipart(file_name, content_type, metadata: metadata)
- upload_stub = ExternalUploadStub.create!(
- key: multipart_upload[:key],
- created_by: current_user,
- original_filename: file_name,
- upload_type: upload_type,
- external_upload_identifier: multipart_upload[:upload_id],
- multipart: true,
- filesize: file_size
- )
+ upload_stub =
+ ExternalUploadStub.create!(
+ key: multipart_upload[:key],
+ created_by: current_user,
+ original_filename: file_name,
+ upload_type: upload_type,
+ external_upload_identifier: multipart_upload[:upload_id],
+ multipart: true,
+ filesize: file_size,
+ )
{
external_upload_identifier: upload_stub.external_upload_identifier,
key: upload_stub.key,
- unique_identifier: upload_stub.unique_identifier
+ unique_identifier: upload_stub.unique_identifier,
}
end
def self.store_for_upload_type(upload_type)
if upload_type == "backup"
- if !SiteSetting.enable_backups? || SiteSetting.backup_location != BackupLocationSiteSetting::S3
+ if !SiteSetting.enable_backups? ||
+ SiteSetting.backup_location != BackupLocationSiteSetting::S3
raise Discourse::InvalidAccess.new
end
BackupRestore::BackupStore.create
@@ -98,9 +105,11 @@ class ExternalUploadManager
if external_size != external_upload_stub.filesize
ExternalUploadManager.ban_user_from_external_uploads!(
user: external_upload_stub.created_by,
- ban_minutes: SIZE_MISMATCH_BAN_MINUTES
+ ban_minutes: SIZE_MISMATCH_BAN_MINUTES,
)
- raise SizeMismatchError.new("expected: #{external_upload_stub.filesize}, actual: #{external_size}")
+ raise SizeMismatchError.new(
+ "expected: #{external_upload_stub.filesize}, actual: #{external_size}",
+ )
end
if UPLOAD_TYPES_EXCLUDED_FROM_UPLOAD_PROMOTION.include?(external_upload_stub.upload_type)
@@ -108,7 +117,7 @@ class ExternalUploadManager
else
promote_to_upload
end
- rescue
+ rescue StandardError
if !SiteSetting.enable_upload_debug_mode
# We don't need to do anything special to abort multipart uploads here,
# because at this point (calling promote_to_upload!), the multipart
@@ -137,9 +146,7 @@ class ExternalUploadManager
raise DownloadFailedError if tempfile.blank?
actual_sha1 = Upload.generate_digest(tempfile)
- if external_sha1 && external_sha1 != actual_sha1
- raise ChecksumMismatchError
- end
+ raise ChecksumMismatchError if external_sha1 && external_sha1 != actual_sha1
end
# TODO (martin): See if these additional opts will be needed
@@ -148,11 +155,11 @@ class ExternalUploadManager
type: external_upload_stub.upload_type,
existing_external_upload_key: external_upload_stub.key,
external_upload_too_big: external_size > DOWNLOAD_LIMIT,
- filesize: external_size
+ filesize: external_size,
}.merge(@upload_create_opts)
UploadCreator.new(tempfile, external_upload_stub.original_filename, opts).create_for(
- external_upload_stub.created_by_id
+ external_upload_stub.created_by_id,
)
ensure
tempfile&.close!
@@ -163,7 +170,7 @@ class ExternalUploadManager
@store.move_existing_stored_upload(
existing_external_upload_key: external_upload_stub.key,
original_filename: external_upload_stub.original_filename,
- content_type: content_type
+ content_type: content_type,
)
Struct.new(:errors).new([])
end
@@ -190,7 +197,7 @@ class ExternalUploadManager
url,
max_file_size: DOWNLOAD_LIMIT,
tmp_file_name: "discourse-upload-#{type}",
- follow_redirect: true
+ follow_redirect: true,
)
end
end
diff --git a/app/services/group_action_logger.rb b/app/services/group_action_logger.rb
index d38d0e7c5a7..02299afb485 100644
--- a/app/services/group_action_logger.rb
+++ b/app/services/group_action_logger.rb
@@ -1,64 +1,71 @@
# frozen_string_literal: true
class GroupActionLogger
-
def initialize(acting_user, group)
@acting_user = acting_user
@group = group
end
def log_make_user_group_owner(target_user)
- GroupHistory.create!(default_params.merge(
- action: GroupHistory.actions[:make_user_group_owner],
- target_user: target_user
- ))
+ GroupHistory.create!(
+ default_params.merge(
+ action: GroupHistory.actions[:make_user_group_owner],
+ target_user: target_user,
+ ),
+ )
end
def log_remove_user_as_group_owner(target_user)
- GroupHistory.create!(default_params.merge(
- action: GroupHistory.actions[:remove_user_as_group_owner],
- target_user: target_user
- ))
+ GroupHistory.create!(
+ default_params.merge(
+ action: GroupHistory.actions[:remove_user_as_group_owner],
+ target_user: target_user,
+ ),
+ )
end
def log_add_user_to_group(target_user, subject = nil)
- GroupHistory.create!(default_params.merge(
- action: GroupHistory.actions[:add_user_to_group],
- target_user: target_user,
- subject: subject
- ))
+ GroupHistory.create!(
+ default_params.merge(
+ action: GroupHistory.actions[:add_user_to_group],
+ target_user: target_user,
+ subject: subject,
+ ),
+ )
end
def log_remove_user_from_group(target_user, subject = nil)
- GroupHistory.create!(default_params.merge(
- action: GroupHistory.actions[:remove_user_from_group],
- target_user: target_user,
- subject: subject
- ))
+ GroupHistory.create!(
+ default_params.merge(
+ action: GroupHistory.actions[:remove_user_from_group],
+ target_user: target_user,
+ subject: subject,
+ ),
+ )
end
def log_change_group_settings
- @group.previous_changes.except(*excluded_attributes).each do |attribute_name, value|
- next if value[0].blank? && value[1].blank?
+ @group
+ .previous_changes
+ .except(*excluded_attributes)
+ .each do |attribute_name, value|
+ next if value[0].blank? && value[1].blank?
- GroupHistory.create!(default_params.merge(
- action: GroupHistory.actions[:change_group_setting],
- subject: attribute_name,
- prev_value: value[0],
- new_value: value[1]
- ))
- end
+ GroupHistory.create!(
+ default_params.merge(
+ action: GroupHistory.actions[:change_group_setting],
+ subject: attribute_name,
+ prev_value: value[0],
+ new_value: value[1],
+ ),
+ )
+ end
end
private
def excluded_attributes
- [
- :bio_cooked,
- :updated_at,
- :created_at,
- :user_count
- ]
+ %i[bio_cooked updated_at created_at user_count]
end
def default_params
diff --git a/app/services/group_mentions_updater.rb b/app/services/group_mentions_updater.rb
index 5130baa43e6..8099dcde2b8 100644
--- a/app/services/group_mentions_updater.rb
+++ b/app/services/group_mentions_updater.rb
@@ -2,15 +2,16 @@
class GroupMentionsUpdater
def self.update(current_name, previous_name)
- Post.where(
- "cooked LIKE '%class=\"mention-group%' AND raw LIKE :previous_name",
- previous_name: "%@#{previous_name}%"
- ).find_in_batches do |posts|
-
- posts.each do |post|
- post.raw.gsub!(/(^|\s)(@#{previous_name})(\s|$)/, "\\1@#{current_name}\\3")
- post.save!(validate: false)
+ Post
+ .where(
+ "cooked LIKE '%class=\"mention-group%' AND raw LIKE :previous_name",
+ previous_name: "%@#{previous_name}%",
+ )
+ .find_in_batches do |posts|
+ posts.each do |post|
+ post.raw.gsub!(/(^|\s)(@#{previous_name})(\s|$)/, "\\1@#{current_name}\\3")
+ post.save!(validate: false)
+ end
end
- end
end
end
diff --git a/app/services/group_message.rb b/app/services/group_message.rb
index 1f24289434a..47ee093a3fd 100644
--- a/app/services/group_message.rb
+++ b/app/services/group_message.rb
@@ -11,7 +11,6 @@
# The default is 24 hours. Set to false to always send the message.
class GroupMessage
-
include Rails.application.routes.url_helpers
RECENT_MESSAGE_PERIOD = 3.months
@@ -29,14 +28,15 @@ class GroupMessage
def create
return false if sent_recently?
- post = PostCreator.create(
- Discourse.system_user,
- target_group_names: [@group_name],
- archetype: Archetype.private_message,
- subtype: TopicSubtype.system_message,
- title: I18n.t("system_messages.#{@message_type}.subject_template", message_params),
- raw: I18n.t("system_messages.#{@message_type}.text_body_template", message_params)
- )
+ post =
+ PostCreator.create(
+ Discourse.system_user,
+ target_group_names: [@group_name],
+ archetype: Archetype.private_message,
+ subtype: TopicSubtype.system_message,
+ title: I18n.t("system_messages.#{@message_type}.subject_template", message_params),
+ raw: I18n.t("system_messages.#{@message_type}.text_body_template", message_params),
+ )
remember_message_sent
post
end
@@ -44,38 +44,44 @@ class GroupMessage
def delete_previous!(respect_sent_recently: true, match_raw: true)
return false if respect_sent_recently && sent_recently?
- posts = Post
- .joins(topic: { topic_allowed_groups: :group })
- .where(topic: {
- posts_count: 1,
- user_id: Discourse.system_user,
- archetype: Archetype.private_message,
- subtype: TopicSubtype.system_message,
- title: I18n.t("system_messages.#{@message_type}.subject_template", message_params),
- topic_allowed_groups: {
- groups: { name: @group_name }
- }
- })
- .where("posts.created_at > ?", RECENT_MESSAGE_PERIOD.ago)
+ posts =
+ Post
+ .joins(topic: { topic_allowed_groups: :group })
+ .where(
+ topic: {
+ posts_count: 1,
+ user_id: Discourse.system_user,
+ archetype: Archetype.private_message,
+ subtype: TopicSubtype.system_message,
+ title: I18n.t("system_messages.#{@message_type}.subject_template", message_params),
+ topic_allowed_groups: {
+ groups: {
+ name: @group_name,
+ },
+ },
+ },
+ )
+ .where("posts.created_at > ?", RECENT_MESSAGE_PERIOD.ago)
if match_raw
- posts = posts.where(raw: I18n.t("system_messages.#{@message_type}.text_body_template", message_params).rstrip)
+ posts =
+ posts.where(
+ raw: I18n.t("system_messages.#{@message_type}.text_body_template", message_params).rstrip,
+ )
end
- posts.find_each do |post|
- PostDestroyer.new(Discourse.system_user, post).destroy
- end
+ posts.find_each { |post| PostDestroyer.new(Discourse.system_user, post).destroy }
end
def message_params
- @message_params ||= begin
- h = { base_url: Discourse.base_url }.merge(@opts[:message_params] || {})
- if @opts[:user]
- h.merge!(username: @opts[:user].username,
- user_url: user_path(@opts[:user].username))
+ @message_params ||=
+ begin
+ h = { base_url: Discourse.base_url }.merge(@opts[:message_params] || {})
+ if @opts[:user]
+ h.merge!(username: @opts[:user].username, user_url: user_path(@opts[:user].username))
+ end
+ h
end
- h
- end
end
def sent_recently?
@@ -85,10 +91,12 @@ class GroupMessage
# default is to send no more than once every 24 hours (24 * 60 * 60 = 86,400 seconds)
def remember_message_sent
- Discourse.redis.setex(sent_recently_key, @opts[:limit_once_per].try(:to_i) || 86_400, 1) unless @opts[:limit_once_per] == false
+ unless @opts[:limit_once_per] == false
+ Discourse.redis.setex(sent_recently_key, @opts[:limit_once_per].try(:to_i) || 86_400, 1)
+ end
end
def sent_recently_key
- "grpmsg:#{@group_name}:#{@message_type}:#{@opts[:user] ? @opts[:user].username : ''}"
+ "grpmsg:#{@group_name}:#{@message_type}:#{@opts[:user] ? @opts[:user].username : ""}"
end
end
diff --git a/app/services/handle_chunk_upload.rb b/app/services/handle_chunk_upload.rb
index d966f659aa1..cc69c1c5baa 100644
--- a/app/services/handle_chunk_upload.rb
+++ b/app/services/handle_chunk_upload.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
class HandleChunkUpload
-
def initialize(chunk, params = {})
@chunk = chunk
@params = params
@@ -21,7 +20,8 @@ class HandleChunkUpload
def check_chunk
# check whether the chunk has already been uploaded
- has_chunk_been_uploaded = File.exist?(@chunk) && File.size(@chunk) == @params[:current_chunk_size]
+ has_chunk_been_uploaded =
+ File.exist?(@chunk) && File.size(@chunk) == @params[:current_chunk_size]
# 200 = exists, 404 = not uploaded yet
status = has_chunk_been_uploaded ? 200 : 404
end
@@ -36,11 +36,11 @@ class HandleChunkUpload
end
def merge_chunks
- upload_path = @params[:upload_path]
+ upload_path = @params[:upload_path]
tmp_upload_path = @params[:tmp_upload_path]
- identifier = @params[:identifier]
- filename = @params[:filename]
- tmp_directory = @params[:tmp_directory]
+ identifier = @params[:identifier]
+ filename = @params[:filename]
+ tmp_directory = @params[:tmp_directory]
# delete destination files
begin
@@ -68,5 +68,4 @@ class HandleChunkUpload
rescue Errno::ENOENT
end
end
-
end
diff --git a/app/services/heat_settings_updater.rb b/app/services/heat_settings_updater.rb
index 56666b71f47..325e87117c4 100644
--- a/app/services/heat_settings_updater.rb
+++ b/app/services/heat_settings_updater.rb
@@ -70,23 +70,20 @@ class HeatSettingsUpdater
if SiteSetting.get(name) != SiteSetting.defaults[name]
SiteSetting.set_and_log(name, SiteSetting.defaults[name])
end
- elsif SiteSetting.get(name) == 0 ||
- (new_value.to_f / SiteSetting.get(name) - 1.0).abs >= 0.05
-
- rounded_new_value = if new_value.is_a?(Integer)
- if new_value > 9
- digits = new_value.digits.reverse
- (digits[0] * 10 + digits[1]) * 10.pow(digits[2..-1].size)
+ elsif SiteSetting.get(name) == 0 || (new_value.to_f / SiteSetting.get(name) - 1.0).abs >= 0.05
+ rounded_new_value =
+ if new_value.is_a?(Integer)
+ if new_value > 9
+ digits = new_value.digits.reverse
+ (digits[0] * 10 + digits[1]) * 10.pow(digits[2..-1].size)
+ else
+ new_value
+ end
else
- new_value
+ new_value.round(2)
end
- else
- new_value.round(2)
- end
- if SiteSetting.get(name) != rounded_new_value
- SiteSetting.set_and_log(name, rounded_new_value)
- end
+ SiteSetting.set_and_log(name, rounded_new_value) if SiteSetting.get(name) != rounded_new_value
end
end
end
diff --git a/app/services/inline_uploads.rb b/app/services/inline_uploads.rb
index 62d081caa32..8feb0efc935 100644
--- a/app/services/inline_uploads.rb
+++ b/app/services/inline_uploads.rb
@@ -16,14 +16,20 @@ class InlineUploads
end
end
- cooked_fragment = Nokogiri::HTML5::fragment(PrettyText.cook(markdown, disable_emojis: true))
+ cooked_fragment = Nokogiri::HTML5.fragment(PrettyText.cook(markdown, disable_emojis: true))
link_occurrences = []
cooked_fragment.traverse do |node|
if node.name == "img"
# Do nothing
- elsif !(node.children.count == 1 && (node.children[0].name != "img" && node.children[0].children.blank?)) &&
- !(node.name == "a" && node.children.count > 1 && !node_children_names(node).include?("img"))
+ elsif !(
+ node.children.count == 1 &&
+ (node.children[0].name != "img" && node.children[0].children.blank?)
+ ) &&
+ !(
+ node.name == "a" && node.children.count > 1 &&
+ !node_children_names(node).include?("img")
+ )
next
end
@@ -55,7 +61,7 @@ class InlineUploads
end
regexps = [
- /(https?:\/\/[a-zA-Z0-9\.\/-]+\/#{Discourse.store.upload_path}#{UPLOAD_REGEXP_PATTERN})/,
+ %r{(https?://[a-zA-Z0-9\./-]+/#{Discourse.store.upload_path}#{UPLOAD_REGEXP_PATTERN})},
]
if Discourse.store.external?
@@ -103,41 +109,38 @@ class InlineUploads
raw_matches
.sort { |a, b| a[3] <=> b[3] }
.each do |match, link, replace_with, _index|
+ node_info = link_occurrences.shift
+ next unless node_info&.dig(:is_valid)
- node_info = link_occurrences.shift
- next unless node_info&.dig(:is_valid)
-
- if link.include?(node_info[:link])
- begin
- uri = URI(link)
- rescue URI::Error
- end
-
- if !Discourse.store.external?
- host = uri&.host
-
- hosts = [Discourse.current_hostname]
-
- if cdn_url = GlobalSetting.cdn_url
- hosts << URI(GlobalSetting.cdn_url).hostname
+ if link.include?(node_info[:link])
+ begin
+ uri = URI(link)
+ rescue URI::Error
end
- if host && !hosts.include?(host)
- next
+ if !Discourse.store.external?
+ host = uri&.host
+
+ hosts = [Discourse.current_hostname]
+
+ if cdn_url = GlobalSetting.cdn_url
+ hosts << URI(GlobalSetting.cdn_url).hostname
+ end
+
+ next if host && !hosts.include?(host)
end
- end
- upload = Upload.get_from_url(link)
+ upload = Upload.get_from_url(link)
- if upload
- replace_with.sub!(PLACEHOLDER, upload.short_url)
- replace_with.sub!(PATH_PLACEHOLDER, upload.short_path)
- markdown.sub!(match, replace_with)
- else
- on_missing.call(link) if on_missing
+ if upload
+ replace_with.sub!(PLACEHOLDER, upload.short_url)
+ replace_with.sub!(PATH_PLACEHOLDER, upload.short_path)
+ markdown.sub!(match, replace_with)
+ else
+ on_missing.call(link) if on_missing
+ end
end
end
- end
markdown.scan(/(__(\h{40})__)/) do |match|
upload = Upload.find_by(sha1: match[1])
@@ -161,7 +164,7 @@ class InlineUploads
end
def self.match_bbcode_img(markdown, external_src: false)
- markdown.scan(/(\[img\]\s*([^\[\]\s]+)\s*\[\/img\])/i) do |match|
+ markdown.scan(%r{(\[img\]\s*([^\[\]\s]+)\s*\[/img\])}i) do |match|
if (external_src || (matched_uploads(match[1]).present?)) && block_given?
yield(match[0], match[1], +"", $~.offset(0)[0])
end
@@ -182,9 +185,9 @@ class InlineUploads
end
def self.match_anchor(markdown, external_href: false)
- markdown.scan(/(()([^<\a>]*?)<\/a>)/i) do |match|
- node = Nokogiri::HTML5::fragment(match[0]).children[0]
- href = node.attributes["href"]&.value
+ markdown.scan(%r{(()([^<\a>]*?)