forked from mastodon/mastodon
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'mastodon:main' into BirdUI
- Loading branch information
Showing
183 changed files
with
1,963 additions
and
1,201 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| import { useCallback } from 'react'; | ||
|
|
||
| import { useHistory } from 'react-router-dom'; | ||
|
|
||
| import { openURL } from 'mastodon/actions/search'; | ||
| import { useAppDispatch } from 'mastodon/store'; | ||
|
|
||
| const isMentionClick = (element: HTMLAnchorElement) => | ||
| element.classList.contains('mention'); | ||
|
|
||
| const isHashtagClick = (element: HTMLAnchorElement) => | ||
| element.textContent?.[0] === '#' || | ||
| element.previousSibling?.textContent?.endsWith('#'); | ||
|
|
||
| export const useLinks = () => { | ||
| const history = useHistory(); | ||
| const dispatch = useAppDispatch(); | ||
|
|
||
| const handleHashtagClick = useCallback( | ||
| (element: HTMLAnchorElement) => { | ||
| const { textContent } = element; | ||
|
|
||
| if (!textContent) return; | ||
|
|
||
| history.push(`/tags/${textContent.replace(/^#/, '')}`); | ||
| }, | ||
| [history], | ||
| ); | ||
|
|
||
| const handleMentionClick = useCallback( | ||
| (element: HTMLAnchorElement) => { | ||
| dispatch( | ||
| openURL(element.href, history, () => { | ||
| window.location.href = element.href; | ||
| }), | ||
| ); | ||
| }, | ||
| [dispatch, history], | ||
| ); | ||
|
|
||
| const handleClick = useCallback( | ||
| (e: React.MouseEvent) => { | ||
| const target = (e.target as HTMLElement).closest('a'); | ||
|
|
||
| if (!target || e.button !== 0 || e.ctrlKey || e.metaKey) { | ||
| return; | ||
| } | ||
|
|
||
| if (isMentionClick(target)) { | ||
| e.preventDefault(); | ||
| handleMentionClick(target); | ||
| } else if (isHashtagClick(target)) { | ||
| e.preventDefault(); | ||
| handleHashtagClick(target); | ||
| } | ||
| }, | ||
| [handleMentionClick, handleHashtagClick], | ||
| ); | ||
|
|
||
| return handleClick; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import { useRef, useCallback, useEffect } from 'react'; | ||
|
|
||
| export const useTimeout = () => { | ||
| const timeoutRef = useRef<ReturnType<typeof setTimeout>>(); | ||
|
|
||
| const set = useCallback((callback: () => void, delay: number) => { | ||
| if (timeoutRef.current) { | ||
| clearTimeout(timeoutRef.current); | ||
| } | ||
|
|
||
| timeoutRef.current = setTimeout(callback, delay); | ||
| }, []); | ||
|
|
||
| const cancel = useCallback(() => { | ||
| if (timeoutRef.current) { | ||
| clearTimeout(timeoutRef.current); | ||
| timeoutRef.current = undefined; | ||
| } | ||
| }, []); | ||
|
|
||
| useEffect( | ||
| () => () => { | ||
| cancel(); | ||
| }, | ||
| [cancel], | ||
| ); | ||
|
|
||
| return [set, cancel] as const; | ||
| }; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| import type { List as ImmutableList } from 'immutable'; | ||
|
|
||
| import { apiGetDirectory } from 'mastodon/api/directory'; | ||
| import { createDataLoadingThunk } from 'mastodon/store/typed_functions'; | ||
|
|
||
| import { fetchRelationships } from './accounts'; | ||
| import { importFetchedAccounts } from './importer'; | ||
|
|
||
| export const fetchDirectory = createDataLoadingThunk( | ||
| 'directory/fetch', | ||
| async (params: Parameters<typeof apiGetDirectory>[0]) => | ||
| apiGetDirectory(params), | ||
| (data, { dispatch }) => { | ||
| dispatch(importFetchedAccounts(data)); | ||
| dispatch(fetchRelationships(data.map((x) => x.id))); | ||
|
|
||
| return { accounts: data }; | ||
| }, | ||
| ); | ||
|
|
||
| export const expandDirectory = createDataLoadingThunk( | ||
| 'directory/expand', | ||
| async (params: Parameters<typeof apiGetDirectory>[0], { getState }) => { | ||
| const loadedItems = getState().user_lists.getIn([ | ||
| 'directory', | ||
| 'items', | ||
| ]) as ImmutableList<unknown>; | ||
|
|
||
| return apiGetDirectory({ ...params, offset: loadedItems.size }, 20); | ||
| }, | ||
| (data, { dispatch }) => { | ||
| dispatch(importFetchedAccounts(data)); | ||
| dispatch(fetchRelationships(data.map((x) => x.id))); | ||
|
|
||
| return { accounts: data }; | ||
| }, | ||
| ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.