mirror of
https://github.com/discourse/discourse.git
synced 2024-11-25 10:20:58 -06: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.
25 lines
616 B
Ruby
25 lines
616 B
Ruby
# frozen_string_literal: true
|
|
|
|
class WatchedWordListSerializer < ApplicationSerializer
|
|
attributes :actions, :words, :compiled_regular_expressions
|
|
|
|
def actions
|
|
SiteSetting.tagging_enabled ? WatchedWord.actions.keys
|
|
: WatchedWord.actions.keys.filter { |k| k != :tag }
|
|
end
|
|
|
|
def words
|
|
object.map do |word|
|
|
WatchedWordSerializer.new(word, root: false)
|
|
end
|
|
end
|
|
|
|
def compiled_regular_expressions
|
|
expressions = {}
|
|
actions.each do |action|
|
|
expressions[action] = WordWatcher.serializable_word_matcher_regexp(action)
|
|
end
|
|
expressions
|
|
end
|
|
end
|