mirror of
https://github.com/discourse/discourse.git
synced 2025-03-03 09:49:42 +00:00
* 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.
76 lines
2.0 KiB
JavaScript
76 lines
2.0 KiB
JavaScript
import Controller from "@ember/controller";
|
|
import ModalFunctionality from "discourse/mixins/modal-functionality";
|
|
import discourseComputed from "discourse-common/utils/decorators";
|
|
import { equal } from "@ember/object/computed";
|
|
import {
|
|
createWatchedWordRegExp,
|
|
toWatchedWord,
|
|
} from "discourse-common/utils/watched-words";
|
|
|
|
export default Controller.extend(ModalFunctionality, {
|
|
isReplace: equal("model.nameKey", "replace"),
|
|
isTag: equal("model.nameKey", "tag"),
|
|
isLink: equal("model.nameKey", "link"),
|
|
|
|
@discourseComputed(
|
|
"value",
|
|
"model.compiledRegularExpression",
|
|
"model.words",
|
|
"isReplace",
|
|
"isTag",
|
|
"isLink"
|
|
)
|
|
matches(value, regexpList, words, isReplace, isTag, isLink) {
|
|
if (!value || regexpList.length === 0) {
|
|
return [];
|
|
}
|
|
|
|
if (isReplace || isLink) {
|
|
const matches = [];
|
|
words.forEach((word) => {
|
|
const regexp = createWatchedWordRegExp(word);
|
|
let match;
|
|
|
|
while ((match = regexp.exec(value)) !== null) {
|
|
matches.push({
|
|
match: match[1],
|
|
replacement: word.replacement,
|
|
});
|
|
}
|
|
});
|
|
return matches;
|
|
} else if (isTag) {
|
|
const matches = {};
|
|
words.forEach((word) => {
|
|
const regexp = createWatchedWordRegExp(word);
|
|
let match;
|
|
|
|
while ((match = regexp.exec(value)) !== null) {
|
|
if (!matches[match[1]]) {
|
|
matches[match[1]] = new Set();
|
|
}
|
|
|
|
let tags = matches[match[1]];
|
|
word.replacement.split(",").forEach((tag) => {
|
|
tags.add(tag);
|
|
});
|
|
}
|
|
});
|
|
|
|
return Object.entries(matches).map((entry) => ({
|
|
match: entry[0],
|
|
tags: Array.from(entry[1]),
|
|
}));
|
|
} else {
|
|
let matches = [];
|
|
regexpList.forEach((regexp) => {
|
|
const wordRegexp = createWatchedWordRegExp(toWatchedWord(regexp));
|
|
|
|
matches.push(...(value.match(wordRegexp) || []));
|
|
});
|
|
|
|
return matches;
|
|
}
|
|
},
|
|
});
|