forked from glitch-soc/mastodon
-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into …
…merge/TheEssem/20240703
Conflicts:
app/javascript/flavours/glitch/components/status_prepend.jsx
app/javascript/flavours/glitch/components/name_list.jsx
public/favicon.ico- Loading branch information
Showing
200 changed files
with
3,458 additions
and
2,022 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 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 'flavours/glitch/api/directory'; | ||
| import { createDataLoadingThunk } from 'flavours/glitch/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
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,15 @@ | ||
| import { apiRequestGet } from 'flavours/glitch/api'; | ||
| import type { ApiAccountJSON } from 'flavours/glitch/api_types/accounts'; | ||
|
|
||
| export const apiGetDirectory = ( | ||
| params: { | ||
| order: string; | ||
| local: boolean; | ||
| offset?: number; | ||
| }, | ||
| limit = 20, | ||
| ) => | ||
| apiRequestGet<ApiAccountJSON[]>('v1/directory', { | ||
| ...params, | ||
| limit, | ||
| }); |
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,20 @@ | ||
| import { useLinks } from 'flavours/glitch/hooks/useLinks'; | ||
|
|
||
| export const AccountBio: React.FC<{ | ||
| note: string; | ||
| className: string; | ||
| }> = ({ note, className }) => { | ||
| const handleClick = useLinks(); | ||
|
|
||
| if (note.length === 0 || note === '<p></p>') { | ||
| return null; | ||
| } | ||
|
|
||
| return ( | ||
| <div | ||
| className={`${className} translate`} | ||
| dangerouslySetInnerHTML={{ __html: note }} | ||
| onClickCapture={handleClick} | ||
| /> | ||
| ); | ||
| }; |
42 changes: 42 additions & 0 deletions
42
app/javascript/flavours/glitch/components/account_fields.tsx
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,42 @@ | ||
| import classNames from 'classnames'; | ||
|
|
||
| import CheckIcon from '@/material-icons/400-24px/check.svg?react'; | ||
| import { Icon } from 'flavours/glitch/components/icon'; | ||
| import { useLinks } from 'flavours/glitch/hooks/useLinks'; | ||
| import type { Account } from 'flavours/glitch/models/account'; | ||
|
|
||
| export const AccountFields: React.FC<{ | ||
| fields: Account['fields']; | ||
| limit: number; | ||
| }> = ({ fields, limit = -1 }) => { | ||
| const handleClick = useLinks(); | ||
|
|
||
| if (fields.size === 0) { | ||
| return null; | ||
| } | ||
|
|
||
| return ( | ||
| <div className='account-fields' onClickCapture={handleClick}> | ||
| {fields.take(limit).map((pair, i) => ( | ||
| <dl | ||
| key={i} | ||
| className={classNames({ verified: pair.get('verified_at') })} | ||
| > | ||
| <dt | ||
| dangerouslySetInnerHTML={{ __html: pair.get('name_emojified') }} | ||
| className='translate' | ||
| /> | ||
|
|
||
| <dd className='translate' title={pair.get('value_plain') ?? ''}> | ||
| {pair.get('verified_at') && ( | ||
| <Icon id='check' icon={CheckIcon} className='verified__mark' /> | ||
| )} | ||
| <span | ||
| dangerouslySetInnerHTML={{ __html: pair.get('value_emojified') }} | ||
| /> | ||
| </dd> | ||
| </dl> | ||
| ))} | ||
| </div> | ||
| ); | ||
| }; |
Oops, something went wrong.