]
def self.search(term)
match_search term, posts: :body_markdown
end
+ def self.by_slug(slug, user)
+ post = Post.unscoped.where(
+ doc_slug: slug,
+ community_id: [RequestContext.community_id, nil]
+ ).first
+
+ if post&.help_category == '$Disabled'
+ return nil
+ end
+
+ if post&.help_category == '$Moderator' && !user&.is_moderator
+ return nil
+ end
+
+ post
+ end
+
# Double-define: initial definitions are less efficient, so if we have a record of the post type we'll
# override them later with more efficient methods.
['Question', 'Answer', 'PolicyDoc', 'HelpDoc', 'Article'].each do |pt|
@@ -76,14 +94,18 @@ def self.search(term)
end
end
+ # @return [TagSet]
def tag_set
parent.nil? ? category.tag_set : parent.category.tag_set
end
+ # @return [Boolean]
def meta?
false
end
+ # Used in the transfer of content from SE to reassign the owner of a post to the given user.
+ # @param new_user [User]
def reassign_user(new_user)
new_user.ensure_community_user!
@@ -94,10 +116,13 @@ def reassign_user(new_user)
update!(deleted: false, deleted_at: nil, deleted_by: nil)
end
+ # Removes the attribution notice from this post
+ # @return [Boolean] whether the action was successful
def remove_attribution_notice!
update(att_source: nil, att_license_link: nil, att_license_name: nil)
end
+ # @return [String] the type of the last activity on this post
def last_activity_type
case last_activity
when closed_at
@@ -121,37 +146,51 @@ def last_activity_type
end
end
+ # @return [String] the body with all markdown stripped
def body_plain
ApplicationController.helpers.strip_markdown(body_markdown)
end
+ # @return [Boolean] whether this post is a question
def question?
post_type_id == Question.post_type_id
end
+ # @return [Boolean] whether this post is an answer
def answer?
post_type_id == Answer.post_type_id
end
+ # @return [Boolean] whether this post is an article
def article?
post_type_id == Article.post_type_id
end
+ # @return [Boolean] whether there is a suggested edit pending for this post
def pending_suggested_edit?
SuggestedEdit.where(post_id: id, active: true).any?
end
+ # @return [SuggestedEdit, Nil] the suggested edit pending for this post (if any)
def pending_suggested_edit
SuggestedEdit.where(post_id: id, active: true).last
end
+ # Recalculates the score of this post based on its up and downvotes
def recalc_score
variable = SiteSetting['ScoringVariable'] || 2
sql = 'UPDATE posts SET score = (upvote_count + ?) / (upvote_count + downvote_count + (2 * ?)) WHERE id = ?'
sanitized = ActiveRecord::Base.sanitize_sql_array([sql, variable, variable, id])
ActiveRecord::Base.connection.execute sanitized
+
+ # ensures the updated score is immediately available
+ self.score = (upvote_count + variable).to_f / (upvote_count + downvote_count + (2 * variable))
+ # prevents AR from accidentally saving the dirty state
+ clear_attribute_changes([:score])
end
+ # This method will update the locked status of this post if locked_until is in the past.
+ # @return [Boolean] whether this post is locked
def locked?
return true if locked && locked_until.nil? # permanent lock
return true if locked && !locked_until.past?
@@ -159,14 +198,27 @@ def locked?
if locked
update(locked: false, locked_by: nil, locked_at: nil, locked_until: nil)
end
+
+ false
+ end
+
+ # The test here is for flags that are pending (no status). A spam flag
+ # could be marked helpful but the post wouldn't be deleted, and
+ # we don't necessarily want the post to be treated like it's a spam risk
+ # if that happens.
+ def spam_flag_pending?
+ flags.any? { |flag| flag.post_flag_type&.name == "it's spam" && !flag.status }
end
+ # @param user [User, Nil]
+ # @return [Boolean] whether the given user can view this post
def can_access?(user)
(!deleted? || user&.has_post_privilege?('flag_curate', self)) &&
(!category.present? || !category.min_view_trust_level.present? ||
category.min_view_trust_level <= (user&.trust_level || 0))
end
+ # @return [Hash] a hash with as key the reaction type and value the amount of reactions for that type
def reaction_list
reactions.includes(:reaction_type).group_by(&:reaction_type_id)
.to_h { |_k, v| [v.first.reaction_type, v] }
@@ -174,12 +226,21 @@ def reaction_list
private
+ ##
+ # Before-validation callback. Update the tags association from the tags_cache.
def update_tag_associations
tags_cache.each do |tag_name|
- tag = Tag.find_or_create_by name: tag_name, tag_set: category.tag_set
+ tag, name_used = Tag.find_or_create_synonymized name: tag_name, tag_set: category.tag_set
unless tags.include? tag
tags << tag
end
+
+ # If the tags_cache doesn't include name_used then tag_name was a synonym - remove the synonym from tags_cache
+ # and add the primary for it instead.
+ unless tags_cache.include? name_used
+ tags_cache.delete tag_name
+ tags_cache << name_used
+ end
end
tags.each do |tag|
unless tags_cache.include? tag.name
@@ -188,11 +249,20 @@ def update_tag_associations
end
end
+ ##
+ # Helper method for #check_attribution_notice validator. Produces a text-only attribution notice either based on
+ # values given or the current state of the post for use in post histories.
+ # @param source [String, Nil] where the post originally came from
+ # @param name [String, Nil] the name of the license
+ # @param url [String, Nil] the url of the license
+ # @return [String] an attribution notice corresponding to this post
def attribution_text(source = nil, name = nil, url = nil)
"Source: #{source || att_source}\nLicense name: #{name || att_license_name}\n" \
"License URL: #{url || att_license_link}"
end
+ # Intended to be called as callback after a save.
+ # If changes were made to the licensing of this post, this will insert the correct history items.
def check_attribution_notice
sc = saved_changes
attributes = ['att_source', 'att_license_name', 'att_license_link']
@@ -210,6 +280,8 @@ def check_attribution_notice
end
end
+ # Intended to be called as callback after a save.
+ # If the last activity of this post was changed and it has a parent, also updates the parent activity
def copy_last_activity_to_parent
sc = saved_changes
if parent.present? && (sc.include?('last_activity') || sc.include?('last_activity_by_id')) \
@@ -218,22 +290,28 @@ def copy_last_activity_to_parent
end
end
+ # Intended to be called as callback after a save.
+ # If this deletion status of this post was changed, then remove or re-add the reputation.
def modify_author_reputation
sc = saved_changes
if sc.include?('deleted') && sc['deleted'][0] != sc['deleted'][1] && created_at >= 60.days.ago
deleted = !!saved_changes['deleted']&.last
if deleted
- user.update(reputation: user.reputation - Vote.total_rep_change(votes))
+ user&.update(reputation: (user&.reputation || 1) - Vote.total_rep_change(votes))
else
- user.update(reputation: user.reputation + Vote.total_rep_change(votes))
+ user&.update(reputation: (user&.reputation || 1) + Vote.total_rep_change(votes))
end
end
end
+ # Intended to be called as callback after a save.
+ # @return [PostHistory] creates an initial revision for this post
def create_initial_revision
PostHistory.initial_revision(self, user, after: body_markdown, after_title: title, after_tags: tags)
end
+ # Intended to be used as validation.
+ # Will add an error if this post's post type is not allowed in the associated category.
def category_allows_post_type
return if category.nil?
@@ -242,6 +320,8 @@ def category_allows_post_type
end
end
+ # Intended to be called as callback after a save.
+ # Deletes this posts description from the cache such that it will be regenerated next time it is needed.
def break_description_cache
Rails.cache.delete "posts/#{id}/description"
if parent_id.present?
@@ -249,6 +329,8 @@ def break_description_cache
end
end
+ # Intended to be used as a validation.
+ # Checks whether the associated license is present and enabled.
def license_valid
# Don't validate license on edits
return unless id.nil?
@@ -263,63 +345,9 @@ def license_valid
end
end
- def maximum_tags
- if tags_cache.length > 5
- errors.add(:base, "Post can't have more than 5 tags.")
- elsif tags_cache.empty?
- errors.add(:base, 'Post must have at least one tag.')
- end
- end
-
- def maximum_tag_length
- tags_cache.each do |tag|
- max_len = SiteSetting['MaxTagLength']
- if tag.length > max_len
- errors.add(:tags, "can't be more than #{max_len} characters long each")
- end
- end
- end
-
- def no_spaces_in_tags
- tags_cache.each do |tag|
- if tag.include?(' ') || tag.include?('_')
- errors.add(:tags, 'may not include spaces or underscores - use hyphens for multiple-word tags')
- end
- end
- end
-
- def stripped_minimum
- if (body&.gsub(/(?:^[\s\t\u2000-\u200F]+|[\s\t\u2000-\u200F]+$)/, '')&.length || 0) < 30
- errors.add(:body, 'must be more than 30 non-whitespace characters long')
- end
- if (title&.gsub(/(?:^[\s\t\u2000-\u200F]+|[\s\t\u2000-\u200F]+$)/, '')&.length || 0) < 15
- errors.add(:title, 'must be more than 15 non-whitespace characters long')
- end
- end
-
- def maximum_title_length
- max_title_len = SiteSetting['MaxTitleLength']
- if title.length > [(max_title_len || 255), 255].min
- errors.add(:title, "can't be more than #{max_title_len} characters")
- end
- end
-
- def tags_in_tag_set
- tag_set = category.tag_set
- unless tags.all? { |t| t.tag_set_id == tag_set.id }
- errors.add(:base, "Not all of this question's tags are in the correct tag set.")
- end
- end
-
- def required_tags?
- required = category&.required_tag_ids
- return unless required.present? && !required.empty?
-
- unless tag_ids.any? { |t| required.include? t }
- errors.add(:tags, "must contain at least one required tag (#{category.required_tags.pluck(:name).join(', ')})")
- end
- end
-
+ # Intended to be used as validation.
+ # Checks whether there are any moderator tags present added, and if so whether the current user is allowed to add
+ # those.
def moderator_tags
mod_tags = category&.moderator_tags&.map(&:name)
return unless mod_tags.present? && !mod_tags.empty?
@@ -333,6 +361,8 @@ def moderator_tags
end
end
+ # Intended to be used as callback after a save.
+ # Updates the category activity indicator if the last activity of this post changed.
def update_category_activity
if saved_changes.include? 'last_activity'
category.update_activity(last_activity)
diff --git a/app/models/post_history.rb b/app/models/post_history.rb
index 2a742a99f..990518da2 100644
--- a/app/models/post_history.rb
+++ b/app/models/post_history.rb
@@ -1,5 +1,7 @@
class PostHistory < ApplicationRecord
include PostRelated
+ include EditsValidations
+
belongs_to :post_history_type
belongs_to :user
has_many :post_history_tags
@@ -13,13 +15,30 @@ def after_tags
tags.where(post_history_tags: { relationship: 'after' })
end
+ # @param user [User]
+ # @return [Boolean] whether the given user is allowed to see the details of this history item
+ def allowed_to_see_details?(user)
+ !hidden || user&.is_admin || user_id == user&.id || post.user_id == user&.id
+ end
+
+ # Hides all previous history
+ # @param post [Post]
+ # @param user [User]
+ def self.redact(post, user)
+ where(post: post).update_all(hidden: true)
+ history_hidden(post, user, after: post.body_markdown,
+ after_title: post.title,
+ after_tags: post.tags,
+ comment: 'Detailed history before this event is hidden because of a redaction.')
+ end
+
def self.method_missing(name, *args, **opts)
unless args.length >= 2
raise NoMethodError
end
object, user = args
- fields = [:before, :after, :comment, :before_title, :after_title, :before_tags, :after_tags]
+ fields = [:before, :after, :comment, :before_title, :after_title, :before_tags, :after_tags, :hidden]
values = fields.to_h { |f| [f, nil] }.merge(opts)
history_type_name = name.to_s
@@ -31,7 +50,7 @@ def self.method_missing(name, *args, **opts)
params = { post_history_type: history_type, user: user, post: object, community_id: object.community_id }
{ before: :before_state, after: :after_state, comment: :comment, before_title: :before_title,
- after_title: :after_title }.each do |arg, attr|
+ after_title: :after_title, hidden: :hidden }.each do |arg, attr|
next if values[arg].nil?
params = params.merge(attr => values[arg])
@@ -47,7 +66,10 @@ def self.method_missing(name, *args, **opts)
end
end.values.compact.flatten
- history.post_history_tags = PostHistoryTag.create(post_history_tags)
+ # do not create post history tags if post history validations failed
+ unless history.errors.any?
+ history.post_history_tags = PostHistoryTag.create(post_history_tags)
+ end
history
end
diff --git a/app/models/post_type.rb b/app/models/post_type.rb
index 7f3e7570b..2cf37fdfd 100644
--- a/app/models/post_type.rb
+++ b/app/models/post_type.rb
@@ -19,6 +19,11 @@ def reactions
end
end
+ # @return [Boolean] whether the post type is a system type
+ def system?
+ ['HelpDoc', 'PolicyDoc'].include?(name)
+ end
+
def self.mapping
Rails.cache.fetch 'network/post_types/post_type_ids', include_community: false do
PostType.all.to_h { |pt| [pt.name, pt.id] }
diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb
index ab5c9504b..160bbd05b 100644
--- a/app/models/site_setting.rb
+++ b/app/models/site_setting.rb
@@ -11,14 +11,14 @@ class SiteSetting < ApplicationRecord
def self.[](name)
key = "SiteSettings/#{RequestContext.community_id}/#{name}"
- cached = Rails.cache.fetch key do
+ cached = Rails.cache.fetch key, include_community: false do
SiteSetting.applied_setting(name)&.typed
end
if cached.nil?
- Rails.cache.delete key
+ Rails.cache.delete key, include_community: false
value = SiteSetting.applied_setting(name)&.typed
- Rails.cache.write key, value
+ Rails.cache.write key, value, include_community: false
value
else
cached
@@ -26,10 +26,16 @@ def self.[](name)
end
def self.exist?(name)
- Rails.cache.exist?("SiteSettings/#{RequestContext.community_id}/#{name}") ||
+ Rails.cache.exist?("SiteSettings/#{RequestContext.community_id}/#{name}", include_community: false) ||
SiteSetting.where(name: name).count.positive?
end
+ # Checks whether the setting is a global site setting
+ # @return [Boolean]
+ def global?
+ community_id.nil?
+ end
+
def typed
SettingConverter.new(value).send("as_#{value_type.downcase}")
end
@@ -45,14 +51,14 @@ def self.applied_setting(name)
def self.all_communities(name)
communities = Community.all
keys = (communities.map { |c| [c.id, "SiteSetting/#{c.id}/#{name}"] } + [[nil, "SiteSetting//#{name}"]]).to_h
- cached = Rails.cache.read_multi(*keys.values)
+ cached = Rails.cache.read_multi(*keys.values, include_community: false)
missing = keys.reject { |_k, v| cached.include?(v) }.map { |k, _v| k }
settings = if missing.empty?
{}
else
SiteSetting.where(name: name, community_id: missing).to_h { |s| [s.community_id, s] }
end
- Rails.cache.write_multi(missing.to_h { |cid| [keys[cid], settings[cid]&.typed] })
+ Rails.cache.write_multi(missing.to_h { |cid| [keys[cid], settings[cid]&.typed] }, include_community: false)
communities.to_h do |c|
[
c.id,
diff --git a/app/models/sso_profile.rb b/app/models/sso_profile.rb
new file mode 100644
index 000000000..0559a0f0f
--- /dev/null
+++ b/app/models/sso_profile.rb
@@ -0,0 +1,5 @@
+class SsoProfile < ApplicationRecord
+ belongs_to :user, inverse_of: :sso_profile
+
+ validates :saml_identifier, uniqueness: true, presence: true
+end
diff --git a/app/models/suggested_edit.rb b/app/models/suggested_edit.rb
index 7730bbc61..0afbe4d90 100644
--- a/app/models/suggested_edit.rb
+++ b/app/models/suggested_edit.rb
@@ -1,5 +1,7 @@
class SuggestedEdit < ApplicationRecord
include PostRelated
+ include PostValidations
+ include EditsValidations
belongs_to :user
@@ -10,6 +12,15 @@ class SuggestedEdit < ApplicationRecord
has_and_belongs_to_many :tags
has_and_belongs_to_many :before_tags, class_name: 'Tag', join_table: 'suggested_edits_before_tags'
+ has_one :post_type, through: :post
+ has_one :category, through: :post
+
+ after_save :clear_pending_cache, if: proc { saved_change_to_attribute?(:active) }
+
+ def clear_pending_cache
+ Rails.cache.delete "pending_suggestions/#{post.category_id}"
+ end
+
def pending?
active
end
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 1b78a95fe..873a0ea95 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -5,6 +5,8 @@ class Tag < ApplicationRecord
has_many :children, class_name: 'Tag', foreign_key: :parent_id
has_many :children_with_paths, class_name: 'TagWithPath', foreign_key: :parent_id
has_many :post_history_tags
+ has_many :tag_synonyms, dependent: :destroy
+ accepts_nested_attributes_for :tag_synonyms, allow_destroy: true
belongs_to :tag_set
belongs_to :parent, class_name: 'Tag', optional: true
@@ -13,12 +15,57 @@ class Tag < ApplicationRecord
validates :name, presence: true, format: { with: /[^ \t]+/, message: 'Tag names may not include spaces' }
validate :parent_not_self
validate :parent_not_own_child
+ validate :synonym_unique
validates :name, uniqueness: { scope: [:tag_set_id], case_sensitive: false }
def self.search(term)
- where('name LIKE ?', "%#{sanitize_sql_like(term)}%")
- .or(where('excerpt LIKE ?', "%#{sanitize_sql_like(term)}%"))
- .order(Arel.sql(sanitize_sql_array(['name LIKE ? DESC, name', "#{sanitize_sql_like(term)}%"])))
+ stripped = term.strip
+ # Query to search on tags, the name is used for sorting.
+ q1 = where('tags.name LIKE ?', "%#{sanitize_sql_like(stripped)}%")
+ .or(where('tags.excerpt LIKE ?', "%#{sanitize_sql_like(stripped)}%"))
+ .select(Arel.sql('name AS sortname, tags.*'))
+
+ # Query to search on synonyms, the synonym name is used for sorting.
+ # The order clause here actually applies to the union of q1 and q2 (so not just q2).
+ q2 = joins(:tag_synonyms)
+ .where('tag_synonyms.name LIKE ?', "%#{sanitize_sql_like(stripped)}%")
+ .select(Arel.sql('tag_synonyms.name AS sortname, tags.*'))
+ .order(Arel.sql(sanitize_sql_array(['sortname LIKE ? DESC, sortname', "#{sanitize_sql_like(stripped)}%"])))
+
+ # Select from the union of the above queries, select only the tag columns such that we can distinct them
+ from(Arel.sql("(#{q1.to_sql} UNION #{q2.to_sql}) tags"))
+ .select(Tag.column_names.map { |c| "tags.#{c}" })
+ .distinct
+ end
+
+ ##
+ # Find or create a tag within a given tag set, considering synonyms. If a synonym is given as +name+ then the primary
+ # tag for it is returned instead.
+ # @param name [String] A tag name to find or create.
+ # @param tag_set [TagSet] The tag set within which to search for or create the tag.
+ # @return [Array(Tag, String)] The found or created tag, and the final name used. If a synonymized name was given as
+ # +name+ then this will be the primary tag name.
+ #
+ # @example +name+ does not yet exist: a new Tag is created
+ # Tag.find_or_create_synonymized name: 'new-tag', tag_set: ...
+ # # => [Tag, 'new-tag']
+ #
+ # @example +name+ already exists: the existing Tag is returned
+ # Tag.find_or_create_synonymized name: 'existing-tag', tag_set: ...
+ # # => [Tag, 'existing-tag']
+ #
+ # @example +name+ is a synonym of 'other-tag': the Tag for 'other-tag' is returned
+ # Tag.find_or_create_synonymized name: 'synonym', tag_set: ...
+ # # => [Tag, 'other-tag']
+ def self.find_or_create_synonymized(name:, tag_set:)
+ existing = Tag.find_by(name: name, tag_set: tag_set)
+ if existing.nil?
+ synonyms = TagSynonym.joins(:tag).where(name: name, tags: { tag_set: tag_set })
+ synonymized_name = synonyms.exists? ? synonyms.first.tag.name : name
+ [Tag.find_or_create_by(name: synonymized_name, tag_set: tag_set), synonymized_name]
+ else
+ [existing, name]
+ end
end
def all_children
@@ -54,4 +101,10 @@ def parent_not_own_child
errors.add(:base, "The #{parent.name} tag is already a child of this tag.")
end
end
+
+ def synonym_unique
+ if TagSynonym.joins(:tag).where(tags: { community_id: community_id }).exists?(name: name)
+ errors.add(:base, "A tag synonym with the name #{name} already exists.")
+ end
+ end
end
diff --git a/app/models/tag_set.rb b/app/models/tag_set.rb
index e71e33c89..150dab46a 100644
--- a/app/models/tag_set.rb
+++ b/app/models/tag_set.rb
@@ -13,4 +13,12 @@ def self.meta
def self.main
where(name: 'Main').first
end
+
+ def with_paths(no_excerpt = false)
+ if no_excerpt
+ tags_with_paths.where(excerpt: ['', nil])
+ else
+ tags_with_paths
+ end
+ end
end
diff --git a/app/models/tag_synonym.rb b/app/models/tag_synonym.rb
new file mode 100644
index 000000000..da0aec259
--- /dev/null
+++ b/app/models/tag_synonym.rb
@@ -0,0 +1,18 @@
+class TagSynonym < ApplicationRecord
+ belongs_to :tag
+ has_one :community, through: :tag
+
+ validates :name, presence: true, format: { with: /[^ \t]+/, message: 'Tag names may not include spaces' }
+ validate :name_unique
+
+ private
+
+ # Checks whether the name of this synonym is not already taken by a tag or synonym in the same community.
+ def name_unique
+ if TagSynonym.joins(:tag).where(tags: { community_id: tag.community_id }).exists?(name: name)
+ errors.add(:base, "A tag synonym with the name #{name} already exists.")
+ elsif Tag.unscoped.where(community_id: tag.community_id).exists?(name: name)
+ errors.add(:base, "A tag with the name #{name} already exists.")
+ end
+ end
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 84d79db01..04e1219f7 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -2,10 +2,11 @@
# application code (i.e. excluding Devise) is concerned, has many questions, answers, and votes.
class User < ApplicationRecord
include ::UserMerge
+ include ::SamlInit
devise :database_authenticatable, :registerable, :confirmable,
:recoverable, :rememberable, :trackable, :validatable,
- :lockable, :omniauthable
+ :lockable, :omniauthable, :saml_authenticatable
has_many :posts, dependent: :nullify
has_many :votes, dependent: :destroy
@@ -24,6 +25,10 @@ class User < ApplicationRecord
has_many :comments, dependent: :nullify
has_many :comment_threads_deleted, class_name: 'CommentThread', foreign_key: :deleted_by_id, dependent: :nullify
has_many :comment_threads_locked, class_name: 'CommentThread', foreign_key: :locked_by_id, dependent: :nullify
+ has_many :category_filter_defaults, dependent: :destroy
+ has_many :filters, dependent: :destroy
+ has_many :user_websites, dependent: :destroy
+ accepts_nested_attributes_for :user_websites
belongs_to :deleted_by, required: false, class_name: 'User'
validates :username, presence: true, length: { minimum: 3, maximum: 50 }
@@ -40,7 +45,7 @@ class User < ApplicationRecord
scope :active, -> { where(deleted: false) }
scope :deleted, -> { where(deleted: true) }
- after_create :send_welcome_tour_message
+ after_create :send_welcome_tour_message, :ensure_websites
def self.list_includes
includes(:posts, :avatar_attachment)
@@ -58,6 +63,12 @@ def trust_level
community_user.trust_level
end
+ # Checks whether this user is the same as a given user
+ # @param [User] user user to compare with
+ def same_as?(user)
+ id == user.id
+ end
+
# This class makes heavy use of predicate names, and their use is prevalent throughout the codebase
# because of the importance of these methods.
# rubocop:disable Naming/PredicateName
@@ -69,6 +80,22 @@ def has_post_privilege?(name, post)
end
end
+ # Checks if the user can push a given post type to network
+ # @param post_type [PostType] type of the post to be pushed
+ # @return [Boolean]
+ def can_push_to_network(post_type)
+ post_type.system? && (is_global_moderator || is_global_admin)
+ end
+
+ # Checks if the user can directly update a given post
+ # @param post [Post] updated post (owners can unilaterally update)
+ # @param post_type [PostType] type of the post (some are freely editable)
+ # @return [Boolean]
+ def can_update(post, post_type)
+ privilege?('edit_posts') || is_moderator || self == post.user || \
+ (post_type.is_freely_editable && privilege?('unrestricted'))
+ end
+
def metric(key)
Rails.cache.fetch("community_user/#{community_user.id}/metric/#{key}", expires_in: 24.hours) do
case key
@@ -111,6 +138,18 @@ def website_domain
website.nil? ? website : URI.parse(website).hostname
end
+ def valid_websites_for
+ user_websites.where.not(url: [nil, '']).order(position: :asc)
+ end
+
+ def ensure_websites
+ pos = user_websites.size
+ while pos < UserWebsite::MAX_ROWS
+ pos += 1
+ UserWebsite.create(user_id: id, position: pos)
+ end
+ end
+
def is_moderator
is_global_moderator || community_user&.is_moderator || is_admin || community_user&.privilege?('mod') || false
end
@@ -119,6 +158,42 @@ def is_admin
is_global_admin || community_user&.is_admin || false
end
+ # Used by network profile: does this user have a profile on that other comm?
+ def has_profile_on(community_id)
+ cu = community_users.where(community_id: community_id).first
+ !cu&.user_id.nil? || false
+ end
+
+ def reputation_on(community_id)
+ cu = community_users.where(community_id: community_id).first
+ cu&.reputation || 1
+ end
+
+ def post_count_on(community_id)
+ cu = community_users.where(community_id: community_id).first
+ cu&.post_count || 0
+ end
+
+ def is_moderator_on(community_id)
+ cu = community_users.where(community_id: community_id).first
+ # is_moderator is a DB check, not a call to is_moderator()
+ is_global_moderator || is_admin || cu&.is_moderator || cu&.privilege?('mod') || false
+ end
+
+ def has_ability_on(community_id, ability_internal_id)
+ cu = community_users.where(community_id: community_id).first
+ if cu&.is_moderator || cu&.is_admin || is_global_moderator || is_global_admin || cu&.privilege?('mod')
+ true
+ elsif cu.nil?
+ false
+ else
+ Ability.unscoped do
+ UserAbility.joins(:ability).where(community_user_id: cu&.id, is_suspended: false,
+ ability: { internal_id: ability_internal_id }).exists?
+ end
+ end
+ end
+
def rtl_safe_username
"#{username}\u202D"
end
@@ -177,7 +252,7 @@ def is_not_blocklisted
def email_not_bad_pattern
return unless File.exist?(Rails.root.join('../.qpixel-email-patterns.txt'))
- return unless saved_changes.include? 'email'
+ return unless changes.include? 'email'
patterns = File.read(Rails.root.join('../.qpixel-email-patterns.txt')).split("\n")
matched = patterns.select { |p| email.match? Regexp.new(p) }
@@ -214,7 +289,7 @@ def send_welcome_tour_message
'how this site works.', '/tour')
end
- def block(reason)
+ def block(reason, length: 180.days)
user_email = email
user_ip = [last_sign_in_ip]
@@ -222,10 +297,10 @@ def block(reason)
user_ip << current_sign_in_ip
end
- BlockedItem.create(item_type: 'email', value: user_email, expires: DateTime.now + 180.days,
+ BlockedItem.create(item_type: 'email', value: user_email, expires: length.from_now,
automatic: true, reason: "#{reason}: #" + id.to_s)
user_ip.compact.uniq.each do |ip|
- BlockedItem.create(item_type: 'ip', value: ip, expires: 180.days.from_now,
+ BlockedItem.create(item_type: 'ip', value: ip, expires: length.from_now,
automatic: true, reason: "#{reason}: #" + id.to_s)
end
end
@@ -234,13 +309,19 @@ def preferences
global_key = "prefs.#{id}"
community_key = "prefs.#{id}.community.#{RequestContext.community_id}"
{
- global: AppConfig.preferences.reject { |_, v| v['community'] }.transform_values { |v| v['default'] }
+ global: AppConfig.preferences.select { |_, v| v['global'] }.transform_values { |v| v['default'] }
.merge(RequestContext.redis.hgetall(global_key)),
community: AppConfig.preferences.select { |_, v| v['community'] }.transform_values { |v| v['default'] }
.merge(RequestContext.redis.hgetall(community_key))
}
end
+ def category_preference(category_id)
+ category_key = "prefs.#{id}.category.#{RequestContext.community_id}.category.#{category_id}"
+ AppConfig.preferences.select { |_, v| v['category'] }.transform_values { |v| v['default'] }
+ .merge(RequestContext.redis.hgetall(category_key))
+ end
+
def validate_prefs!
global_key = "prefs.#{id}"
community_key = "prefs.#{id}.community.#{RequestContext.community_id}"
@@ -260,5 +341,24 @@ def validate_prefs!
def preference(name, community: false)
preferences[community ? :community : :global][name]
end
+
+ def has_active_flags?(post)
+ !post.flags.where(user: self, status: nil).empty?
+ end
+
+ def active_flags(post)
+ post.flags.where(user: self, status: nil)
+ end
+
+ def do_soft_delete(attribute_to)
+ AuditLog.moderator_audit(event_type: 'user_delete', related: self, user: attribute_to,
+ comment: attributes_print(join: "\n"))
+ assign_attributes(deleted: true, deleted_by_id: attribute_to.id, deleted_at: DateTime.now,
+ username: "user#{id}", email: "#{id}@deleted.localhost",
+ password: SecureRandom.hex(32))
+ skip_reconfirmation!
+ save
+ end
+
# rubocop:enable Naming/PredicateName
end
diff --git a/app/models/user_website.rb b/app/models/user_website.rb
new file mode 100644
index 000000000..6b50d909f
--- /dev/null
+++ b/app/models/user_website.rb
@@ -0,0 +1,6 @@
+class UserWebsite < ApplicationRecord
+ belongs_to :user
+ default_scope { order(:position) }
+
+ MAX_ROWS = 3
+end
diff --git a/app/models/vote.rb b/app/models/vote.rb
index a7a3505ab..a7c42dcb3 100644
--- a/app/models/vote.rb
+++ b/app/models/vote.rb
@@ -34,37 +34,45 @@ def reverse_rep_change
end
def rep_change(direction)
+ return unless post.present?
+
change = CategoryPostType.rep_changes[[post.category_id, post.post_type_id]][vote_type] || 0
recv_user.update!(reputation: recv_user.reputation + (direction * change))
end
def post_not_deleted
- if post.deleted?
+ if post&.deleted?
errors.add(:base, 'Votes are locked on deleted posts')
end
end
def check_valid
- throw :abort unless valid?
+ throw :abort unless valid? || post.blank?
end
def add_counter
+ return unless post.present?
+
case vote_type
when 1
post.update(upvote_count: post.upvote_count + 1)
when -1
post.update(downvote_count: post.downvote_count + 1)
end
+
post.recalc_score
end
def remove_counter
+ return unless post.present?
+
case vote_type
when 1
post.update(upvote_count: [post.upvote_count - 1, 0].max)
when -1
post.update(downvote_count: [post.downvote_count - 1, 0].max)
end
+
post.recalc_score
end
end
diff --git a/app/tasks/maintenance/initialize_user_websites_task.rb b/app/tasks/maintenance/initialize_user_websites_task.rb
new file mode 100644
index 000000000..80a91b948
--- /dev/null
+++ b/app/tasks/maintenance/initialize_user_websites_task.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Maintenance
+ class InitializeUserWebsitesTask < MaintenanceTasks::Task
+ def collection
+ User.all
+ end
+
+ def process(user)
+ unless user.user_websites.exists?(position: 1)
+ if user.website.present?
+ UserWebsite.create!(user_id: user.id, position: 1, label: 'website', url: user.website)
+ else
+ UserWebsite.create!(user_id: user.id, position: 1)
+ end
+ end
+
+ unless user.user_websites.exists?(position: 2)
+ if user.twitter.present?
+ UserWebsite.create!(user_id: user.id, position: 2, label: 'Twitter',
+ url: "https://twitter.com/#{user.twitter}")
+ else
+ UserWebsite.create!(user_id: user.id, position: 2)
+ end
+ end
+
+ # This check *should* be superfluous, but just in case...
+ unless user.user_websites.exists?(position: 3)
+ UserWebsite.create!(user_id: user.id, position: 3)
+ end
+ end
+ end
+end
diff --git a/app/views/abilities/show.html.erb b/app/views/abilities/show.html.erb
index c06d2131e..a34e29ca2 100644
--- a/app/views/abilities/show.html.erb
+++ b/app/views/abilities/show.html.erb
@@ -49,20 +49,23 @@
<% unless @ability.manual? %>
<% unless params[:thresholds].nil? %>
-
You need to reach these thresholds to earn the ability:
-
+ <% if @user.id == current_user&.id %>
+
You need to reach these thresholds to earn the ability:
+ <% else %>
+
<%= @user.username %> needs to reach these thresholds to earn the ability:
+ <% end %>
<% unless @ability.post_score_threshold.nil? %>
<% post_score_percent = (linearize_progress(@user.community_user.post_score) / linearize_progress(@ability.post_score_threshold) * 100).to_i %>
Post score threshold
<% if post_score_percent < 100 %>
-
You need to have more well-received posts.
+
Need to have more well-received posts.
<%= post_score_percent %>%
<% else %>
-
You need to have many well-received posts.
+
Need to have many well-received posts.
100%
@@ -75,13 +78,13 @@
Edit score threshold
<% if edit_score_percent < 100 %>
-
You need to have more accepted suggested edits.
+
Need to have more accepted suggested edits.
<%= edit_score_percent %>%
<% else %>
-
You need to have many accepted suggested edits.
+
Need to have many accepted suggested edits.
100%
@@ -94,13 +97,13 @@
Flag score threshold
<% if flag_score_percent < 100 %>
-
You need to have more helpful flags.
+
Need to have more helpful flags.
<%= flag_score_percent %>%
<% else %>
-
You need to have many helpful flags.
+
Need to have many helpful flags.
100%
diff --git a/app/views/admin/all_email.html.erb b/app/views/admin/all_email.html.erb
new file mode 100644
index 000000000..ade37ea36
--- /dev/null
+++ b/app/views/admin/all_email.html.erb
@@ -0,0 +1,24 @@
+<%= render 'posts/markdown_script' %>
+
+
+
+ Please be careful, as this tool sends a lot of emails.
+
+
+
+
<%= t 'admin.tools.email_all' %>
+
<%= t 'admin.email_all_blurb' %>
+
+<%= form_with url: send_all_email_path do |f| %>
+
+ <%= f.label :subject, t('g.subject').capitalize, class: 'form-element' %>
+ <%= f.text_field :subject, class: 'form-element', required: true %>
+
+
+ <%= render 'shared/body_field', f: f, field_name: :body_markdown, field_label: t('g.body').capitalize, post: nil %>
+
+
+
+ <%= f.submit t('g.send').capitalize, class: 'button is-filled',
+ onclick: "return confirm('Are you sure you want to send this email to all users?')" %>
+<% end %>
diff --git a/app/views/admin/audit_log.html.erb b/app/views/admin/audit_log.html.erb
index cb6003e1b..ea2b467af 100644
--- a/app/views/admin/audit_log.html.erb
+++ b/app/views/admin/audit_log.html.erb
@@ -4,15 +4,15 @@
<%= pluralize(@logs.count, t('g.log')) %>
<% classes = 'button is-outlined is-muted' %>
- <%= link_to t('g.age'), query_url(sort: 'age'),
+ <%= link_to t('g.age'), request.params.merge(sort: 'age'),
class: "#{classes} #{params[:sort] == 'age' || params[:sort].nil? ? 'is-active' : ''}" %>
- <%= link_to t('g.type'), query_url(sort: 'type'),
+ <%= link_to t('g.type'), request.params.merge(sort: 'type'),
class: "#{classes} #{params[:sort] == 'type' ? 'is-active' : ''}" %>
- <%= link_to t('g.event'), query_url(sort: 'event'),
+ <%= link_to t('g.event'), request.params.merge(sort: 'event'),
class: "#{classes} #{params[:sort] == 'event' ? 'is-active' : ''}" %>
- <%= link_to t('g.related'), query_url(sort: 'related'),
+ <%= link_to t('g.related'), request.params.merge(sort: 'related'),
class: "#{classes} #{params[:sort] == 'related' ? 'is-active' : ''}" %>
- <%= link_to t('g.user'), query_url(sort: 'user'),
+ <%= link_to t('g.user'), request.params.merge(sort: 'user'),
class: "#{classes} #{params[:sort] == 'user' ? 'is-active' : ''}" %>
diff --git a/app/views/admin/change_back.html.erb b/app/views/admin/change_back.html.erb
index 26e9e77c0..33cf3c7ea 100644
--- a/app/views/admin/change_back.html.erb
+++ b/app/views/admin/change_back.html.erb
@@ -1,14 +1,20 @@
Stop impersonating
- You (<%= @impersonator.username %>) are currently impersonating <%= current_user.username %>. To stop
- impersonating them, verify your password below
+ You (<%= @impersonator.username %>) are currently impersonating <%= current_user.username %>.
+ <% if @impersonator.sso_profile.present? %>
+ You can stop impersonating them with the button below, after which you will have to sign in again.
+ <% else %>
+ To stop impersonating them, verify your password below.
+ <% end %>
<%= form_tag stop_impersonating_path, class: 'form-horizontal' do %>
-
- <%= label_tag :password, 'Password', class: 'form-element' %>
- <%= password_field_tag :password, '', class: 'form-element' %>
-
+ <% unless @impersonator.sso_profile.present? %>
+
+ <%= label_tag :password, 'Password', class: 'form-element' %>
+ <%= password_field_tag :password, '', class: 'form-element' %>
+
+ <% end %>
<%= submit_tag 'Verify & Stop Impersonating', class: 'button is-primary is-filled' %>
diff --git a/app/views/admin/index.html.erb b/app/views/admin/index.html.erb
index 89f299e13..2f4c5266d 100644
--- a/app/views/admin/index.html.erb
+++ b/app/views/admin/index.html.erb
@@ -30,17 +30,28 @@
+ <% if current_user.developer? %>
+
+ <% end %>
+
@@ -108,6 +119,7 @@
+
+
<% if current_user.is_global_admin %>
-
Posts
<% categories.each do |cat| %>
<% next if (cat.min_view_trust_level || -1) > (current_user&.trust_level || 0) %>
@@ -29,6 +29,15 @@
<% end %>
<% end %>
+
+ <% if current_user&.has_ability_on(c.id, 'edit_posts') %>
+ <% sug_edits = @edits[cat.id] || 0 %>
+ <% if sug_edits > 0 %>
+ <%= link_to suggested_edits_queue_url(cat, host: c.host), class: 'widget--body-extra' do %>
+ (<%= sug_edits %> pending <%= "edit".pluralize(sug_edits) %>)
+ <% end %>
+ <% end %>
+ <% end %>
<% end %>
<% if current_user&.is_global_moderator || current_user&.is_global_admin %>
diff --git a/app/views/categories/_form.html.erb b/app/views/categories/_form.html.erb
index 7b172c7eb..55e04b314 100644
--- a/app/views/categories/_form.html.erb
+++ b/app/views/categories/_form.html.erb
@@ -1,4 +1,14 @@
<%= form_for @category, url: submit_path, method: :post do |f| %>
+ <% if @category.errors.any? %>
+
+
+ <% @category.errors.full_messages.each do |m| %>
+ - <%= m %>
+ <% end %>
+
+
+ <% end %>
+
Basic Information
@@ -51,6 +61,18 @@
<%= f.select :tag_set_id, options_for_select(TagSet.all.map { |ts| [ts.name, ts.id] }, selected: @category.tag_set_id),
{ include_blank: true }, class: 'form-element js-category-tag-set-select' %>
+
+
+ <%= f.label :min_title_length, 'Minimum title length', class: 'form-element' %>
+ Titles of posts in this category must be at least this many characters long.
+ <%= f.number_field :min_title_length, class: 'form-element' %>
+
+
+
+ <%= f.label :min_body_length, 'Minimum body length', class: 'form-element' %>
+ Posts in this category must be at least this many characters long.
+ <%= f.number_field :min_body_length, class: 'form-element' %>
+
@@ -123,6 +145,13 @@
<%= f.number_field :sequence, class: 'form-element' %>
+ <%= f.label :default_filter_id, class: 'form-element' %>
+ The default filter for this category, used for anonymous users.
+ <% system_filters = User.find(-1).filters.to_h { |filter| [filter.name, filter.id] } %>
+ <%= f.select :default_filter_id, options_for_select(system_filters, selected: @category.default_filter_id), { include_blank: "No default" } %>
+
@@ -192,7 +221,7 @@
<% disabled = @category.tag_set.nil? %>
<%= f.select :required_tag_ids, options_for_select(@category.required_tags.map { |t| [t.name, t.id] },
selected: @category.required_tag_ids),
- { include_blank: true }, multiple: true, class: 'form-element js-tag-select js-required-tags',
+ {}, multiple: true, class: 'form-element js-tag-select js-required-tags',
data: { tag_set: @category.tag_set&.id, create: 'false', use_ids: 'true' }, disabled: disabled %>
@@ -210,7 +239,7 @@
<%= f.select :topic_tag_ids, options_for_select(@category.topic_tags.map { |t| [t.name, t.id] },
selected: @category.topic_tag_ids),
- { include_blank: true }, multiple: true, class: 'form-element js-tag-select js-topic-tags',
+ {}, multiple: true, class: 'form-element js-tag-select js-topic-tags',
data: { tag_set: @category.tag_set&.id, create: 'false', use_ids: 'true' }, disabled: disabled %>
@@ -227,7 +256,7 @@
<%= f.select :moderator_tag_ids, options_for_select(@category.moderator_tags.map { |t| [t.name, t.id] },
selected: @category.moderator_tag_ids),
- { include_blank: true }, multiple: true, class: 'form-element js-tag-select js-moderator-tags',
+ {}, multiple: true, class: 'form-element js-tag-select js-moderator-tags',
data: { tag_set: @category.tag_set&.id, create: 'false', use_ids: 'true' }, disabled: disabled %>
diff --git a/app/views/categories/show.html.erb b/app/views/categories/show.html.erb
index c5bfcce11..62a18a316 100644
--- a/app/views/categories/show.html.erb
+++ b/app/views/categories/show.html.erb
@@ -11,45 +11,62 @@
<% end %>
<% post_count = @posts.count %>
-
-
- <%= short_number_to_human post_count, precision: 1, significant: false %>
- <%= 'post'.pluralize(post_count) %> ·
-
- <% if current_user&.is_admin %>
- <%= link_to 'Edit Category', edit_category_path(@category) %>
- ·
- <% end %>
-
- <%= link_to 'Subscribe',
- new_subscription_path(type: 'category', qualifier: @category.id, return_to: request.path),
- class: 'button is-outlined' %>
-
+
+
+ Filters (<%= @filtered ? @active_filter[:name].empty? ? 'Custom' : @active_filter[:name] : 'None' %>)
+ <% if @active_filter[:default] == :user %>
+
+ You are currently filtering by <%= @active_filter[:name] %> because it is set as your default for this category
+
+ <% elsif @active_filter[:default] == :category and not user_signed_in? %>
+
+ You are currently filtering by <%= @active_filter[:name] %> because it is the default for this category
+
+ <% elsif @active_filter[:default] == :category and user_signed_in? %>
+
+ You are currently filtering by <%= @active_filter[:name] %> because it is the default for this category and you do not have a personal default set
+
+ <% end %>
+ <%= form_tag request.original_url, method: :get do %>
+ <%= render 'search/filters' %>
+ <% end %>
+
+
<% @posts.each do |post| %>
<%= render 'posts/type_agnostic', post: post %>
@@ -61,7 +78,5 @@
- <%= link_to category_feed_path(@category, format: 'rss') do %>
- Category RSS feed
- <% end %>
-
\ No newline at end of file
+ <%= render 'shared/rss_link', url: category_feed_path(@category, format: 'rss'), text: 'Category RSS feed' %>
+
<%= reason.requires_other_post ? "yes" : "no" %> |
<%= reason.active ? "yes" : "no" %> |
- <%= link_to "edit", close_reason_path(id: reason.id), class: "button is-outlined" %>
+ <%= link_to "edit", close_reason_path(id: reason.id), class: "button is-outlined", 'aria-label': "Edit close reason #{reason.name}" %>
|
<% end %>
@@ -46,5 +46,5 @@
Do not add reasons where you're not sure that your community needs or wants them.
It's not possible to remove reasons, once created. They can only be deactivated.
- <%= link_to "add reason", new_close_reason_path(global: params[:global]), class: "button is-outlined" %>
+ <%= link_to "add reason", new_close_reason_path(global: params[:global]), class: "button is-outlined", 'aria-label': 'Add new close reason' %>
diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index 7dc7caad9..4d8e4f2c2 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -45,27 +45,27 @@
<% end %>
diff --git a/app/views/comments/_new_thread_modal.html.erb b/app/views/comments/_new_thread_modal.html.erb
index 5ba122f28..8ea24575f 100644
--- a/app/views/comments/_new_thread_modal.html.erb
+++ b/app/views/comments/_new_thread_modal.html.erb
@@ -20,11 +20,7 @@
Start the thread with a comment.
<%= text_area_tag :body, '', class: 'form-element js-comment-field', required: true,
data: { post: post.id, thread: '-1', character_count: ".js-character-count-#{post.id}" } %>
-
-
- 0 / 1000
-
+ <%= render 'shared/char_count', type: post.id, min: 15, max: 1000 %>
<%= label_tag :title, 'Comment thread title (optional)', class: 'form-element' %>
@@ -32,12 +28,7 @@
be shown.
<%= text_field_tag :title, '', class: 'form-element', data: { character_count: ".js-character-count-thread-title" } %>
-
-
-
- 0 / 255
-
+ <%= render 'shared/char_count', type: 'thread-title' %>
<%= submit_tag 'Create thread', class: 'button is-filled', id: "create_thread_button_#{post.id}", disabled: true %>
<% end %>
diff --git a/app/views/comments/_post.html.erb b/app/views/comments/_post.html.erb
index 4949f5012..4d7c00fcf 100644
--- a/app/views/comments/_post.html.erb
+++ b/app/views/comments/_post.html.erb
@@ -3,14 +3,14 @@
%>
<% comment_threads.each do |thread| %>
-
\ No newline at end of file
diff --git a/app/views/micro_auth/apps/index.html.erb b/app/views/micro_auth/apps/index.html.erb
index 8f9984adc..5e19d56f3 100644
--- a/app/views/micro_auth/apps/index.html.erb
+++ b/app/views/micro_auth/apps/index.html.erb
@@ -3,7 +3,7 @@
Your OAuth Apps
- <%= link_to new_oauth_app_path, class: 'button is-filled' do %>
+ <%= link_to new_oauth_app_path, class: 'button is-filled', 'aria-label': 'Create new OAuth App' do %>
Create
<% end %>
@@ -11,9 +11,9 @@
<% classes = 'button is-outlined is-muted' %>
<%= link_to 'yours', oauth_apps_path(request.query_parameters.except(:admin)),
- class: "#{classes} #{params[:admin].nil? ? 'is-active' : ''}" %>
+ class: "#{classes} #{params[:admin].nil? ? 'is-active' : ''}", 'aria-label': 'View your OAuth Apps' %>
<%= link_to 'admin', oauth_apps_path(request.query_parameters.merge(admin: true)),
- class: "#{classes} #{params[:admin].present? ? 'is-active' : ''}" %>
+ class: "#{classes} #{params[:admin].present? ? 'is-active' : ''}", 'aria-label': 'View Admin OAuth Apps' %>
<% end %>
- <%= submit_tag 'Search', class: 'button' %>
+ <%= button_tag type: :submit, class: 'button is-medium is-filled is-outlined', name: nil do %>
+
+ <% end %>
<% end %>
diff --git a/app/views/micro_auth/authentication/initiate.html.erb b/app/views/micro_auth/authentication/initiate.html.erb
index ff4f9222c..bc1e9bebb 100644
--- a/app/views/micro_auth/authentication/initiate.html.erb
+++ b/app/views/micro_auth/authentication/initiate.html.erb
@@ -24,5 +24,5 @@
You can choose to allow or deny this request.
-<%= link_to 'Allow', approve_oauth_path(request.query_parameters), method: :post, class: 'button is-green is-filled' %>
-<%= link_to 'Deny', reject_oauth_path, class: 'button is-danger is-outlined' %>
+<%= link_to 'Allow', approve_oauth_path(request.query_parameters), method: :post, class: 'button is-green is-filled', role: 'button' %>
+<%= link_to 'Deny', reject_oauth_path, class: 'button is-danger is-outlined', role: 'button' %>
diff --git a/app/views/mod_warning/current.html.erb b/app/views/mod_warning/current.html.erb
index c98f4bf93..f5f7eb3e9 100644
--- a/app/views/mod_warning/current.html.erb
+++ b/app/views/mod_warning/current.html.erb
@@ -10,7 +10,11 @@
<%= raw(sanitize(@warning.body_as_html, scrubber: scrubber)) %>
Your account has been temporarily suspended (ends in <%= time_ago_in_words(current_user.community_user.suspension_end) %>). We look forward to your return and continued contributions to the site after this period. In the event of continued rule violations after this period, your account may be suspended for longer periods. If you have any questions about this suspension or would like to dispute it, contact us.
- <%= link_to 'Sign Out', destroy_user_session_path, method: :delete, class: 'button is-danger is-outlined' %>
+ <% if devise_sign_in_enabled? %>
+ <%= link_to 'Sign Out', destroy_user_session_path, method: :delete, class: 'button is-danger is-outlined', role: 'button' %>
+ <% else %>
+ <%= link_to 'Sign Out', destroy_saml_user_session_path, method: :delete, class: 'button is-danger is-outlined', role: 'button' %>
+ <% end %>
<% else %>
@@ -27,7 +31,11 @@
<%= submit_tag 'Continue', class: 'button is-filled' %>
- <%= link_to 'Sign Out', destroy_user_session_path, method: :delete, class: 'button is-danger is-outlined' %>
+ <% if devise_sign_in_enabled? %>
+ <%= link_to 'Sign Out', destroy_user_session_path, method: :delete, class: 'button is-danger is-outlined', role: 'button' %>
+ <% else %>
+ <%= link_to 'Sign Out', destroy_saml_user_session_path, method: :delete, class: 'button is-danger is-outlined', role: 'button' %>
+ <% end %>
<% end %>
<% end %>
@@ -46,7 +54,11 @@
<%= submit_tag 'Continue', class: 'button is-filled' %>
- <%= link_to 'Sign Out', destroy_user_session_path, method: :delete, class: 'button is-danger is-outlined' %>
+ <% if devise_sign_in_enabled? %>
+ <%= link_to 'Sign Out', destroy_user_session_path, method: :delete, class: 'button is-danger is-outlined', role: 'button' %>
+ <% else %>
+ <%= link_to 'Sign Out', destroy_saml_user_session_path, method: :delete, class: 'button is-danger is-outlined', role: 'button' %>
+ <% end %>
<% end %>
<% end %>
\ No newline at end of file
diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb
index 0672c4558..33c2be2fb 100644
--- a/app/views/notifications/index.html.erb
+++ b/app/views/notifications/index.html.erb
@@ -1,3 +1,5 @@
+<%= render 'users/tabs', user: current_user %>
+
Your Inbox
You'll find all your inbox messages here, as far back as your account goes.
diff --git a/app/views/pinned_links/_form.html.erb b/app/views/pinned_links/_form.html.erb
index a69f010bb..80a3191e6 100644
--- a/app/views/pinned_links/_form.html.erb
+++ b/app/views/pinned_links/_form.html.erb
@@ -48,5 +48,5 @@
<%= f.submit "Update", class: "button is-filled" %>
- <%= link_to "Cancel", pinned_links_path(global: params[:global]), class: "button" %>
+ <%= link_to "Cancel", pinned_links_path(global: params[:global]), class: "button", role: 'button' %>
<% end %>
\ No newline at end of file
diff --git a/app/views/post_history/post.html.erb b/app/views/post_history/post.html.erb
index 5e2b284d6..c31b586ea 100644
--- a/app/views/post_history/post.html.erb
+++ b/app/views/post_history/post.html.erb
@@ -1,11 +1,15 @@
+<% @show_content = !!defined?(show_content) ? show_content : true %>
+
Post History
+<% if @show_content %>
<%= render 'posts/type_agnostic', post: @post, show_category_tag: true, show_type_tag: true, last_activity: false %>
+<% end %>
<% @history.each.with_index do |event, index| %>
-
+
#<%= @history.size - index %>: <%= event.post_history_type.name.humanize %>
@@ -24,15 +28,45 @@
<%= event.comment %>
<% end %>
+ <%= render 'shared/copy_link', classes: ["button", "is-small", "is-muted", "is-outlined"],
+ desc: "Copy a permanent link to revision #{@history.size - index}",
+ id: "#{@post.id}-#{@history.size - index}",
+ md: post_history_share_link_md(@post, @history, index),
+ raw: post_history_share_link(@post, @history, index)
+ %>
- <% if (event.before_title.present? || event.after_title.present?) && event.before_title != event.after_title %>
- <%= render 'diff', before: event.before_title, after: event.after_title, post: @post %>
- <% end %>
- <% if (event.before_state.present? || event.after_state.present?) && event.before_state != event.after_state %>
- <%= render 'diff', before: event.before_state, after: event.after_state, post: @post %>
- <% end %>
- <% if (event.before_tags.present? || event.after_tags.present?) && event.before_tags != event.after_tags %>
- <%= render 'diff', before: event.before_tags, after: event.after_tags, post: @post %>
+ <% if event.allowed_to_see_details?(current_user) %>
+ <% if event.hidden? %>
+
+
Hidden revision
+
+ This revision is hidden because of a redaction. You have access to the details because
+ <% if current_user == event.user %>
+ you performed the redaction,
+ <% elsif current_user == @post.user %>
+ you are the post author,
+ <% elsif current_user&.is_admin %>
+ you are an administrator,
+ <% end %>
+ but you should not share this revision with others.
+
+
+ The detailed changes of this event are hidden because of a redaction.
+
<% end %>
<% end %>
diff --git a/app/views/posts/_article_list.html.erb b/app/views/posts/_article_list.html.erb
index d8deeaf56..fb48d014d 100644
--- a/app/views/posts/_article_list.html.erb
+++ b/app/views/posts/_article_list.html.erb
@@ -3,7 +3,7 @@
<% @show_category_tag = !!defined?(show_category_tag) ? show_category_tag : false %>
<% @last_activity = !!defined?(last_activity) ? last_activity : true %>
-
+
<%= (post.score * 100).to_i %>%
@@ -17,7 +17,7 @@
<% if @show_category_tag %>
- <%= defined?(@category) ? @category.name : post.category.name %>
+ <%= post.category.name %>
<% end %>
<%= link_to post.title, generic_share_link(post), 'data-ckb-item-link' => '' %>
diff --git a/app/views/posts/_edit_comment.html.erb b/app/views/posts/_edit_comment.html.erb
new file mode 100644
index 000000000..80a952ccd
--- /dev/null
+++ b/app/views/posts/_edit_comment.html.erb
@@ -0,0 +1,39 @@
+<%#
+ Edit comment reusable partial.
+ Variables:
+ comment : [String, Nil] optional, initial value of the field (default '')
+ cur_length : [Integer, Nil] optional, current character length (default 0)
+ min_length : [Integer, Nil] optional, the minimum allowed length (default 0)
+ max_length : [Integer, Nil] optional, the maximum allowed length (default 255)
+%>
+
+<%
+ # Defaults
+ comment = (defined?(comment) ? comment : nil) || ''
+ cur_length = (defined?(cur_length) ? cur_length : nil) || 0
+ min_length = (defined?(min_length) ? min_length : nil) || 0
+ max_length = (defined?(max_length) ? max_length : nil) || 255
+%>
+
+
+
\ No newline at end of file
diff --git a/app/views/posts/_expanded.html.erb b/app/views/posts/_expanded.html.erb
index 82733701f..5f28e9d23 100644
--- a/app/views/posts/_expanded.html.erb
+++ b/app/views/posts/_expanded.html.erb
@@ -18,7 +18,7 @@
<% title = post.title +
(post.closed && !post.duplicate_post ? " [closed]" : "") +
(post.duplicate_post ? " [duplicate]" : "") %>
-
<%= title %>
+
<%= title %>
<% if category.display_post_types.reject { |e| e.to_s.empty? }.size > 1 %>
<%= post_type_badge(post_type) %>
<% end %>
@@ -36,33 +36,35 @@
<% end %>
- <% if post_type.has_votes %>
+ <% if post_type.has_votes || (user_signed_in? && post.post_type.has_reactions && post.post_type.reactions.any?) %>
-
- <% existing_vote = my_vote(post) %>
- <% unless post.locked? %>
-
- <% end %>
-
- +<%= post.upvote_count %>
-
-
- −<%= post.downvote_count %>
+ <% if post_type.has_votes %>
+
+ <% existing_vote = my_vote(post) %>
+ <% unless post.locked? %>
+
+ <% end %>
+
+ +<%= post.upvote_count %>
+
+
+ −<%= post.downvote_count %>
+
+ <% unless post.locked? %>
+
+ <% end %>
- <% unless post.locked? %>
-
- <% end %>
-
+ <% end %>
<% if user_signed_in? && post.post_type.has_reactions && post.post_type.reactions.any? %>
<% unless post.locked? %>
@@ -83,6 +85,15 @@
<%= render('reactions/list', post: post) if post.reactions %>
<% if post_type.is_closeable && post.closed %>
+ <% if current_user == post.user %>
+
+
+
+ <%= t 'posts.post_closed_guidance' %>
+
+
+ <% end %>
+
Closed
@@ -123,7 +134,7 @@
<% end %>
-
Users with the Curate privilege may vote to undelete this post if it has been deleted incorrectly.
+
Users with the Curate privilege may vote to restore this post if it has been deleted incorrectly.
<% end %>
@@ -134,22 +145,42 @@
on <%= post.locked_at.strftime('%b %e, %Y at %H:%M') %>.
- <% end %>
+ <% end %>
+ <% if post.spam_flag_pending? && user_signed_in? %>
+
+ <% if post.user == current_user %>
+
Your post has been flagged by members of our community. Please review our guidelines for promotional content.
+ <% else %>
+
Possible spam: this post has pending flags for spam. Be careful when following links.
+ <% end %>
+
+ <% end %>
<% if post_type.is_public_editable && post.pending_suggested_edit? %>
<% if check_your_post_privilege(post, 'edit_posts') %>
- <% elsif post.pending_suggested_edit.user.id == current_user&.id %>
+ <% elsif post.pending_suggested_edit.user&.id == current_user&.id %>
-
Your suggested edit on this post is <%= link_to 'pending review', suggested_edit_url(post.pending_suggested_edit.id) %>.
+
+
+ Your suggested edit on this post is
+ <%= link_to 'pending review', suggested_edit_url(post.pending_suggested_edit.id) %>.
<% end %>
- <% end %>
+ <% end %>
-
- <%= raw(sanitize(post.body, scrubber: scrubber)) %>
+
+ <% effective_post = raw(sanitize(post.body, scrubber: scrubber)) %>
+ <% if post.spam_flag_pending? && !user_signed_in? %>
+ <%= sanitize(effective_post, attributes: %w()) %>
+ <% else %>
+ <%= effective_post %>
+ <% end %>
<% been_edited = post.last_edited_by_id != nil %>
<% if been_edited then last_edited_by_self = post.user_id == post.last_edited_by_id end %>
@@ -200,11 +231,12 @@
- <%= link_to generic_share_link(post), class: 'tools--item js-permalink' do %>
-
-
Permalink
- <% end %>
- <%= link_to post_history_path(post), class: 'tools--item' do %>
+ <%= render "shared/copy_link", classes: ["tools--item"],
+ desc: "Copy a permanent link to this post",
+ id: post.id,
+ md: generic_share_link_md(post),
+ raw: generic_share_link(post) %>
+ <%= link_to post_history_path(post), class: 'tools--item', 'aria-label': 'View history of this post' do %>
History
<% end %>
@@ -216,7 +248,7 @@
Review suggested edit
<% end %>
<% else %>
- <%= link_to edit_post_path(post), class: 'tools--item' do %>
+ <%= link_to edit_post_path(post), class: 'tools--item', 'aria-label': 'Edit this post' do %>
Edit
<% end %>
@@ -224,8 +256,13 @@
<% elsif !current_user.nil? %>
<% if post.pending_suggested_edit? %>
suggested edit pending...
+ <% elsif post_type.is_freely_editable %>
+ <%= link_to edit_post_path(post), class: 'tools--item', 'aria-label': 'Edit this post' do %>
+
+ Edit
+ <% end %>
<% else %>
- <%= link_to edit_post_path(post), class: 'tools--item' do %>
+ <%= link_to edit_post_path(post), class: 'tools--item', 'aria-label': 'Suggest edit to this post' do %>
Suggest edit
<% end %>
@@ -233,7 +270,7 @@
<% end %>
<% end %>
<% if user_signed_in? %>
-
+
Flag
@@ -241,12 +278,12 @@
<% unless post.locked? || !post_type.is_closeable %>
<% if check_your_privilege('flag_close') || (post.user_id === current_user&.id)%>
<% if !post.closed %>
-
+
Close
<% elsif post.closed %>
- <%= link_to reopen_post_path(post), method: :post, class: 'reopen-question tools--item' do %>
+ <%= link_to reopen_post_path(post), method: :post, class: 'reopen-question tools--item', role: 'button', 'aria-label': 'Reopen this post' do %>
Reopen
<% end %>
@@ -257,13 +294,15 @@
<% unless post.locked? %>
<% if !post.deleted %>
<%= link_to delete_post_path(post), method: :post,
- data: { confirm: 'Are you sure you want to delete this post?' }, class: "tools--item is-danger" do %>
+ data: { confirm: 'Are you sure you want to delete this post?' }, class: "tools--item is-danger",
+ role: 'button', 'aria-label': 'Delete this post' do %>
Delete
<% end %>
<% else %>
<%= link_to restore_post_path(post), method: :post,
- data: { confirm: 'Restore this post, making it visible to regular users?' }, class: "tools--item is-danger is-filled" do %>
+ data: { confirm: 'Restore this post, making it visible to regular users?' }, class: "tools--item is-danger is-filled",
+ role: 'button', 'aria-label': 'Restore this post' do %>
Restore
<% end %>
@@ -271,7 +310,7 @@
<% end %>
<% end %>
<% if check_your_privilege('flag_curate') %>
-
+
Tools
@@ -288,7 +327,7 @@
end %>
<% if flags_count > 0 %>
-
+
Show <%= pluralize(flags_count - own_flags_count, 'flag') %>
@@ -299,9 +338,26 @@