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

Merge remote-tracking branch 'parent/main' into upstream-2024112

Browse source
This commit is contained in:
KMY 2024-11-28 19:45:31 +09:00
commit 3359008684
71 changed files with 1505 additions and 2295 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/selectors/index.js
View file

@ -139,9 +139,9 @@ export const getStatusList = createSelector([
], (items) => items.toList());
export const getBookmarkCategoryStatusList = createSelector([
(state, bookmarkCategoryId) => state.getIn(['bookmark_categories', bookmarkCategoryId, 'items']),
(state, bookmarkCategoryId) => state.getIn(['status_lists', 'bookmark_category_statuses', bookmarkCategoryId, 'items']),
], (items) => items ? items.toList() : ImmutableList());
export const getCircleStatusList = createSelector([
(state, circleId) => state.getIn(['circles', circleId, 'items']),
(state, circleId) => state.getIn(['status_lists', 'circle_statuses', circleId, `items`]),
], (items) => items ? items.toList() : ImmutableList());