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

Merge commit 'e58c36d308' into kb_migration

Browse source
This commit is contained in:
KMY 2023-05-25 08:46:53 +09:00
commit d6f8f19e31
418 changed files with 2835 additions and 1841 deletions
Download patch file Download diff file Expand all files Collapse all files

59
app/javascript/mastodon/reducers/status_lists.js
View file

@ -1,19 +1,9 @@
import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet } from 'immutable';
import {
FAVOURITED_STATUSES_FETCH_REQUEST,
FAVOURITED_STATUSES_FETCH_SUCCESS,
FAVOURITED_STATUSES_FETCH_FAIL,
FAVOURITED_STATUSES_EXPAND_REQUEST,
FAVOURITED_STATUSES_EXPAND_SUCCESS,
FAVOURITED_STATUSES_EXPAND_FAIL,
} from '../actions/favourites';
import {
EMOJI_REACTED_STATUSES_FETCH_REQUEST,
EMOJI_REACTED_STATUSES_FETCH_SUCCESS,
EMOJI_REACTED_STATUSES_FETCH_FAIL,
EMOJI_REACTED_STATUSES_EXPAND_REQUEST,
EMOJI_REACTED_STATUSES_EXPAND_SUCCESS,
EMOJI_REACTED_STATUSES_EXPAND_FAIL,
} from '../actions/emoji_reactions';
ACCOUNT_BLOCK_SUCCESS,
ACCOUNT_MUTE_SUCCESS,
} from '../actions/accounts';
import {
BOOKMARKED_STATUSES_FETCH_REQUEST,
BOOKMARKED_STATUSES_FETCH_SUCCESS,
@ -23,17 +13,21 @@ import {
BOOKMARKED_STATUSES_EXPAND_FAIL,
} from '../actions/bookmarks';
import {
PINNED_STATUSES_FETCH_SUCCESS,
} from '../actions/pin_statuses';
EMOJI_REACTED_STATUSES_FETCH_REQUEST,
EMOJI_REACTED_STATUSES_FETCH_SUCCESS,
EMOJI_REACTED_STATUSES_FETCH_FAIL,
EMOJI_REACTED_STATUSES_EXPAND_REQUEST,
EMOJI_REACTED_STATUSES_EXPAND_SUCCESS,
EMOJI_REACTED_STATUSES_EXPAND_FAIL,
} from '../actions/emoji_reactions';
import {
TRENDS_STATUSES_FETCH_REQUEST,
TRENDS_STATUSES_FETCH_SUCCESS,
TRENDS_STATUSES_FETCH_FAIL,
TRENDS_STATUSES_EXPAND_REQUEST,
TRENDS_STATUSES_EXPAND_SUCCESS,
TRENDS_STATUSES_EXPAND_FAIL,
} from '../actions/trends';
import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet } from 'immutable';
FAVOURITED_STATUSES_FETCH_REQUEST,
FAVOURITED_STATUSES_FETCH_SUCCESS,
FAVOURITED_STATUSES_FETCH_FAIL,
FAVOURITED_STATUSES_EXPAND_REQUEST,
FAVOURITED_STATUSES_EXPAND_SUCCESS,
FAVOURITED_STATUSES_EXPAND_FAIL,
} from '../actions/favourites';
import {
FAVOURITE_SUCCESS,
UNFAVOURITE_SUCCESS,
@ -45,9 +39,18 @@ import {
UNPIN_SUCCESS,
} from '../actions/interactions';
import {
ACCOUNT_BLOCK_SUCCESS,
ACCOUNT_MUTE_SUCCESS,
} from '../actions/accounts';
PINNED_STATUSES_FETCH_SUCCESS,
} from '../actions/pin_statuses';
import {
TRENDS_STATUSES_FETCH_REQUEST,
TRENDS_STATUSES_FETCH_SUCCESS,
TRENDS_STATUSES_FETCH_FAIL,
TRENDS_STATUSES_EXPAND_REQUEST,
TRENDS_STATUSES_EXPAND_SUCCESS,
TRENDS_STATUSES_EXPAND_FAIL,
} from '../actions/trends';
const initialState = ImmutableMap({
favourites: ImmutableMap({