Change IDs to strings rather than numbers in API JSON output (#5019)
* Fix JavaScript interface with long IDs Somewhat predictably, the JS interface handled IDs as numbers, which in JS are IEEE double-precision floats. This loses some precision when working with numbers as large as those generated by the new ID scheme, so we instead handle them here as strings. This is relatively simple, and doesn't appear to have caused any problems, but should definitely be tested more thoroughly than the built-in tests. Several days of use appear to support this working properly. BREAKING CHANGE: The major(!) change here is that IDs are now returned as strings by the REST endpoints, rather than as integers. In practice, relatively few changes were required to make the existing JS UI work with this change, but it will likely hit API clients pretty hard: it's an entirely different type to consume. (The one API client I tested, Tusky, handles this with no problems, however.) Twitter ran into this issue when introducing Snowflake IDs, and decided to instead introduce an `id_str` field in JSON responses. I have opted to *not* do that, and instead force all IDs to 64-bit integers represented by strings in one go. (I believe Twitter exacerbated their problem by rolling out the changes three times: once for statuses, once for DMs, and once for user IDs, as well as by leaving an integer ID value in JSON. As they said, "If you’re using the `id` field with JSON in a Javascript-related language, there is a very high likelihood that the integers will be silently munged by Javascript interpreters. In most cases, this will result in behavior such as being unable to load or delete a specific direct message, because the ID you're sending to the API is different than the actual identifier associated with the message." [1]) However, given that this is a significant change for API users, alternatives or a transition time may be appropriate. 1: https://blog.twitter.com/developer/en_us/a/2011/direct-messages-going-snowflake-on-sep-30-2011.html * Additional fixes for stringified IDs in JSON These should be the last two. These were identified using eslint to try to identify any plain casts to JavaScript numbers. (Some such casts are legitimate, but these were not.) Adding the following to .eslintrc.yml will identify casts to numbers: ~~~ no-restricted-syntax: - warn - selector: UnaryExpression[operator='+'] > :not(Literal) message: Avoid the use of unary + - selector: CallExpression[callee.name='Number'] message: Casting with Number() may coerce string IDs to numbers ~~~ The remaining three casts appear legitimate: two casts to array indices, one in a server to turn an environment variable into a number. * Back out RelationshipsController Change This was made to make a test a bit less flakey, but has nothing to do with this branch. * Change internal streaming payloads to stringified IDs as well Per https://github.com/tootsuite/mastodon/pull/5019#issuecomment-330736452 we need these changes to send deleted status IDs as strings, not integers.
This commit is contained in:
parent
b35406b700
commit
669fe9ee06
|
@ -5,8 +5,7 @@ export const STORE_HYDRATE_LAZY = 'STORE_HYDRATE_LAZY';
|
||||||
|
|
||||||
const convertState = rawState =>
|
const convertState = rawState =>
|
||||||
fromJS(rawState, (k, v) =>
|
fromJS(rawState, (k, v) =>
|
||||||
Iterable.isIndexed(v) ? v.toList() : v.toMap().mapKeys(x =>
|
Iterable.isIndexed(v) ? v.toList() : v.toMap());
|
||||||
Number.isNaN(x * 1) ? x : x * 1));
|
|
||||||
|
|
||||||
export function hydrateStore(rawState) {
|
export function hydrateStore(rawState) {
|
||||||
const state = convertState(rawState);
|
const state = convertState(rawState);
|
||||||
|
|
|
@ -21,7 +21,7 @@ export default class Account extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
account: ImmutablePropTypes.map.isRequired,
|
account: ImmutablePropTypes.map.isRequired,
|
||||||
me: PropTypes.number.isRequired,
|
me: PropTypes.string.isRequired,
|
||||||
onFollow: PropTypes.func.isRequired,
|
onFollow: PropTypes.func.isRequired,
|
||||||
onBlock: PropTypes.func.isRequired,
|
onBlock: PropTypes.func.isRequired,
|
||||||
onMute: PropTypes.func.isRequired,
|
onMute: PropTypes.func.isRequired,
|
||||||
|
|
|
@ -128,7 +128,7 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
|
||||||
}
|
}
|
||||||
|
|
||||||
onSuggestionClick = (e) => {
|
onSuggestionClick = (e) => {
|
||||||
const suggestion = Number(e.currentTarget.getAttribute('data-index'));
|
const suggestion = e.currentTarget.getAttribute('data-index');
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
this.props.onSuggestionSelected(this.state.tokenStart, this.state.lastToken, suggestion);
|
this.props.onSuggestionSelected(this.state.tokenStart, this.state.lastToken, suggestion);
|
||||||
this.textarea.focus();
|
this.textarea.focus();
|
||||||
|
|
|
@ -34,7 +34,7 @@ export default class Status extends ImmutablePureComponent {
|
||||||
onBlock: PropTypes.func,
|
onBlock: PropTypes.func,
|
||||||
onEmbed: PropTypes.func,
|
onEmbed: PropTypes.func,
|
||||||
onHeightChange: PropTypes.func,
|
onHeightChange: PropTypes.func,
|
||||||
me: PropTypes.number,
|
me: PropTypes.string,
|
||||||
boostModal: PropTypes.bool,
|
boostModal: PropTypes.bool,
|
||||||
autoPlayGif: PropTypes.bool,
|
autoPlayGif: PropTypes.bool,
|
||||||
muted: PropTypes.bool,
|
muted: PropTypes.bool,
|
||||||
|
@ -70,7 +70,7 @@ export default class Status extends ImmutablePureComponent {
|
||||||
|
|
||||||
handleAccountClick = (e) => {
|
handleAccountClick = (e) => {
|
||||||
if (this.context.router && e.button === 0) {
|
if (this.context.router && e.button === 0) {
|
||||||
const id = Number(e.currentTarget.getAttribute('data-id'));
|
const id = e.currentTarget.getAttribute('data-id');
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
this.context.router.history.push(`/accounts/${id}`);
|
this.context.router.history.push(`/accounts/${id}`);
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,7 +46,7 @@ export default class StatusActionBar extends ImmutablePureComponent {
|
||||||
onEmbed: PropTypes.func,
|
onEmbed: PropTypes.func,
|
||||||
onMuteConversation: PropTypes.func,
|
onMuteConversation: PropTypes.func,
|
||||||
onPin: PropTypes.func,
|
onPin: PropTypes.func,
|
||||||
me: PropTypes.number,
|
me: PropTypes.string,
|
||||||
withDismiss: PropTypes.bool,
|
withDismiss: PropTypes.bool,
|
||||||
intl: PropTypes.object.isRequired,
|
intl: PropTypes.object.isRequired,
|
||||||
};
|
};
|
||||||
|
|
|
@ -26,7 +26,7 @@ export default class ActionBar extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
account: ImmutablePropTypes.map.isRequired,
|
account: ImmutablePropTypes.map.isRequired,
|
||||||
me: PropTypes.number.isRequired,
|
me: PropTypes.string.isRequired,
|
||||||
onFollow: PropTypes.func,
|
onFollow: PropTypes.func,
|
||||||
onBlock: PropTypes.func.isRequired,
|
onBlock: PropTypes.func.isRequired,
|
||||||
onMention: PropTypes.func.isRequired,
|
onMention: PropTypes.func.isRequired,
|
||||||
|
|
|
@ -77,7 +77,7 @@ export default class Header extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
account: ImmutablePropTypes.map,
|
account: ImmutablePropTypes.map,
|
||||||
me: PropTypes.number.isRequired,
|
me: PropTypes.string.isRequired,
|
||||||
onFollow: PropTypes.func.isRequired,
|
onFollow: PropTypes.func.isRequired,
|
||||||
intl: PropTypes.object.isRequired,
|
intl: PropTypes.object.isRequired,
|
||||||
autoPlayGif: PropTypes.bool.isRequired,
|
autoPlayGif: PropTypes.bool.isRequired,
|
||||||
|
|
|
@ -16,9 +16,9 @@ import { ScrollContainer } from 'react-router-scroll';
|
||||||
import LoadMore from '../../components/load_more';
|
import LoadMore from '../../components/load_more';
|
||||||
|
|
||||||
const mapStateToProps = (state, props) => ({
|
const mapStateToProps = (state, props) => ({
|
||||||
medias: getAccountGallery(state, Number(props.params.accountId)),
|
medias: getAccountGallery(state, props.params.accountId),
|
||||||
isLoading: state.getIn(['timelines', `account:${Number(props.params.accountId)}:media`, 'isLoading']),
|
isLoading: state.getIn(['timelines', `account:${props.params.accountId}:media`, 'isLoading']),
|
||||||
hasMore: !!state.getIn(['timelines', `account:${Number(props.params.accountId)}:media`, 'next']),
|
hasMore: !!state.getIn(['timelines', `account:${props.params.accountId}:media`, 'next']),
|
||||||
autoPlayGif: state.getIn(['meta', 'auto_play_gif']),
|
autoPlayGif: state.getIn(['meta', 'auto_play_gif']),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -35,20 +35,20 @@ export default class AccountGallery extends ImmutablePureComponent {
|
||||||
};
|
};
|
||||||
|
|
||||||
componentDidMount () {
|
componentDidMount () {
|
||||||
this.props.dispatch(fetchAccount(Number(this.props.params.accountId)));
|
this.props.dispatch(fetchAccount(this.props.params.accountId));
|
||||||
this.props.dispatch(refreshAccountMediaTimeline(Number(this.props.params.accountId)));
|
this.props.dispatch(refreshAccountMediaTimeline(this.props.params.accountId));
|
||||||
}
|
}
|
||||||
|
|
||||||
componentWillReceiveProps (nextProps) {
|
componentWillReceiveProps (nextProps) {
|
||||||
if (nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) {
|
if (nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) {
|
||||||
this.props.dispatch(fetchAccount(Number(nextProps.params.accountId)));
|
this.props.dispatch(fetchAccount(nextProps.params.accountId));
|
||||||
this.props.dispatch(refreshAccountMediaTimeline(Number(this.props.params.accountId)));
|
this.props.dispatch(refreshAccountMediaTimeline(this.props.params.accountId));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
handleScrollToBottom = () => {
|
handleScrollToBottom = () => {
|
||||||
if (this.props.hasMore) {
|
if (this.props.hasMore) {
|
||||||
this.props.dispatch(expandAccountMediaTimeline(Number(this.props.params.accountId)));
|
this.props.dispatch(expandAccountMediaTimeline(this.props.params.accountId));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ export default class Header extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
account: ImmutablePropTypes.map,
|
account: ImmutablePropTypes.map,
|
||||||
me: PropTypes.number.isRequired,
|
me: PropTypes.string.isRequired,
|
||||||
onFollow: PropTypes.func.isRequired,
|
onFollow: PropTypes.func.isRequired,
|
||||||
onBlock: PropTypes.func.isRequired,
|
onBlock: PropTypes.func.isRequired,
|
||||||
onMention: PropTypes.func.isRequired,
|
onMention: PropTypes.func.isRequired,
|
||||||
|
|
|
@ -27,7 +27,7 @@ const makeMapStateToProps = () => {
|
||||||
const getAccount = makeGetAccount();
|
const getAccount = makeGetAccount();
|
||||||
|
|
||||||
const mapStateToProps = (state, { accountId }) => ({
|
const mapStateToProps = (state, { accountId }) => ({
|
||||||
account: getAccount(state, Number(accountId)),
|
account: getAccount(state, accountId),
|
||||||
me: state.getIn(['meta', 'me']),
|
me: state.getIn(['meta', 'me']),
|
||||||
unfollowModal: state.getIn(['meta', 'unfollow_modal']),
|
unfollowModal: state.getIn(['meta', 'unfollow_modal']),
|
||||||
});
|
});
|
||||||
|
|
|
@ -13,9 +13,9 @@ import { List as ImmutableList } from 'immutable';
|
||||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||||
|
|
||||||
const mapStateToProps = (state, props) => ({
|
const mapStateToProps = (state, props) => ({
|
||||||
statusIds: state.getIn(['timelines', `account:${Number(props.params.accountId)}`, 'items'], ImmutableList()),
|
statusIds: state.getIn(['timelines', `account:${props.params.accountId}`, 'items'], ImmutableList()),
|
||||||
isLoading: state.getIn(['timelines', `account:${Number(props.params.accountId)}`, 'isLoading']),
|
isLoading: state.getIn(['timelines', `account:${props.params.accountId}`, 'isLoading']),
|
||||||
hasMore: !!state.getIn(['timelines', `account:${Number(props.params.accountId)}`, 'next']),
|
hasMore: !!state.getIn(['timelines', `account:${props.params.accountId}`, 'next']),
|
||||||
me: state.getIn(['meta', 'me']),
|
me: state.getIn(['meta', 'me']),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -28,24 +28,24 @@ export default class AccountTimeline extends ImmutablePureComponent {
|
||||||
statusIds: ImmutablePropTypes.list,
|
statusIds: ImmutablePropTypes.list,
|
||||||
isLoading: PropTypes.bool,
|
isLoading: PropTypes.bool,
|
||||||
hasMore: PropTypes.bool,
|
hasMore: PropTypes.bool,
|
||||||
me: PropTypes.number.isRequired,
|
me: PropTypes.string.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
componentWillMount () {
|
componentWillMount () {
|
||||||
this.props.dispatch(fetchAccount(Number(this.props.params.accountId)));
|
this.props.dispatch(fetchAccount(this.props.params.accountId));
|
||||||
this.props.dispatch(refreshAccountTimeline(Number(this.props.params.accountId)));
|
this.props.dispatch(refreshAccountTimeline(this.props.params.accountId));
|
||||||
}
|
}
|
||||||
|
|
||||||
componentWillReceiveProps (nextProps) {
|
componentWillReceiveProps (nextProps) {
|
||||||
if (nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) {
|
if (nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) {
|
||||||
this.props.dispatch(fetchAccount(Number(nextProps.params.accountId)));
|
this.props.dispatch(fetchAccount(nextProps.params.accountId));
|
||||||
this.props.dispatch(refreshAccountTimeline(Number(nextProps.params.accountId)));
|
this.props.dispatch(refreshAccountTimeline(nextProps.params.accountId));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
handleScrollToBottom = () => {
|
handleScrollToBottom = () => {
|
||||||
if (!this.props.isLoading && this.props.hasMore) {
|
if (!this.props.isLoading && this.props.hasMore) {
|
||||||
this.props.dispatch(expandAccountTimeline(Number(this.props.params.accountId)));
|
this.props.dispatch(expandAccountTimeline(this.props.params.accountId));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,7 @@ export default class ComposeForm extends ImmutablePureComponent {
|
||||||
preselectDate: PropTypes.instanceOf(Date),
|
preselectDate: PropTypes.instanceOf(Date),
|
||||||
is_submitting: PropTypes.bool,
|
is_submitting: PropTypes.bool,
|
||||||
is_uploading: PropTypes.bool,
|
is_uploading: PropTypes.bool,
|
||||||
me: PropTypes.number,
|
me: PropTypes.string,
|
||||||
onChange: PropTypes.func.isRequired,
|
onChange: PropTypes.func.isRequired,
|
||||||
onSubmit: PropTypes.func.isRequired,
|
onSubmit: PropTypes.func.isRequired,
|
||||||
onClearSuggestions: PropTypes.func.isRequired,
|
onClearSuggestions: PropTypes.func.isRequired,
|
||||||
|
|
|
@ -21,7 +21,7 @@ export default class UploadForm extends React.PureComponent {
|
||||||
};
|
};
|
||||||
|
|
||||||
onRemoveFile = (e) => {
|
onRemoveFile = (e) => {
|
||||||
const id = Number(e.currentTarget.parentElement.getAttribute('data-id'));
|
const id = e.currentTarget.parentElement.getAttribute('data-id');
|
||||||
this.props.onRemoveFile(id);
|
this.props.onRemoveFile(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ import ColumnBackButton from '../../components/column_back_button';
|
||||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||||
|
|
||||||
const mapStateToProps = (state, props) => ({
|
const mapStateToProps = (state, props) => ({
|
||||||
accountIds: state.getIn(['user_lists', 'favourited_by', Number(props.params.statusId)]),
|
accountIds: state.getIn(['user_lists', 'favourited_by', props.params.statusId]),
|
||||||
});
|
});
|
||||||
|
|
||||||
@connect(mapStateToProps)
|
@connect(mapStateToProps)
|
||||||
|
@ -24,12 +24,12 @@ export default class Favourites extends ImmutablePureComponent {
|
||||||
};
|
};
|
||||||
|
|
||||||
componentWillMount () {
|
componentWillMount () {
|
||||||
this.props.dispatch(fetchFavourites(Number(this.props.params.statusId)));
|
this.props.dispatch(fetchFavourites(this.props.params.statusId));
|
||||||
}
|
}
|
||||||
|
|
||||||
componentWillReceiveProps (nextProps) {
|
componentWillReceiveProps (nextProps) {
|
||||||
if (nextProps.params.statusId !== this.props.params.statusId && nextProps.params.statusId) {
|
if (nextProps.params.statusId !== this.props.params.statusId && nextProps.params.statusId) {
|
||||||
this.props.dispatch(fetchFavourites(Number(nextProps.params.statusId)));
|
this.props.dispatch(fetchFavourites(nextProps.params.statusId));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,8 +17,8 @@ import ColumnBackButton from '../../components/column_back_button';
|
||||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||||
|
|
||||||
const mapStateToProps = (state, props) => ({
|
const mapStateToProps = (state, props) => ({
|
||||||
accountIds: state.getIn(['user_lists', 'followers', Number(props.params.accountId), 'items']),
|
accountIds: state.getIn(['user_lists', 'followers', props.params.accountId, 'items']),
|
||||||
hasMore: !!state.getIn(['user_lists', 'followers', Number(props.params.accountId), 'next']),
|
hasMore: !!state.getIn(['user_lists', 'followers', props.params.accountId, 'next']),
|
||||||
});
|
});
|
||||||
|
|
||||||
@connect(mapStateToProps)
|
@connect(mapStateToProps)
|
||||||
|
@ -32,14 +32,14 @@ export default class Followers extends ImmutablePureComponent {
|
||||||
};
|
};
|
||||||
|
|
||||||
componentWillMount () {
|
componentWillMount () {
|
||||||
this.props.dispatch(fetchAccount(Number(this.props.params.accountId)));
|
this.props.dispatch(fetchAccount(this.props.params.accountId));
|
||||||
this.props.dispatch(fetchFollowers(Number(this.props.params.accountId)));
|
this.props.dispatch(fetchFollowers(this.props.params.accountId));
|
||||||
}
|
}
|
||||||
|
|
||||||
componentWillReceiveProps (nextProps) {
|
componentWillReceiveProps (nextProps) {
|
||||||
if (nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) {
|
if (nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) {
|
||||||
this.props.dispatch(fetchAccount(Number(nextProps.params.accountId)));
|
this.props.dispatch(fetchAccount(nextProps.params.accountId));
|
||||||
this.props.dispatch(fetchFollowers(Number(nextProps.params.accountId)));
|
this.props.dispatch(fetchFollowers(nextProps.params.accountId));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -47,13 +47,13 @@ export default class Followers extends ImmutablePureComponent {
|
||||||
const { scrollTop, scrollHeight, clientHeight } = e.target;
|
const { scrollTop, scrollHeight, clientHeight } = e.target;
|
||||||
|
|
||||||
if (scrollTop === scrollHeight - clientHeight && this.props.hasMore) {
|
if (scrollTop === scrollHeight - clientHeight && this.props.hasMore) {
|
||||||
this.props.dispatch(expandFollowers(Number(this.props.params.accountId)));
|
this.props.dispatch(expandFollowers(this.props.params.accountId));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
handleLoadMore = (e) => {
|
handleLoadMore = (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
this.props.dispatch(expandFollowers(Number(this.props.params.accountId)));
|
this.props.dispatch(expandFollowers(this.props.params.accountId));
|
||||||
}
|
}
|
||||||
|
|
||||||
render () {
|
render () {
|
||||||
|
|
|
@ -17,8 +17,8 @@ import ColumnBackButton from '../../components/column_back_button';
|
||||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||||
|
|
||||||
const mapStateToProps = (state, props) => ({
|
const mapStateToProps = (state, props) => ({
|
||||||
accountIds: state.getIn(['user_lists', 'following', Number(props.params.accountId), 'items']),
|
accountIds: state.getIn(['user_lists', 'following', props.params.accountId, 'items']),
|
||||||
hasMore: !!state.getIn(['user_lists', 'following', Number(props.params.accountId), 'next']),
|
hasMore: !!state.getIn(['user_lists', 'following', props.params.accountId, 'next']),
|
||||||
});
|
});
|
||||||
|
|
||||||
@connect(mapStateToProps)
|
@connect(mapStateToProps)
|
||||||
|
@ -32,14 +32,14 @@ export default class Following extends ImmutablePureComponent {
|
||||||
};
|
};
|
||||||
|
|
||||||
componentWillMount () {
|
componentWillMount () {
|
||||||
this.props.dispatch(fetchAccount(Number(this.props.params.accountId)));
|
this.props.dispatch(fetchAccount(this.props.params.accountId));
|
||||||
this.props.dispatch(fetchFollowing(Number(this.props.params.accountId)));
|
this.props.dispatch(fetchFollowing(this.props.params.accountId));
|
||||||
}
|
}
|
||||||
|
|
||||||
componentWillReceiveProps (nextProps) {
|
componentWillReceiveProps (nextProps) {
|
||||||
if (nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) {
|
if (nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) {
|
||||||
this.props.dispatch(fetchAccount(Number(nextProps.params.accountId)));
|
this.props.dispatch(fetchAccount(nextProps.params.accountId));
|
||||||
this.props.dispatch(fetchFollowing(Number(nextProps.params.accountId)));
|
this.props.dispatch(fetchFollowing(nextProps.params.accountId));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -47,13 +47,13 @@ export default class Following extends ImmutablePureComponent {
|
||||||
const { scrollTop, scrollHeight, clientHeight } = e.target;
|
const { scrollTop, scrollHeight, clientHeight } = e.target;
|
||||||
|
|
||||||
if (scrollTop === scrollHeight - clientHeight && this.props.hasMore) {
|
if (scrollTop === scrollHeight - clientHeight && this.props.hasMore) {
|
||||||
this.props.dispatch(expandFollowing(Number(this.props.params.accountId)));
|
this.props.dispatch(expandFollowing(this.props.params.accountId));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
handleLoadMore = (e) => {
|
handleLoadMore = (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
this.props.dispatch(expandFollowing(Number(this.props.params.accountId)));
|
this.props.dispatch(expandFollowing(this.props.params.accountId));
|
||||||
}
|
}
|
||||||
|
|
||||||
render () {
|
render () {
|
||||||
|
|
|
@ -11,7 +11,7 @@ import ColumnBackButton from '../../components/column_back_button';
|
||||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||||
|
|
||||||
const mapStateToProps = (state, props) => ({
|
const mapStateToProps = (state, props) => ({
|
||||||
accountIds: state.getIn(['user_lists', 'reblogged_by', Number(props.params.statusId)]),
|
accountIds: state.getIn(['user_lists', 'reblogged_by', props.params.statusId]),
|
||||||
});
|
});
|
||||||
|
|
||||||
@connect(mapStateToProps)
|
@connect(mapStateToProps)
|
||||||
|
@ -24,12 +24,12 @@ export default class Reblogs extends ImmutablePureComponent {
|
||||||
};
|
};
|
||||||
|
|
||||||
componentWillMount () {
|
componentWillMount () {
|
||||||
this.props.dispatch(fetchReblogs(Number(this.props.params.statusId)));
|
this.props.dispatch(fetchReblogs(this.props.params.statusId));
|
||||||
}
|
}
|
||||||
|
|
||||||
componentWillReceiveProps(nextProps) {
|
componentWillReceiveProps(nextProps) {
|
||||||
if (nextProps.params.statusId !== this.props.params.statusId && nextProps.params.statusId) {
|
if (nextProps.params.statusId !== this.props.params.statusId && nextProps.params.statusId) {
|
||||||
this.props.dispatch(fetchReblogs(Number(nextProps.params.statusId)));
|
this.props.dispatch(fetchReblogs(nextProps.params.statusId));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,7 @@ export default class ActionBar extends React.PureComponent {
|
||||||
onReport: PropTypes.func,
|
onReport: PropTypes.func,
|
||||||
onPin: PropTypes.func,
|
onPin: PropTypes.func,
|
||||||
onEmbed: PropTypes.func,
|
onEmbed: PropTypes.func,
|
||||||
me: PropTypes.number.isRequired,
|
me: PropTypes.string.isRequired,
|
||||||
intl: PropTypes.object.isRequired,
|
intl: PropTypes.object.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -38,9 +38,9 @@ const makeMapStateToProps = () => {
|
||||||
const getStatus = makeGetStatus();
|
const getStatus = makeGetStatus();
|
||||||
|
|
||||||
const mapStateToProps = (state, props) => ({
|
const mapStateToProps = (state, props) => ({
|
||||||
status: getStatus(state, Number(props.params.statusId)),
|
status: getStatus(state, props.params.statusId),
|
||||||
ancestorsIds: state.getIn(['contexts', 'ancestors', Number(props.params.statusId)]),
|
ancestorsIds: state.getIn(['contexts', 'ancestors', props.params.statusId]),
|
||||||
descendantsIds: state.getIn(['contexts', 'descendants', Number(props.params.statusId)]),
|
descendantsIds: state.getIn(['contexts', 'descendants', props.params.statusId]),
|
||||||
me: state.getIn(['meta', 'me']),
|
me: state.getIn(['meta', 'me']),
|
||||||
boostModal: state.getIn(['meta', 'boost_modal']),
|
boostModal: state.getIn(['meta', 'boost_modal']),
|
||||||
deleteModal: state.getIn(['meta', 'delete_modal']),
|
deleteModal: state.getIn(['meta', 'delete_modal']),
|
||||||
|
@ -64,7 +64,7 @@ export default class Status extends ImmutablePureComponent {
|
||||||
status: ImmutablePropTypes.map,
|
status: ImmutablePropTypes.map,
|
||||||
ancestorsIds: ImmutablePropTypes.list,
|
ancestorsIds: ImmutablePropTypes.list,
|
||||||
descendantsIds: ImmutablePropTypes.list,
|
descendantsIds: ImmutablePropTypes.list,
|
||||||
me: PropTypes.number,
|
me: PropTypes.string,
|
||||||
boostModal: PropTypes.bool,
|
boostModal: PropTypes.bool,
|
||||||
deleteModal: PropTypes.bool,
|
deleteModal: PropTypes.bool,
|
||||||
autoPlayGif: PropTypes.bool,
|
autoPlayGif: PropTypes.bool,
|
||||||
|
@ -72,12 +72,12 @@ export default class Status extends ImmutablePureComponent {
|
||||||
};
|
};
|
||||||
|
|
||||||
componentWillMount () {
|
componentWillMount () {
|
||||||
this.props.dispatch(fetchStatus(Number(this.props.params.statusId)));
|
this.props.dispatch(fetchStatus(this.props.params.statusId));
|
||||||
}
|
}
|
||||||
|
|
||||||
componentWillReceiveProps (nextProps) {
|
componentWillReceiveProps (nextProps) {
|
||||||
if (nextProps.params.statusId !== this.props.params.statusId && nextProps.params.statusId) {
|
if (nextProps.params.statusId !== this.props.params.statusId && nextProps.params.statusId) {
|
||||||
this.props.dispatch(fetchStatus(Number(nextProps.params.statusId)));
|
this.props.dispatch(fetchStatus(nextProps.params.statusId));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,11 +10,11 @@ class InitialStateSerializer < ActiveModel::Serializer
|
||||||
access_token: object.token,
|
access_token: object.token,
|
||||||
locale: I18n.locale,
|
locale: I18n.locale,
|
||||||
domain: Rails.configuration.x.local_domain,
|
domain: Rails.configuration.x.local_domain,
|
||||||
admin: object.admin&.id,
|
admin: object.admin&.id&.to_s,
|
||||||
}
|
}
|
||||||
|
|
||||||
if object.current_account
|
if object.current_account
|
||||||
store[:me] = object.current_account.id
|
store[:me] = object.current_account.id.to_s
|
||||||
store[:unfollow_modal] = object.current_account.user.setting_unfollow_modal
|
store[:unfollow_modal] = object.current_account.user.setting_unfollow_modal
|
||||||
store[:boost_modal] = object.current_account.user.setting_boost_modal
|
store[:boost_modal] = object.current_account.user.setting_boost_modal
|
||||||
store[:delete_modal] = object.current_account.user.setting_delete_modal
|
store[:delete_modal] = object.current_account.user.setting_delete_modal
|
||||||
|
@ -28,7 +28,7 @@ class InitialStateSerializer < ActiveModel::Serializer
|
||||||
store = {}
|
store = {}
|
||||||
|
|
||||||
if object.current_account
|
if object.current_account
|
||||||
store[:me] = object.current_account.id
|
store[:me] = object.current_account.id.to_s
|
||||||
store[:default_privacy] = object.current_account.user.setting_default_privacy
|
store[:default_privacy] = object.current_account.user.setting_default_privacy
|
||||||
store[:default_sensitive] = object.current_account.user.setting_default_sensitive
|
store[:default_sensitive] = object.current_account.user.setting_default_sensitive
|
||||||
end
|
end
|
||||||
|
@ -40,8 +40,8 @@ class InitialStateSerializer < ActiveModel::Serializer
|
||||||
|
|
||||||
def accounts
|
def accounts
|
||||||
store = {}
|
store = {}
|
||||||
store[object.current_account.id] = ActiveModelSerializers::SerializableResource.new(object.current_account, serializer: REST::AccountSerializer) if object.current_account
|
store[object.current_account.id.to_s] = ActiveModelSerializers::SerializableResource.new(object.current_account, serializer: REST::AccountSerializer) if object.current_account
|
||||||
store[object.admin.id] = ActiveModelSerializers::SerializableResource.new(object.admin, serializer: REST::AccountSerializer) if object.admin
|
store[object.admin.id.to_s] = ActiveModelSerializers::SerializableResource.new(object.admin, serializer: REST::AccountSerializer) if object.admin
|
||||||
store
|
store
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,10 @@ class REST::AccountSerializer < ActiveModel::Serializer
|
||||||
:note, :url, :avatar, :avatar_static, :header, :header_static,
|
:note, :url, :avatar, :avatar_static, :header, :header_static,
|
||||||
:followers_count, :following_count, :statuses_count
|
:followers_count, :following_count, :statuses_count
|
||||||
|
|
||||||
|
def id
|
||||||
|
object.id.to_s
|
||||||
|
end
|
||||||
|
|
||||||
def note
|
def note
|
||||||
Formatter.instance.simplified_format(object)
|
Formatter.instance.simplified_format(object)
|
||||||
end
|
end
|
||||||
|
|
|
@ -4,8 +4,12 @@ class REST::ApplicationSerializer < ActiveModel::Serializer
|
||||||
attributes :id, :name, :website, :redirect_uri,
|
attributes :id, :name, :website, :redirect_uri,
|
||||||
:client_id, :client_secret
|
:client_id, :client_secret
|
||||||
|
|
||||||
|
def id
|
||||||
|
object.id.to_s
|
||||||
|
end
|
||||||
|
|
||||||
def client_id
|
def client_id
|
||||||
object.uid
|
object.uid.to_s
|
||||||
end
|
end
|
||||||
|
|
||||||
def client_secret
|
def client_secret
|
||||||
|
|
|
@ -6,6 +6,10 @@ class REST::MediaAttachmentSerializer < ActiveModel::Serializer
|
||||||
attributes :id, :type, :url, :preview_url,
|
attributes :id, :type, :url, :preview_url,
|
||||||
:remote_url, :text_url, :meta
|
:remote_url, :text_url, :meta
|
||||||
|
|
||||||
|
def id
|
||||||
|
object.id.to_s
|
||||||
|
end
|
||||||
|
|
||||||
def url
|
def url
|
||||||
if object.needs_redownload?
|
if object.needs_redownload?
|
||||||
media_proxy_url(object.id, :original)
|
media_proxy_url(object.id, :original)
|
||||||
|
|
|
@ -6,6 +6,10 @@ class REST::NotificationSerializer < ActiveModel::Serializer
|
||||||
belongs_to :from_account, key: :account, serializer: REST::AccountSerializer
|
belongs_to :from_account, key: :account, serializer: REST::AccountSerializer
|
||||||
belongs_to :target_status, key: :status, if: :status_type?, serializer: REST::StatusSerializer
|
belongs_to :target_status, key: :status, if: :status_type?, serializer: REST::StatusSerializer
|
||||||
|
|
||||||
|
def id
|
||||||
|
object.id.to_s
|
||||||
|
end
|
||||||
|
|
||||||
def status_type?
|
def status_type?
|
||||||
[:favourite, :reblog, :mention].include?(object.type)
|
[:favourite, :reblog, :mention].include?(object.type)
|
||||||
end
|
end
|
||||||
|
|
|
@ -4,6 +4,10 @@ class REST::RelationshipSerializer < ActiveModel::Serializer
|
||||||
attributes :id, :following, :followed_by, :blocking,
|
attributes :id, :following, :followed_by, :blocking,
|
||||||
:muting, :requested, :domain_blocking
|
:muting, :requested, :domain_blocking
|
||||||
|
|
||||||
|
def id
|
||||||
|
object.id.to_s
|
||||||
|
end
|
||||||
|
|
||||||
def following
|
def following
|
||||||
instance_options[:relationships].following[object.id] || false
|
instance_options[:relationships].following[object.id] || false
|
||||||
end
|
end
|
||||||
|
|
|
@ -2,4 +2,8 @@
|
||||||
|
|
||||||
class REST::ReportSerializer < ActiveModel::Serializer
|
class REST::ReportSerializer < ActiveModel::Serializer
|
||||||
attributes :id, :action_taken
|
attributes :id, :action_taken
|
||||||
|
|
||||||
|
def id
|
||||||
|
object.id.to_s
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -19,6 +19,18 @@ class REST::StatusSerializer < ActiveModel::Serializer
|
||||||
has_many :tags
|
has_many :tags
|
||||||
has_many :emojis
|
has_many :emojis
|
||||||
|
|
||||||
|
def id
|
||||||
|
object.id.to_s
|
||||||
|
end
|
||||||
|
|
||||||
|
def in_reply_to_id
|
||||||
|
object.in_reply_to_id.to_s
|
||||||
|
end
|
||||||
|
|
||||||
|
def in_reply_to_account_id
|
||||||
|
object.in_reply_to_account_id.to_s
|
||||||
|
end
|
||||||
|
|
||||||
def current_user?
|
def current_user?
|
||||||
!current_user.nil?
|
!current_user.nil?
|
||||||
end
|
end
|
||||||
|
@ -82,7 +94,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
|
||||||
attributes :id, :username, :url, :acct
|
attributes :id, :username, :url, :acct
|
||||||
|
|
||||||
def id
|
def id
|
||||||
object.account_id
|
object.account_id.to_s
|
||||||
end
|
end
|
||||||
|
|
||||||
def username
|
def username
|
||||||
|
|
|
@ -18,7 +18,7 @@ class BatchedRemoveStatusService < BaseService
|
||||||
@stream_entry_batches = []
|
@stream_entry_batches = []
|
||||||
@salmon_batches = []
|
@salmon_batches = []
|
||||||
@activity_json_batches = []
|
@activity_json_batches = []
|
||||||
@json_payloads = statuses.map { |s| [s.id, Oj.dump(event: :delete, payload: s.id)] }.to_h
|
@json_payloads = statuses.map { |s| [s.id, Oj.dump(event: :delete, payload: s.id.to_s)] }.to_h
|
||||||
@activity_json = {}
|
@activity_json = {}
|
||||||
@activity_xml = {}
|
@activity_xml = {}
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ class RemoveStatusService < BaseService
|
||||||
include StreamEntryRenderer
|
include StreamEntryRenderer
|
||||||
|
|
||||||
def call(status)
|
def call(status)
|
||||||
@payload = Oj.dump(event: :delete, payload: status.id)
|
@payload = Oj.dump(event: :delete, payload: status.id.to_s)
|
||||||
@status = status
|
@status = status
|
||||||
@account = status.account
|
@account = status.account
|
||||||
@tags = status.tags.pluck(:name).to_a
|
@tags = status.tags.pluck(:name).to_a
|
||||||
|
|
|
@ -50,14 +50,14 @@ describe Api::V1::Accounts::RelationshipsController do
|
||||||
json = body_as_json
|
json = body_as_json
|
||||||
|
|
||||||
expect(json).to be_a Enumerable
|
expect(json).to be_a Enumerable
|
||||||
expect(json.first[:id]).to eq simon.id
|
expect(json.first[:id]).to eq simon.id.to_s
|
||||||
expect(json.first[:following]).to be true
|
expect(json.first[:following]).to be true
|
||||||
expect(json.first[:followed_by]).to be false
|
expect(json.first[:followed_by]).to be false
|
||||||
expect(json.first[:muting]).to be false
|
expect(json.first[:muting]).to be false
|
||||||
expect(json.first[:requested]).to be false
|
expect(json.first[:requested]).to be false
|
||||||
expect(json.first[:domain_blocking]).to be false
|
expect(json.first[:domain_blocking]).to be false
|
||||||
|
|
||||||
expect(json.second[:id]).to eq lewis.id
|
expect(json.second[:id]).to eq lewis.id.to_s
|
||||||
expect(json.second[:following]).to be false
|
expect(json.second[:following]).to be false
|
||||||
expect(json.second[:followed_by]).to be true
|
expect(json.second[:followed_by]).to be true
|
||||||
expect(json.second[:muting]).to be false
|
expect(json.second[:muting]).to be false
|
||||||
|
|
|
@ -53,7 +53,7 @@ RSpec.describe Api::V1::MediaController, type: :controller do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns media ID in JSON' do
|
it 'returns media ID in JSON' do
|
||||||
expect(body_as_json[:id]).to eq MediaAttachment.first.id
|
expect(body_as_json[:id]).to eq MediaAttachment.first.id.to_s
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -75,7 +75,7 @@ RSpec.describe Api::V1::MediaController, type: :controller do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns media ID in JSON' do
|
it 'returns media ID in JSON' do
|
||||||
expect(body_as_json[:id]).to eq MediaAttachment.first.id
|
expect(body_as_json[:id]).to eq MediaAttachment.first.id.to_s
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -97,7 +97,7 @@ RSpec.describe Api::V1::MediaController, type: :controller do
|
||||||
end
|
end
|
||||||
|
|
||||||
xit 'returns media ID in JSON' do
|
xit 'returns media ID in JSON' do
|
||||||
expect(body_as_json[:id]).to eq MediaAttachment.first.id
|
expect(body_as_json[:id]).to eq MediaAttachment.first.id.to_s
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -36,7 +36,7 @@ describe Api::V1::Statuses::FavouritesController do
|
||||||
it 'return json with updated attributes' do
|
it 'return json with updated attributes' do
|
||||||
hash_body = body_as_json
|
hash_body = body_as_json
|
||||||
|
|
||||||
expect(hash_body[:id]).to eq status.id
|
expect(hash_body[:id]).to eq status.id.to_s
|
||||||
expect(hash_body[:favourites_count]).to eq 1
|
expect(hash_body[:favourites_count]).to eq 1
|
||||||
expect(hash_body[:favourited]).to be true
|
expect(hash_body[:favourited]).to be true
|
||||||
end
|
end
|
||||||
|
|
|
@ -32,7 +32,7 @@ describe Api::V1::Statuses::PinsController do
|
||||||
it 'return json with updated attributes' do
|
it 'return json with updated attributes' do
|
||||||
hash_body = body_as_json
|
hash_body = body_as_json
|
||||||
|
|
||||||
expect(hash_body[:id]).to eq status.id
|
expect(hash_body[:id]).to eq status.id.to_s
|
||||||
expect(hash_body[:pinned]).to be true
|
expect(hash_body[:pinned]).to be true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -36,7 +36,7 @@ describe Api::V1::Statuses::ReblogsController do
|
||||||
it 'return json with updated attributes' do
|
it 'return json with updated attributes' do
|
||||||
hash_body = body_as_json
|
hash_body = body_as_json
|
||||||
|
|
||||||
expect(hash_body[:reblog][:id]).to eq status.id
|
expect(hash_body[:reblog][:id]).to eq status.id.to_s
|
||||||
expect(hash_body[:reblog][:reblogs_count]).to eq 1
|
expect(hash_body[:reblog][:reblogs_count]).to eq 1
|
||||||
expect(hash_body[:reblog][:reblogged]).to be true
|
expect(hash_body[:reblog][:reblogged]).to be true
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue