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

app/javascript/mastodon/reducers/status_lists.js

@@ -1,12 +1,13 @@
 import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet } from 'immutable';
 
+import { BOOKMARK_CATEGORY_STATUSES_FETCH_SUCCESS, BOOKMARK_CATEGORY_STATUSES_EXPAND_SUCCESS, BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS, BOOKMARK_CATEGORY_EDITOR_REMOVE_SUCCESS } from 'mastodon/actions/bookmark_categories';
+import { CIRCLE_STATUSES_EXPAND_SUCCESS, CIRCLE_STATUSES_FETCH_SUCCESS } from 'mastodon/actions/circles';
+import { COMPOSE_WITH_CIRCLE_SUCCESS } from 'mastodon/actions/compose';
+
 import {
   blockAccountSuccess,
   muteAccountSuccess,
 } from '../actions/accounts';
-import {
-  BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS,
-} from '../actions/bookmark_categories';
 import {
   BOOKMARKED_STATUSES_FETCH_REQUEST,
   BOOKMARKED_STATUSES_FETCH_SUCCESS,
@@ -54,7 +55,6 @@ import {
 } from '../actions/trends';
 
 
-
 const initialState = ImmutableMap({
   favourites: ImmutableMap({
     next: null,
@@ -81,9 +81,31 @@ const initialState = ImmutableMap({
     loaded: false,
     items: ImmutableOrderedSet(),
   }),
+  circle_statuses: ImmutableMap(),
+  bookmark_category_statuses: ImmutableMap(),
 });
 
 const normalizeList = (state, listType, statuses, next) => {
+  if (Array.isArray(listType)) {
+    if (state.getIn(listType)) {
+      return state.updateIn(listType, listMap => {
+        return listMap.withMutations(map => {
+          map.set('next', next);
+          map.set('loaded', true);
+          map.set('isLoading', false);
+          map.set('items', ImmutableOrderedSet(statuses.map(item => item.id)));
+        });
+      });
+    } else {
+      return state.setIn(listType, ImmutableMap({
+        next: next,
+        loaded: true,
+        isLoading: false,
+        items: ImmutableOrderedSet(statuses.map(item => item.id)),
+      }));
+    }
+  }
+
   return state.update(listType, listMap => listMap.withMutations(map => {
     map.set('next', next);
     map.set('loaded', true);
@@ -93,6 +115,14 @@ const normalizeList = (state, listType, statuses, next) => {
 };
 
 const appendToList = (state, listType, statuses, next) => {
+  if (Array.isArray(listType)) {
+    return state.updateIn(listType, listMap => listMap.withMutations(map => {
+      map.set('next', next);
+      map.set('isLoading', false);
+      map.set('items', map.get('items').union(statuses.map(item => item.id)));
+    }));
+  }
+
   return state.update(listType, listMap => listMap.withMutations(map => {
     map.set('next', next);
     map.set('isLoading', false);
@@ -105,6 +135,16 @@ const prependOneToList = (state, listType, status) => {
 };
 
 const prependOneToListById = (state, listType, statusId) => {
+  if (Array.isArray(listType)) {
+    if (!state.getIn(listType)) return state;
+
+    return state.updateIn(listType, item => item.withMutations(map => {
+      if (map.get('items')) {
+        map.update('items', list => ImmutableOrderedSet([statusId]).union(list));
+      }
+    }));
+  }
+
   return state.updateIn([listType, 'items'], (list) => {
     if (list.includes(statusId)) {
       return list;
@@ -118,6 +158,32 @@ const removeOneFromList = (state, listType, status) => {
   return state.updateIn([listType, 'items'], (list) => list.delete(status.get('id')));
 };
 
+const removeOneFromListById = (state, listType, statusId) => {
+  if (Array.isArray(listType)) {
+    if (!state.getIn(listType)) return state;
+
+    return state.updateIn(listType, item => item.withMutations(map => {
+      if (map.get('items')) {
+        map.update('items', list => list.delete(statusId));
+      }
+    }));
+  }
+  
+  return state.update(listType, item => item.withMutations(map => {
+    if (map.get('items')) {
+      map.update('items', list => list.delete(statusId));
+    }
+  }));
+};
+
+const removeOneFromAllBookmarkCategoriesById = (state, statusId) => {
+  let s = state;
+  state.get('bookmark_category_statuses').forEach((category) => {
+    s = s.updateIn(['bookmark_category_statuses', category.get('id'), 'items'], list => list?.delete(statusId));
+  });
+  return s;
+};
+
 export default function statusLists(state = initialState, action) {
   switch(action.type) {
   case FAVOURITED_STATUSES_FETCH_REQUEST:
@@ -140,6 +206,16 @@ export default function statusLists(state = initialState, action) {
     return normalizeList(state, 'emoji_reactions', action.statuses, action.next);
   case EMOJI_REACTED_STATUSES_EXPAND_SUCCESS:
     return appendToList(state, 'emoji_reactions', action.statuses, action.next);
+  case CIRCLE_STATUSES_FETCH_SUCCESS:
+    return normalizeList(state, ['circle_statuses', action.id], action.statuses, action.next);
+  case CIRCLE_STATUSES_EXPAND_SUCCESS:
+    return appendToList(state, ['circle_statuses', action.id], action.statuses, action.next);
+  case COMPOSE_WITH_CIRCLE_SUCCESS:
+    return prependOneToListById(state, ['circle_statuses', action.circleId], action.statusId);
+  case BOOKMARK_CATEGORY_STATUSES_FETCH_SUCCESS:
+    return normalizeList(state, ['bookmark_category_statuses', action.id], action.statuses, action.next);
+  case BOOKMARK_CATEGORY_STATUSES_EXPAND_SUCCESS:
+    return appendToList(state, ['bookmark_category_statuses', action.id], action.statuses, action.next);
   case BOOKMARKED_STATUSES_FETCH_REQUEST:
   case BOOKMARKED_STATUSES_EXPAND_REQUEST:
     return state.setIn(['bookmarks', 'isLoading'], true);
@@ -171,9 +247,17 @@ export default function statusLists(state = initialState, action) {
   case BOOKMARK_SUCCESS:
     return prependOneToList(state, 'bookmarks', action.status);
   case BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS:
-    return prependOneToListById(state, 'bookmarks', action.statusId);
+  {
+    const s = prependOneToListById(state, 'bookmarks', action.statusId);
+    return prependOneToListById(s, ['bookmark_category_statuses', action.id], action.statusId);
+  }
+  case BOOKMARK_CATEGORY_EDITOR_REMOVE_SUCCESS:
+    return removeOneFromListById(state, ['bookmark_category_statuses', action.id], action.statusId);
   case UNBOOKMARK_SUCCESS:
-    return removeOneFromList(state, 'bookmarks', action.status);
+  {
+    const s = removeOneFromList(state, 'bookmarks', action.status);
+    return removeOneFromAllBookmarkCategoriesById(s, action.statusId);
+  }
   case PINNED_STATUSES_FETCH_SUCCESS:
     return normalizeList(state, 'pins', action.statuses, action.next);
   case PIN_SUCCESS: