Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
44,243 Commits 28 Branches 143 Tags 605 MiB
Commit Graph

35 Commits

Author SHA1 Message Date
Riken Shah 37b265495b alert_words: Revert back `before_punctuation` regex to stable one. 
In this 009b7bca24 commit `before_punctuation`
regex was updated to use lookbehind feature of regex.

This caused a regex error in some browsers (reported in
Safari) because lookbehind feature is not yet supported
on all the browsers (https://caniuse.com/js-regexp-lookbehind).

This commit fixes that error by reverting to stable regex which
works on all the browsers.
 2021-05-06 20:36:52 -07:00
im-adithya 009b7bca24 alert_words: Fix highlighting of adjacent alert words. 
This prevents the regex from requiring multiple spaces between
adjacent alert words by using lookahead and lookbehind (rather than
the before/after checks each needing to eat a whitespace character) so
that consecutive alert words (if any) can be highlighted.

With a frontend test covering adjacent corner cases by tabbott.

Fixes #17320
 2021-04-28 07:54:50 -07:00
Anders Kaseorg 5655e326c9 js: Convert static/js/alert_words.js to ES6 module. 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2021-02-10 10:27:14 -08:00
Anders Kaseorg 81d21068b5 eslint: Fix no-useless-concat. 
https://eslint.org/docs/rules/no-useless-concat

And add some escaping to static/js/markdown.js while I’m here.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2020-10-07 16:00:33 -07:00
Anders Kaseorg 48f5e5179a eslint: Fix unicorn/prefer-string-slice. 
https://github.com/sindresorhus/eslint-plugin-unicorn/blob/master/docs/rules/prefer-string-slice.md

Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2020-10-07 16:00:33 -07:00
Priyank Patel b7998d3160 js: Purge people module from window. 2020-09-01 19:55:58 -07:00
Anders Kaseorg 6ec808b8df js: Add "use strict" directive to CommonJS files. 
ES and TypeScript modules are strict by default and don’t need this
directive.  ESLint will remind us to add it to new CommonJS files and
remove it from ES and TypeScript modules.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2020-07-31 22:09:46 -07:00
Anders Kaseorg 4a26bde4bd alert_words: Replace escape_user_regex with _.escapeRegExp. 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2020-07-29 17:26:42 -07:00
Anders Kaseorg b65d2e063d js: Reformat with Prettier. 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2020-07-17 14:31:25 -07:00
Anders Kaseorg f3726db89a js: Normalize strings to double quotes. 
Prettier would do this anyway, but it’s separated out for a more
reviewable diff.  Generated by ESLint.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2020-07-17 14:31:24 -07:00
Anders Kaseorg 569b38fe34 js: Fix no-useless-escape errors. 
Generated manually, since ESLint doesn’t have a fixer for this.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2020-07-17 14:30:52 -07:00
Anders Kaseorg a79322bc94 eslint: Enable prefer-arrow-callback. 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2020-07-03 16:55:50 -07:00
Steve Howell 1f156230b0 refactor: Clean up alert_words API. 
We add these two functions to the API,
so that we no longer have `alert_words_ui`
using private data from `alert_word`:

    alert_words.has_alert_word()
    alert_words.get_word_list()

And to initialize the data, we have a proper
`initialize` method that is passed in only
the parameters that it needs from `ui_init`.

(We also move the step of deleting `alert_words`
from `page_params` to the `ui_init` module.)

Because it's a bit less cumbersome to initialize
`alert_words`, we now just it directly in the
node tests for `alert_words_ui`.
 2020-02-27 11:10:13 -08:00
Anders Kaseorg 02511bff1c js: Automatically convert _.each to for…of. 
This commit was automatically generated by the following script,
followed by lint --fix and a few small manual lint-related cleanups.

import * as babelParser from "recast/parsers/babel";
import * as recast from "recast";
import * as tsParser from "recast/parsers/typescript";
import { builders as b, namedTypes as n } from "ast-types";
import { Context } from "ast-types/lib/path-visitor";
import K from "ast-types/gen/kinds";
import { NodePath } from "ast-types/lib/node-path";
import assert from "assert";
import fs from "fs";
import path from "path";
import process from "process";

const checkExpression = (node: n.Node): node is K.ExpressionKind =>
  n.Expression.check(node);
const checkStatement = (node: n.Node): node is K.StatementKind =>
  n.Statement.check(node);

for (const file of process.argv.slice(2)) {
  console.log("Parsing", file);
  const ast = recast.parse(fs.readFileSync(file, { encoding: "utf8" }), {
    parser: path.extname(file) === ".ts" ? tsParser : babelParser,
  });
  let changed = false;
  let inLoop = false;
  let replaceReturn = false;

  const visitLoop = (...args: string[]) =>
    function(this: Context, path: NodePath) {
      for (const arg of args) {
        this.visit(path.get(arg));
      }
      const old = { inLoop };
      inLoop = true;
      this.visit(path.get("body"));
      inLoop = old.inLoop;
      return false;
    };

  recast.visit(ast, {
    visitDoWhileStatement: visitLoop("test"),

    visitExpressionStatement(path) {
      const { expression, comments } = path.node;
      let valueOnly;
      if (
        n.CallExpression.check(expression) &&
        n.MemberExpression.check(expression.callee) &&
        !expression.callee.computed &&
        n.Identifier.check(expression.callee.object) &&
        expression.callee.object.name === "_" &&
        n.Identifier.check(expression.callee.property) &&
        ["each", "forEach"].includes(expression.callee.property.name) &&
        [2, 3].includes(expression.arguments.length) &&
        checkExpression(expression.arguments[0]) &&
        (n.FunctionExpression.check(expression.arguments[1]) ||
          n.ArrowFunctionExpression.check(expression.arguments[1])) &&
        [1, 2].includes(expression.arguments[1].params.length) &&
        n.Identifier.check(expression.arguments[1].params[0]) &&
        ((valueOnly = expression.arguments[1].params[1] === undefined) ||
          n.Identifier.check(expression.arguments[1].params[1])) &&
        (expression.arguments[2] === undefined ||
          n.ThisExpression.check(expression.arguments[2]))
      ) {
        const old = { inLoop, replaceReturn };
        inLoop = false;
        replaceReturn = true;
        this.visit(
          path
            .get("expression")
            .get("arguments")
            .get(1)
            .get("body")
        );
        inLoop = old.inLoop;
        replaceReturn = old.replaceReturn;

        const [right, { body, params }] = expression.arguments;
        const loop = b.forOfStatement(
          b.variableDeclaration("let", [
            b.variableDeclarator(
              valueOnly ? params[0] : b.arrayPattern([params[1], params[0]])
            ),
          ]),
          valueOnly
            ? right
            : b.callExpression(
                b.memberExpression(right, b.identifier("entries")),
                []
              ),
          checkStatement(body) ? body : b.expressionStatement(body)
        );
        loop.comments = comments;
        path.replace(loop);
        changed = true;
      }
      this.traverse(path);
    },

    visitForStatement: visitLoop("init", "test", "update"),

    visitForInStatement: visitLoop("left", "right"),

    visitForOfStatement: visitLoop("left", "right"),

    visitFunction(path) {
      this.visit(path.get("params"));
      const old = { replaceReturn };
      replaceReturn = false;
      this.visit(path.get("body"));
      replaceReturn = old.replaceReturn;
      return false;
    },

    visitReturnStatement(path) {
      if (replaceReturn) {
        assert(!inLoop); // could use labeled continue if this ever fires
        const { argument, comments } = path.node;
        if (argument === null) {
          const s = b.continueStatement();
          s.comments = comments;
          path.replace(s);
        } else {
          const s = b.expressionStatement(argument);
          s.comments = comments;
          path.replace(s, b.continueStatement());
        }
        return false;
      }
      this.traverse(path);
    },

    visitWhileStatement: visitLoop("test"),
  });

  if (changed) {
    console.log("Writing", file);
    fs.writeFileSync(file, recast.print(ast).code, { encoding: "utf8" });
  }
}

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
 2020-02-07 14:09:47 -08:00
Anders Kaseorg 28f3dfa284 js: Automatically convert var to let and const in most files. 
This commit was originally automatically generated using `tools/lint
--only=eslint --fix`.  It was then modified by tabbott to contain only
changes to a set of files that are unlikely to result in significant
merge conflicts with any open pull request, excluding about 20 files.
His plan is to merge the remaining changes with more precise care,
potentially involving merging parts of conflicting pull requests
before running the `eslint --fix` operation.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
 2019-11-03 12:42:39 -08:00
Anders Kaseorg d17b577d0c js: Purge useless IIFEs. 
With webpack, variables declared in each file are already file-local
(Global variables need to be explicitly exported), so these IIFEs are
no longer needed.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
 2019-10-25 13:51:21 -07:00
Anders Kaseorg 190524b6a0 alert_words.js: Add setter for words. 
After migration to an ES6 module, `words` would no longer be mutable
from outside the module.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
 2019-07-08 21:22:54 -07:00
Tim Abbott 838dd6d273 lint: Add eslint enforcement for comma-spacing. 
We've been enforcing this manually for a long time, and hadn't
realized it was missing from our eslint configuration.
 2018-12-07 12:22:24 -08:00
Armaan Ahluwalia 6d255efe4c app: Prepare JS files for consumption by webpack. 
This commit prepares the frontend code to be consumed by webpack.

It is a hack: In theory, modules should be declaring and importing the
modules they depend on and the globals they expose directly.

However, that requires significant per-module work, which we don't
really want to block moving our toolchain to webpack on.

So we expose the modules by setting window.varName = varName; as
needed in the js files.
 2018-07-05 10:53:36 +02:00
Steve Howell 52299ce987 Highlight alert words in mentions you send to yourself. 
Fixes #6946.
 2017-10-12 14:03:36 -07:00
Harshit Bansal a13535ff1f alert_words: Don't muck up rendered HTML content while munging. 
Prior to this we were also performing highlighting inside HTML tags
which was wrong and causing weird behavior. Like, for example, if
someone added `emoji` as an alert word then any message containing
both emoji and alert word was rendered with a jumbo emoji.

Fixes: #4357.
 2017-07-31 21:20:21 -07:00
Harshit Bansal d5ab8ac1e1 alert_words: Remove the `page_params.alert_words` after initialization. 
We remove the `page_params.alert_words` since `alert_words.words`
is the sole source of alert words. Use of `page_params.alert_words`
could lead to bugs when alert words are updated since it is not updated.
 2017-06-13 16:36:11 -07:00
Steve Howell 73125e2718 refactor: Move is_current_user() to people.js. 
We no longer have it in util.js, because we will
want to encapsulate this better for upcoming commits
related to email changes.
 2017-01-21 21:45:12 -08:00
Rafid Aslam 0290aeb6ab lint: Fix several no-unused-vars eslint rule violations. 
These changes were extracted by tabbott from the original commit
to merge now because they have been reviewed as safe.
 2016-12-03 18:43:47 -08:00
AZtheAsian 9c0ebc7359 eslint: change no-else-return to error and fix violations 2016-12-02 14:43:09 -08:00
Tommy Ip b3f4feb996 eslint: change max-len from warning to error and fix violations. 2016-12-02 14:16:33 +00:00
Tim Abbott b25562ca1d Add and use util.is_current_user helper function. 
Previously, we were checking if a particular user was the current user
in dozens of places in the codebase, and correct case-insensitive
checks were not used consistently, leading to bugs like #502.
 2016-06-07 21:58:44 -07:00
Leo Franchi 9d8758557b Use global match in alert word regex to match all matches 
(imported from commit aaec296ad6b18b20c1c2d1cb017cffef8e3e0512)
 2014-03-11 13:06:16 -04:00
Leo Franchi 65b6c80f07 Don't highlight alert words that are in URLs, breaking them 
(imported from commit e20ee33a1687f935482f48f829c19a1606ce6db1)
 2014-03-11 13:06:16 -04:00
Luke Faraone 4ebc4a4ef1 Expand characters allowed after an alertword. 
We now support .';[ before a word and ';]! after.

Closes trac #2283.

(imported from commit b3e3cb3d8d49a8e74d0b6a108c5ec73e9d9b5f32)
 2014-02-13 17:14:53 -05:00
Steve Howell 175aeef09a Simplify code by using message.alerted. 
(imported from commit 10eaca36cd3d60ce3cdd36be62dff02217f0b6c6)
 2014-01-10 21:39:02 -05:00
Steve Howell b98e7f8d90 Remove transitional feature_flags.alert_words flag. 
(imported from commit f00eba8a12054e9771105e341e2652a53271e298)
 2013-10-15 09:57:19 -04:00
Leo Franchi 6e188fb067 Tweak alert_word matches and add some more tests 
(imported from commit 63dc4064c15d5d33a7ec0c992b183bf323dd4ee8)
 2013-10-10 10:58:21 -04:00
Leo Franchi 663fd4653f Feature-flag alert words to staging + reddit 
(imported from commit 1fe9c596b26ce6676514719e4ed2e185108685cb)
 2013-09-05 10:21:39 -04:00
Leo Franchi 897dd87b94 Add a span around alert words to mark them visually 
(imported from commit 9b8fbbd957086f1eeaa3409e5830aa6d7974fbe8)
 2013-09-05 10:18:40 -04:00