mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-06 10:25:09 +01:00
Code Issues Projects Releases Wiki Activity

refactor handleChange to extract context from URLs

Browse Source 
previously, the search box would only add new quickActions if raw `@` or `#` characters were found in the search string; but in the case of a drag and drop, or a copy-paste, of a URL into the search bar, no elements of the URL's path would be recognized for potential quickActions.
This change enables identification of possible hashtags or user accounts in a (presumed) mastodon URL; augmenting id by special input characters.
This commit is contained in:
Matt Panaro 2024-12-31 22:29:19 -05:00
parent 4b28d99f16
commit 7fb47a4866
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/javascript/mastodon/features/compose/components/search.tsx
View File

@ -360,22 +360,47 @@ export const Search: React.FC<{
const couldBeURL =
trimmedValue.startsWith('https://') && !trimmedValue.includes(' ');
let mastoPath;
if (couldBeURL) {
newQuickActions.push(QuickActionGenerators.couldBeURL(trimmedValue));
// presume URL is from a mastodon server; not just some random web URL
mastoPath = new URL(trimmedValue).pathname.replace(/^\//, '');
} else {
mastoPath = '';
}
const couldBeHashtag =
(trimmedValue.startsWith('#') && trimmedValue.length > 1) ||
trimmedValue.match(HASHTAG_REGEX);
trimmedValue.match(HASHTAG_REGEX) ||
(couldBeURL && mastoPath.startsWith('tags/'));
if (couldBeHashtag) {
newQuickActions.push(QuickActionGenerators.couldBeHashtag(trimmedValue.replace(/^#/, '')));
const hashtag = couldBeURL
? mastoPath.replace(/^tags\//, '')
: trimmedValue.replace(/^#/, '');
newQuickActions.push(QuickActionGenerators.couldBeHashtag(hashtag));
}
const couldBeUsername = /^@?[a-z0-9_-]+(@[^\s]+)?$/i.exec(trimmedValue);
const userRegexp = /^@?[a-z0-9_-]+(@[^\s]+)?$/i;
const couldBeUsername =
userRegexp.test(trimmedValue) ||
(couldBeURL && userRegexp.test(mastoPath));
if (couldBeUsername) {
newQuickActions.push(QuickActionGenerators.couldBeUsername(trimmedValue.replace(/^@/, '')));
const mastoUser = mastoPath.replace(/^@/, '');
const username = !couldBeURL
? trimmedValue.replace(/^@/, '')
: // @ts-expect-error : mastoPath was tested against userRegexp above, meaning there must be at least one `@`:
// so match can't return null here
mastoPath.match(/@/g).length === 1
? // if there's only 1 `@` in mastoPath, obtain domain from URL's FQDN & append to mastoUser
`${mastoUser}@${new URL(trimmedValue).hostname}`
: // otherwise there were at least (hopefully, only) 2, and it's a full masto identifier
mastoUser;
newQuickActions.push(QuickActionGenerators.couldBeUsername(username));
}
const couldBeStatusSearch = searchEnabled;