mirror of
https://github.com/discourse/discourse.git
synced 2024-12-01 12:03:43 +08:00
862007fb18
* FEATURE: Add case-sensitivity flag to watched_words Currently, all watched words are matched case-insensitively. This flag allows a watched word to be flagged for case-sensitive matching. To allow allow for backwards compatibility the flag is set to false by default. * FEATURE: Support case-sensitive creation of Watched Words via API Extend admin creation and upload of Watched Words to support case sensitive flag. This lays the ground work for supporting case-insensitive matching of Watched Words. Support for an extra column has also been introduced for the Watched Words upload CSV file. The new column structure is as follows: word,replacement,case_sentive * FEATURE: Enable case-sensitive matching of Watched Words WordWatcher's word_matcher_regexp now returns a list of regular expressions instead of one case-insensitive regular expression. With the ability to flag a Watched Word as case-sensitive, an action can have words of both sensitivities.This makes the use of the global Regexp::IGNORECASE flag added to all words problematic. To get around platform limitations around the use of subexpression level switches/flags, a list of regular expressions is returned instead, one for each case sensitivity. Word matching has also been updated to use this list of regular expressions instead of one. * FEATURE: Use case-sensitive regular expressions for Watched Words Update Watched Words regular expressions matching and processing to handle the extra metadata which comes along with the introduction of case-sensitive Watched Words. This allows case-sensitive Watched Words to matched as such. * DEV: Simplify type casting of case-sensitive flag from uploads Use builtin semantics instead of a custom method for converting string case flags in uploaded Watched Words to boolean. * UX: Add case-sensitivity details to Admin Watched Words UI Update Watched Word form to include a toggle for case-sensitivity. This also adds support for, case-sensitive testing and matching of Watched Word in the admin UI. * DEV: Code improvements from review feedback - Extract watched word regex creation out to a utility function - Make JS array presence check more explicit and readable * DEV: Extract Watched Word regex creation to utility function Clean-up work from review feedback. Reduce code duplication. * DEV: Rename word_matcher_regexp to word_matcher_regexp_list Since a list is returned now instead of a single regular expression, change `word_matcher_regexp` to `word_matcher_regexp_list` to better communicate this change. * DEV: Incorporate WordWatcher updates from upstream Resolve conflicts and ensure apply_to_text does not remove non-word characters in matches that aren't at the beginning of the line.
102 lines
3.1 KiB
Ruby
102 lines
3.1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'csv'
|
|
|
|
class Admin::WatchedWordsController < Admin::AdminController
|
|
skip_before_action :check_xhr, only: [:download]
|
|
|
|
def index
|
|
watched_words = WatchedWord.by_action
|
|
watched_words = watched_words.where.not(action: WatchedWord.actions[:tag]) if !SiteSetting.tagging_enabled
|
|
render_json_dump WatchedWordListSerializer.new(watched_words, scope: guardian, root: false)
|
|
end
|
|
|
|
def create
|
|
watched_word = WatchedWord.create_or_update_word(watched_words_params)
|
|
if watched_word.valid?
|
|
StaffActionLogger.new(current_user).log_watched_words_creation(watched_word)
|
|
render json: watched_word, root: false
|
|
else
|
|
render_json_error(watched_word)
|
|
end
|
|
end
|
|
|
|
def destroy
|
|
watched_word = WatchedWord.find_by(id: params[:id])
|
|
raise Discourse::InvalidParameters.new(:id) unless watched_word
|
|
watched_word.destroy!
|
|
StaffActionLogger.new(current_user).log_watched_words_deletion(watched_word)
|
|
render json: success_json
|
|
end
|
|
|
|
def upload
|
|
file = params[:file] || params[:files].first
|
|
action_key = params[:action_key].to_sym
|
|
has_replacement = WatchedWord.has_replacement?(action_key)
|
|
|
|
Scheduler::Defer.later("Upload watched words") do
|
|
begin
|
|
CSV.foreach(file.tempfile, encoding: "bom|utf-8") do |row|
|
|
if row[0].present? && (!has_replacement || row[1].present?)
|
|
watched_word = WatchedWord.create_or_update_word(
|
|
word: row[0],
|
|
replacement: has_replacement ? row[1] : nil,
|
|
action_key: action_key,
|
|
case_sensitive: "true" == row[2]&.strip&.downcase
|
|
)
|
|
if watched_word.valid?
|
|
StaffActionLogger.new(current_user).log_watched_words_creation(watched_word)
|
|
end
|
|
end
|
|
end
|
|
|
|
data = { url: '/ok' }
|
|
rescue => e
|
|
data = failed_json.merge(errors: [e.message])
|
|
end
|
|
MessageBus.publish("/uploads/txt", data.as_json, client_ids: [params[:client_id]])
|
|
end
|
|
|
|
render json: success_json
|
|
end
|
|
|
|
def download
|
|
params.require(:id)
|
|
name = watched_words_params[:id].to_sym
|
|
action = WatchedWord.actions[name]
|
|
raise Discourse::NotFound if !action
|
|
|
|
content = WatchedWord.where(action: action)
|
|
if WatchedWord.has_replacement?(name)
|
|
content = content.pluck(:word, :replacement).map(&:to_csv).join
|
|
else
|
|
content = content.pluck(:word).join("\n")
|
|
end
|
|
|
|
headers['Content-Length'] = content.bytesize.to_s
|
|
send_data content,
|
|
filename: "#{Discourse.current_hostname}-watched-words-#{name}.csv",
|
|
content_type: "text/csv"
|
|
end
|
|
|
|
def clear_all
|
|
params.require(:id)
|
|
name = watched_words_params[:id].to_sym
|
|
action = WatchedWord.actions[name]
|
|
raise Discourse::NotFound if !action
|
|
|
|
WatchedWord.where(action: action).find_each do |watched_word|
|
|
watched_word.destroy!
|
|
StaffActionLogger.new(current_user).log_watched_words_deletion(watched_word)
|
|
end
|
|
WordWatcher.clear_cache!
|
|
render json: success_json
|
|
end
|
|
|
|
private
|
|
|
|
def watched_words_params
|
|
params.permit(:id, :word, :replacement, :action_key, :case_sensitive)
|
|
end
|
|
end
|