Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream

app/javascript/mastodon/features/compose/containers/language_dropdown_container.js

@@ -8,6 +8,7 @@ import { debounce } from 'lodash';
 import { changeComposeLanguage } from 'mastodon/actions/compose';
 
 import LanguageDropdown from '../components/language_dropdown';
+import { urlRegex } from '../util/url_regex';
 
 const getFrequentlyUsedLanguages = createSelector([
   state => state.getIn(['settings', 'frequentlyUsedLanguages'], ImmutableMap()),
@@ -71,13 +72,25 @@ const ISO_639_MAP = {
   vie: 'vi', // Vietnamese
 };
 
-const debouncedLande = debounce((text) => lande(text), 500, { trailing: true });
+const debouncedLande = debounce((text) => {
+  text = text
+    .replace(urlRegex, '')
+    .replace(/(^|[^/\w])@(([a-z0-9_]+)@[a-z0-9.-]+[a-z0-9]+)/ig, '');
+
+  if (text.length <= 20)
+    return undefined;
+
+  return lande(text);
+}, 500, { trailing: true });
 
 const detectedLanguage = createSelector([
   state => state.getIn(['compose', 'text']),
 ], text => {
   if (text.length > 20) {
     const guesses = debouncedLande(text);
+    if (!guesses)
+      return '';
+
     const [lang, confidence] = guesses[0];
 
     if (confidence > 0.8) {