about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2017-10-12 23:26:34 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-10-12 23:26:34 +0200
commitd37305c628c37aa16c1356c12aecd8de2105b80f (patch)
tree5b9a80d4cc16ca3994c7a381c64616cffdf351d1 /app
parentad917cda106d779f0af776c1c856da43d1770524 (diff)
Reduce discrepancies between server and client-side character count (#5360)
Diffstat (limited to 'app')
-rw-r--r--app/javascript/mastodon/features/compose/util/counter.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/compose/util/counter.js b/app/javascript/mastodon/features/compose/util/counter.js
index 588a372c6..e6d2487c5 100644
--- a/app/javascript/mastodon/features/compose/util/counter.js
+++ b/app/javascript/mastodon/features/compose/util/counter.js
@@ -5,5 +5,5 @@ const urlPlaceholder = 'xxxxxxxxxxxxxxxxxxxxxxx';
 export function countableText(inputText) {
   return inputText
     .replace(urlRegex, urlPlaceholder)
-    .replace(/(?:^|[^\/\w])@(([a-z0-9_]+)@[a-z0-9\.\-]+)/ig, '@$2');
+    .replace(/(?:^|[^\/\w])@(([a-z0-9_]+)@[a-z0-9\.\-]+[a-z0-9]+)/ig, '@$2');
 };