a27fcf5e30
Squashed commit of the following: commit 7b2ba61c4841e23081552fb79270e4e430dd1fe0 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 16:03:52 2020 +0900 Add the ability to change to a new circle by replying to a circle commit 7013a228c65c7bd147885de458b50095f3c24334 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 16:10:57 2020 +0900 fixup! add-limited-visibility-icon-to-status commit 679aa8a7f9bef42ee5d0b326d9ae4925a1999939 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 15:12:53 2020 +0900 Fix 14666 commit b3addd8220d8bb3512ff345b32ca83c714dadd2a Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 11:44:12 2020 +0900 Add Japanese translation for circle commit b7f4b773a0cd554084d5ad6a5923adb06b3acfc4 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 11:40:12 2020 +0900 Squashed commit of the following: commit b85a4685b27c49462288aba5f38723b91e936c4a Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 10:50:03 2020 +0900 Changed to remove restrictions on privacy options and allow users to switch circles when replying commit 0a8c0140c73d7c5333e4f8017964adb5061a7cf1 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 09:33:07 2020 +0900 Change limited visibility icon commit b64adf19788d828249408454ec6afa9beb3d4872 Author: noellabo <noel.yoshiba@gmail.com> Date: Mon Aug 31 06:50:56 2020 +0900 Fix a change to limited-visibility-bearcaps replies commit ed361405b5e38857a2f42b0515a599ddcdd412cf Author: noellabo <noel.yoshiba@gmail.com> Date: Thu Aug 27 15:53:18 2020 +0900 Fix composer text when change visibility commit 4da3adddb6ffde43070d743e34c5b56e06579b30 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Aug 22 22:34:23 2020 +0900 Fix wrong circle_id when changing visibility commit 752d7fc2a3c9e34fab9993d767f83c6eae7ba55a Author: noellabo <noel.yoshiba@gmail.com> Date: Sun Aug 9 13:12:51 2020 +0900 Add circle reply and redraft commit 5978bc04a24695edce6717bda89dcf6f861ef2c4 Author: noellabo <noel.yoshiba@gmail.com> Date: Mon Jul 27 01:07:52 2020 +0900 Fix remove unused props commit 7970f69676c24b4aa9385fee8b1635c46ba52fcd Author: noellabo <noel.yoshiba@gmail.com> Date: Sun Jul 26 21:17:07 2020 +0900 Separate circle choice from privacy commit 36f6a684c0b0c895d4d0f1b9d09b05c91b104666 Author: noellabo <noel.yoshiba@gmail.com> Date: Thu Jul 23 10:54:25 2020 +0900 Add UI for posting to circles commit 7ef48003c1407275663dd603b124d292db2aa93a Author: noellabo <noel.yoshiba@gmail.com> Date: Fri Jul 24 12:55:10 2020 +0900 Fix silent mention by circle commit 7a1caed49333c3d3241301afb77639cdf1cabdc0 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 11:38:10 2020 +0900 Squashed commit of the following: commit dca71fab86c830932ca760b7d8b3f89cc25c453e Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 09:31:26 2020 +0900 Revert "Add focus setting when opening the circle column" This reverts commit 3a93ac99312a13b68b7edc2b81313fb0ffb7bcdc. commit 0a1bc8307bb699c7eb3024072ce14a440df1fc87 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 09:31:11 2020 +0900 Change limited visibility icon commit 9784f8b562f6592e9d9190ca29d2b2e870006d10 Author: noellabo <noel.yoshiba@gmail.com> Date: Thu Aug 13 21:52:07 2020 +0900 Add focus setting when opening the circle column commit a84f680c167fab9276550850c60f9108d251144e Author: noellabo <noel.yoshiba@gmail.com> Date: Thu Aug 13 15:55:27 2020 +0900 Fix message commit e3f11c4adac57b6e6a15c981ed6f4721a1634212 Author: noellabo <noel.yoshiba@gmail.com> Date: Mon Jul 27 01:01:23 2020 +0900 Fix light-theme commit d7d96eda5b86d3e3f654ce79888e7cf5aa535db5 Author: noellabo <noel.yoshiba@gmail.com> Date: Sun Jul 26 21:50:56 2020 +0900 Fix circles loading in share page and followers search commit 10b821f7b8c0a87cea3df51f09deeadc2cb40b32 Author: noellabo <noel.yoshiba@gmail.com> Date: Fri Jul 24 14:08:00 2020 +0900 Refactor list items commit e020072915572ce409039ccf799d08f8d8b5b393 Author: noellabo <noel.yoshiba@gmail.com> Date: Thu Jul 23 20:15:38 2020 +0900 Fixed a bug that circle name change is not reflected in the list commit 735bc41161b4c09a8dafe2c0064096b3ca79f2a0 Author: noellabo <noel.yoshiba@gmail.com> Date: Wed Jul 22 08:49:47 2020 +0900 Add UI for managing circle members commit d7c3145b8fa84be0631bf7f41bb229f3e6d03ff1 Author: noellabo <noel.yoshiba@gmail.com> Date: Wed Jul 22 07:34:52 2020 +0900 Add the followers option to AccountSearchSercive commit 65e2b0c4299b72ede440b50089c1bd6afa6c9c05 Author: noellabo <noel.yoshiba@gmail.com> Date: Wed Jul 22 07:05:56 2020 +0900 Add CircleSerializer commit a639e1803abf5590068846dbe98bc5edfaa2ad82 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 11:37:30 2020 +0900 Squashed commit of the following: commit 9cb3fb9d980e3ee066083076f508c5ab1447176a Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 07:15:19 2020 +0900 Move the link to the mention list to the menu commit b32dd87b43f4e09b8e2c437f1fb5d3ebd6221215 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 00:56:12 2020 +0900 Change limited visibility icon commit 8db0d024119d1c2cef8de849f2501496a166a2dd Author: noellabo <noel.yoshiba@gmail.com> Date: Tue Sep 1 01:42:13 2020 +0900 Fix to disallow getting the list of mentions in limited replies commit 490a9d65a59a3dd0d86e81f6780e879dc4313dff Author: noellabo <noel.yoshiba@gmail.com> Date: Fri Jul 24 11:36:24 2020 +0900 Add column to list mentioned accounts of limited status commit 62a423ac2729c16f26fafe111f257bc373218df2 Author: noellabo <noel.yoshiba@gmail.com> Date: Thu Jul 23 13:30:17 2020 +0900 Fix visibility compatibility more commit a5cfa54b259054f41e89037f299fa928a2361818 Author: noellabo <noel.yoshiba@gmail.com> Date: Mon Jul 20 05:39:49 2020 +0900 Fix visibility compatibility commit 7900ca5650c77565b86ddc594a221dfa3b5321b4 Author: noellabo <noel.yoshiba@gmail.com> Date: Mon Jul 20 02:01:27 2020 +0900 Add limited visibility icon to status commit 66b83965ef068e9ee8c940249c68bcbde15731fe Author: Eugen Rochko <eugen@zeonfederated.com> Date: Wed Aug 26 03:16:47 2020 +0200 Add conversation-based forwarding for limited visibility statuses through bearcaps commit 561abc65e0ace89318b3952047025b8d98515fbb Author: Eugen Rochko <eugen@zeonfederated.com> Date: Sun Jul 19 02:05:16 2020 +0200 Add REST API for managing and posting to circles Circles are the conceptual opposite of lists. A list is a subdivision of your follows, a circle is a subdivision of your followers. Posting to a circle means making content available to only some of your followers. Circles have been internally supported in Mastodon for the purposes of federation since #8950, this adds the REST API necessary for making use of them in Mastodon itsef.
96 lines
3 KiB
JavaScript
96 lines
3 KiB
JavaScript
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: '',
|
|
|
|
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('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;
|
|
}
|
|
};
|