gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Allow @username@domain/@username in follow form, prevent duplicate accounts

Browse source 
created via remote look-up when domains differ but point to the same resource
This commit is contained in:
Eugen Rochko 2016-11-03 16:57:44 +01:00
parent e4671adc25
commit 3731230c6d
5 changed files with 37 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/assets/javascripts/components/reducers/statuses.jsx
View file

@ -21,14 +21,14 @@ import {
import Immutable from 'immutable';
const normalizeStatus = (state, status) => {
status = status.set('account', status.getIn(['account', 'id']));
status.account = status.account.id;
if (status.getIn(['reblog', 'id'])) {
state = normalizeStatus(state, status.get('reblog'));
status = status.set('reblog', status.getIn(['reblog', 'id']));
if (status.reblog && status.reblog.id) {
state = normalizeStatus(state, status.reblog);
status.reblog = status.reblog.id;
}
return state.set(status.get('id'), status);
return state.set(status.id, Immutable.fromJS(status));
};
const normalizeStatuses = (state, statuses) => {
@ -53,18 +53,18 @@ export default function statuses(state = initialState, action) {
switch(action.type) {
case TIMELINE_UPDATE:
case STATUS_FETCH_SUCCESS:
return normalizeStatus(state, Immutable.fromJS(action.status));
return normalizeStatus(state, action.status);
case REBLOG_SUCCESS:
case UNREBLOG_SUCCESS:
case FAVOURITE_SUCCESS:
case UNFAVOURITE_SUCCESS:
return normalizeStatus(state, Immutable.fromJS(action.response));
return normalizeStatus(state, action.response);
case TIMELINE_REFRESH_SUCCESS:
case TIMELINE_EXPAND_SUCCESS:
case ACCOUNT_TIMELINE_FETCH_SUCCESS:
case ACCOUNT_TIMELINE_EXPAND_SUCCESS:
case CONTEXT_FETCH_SUCCESS:
return normalizeStatuses(state, Immutable.fromJS(action.statuses));
return normalizeStatuses(state, action.statuses);
case TIMELINE_DELETE:
return deleteStatus(state, action.id, action.references);
default: