paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-11 17:36:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Rename set_realm_filters().

Browse Source 
This name was misleading, because we weren't
actually setting realm_filters (that's what
`page_params.realm_filters = realm_filters`
is for); we were instead updating our
realm filter rules.
This commit is contained in:
Steve Howell
2020-02-17 13:43:59 +00:00
committed by Tim Abbott
parent 43c1c285f2
commit d55510b57d
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend_tests/node_tests/dispatch.js
View File

@@ -19,7 +19,7 @@ set_global('echo', {
}); });
set_global('markdown', { set_global('markdown', {
set_realm_filters: noop, update_realm_filter_rules: noop,
}); });
set_global('notifications', { set_global('notifications', {

8
frontend_tests/node_tests/markdown.js
View File

@@ -570,19 +570,19 @@ run_test('backend_only_realm_filters', () => {
run_test('python_to_js_filter', () => { run_test('python_to_js_filter', () => {
// The only way to reach python_to_js_filter is indirectly, hence the call // The only way to reach python_to_js_filter is indirectly, hence the call
// to set_realm_filters. // to update_realm_filter_rules.
markdown.set_realm_filters([['/a(?im)a/g'], ['/a(?L)a/g']]); markdown.update_realm_filter_rules([['/a(?im)a/g'], ['/a(?L)a/g']]);
let actual_value = marked.InlineLexer.rules.zulip.realm_filters; let actual_value = marked.InlineLexer.rules.zulip.realm_filters;
let expected_value = [/\/aa\/g(?![\w])/gim, /\/aa\/g(?![\w])/g]; let expected_value = [/\/aa\/g(?![\w])/gim, /\/aa\/g(?![\w])/g];
assert.deepEqual(actual_value, expected_value); assert.deepEqual(actual_value, expected_value);
// Test case with multiple replacements. // Test case with multiple replacements.
markdown.set_realm_filters([['#cf(?P<contest>[0-9]+)(?P<problem>[A-Z][0-9A-Z]*)', 'http://google.com']]); markdown.update_realm_filter_rules([['#cf(?P<contest>[0-9]+)(?P<problem>[A-Z][0-9A-Z]*)', 'http://google.com']]);
actual_value = marked.InlineLexer.rules.zulip.realm_filters; actual_value = marked.InlineLexer.rules.zulip.realm_filters;
expected_value = [/#cf([0-9]+)([A-Z][0-9A-Z]*)(?![\w])/g]; expected_value = [/#cf([0-9]+)([A-Z][0-9A-Z]*)(?![\w])/g];
assert.deepEqual(actual_value, expected_value); assert.deepEqual(actual_value, expected_value);
// Test incorrect syntax. // Test incorrect syntax.
blueslip.set_test_data('error', 'python_to_js_filter: Invalid regular expression: /!@#@(!#&((!&(@#((?![\\w])/: Unterminated group'); blueslip.set_test_data('error', 'python_to_js_filter: Invalid regular expression: /!@#@(!#&((!&(@#((?![\\w])/: Unterminated group');
markdown.set_realm_filters([['!@#@(!#&((!&(@#(', 'http://google.com']]); markdown.update_realm_filter_rules([['!@#@(!#&((!&(@#(', 'http://google.com']]);
actual_value = marked.InlineLexer.rules.zulip.realm_filters; actual_value = marked.InlineLexer.rules.zulip.realm_filters;
expected_value = []; expected_value = [];
assert.deepEqual(actual_value, expected_value); assert.deepEqual(actual_value, expected_value);

2
frontend_tests/node_tests/server_events.js
View File

@@ -27,7 +27,7 @@ set_global('echo', {
process_from_server: function (messages) { process_from_server: function (messages) {
return messages; return messages;
}, },
set_realm_filters: noop, update_realm_filter_rules: noop,
}); });
set_global('ui_report', { set_global('ui_report', {
hide_error: function () { return false; }, hide_error: function () { return false; },

4
static/js/markdown.js
View File

@@ -357,7 +357,7 @@ function python_to_js_filter(pattern, url) {
return [final_regex, url]; return [final_regex, url];
} }
exports.set_realm_filters = function (realm_filters) { exports.update_realm_filter_rules = function (realm_filters) {
// Update the marked parser with our particular set of realm filters // Update the marked parser with our particular set of realm filters
realm_filter_map.clear(); realm_filter_map.clear();
realm_filter_list = []; realm_filter_list = [];
@@ -446,7 +446,7 @@ exports.initialize = function () {
// Disable autolink as (a) it is not used in our backend and (b) it interferes with @mentions // Disable autolink as (a) it is not used in our backend and (b) it interferes with @mentions
disable_markdown_regex(marked.InlineLexer.rules.zulip, 'autolink'); disable_markdown_regex(marked.InlineLexer.rules.zulip, 'autolink');
exports.set_realm_filters(page_params.realm_filters); exports.update_realm_filter_rules(page_params.realm_filters);
// Tell our fenced code preprocessor how to insert arbitrary // Tell our fenced code preprocessor how to insert arbitrary
// HTML into the output. This generated HTML is safe to not escape // HTML into the output. This generated HTML is safe to not escape

2
static/js/server_events_dispatch.js
View File

@@ -220,7 +220,7 @@ exports.dispatch_normal_event = function dispatch_normal_event(event) {
case 'realm_filters': case 'realm_filters':
page_params.realm_filters = event.realm_filters; page_params.realm_filters = event.realm_filters;
markdown.set_realm_filters(page_params.realm_filters); markdown.update_realm_filter_rules(page_params.realm_filters);
settings_linkifiers.populate_filters(page_params.realm_filters); settings_linkifiers.populate_filters(page_params.realm_filters);
break; break;