forked from glitch-soc/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.
Add edit history to web UI (mastodon#17390)
* Add edit history to web UI * Change history reducer to store items per status * Fix missing loading prop
- Loading branch information
Showing
18 changed files
with
615 additions
and
127 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| import api from '../api'; | ||
| import { importFetchedAccounts } from './importer'; | ||
|
|
||
| export const HISTORY_FETCH_REQUEST = 'HISTORY_FETCH_REQUEST'; | ||
| export const HISTORY_FETCH_SUCCESS = 'HISTORY_FETCH_SUCCESS'; | ||
| export const HISTORY_FETCH_FAIL = 'HISTORY_FETCH_FAIL'; | ||
|
|
||
| export const fetchHistory = statusId => (dispatch, getState) => { | ||
| const loading = getState().getIn(['history', statusId, 'loading']); | ||
|
|
||
| if (loading) { | ||
| return; | ||
| } | ||
|
|
||
| dispatch(fetchHistoryRequest(statusId)); | ||
|
|
||
| api(getState).get(`/api/v1/statuses/${statusId}/history`).then(({ data }) => { | ||
| dispatch(importFetchedAccounts(data.map(x => x.account))); | ||
| dispatch(fetchHistorySuccess(statusId, data)); | ||
| }).catch(error => dispatch(fetchHistoryFail(error))); | ||
| }; | ||
|
|
||
| export const fetchHistoryRequest = statusId => ({ | ||
| type: HISTORY_FETCH_REQUEST, | ||
| statusId, | ||
| }); | ||
|
|
||
| export const fetchHistorySuccess = (statusId, history) => ({ | ||
| type: HISTORY_FETCH_SUCCESS, | ||
| statusId, | ||
| history, | ||
| }); | ||
|
|
||
| export const fetchHistoryFail = error => ({ | ||
| type: HISTORY_FETCH_FAIL, | ||
| error, | ||
| }); |
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
27 changes: 27 additions & 0 deletions
27
app/javascript/mastodon/components/edited_timestamp/containers/dropdown_menu_container.js
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,27 @@ | ||
| import { connect } from 'react-redux'; | ||
| import { openDropdownMenu, closeDropdownMenu } from 'mastodon/actions/dropdown_menu'; | ||
| import { fetchHistory } from 'mastodon/actions/history'; | ||
| import DropdownMenu from 'mastodon/components/dropdown_menu'; | ||
|
|
||
| const mapStateToProps = (state, { statusId }) => ({ | ||
| dropdownPlacement: state.getIn(['dropdown_menu', 'placement']), | ||
| openDropdownId: state.getIn(['dropdown_menu', 'openId']), | ||
| openedViaKeyboard: state.getIn(['dropdown_menu', 'keyboard']), | ||
| items: state.getIn(['history', statusId, 'items']), | ||
| loading: state.getIn(['history', statusId, 'loading']), | ||
| }); | ||
|
|
||
| const mapDispatchToProps = (dispatch, { statusId }) => ({ | ||
|
|
||
| onOpen (id, onItemClick, dropdownPlacement, keyboard) { | ||
| dispatch(fetchHistory(statusId)); | ||
| dispatch(openDropdownMenu(id, dropdownPlacement, keyboard)); | ||
| }, | ||
|
|
||
| onClose (id) { | ||
| dispatch(closeDropdownMenu(id)); | ||
| }, | ||
|
|
||
| }); | ||
|
|
||
| export default connect(mapStateToProps, mapDispatchToProps)(DropdownMenu); |
70 changes: 70 additions & 0 deletions
70
app/javascript/mastodon/components/edited_timestamp/index.js
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,70 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import { FormattedMessage, injectIntl } from 'react-intl'; | ||
| import Icon from 'mastodon/components/icon'; | ||
| import DropdownMenu from './containers/dropdown_menu_container'; | ||
| import { connect } from 'react-redux'; | ||
| import { openModal } from 'mastodon/actions/modal'; | ||
| import RelativeTimestamp from 'mastodon/components/relative_timestamp'; | ||
| import InlineAccount from 'mastodon/components/inline_account'; | ||
|
|
||
| const mapDispatchToProps = (dispatch, { statusId }) => ({ | ||
|
|
||
| onItemClick (index) { | ||
| dispatch(openModal('COMPARE_HISTORY', { index, statusId })); | ||
| }, | ||
|
|
||
| }); | ||
|
|
||
| export default @connect(null, mapDispatchToProps) | ||
| @injectIntl | ||
| class EditedTimestamp extends React.PureComponent { | ||
|
|
||
| static propTypes = { | ||
| statusId: PropTypes.string.isRequired, | ||
| timestamp: PropTypes.string.isRequired, | ||
| intl: PropTypes.object.isRequired, | ||
| onItemClick: PropTypes.func.isRequired, | ||
| }; | ||
|
|
||
| handleItemClick = (item, i) => { | ||
| const { onItemClick } = this.props; | ||
| onItemClick(i); | ||
| }; | ||
|
|
||
| renderHeader = items => { | ||
| return ( | ||
| <FormattedMessage id='status.edited_x_times' defaultMessage='Edited {count, plural, one {{count} time} other {{count} times}}' values={{ count: items.size - 1 }} /> | ||
| ); | ||
| } | ||
|
|
||
| renderItem = (item, index, { onClick, onKeyPress }) => { | ||
| const formattedDate = <RelativeTimestamp timestamp={item.get('created_at')} short={false} />; | ||
| const formattedName = <InlineAccount accountId={item.get('account')} />; | ||
|
|
||
| const label = item.get('original') ? ( | ||
| <FormattedMessage id='status.history.created' defaultMessage='{name} created {date}' values={{ name: formattedName, date: formattedDate }} /> | ||
| ) : ( | ||
| <FormattedMessage id='status.history.edited' defaultMessage='{name} edited {date}' values={{ name: formattedName, date: formattedDate }} /> | ||
| ); | ||
|
|
||
| return ( | ||
| <li className='dropdown-menu__item edited-timestamp__history__item' key={item.get('created_at')}> | ||
| <button data-index={index} onClick={onClick} onKeyPress={onKeyPress}>{label}</button> | ||
| </li> | ||
| ); | ||
| } | ||
|
|
||
| render () { | ||
| const { timestamp, intl, statusId } = this.props; | ||
|
|
||
| return ( | ||
| <DropdownMenu statusId={statusId} renderItem={this.renderItem} scrollable renderHeader={this.renderHeader} onItemClick={this.handleItemClick}> | ||
| <button className='dropdown-menu__text-button'> | ||
| <FormattedMessage id='status.edited' defaultMessage='Edited {date}' values={{ date: intl.formatDate(timestamp, { hour12: false, month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) }} /> <Icon id='caret-down' /> | ||
| </button> | ||
| </DropdownMenu> | ||
| ); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.