post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Add circle editor

Browse source
This commit is contained in:
KMY 2023-08-21 16:37:35 +09:00
parent c97e63bb18
commit b0854b1dd8
33 changed files with 1671 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

48
app/javascript/mastodon/reducers/circle_adder.js Normal file
View file

@ -0,0 +1,48 @@
import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
import {
LIST_ADDER_RESET,
LIST_ADDER_SETUP,
LIST_ADDER_LISTS_FETCH_REQUEST,
LIST_ADDER_LISTS_FETCH_SUCCESS,
LIST_ADDER_LISTS_FETCH_FAIL,
LIST_EDITOR_ADD_SUCCESS,
LIST_EDITOR_REMOVE_SUCCESS,
} from '../actions/lists';
const initialState = ImmutableMap({
accountId: null,
lists: ImmutableMap({
items: ImmutableList(),
loaded: false,
isLoading: false,
}),
});
export default function listAdderReducer(state = initialState, action) {
switch(action.type) {
case LIST_ADDER_RESET:
return initialState;
case LIST_ADDER_SETUP:
return state.withMutations(map => {
map.set('accountId', action.account.get('id'));
});
case LIST_ADDER_LISTS_FETCH_REQUEST:
return state.setIn(['lists', 'isLoading'], true);
case LIST_ADDER_LISTS_FETCH_FAIL:
return state.setIn(['lists', 'isLoading'], false);
case LIST_ADDER_LISTS_FETCH_SUCCESS:
return state.update('lists', lists => lists.withMutations(map => {
map.set('isLoading', false);
map.set('loaded', true);
map.set('items', ImmutableList(action.lists.map(item => item.id)));
}));
case LIST_EDITOR_ADD_SUCCESS:
return state.updateIn(['lists', 'items'], list => list.unshift(action.listId));
case LIST_EDITOR_REMOVE_SUCCESS:
return state.updateIn(['lists', 'items'], list => list.filterNot(item => item === action.listId));
default:
return state;
}
}

99
app/javascript/mastodon/reducers/circle_editor.js Normal file
View file

@ -0,0 +1,99 @@
import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
import {
CIRCLE_CREATE_REQUEST,
CIRCLE_CREATE_FAIL,
CIRCLE_CREATE_SUCCESS,
CIRCLE_UPDATE_REQUEST,
CIRCLE_UPDATE_FAIL,
CIRCLE_UPDATE_SUCCESS,
CIRCLE_EDITOR_RESET,
CIRCLE_EDITOR_SETUP,
CIRCLE_EDITOR_TITLE_CHANGE,
CIRCLE_ACCOUNTS_FETCH_REQUEST,
CIRCLE_ACCOUNTS_FETCH_SUCCESS,
CIRCLE_ACCOUNTS_FETCH_FAIL,
CIRCLE_EDITOR_SUGGESTIONS_READY,
CIRCLE_EDITOR_SUGGESTIONS_CLEAR,
CIRCLE_EDITOR_SUGGESTIONS_CHANGE,
CIRCLE_EDITOR_ADD_SUCCESS,
CIRCLE_EDITOR_REMOVE_SUCCESS,
} from '../actions/circles';
const initialState = ImmutableMap({
circleId: null,
isSubmitting: false,
isChanged: false,
title: '',
isExclusive: false,
accounts: ImmutableMap({
items: ImmutableList(),
loaded: false,
isLoading: false,
}),
suggestions: ImmutableMap({
value: '',
items: ImmutableList(),
}),
});
export default function circleEditorReducer(state = initialState, action) {
switch(action.type) {
case CIRCLE_EDITOR_RESET:
return initialState;
case CIRCLE_EDITOR_SETUP:
return state.withMutations(map => {
map.set('circleId', action.circle.get('id'));
map.set('title', action.circle.get('title'));
map.set('isExclusive', action.circle.get('is_exclusive'));
map.set('isSubmitting', false);
});
case CIRCLE_EDITOR_TITLE_CHANGE:
return state.withMutations(map => {
map.set('title', action.value);
map.set('isChanged', true);
});
case CIRCLE_CREATE_REQUEST:
case CIRCLE_UPDATE_REQUEST:
return state.withMutations(map => {
map.set('isSubmitting', true);
map.set('isChanged', false);
});
case CIRCLE_CREATE_FAIL:
case CIRCLE_UPDATE_FAIL:
return state.set('isSubmitting', false);
case CIRCLE_CREATE_SUCCESS:
case CIRCLE_UPDATE_SUCCESS:
return state.withMutations(map => {
map.set('isSubmitting', false);
map.set('circleId', action.circle.id);
});
case CIRCLE_ACCOUNTS_FETCH_REQUEST:
return state.setIn(['accounts', 'isLoading'], true);
case CIRCLE_ACCOUNTS_FETCH_FAIL:
return state.setIn(['accounts', 'isLoading'], false);
case CIRCLE_ACCOUNTS_FETCH_SUCCESS:
return state.update('accounts', accounts => accounts.withMutations(map => {
map.set('isLoading', false);
map.set('loaded', true);
map.set('items', ImmutableList(action.accounts.map(item => item.id)));
}));
case CIRCLE_EDITOR_SUGGESTIONS_CHANGE:
return state.setIn(['suggestions', 'value'], action.value);
case CIRCLE_EDITOR_SUGGESTIONS_READY:
return state.setIn(['suggestions', 'items'], ImmutableList(action.accounts.map(item => item.id)));
case CIRCLE_EDITOR_SUGGESTIONS_CLEAR:
return state.update('suggestions', suggestions => suggestions.withMutations(map => {
map.set('items', ImmutableList());
map.set('value', '');
}));
case CIRCLE_EDITOR_ADD_SUCCESS:
return state.updateIn(['accounts', 'items'], circle => circle.unshift(action.accountId));
case CIRCLE_EDITOR_REMOVE_SUCCESS:
return state.updateIn(['accounts', 'items'], circle => circle.filterNot(item => item === action.accountId));
default:
return state;
}
}

38
app/javascript/mastodon/reducers/circles.js Normal file
View file

@ -0,0 +1,38 @@
import { Map as ImmutableMap, fromJS } from 'immutable';
import {
CIRCLE_FETCH_SUCCESS,
CIRCLE_FETCH_FAIL,
CIRCLES_FETCH_SUCCESS,
CIRCLE_CREATE_SUCCESS,
CIRCLE_UPDATE_SUCCESS,
CIRCLE_DELETE_SUCCESS,
} from '../actions/circles';
const initialState = ImmutableMap();
const normalizeList = (state, circle) => state.set(circle.id, fromJS(circle));
const normalizeLists = (state, circles) => {
circles.forEach(circle => {
state = normalizeList(state, circle);
});
return state;
};
export default function circles(state = initialState, action) {
switch(action.type) {
case CIRCLE_FETCH_SUCCESS:
case CIRCLE_CREATE_SUCCESS:
case CIRCLE_UPDATE_SUCCESS:
return normalizeList(state, action.circle);
case CIRCLES_FETCH_SUCCESS:
return normalizeLists(state, action.circles);
case CIRCLE_DELETE_SUCCESS:
case CIRCLE_FETCH_FAIL:
return state.set(action.id, false);
default:
return state;
}
}

6
app/javascript/mastodon/reducers/index.ts
View file

@ -13,6 +13,9 @@ import antennaEditor from './antenna_editor';
import antennas from './antennas';
import blocks from './blocks';
import boosts from './boosts';
import circleAdder from './circle_adder';
import circleEditor from './circle_editor';
import circles from './circles';
import compose from './compose';
import contexts from './contexts';
import conversations from './conversations';
@ -83,6 +86,9 @@ const reducers = {
antennas,
antennaEditor,
antennaAdder,
circles,
circleEditor,
circleAdder,
filters,
conversations,
suggestions,

46
app/javascript/mastodon/reducers/list_adder.js
View file

@ -1,47 +1,47 @@
import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
import {
LIST_ADDER_RESET,
LIST_ADDER_SETUP,
LIST_ADDER_LISTS_FETCH_REQUEST,
LIST_ADDER_LISTS_FETCH_SUCCESS,
LIST_ADDER_LISTS_FETCH_FAIL,
LIST_EDITOR_ADD_SUCCESS,
LIST_EDITOR_REMOVE_SUCCESS,
} from '../actions/lists';
CIRCLE_ADDER_RESET,
CIRCLE_ADDER_SETUP,
CIRCLE_ADDER_CIRCLES_FETCH_REQUEST,
CIRCLE_ADDER_CIRCLES_FETCH_SUCCESS,
CIRCLE_ADDER_CIRCLES_FETCH_FAIL,
CIRCLE_EDITOR_ADD_SUCCESS,
CIRCLE_EDITOR_REMOVE_SUCCESS,
} from '../actions/circles';
const initialState = ImmutableMap({
accountId: null,
lists: ImmutableMap({
circles: ImmutableMap({
items: ImmutableList(),
loaded: false,
isLoading: false,
}),
});
export default function listAdderReducer(state = initialState, action) {
export default function circleAdderReducer(state = initialState, action) {
switch(action.type) {
case LIST_ADDER_RESET:
case CIRCLE_ADDER_RESET:
return initialState;
case LIST_ADDER_SETUP:
case CIRCLE_ADDER_SETUP:
return state.withMutations(map => {
map.set('accountId', action.account.get('id'));
});
case LIST_ADDER_LISTS_FETCH_REQUEST:
return state.setIn(['lists', 'isLoading'], true);
case LIST_ADDER_LISTS_FETCH_FAIL:
return state.setIn(['lists', 'isLoading'], false);
case LIST_ADDER_LISTS_FETCH_SUCCESS:
return state.update('lists', lists => lists.withMutations(map => {
case CIRCLE_ADDER_CIRCLES_FETCH_REQUEST:
return state.setIn(['circles', 'isLoading'], true);
case CIRCLE_ADDER_CIRCLES_FETCH_FAIL:
return state.setIn(['circles', 'isLoading'], false);
case CIRCLE_ADDER_CIRCLES_FETCH_SUCCESS:
return state.update('circles', circles => circles.withMutations(map => {
map.set('isLoading', false);
map.set('loaded', true);
map.set('items', ImmutableList(action.lists.map(item => item.id)));
map.set('items', ImmutableList(action.circles.map(item => item.id)));
}));
case LIST_EDITOR_ADD_SUCCESS:
return state.updateIn(['lists', 'items'], list => list.unshift(action.listId));
case LIST_EDITOR_REMOVE_SUCCESS:
return state.updateIn(['lists', 'items'], list => list.filterNot(item => item === action.listId));
case CIRCLE_EDITOR_ADD_SUCCESS:
return state.updateIn(['circles', 'items'], circle => circle.unshift(action.circleId));
case CIRCLE_EDITOR_REMOVE_SUCCESS:
return state.updateIn(['circles', 'items'], circle => circle.filterNot(item => item === action.circleId));
default:
return state;
}