diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-07-03 17:04:21 -0500 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-08-30 05:41:03 -0500 |
| commit | d8a6fad2349bcdfa138dfc7e88bb6595c9c4363a (patch) | |
| tree | 1670af72b10ebc7ba34680a53bed002501b0b8fc /app | |
| parent | eaf9bc1a428b338ee666f1da1e32eed7e3b6b25e (diff) | |
[Bug] Skip implicit mentions
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/flavours/glitch/reducers/compose.js | 4 | ||||
| -rw-r--r-- | app/javascript/mastodon/reducers/compose.js | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/reducers/compose.js b/app/javascript/flavours/glitch/reducers/compose.js index 5f53361fa..d305bc236 100644 --- a/app/javascript/flavours/glitch/reducers/compose.js +++ b/app/javascript/flavours/glitch/reducers/compose.js @@ -288,7 +288,9 @@ const expandMentions = status => { const fragment = domParser.parseFromString(status.get('content'), 'text/html').documentElement; status.get('mentions').forEach(mention => { - fragment.querySelector(`a[href="${mention.get('url')}"]`).textContent = `@${mention.get('acct')}`; + const selection = fragment.querySelector(`a[href="${mention.get('url')}"]`); + if (!selection) return; + selection.textContent = `@${mention.get('acct')}`; }); return fragment.innerHTML; diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js index 4c0ba1c36..67ce96feb 100644 --- a/app/javascript/mastodon/reducers/compose.js +++ b/app/javascript/mastodon/reducers/compose.js @@ -205,7 +205,9 @@ const expandMentions = status => { const fragment = domParser.parseFromString(status.get('content'), 'text/html').documentElement; status.get('mentions').forEach(mention => { - fragment.querySelector(`a[href="${mention.get('url')}"]`).textContent = `@${mention.get('acct')}`; + const selection = fragment.querySelector(`a[href="${mention.get('url')}"]`); + if (!selection) return; + selection.textContent = `@${mention.get('acct')}`; }); return fragment.innerHTML; |