From b4972dfa437c7019b534597a0cdd63215298c6e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?KMY=EF=BC=88=E9=9B=AA=E3=81=82=E3=81=99=E3=81=8B=EF=BC=89?= Date: Fri, 6 Dec 2024 12:25:35 +0900 Subject: [PATCH] =?UTF-8?q?Fix:=20=E3=82=B5=E3=83=BC=E3=82=AF=E3=83=AB?= =?UTF-8?q?=E3=83=BB=E3=83=96=E3=83=83=E3=82=AF=E3=83=9E=E3=83=BC=E3=82=AF?= =?UTF-8?q?=E5=88=86=E9=A1=9E=E3=81=A7=E9=81=8E=E5=8E=BB=E6=8A=95=E7=A8=BF?= =?UTF-8?q?=E3=81=8C=E9=81=A1=E3=82=8C=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C?= =?UTF-8?q?=20(#939)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/javascript/mastodon/actions/bookmark_categories.js | 4 ++-- app/javascript/mastodon/actions/circles.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/javascript/mastodon/actions/bookmark_categories.js b/app/javascript/mastodon/actions/bookmark_categories.js index eab632ab7ac749..313d5de8f2aea7 100644 --- a/app/javascript/mastodon/actions/bookmark_categories.js +++ b/app/javascript/mastodon/actions/bookmark_categories.js @@ -129,9 +129,9 @@ export const fetchBookmarkCategoryStatusesFail = (id, error) => ({ export function expandBookmarkCategoryStatuses(bookmarkCategoryId) { return (dispatch, getState) => { - const url = getState().getIn(['bookmark_categories', bookmarkCategoryId, 'next'], null); + const url = getState().getIn(['status_lists', 'bookmark_category_statuses', bookmarkCategoryId, 'next'], null); - if (url === null || getState().getIn(['bookmark_categories', bookmarkCategoryId, 'isLoading'])) { + if (url === null || getState().getIn(['status_lists', 'bookmark_category_statuses', bookmarkCategoryId, 'isLoading'])) { return; } diff --git a/app/javascript/mastodon/actions/circles.js b/app/javascript/mastodon/actions/circles.js index c9cbb2cd13f8a4..221c0c683a7315 100644 --- a/app/javascript/mastodon/actions/circles.js +++ b/app/javascript/mastodon/actions/circles.js @@ -152,9 +152,9 @@ export function fetchCircleStatusesFail(id, error) { export function expandCircleStatuses(circleId) { return (dispatch, getState) => { - const url = getState().getIn(['circles', circleId, 'next'], null); + const url = getState().getIn(['status_lists', 'circle_statuses', circleId, 'next'], null); - if (url === null || getState().getIn(['circles', circleId, 'isLoading'])) { + if (url === null || getState().getIn(['status_lists', 'circle_statuses', circleId, 'isLoading'])) { return; }