rework timelines

packages/pl-fe/src/actions/accounts.ts

@@ -14,7 +14,7 @@ import { getClient, type PlfeResponse } from '../api';
 
 import { importEntities } from './importer';
 
-import type { MinifiedSuggestion } from 'pl-fe/queries/trends/use-suggested-accounts';
+import type { MinifiedSuggestion } from 'pl-fe/queries/trends/suggested-accounts';
 import type { MinifiedStatus } from 'pl-fe/reducers/statuses';
 import type { AppDispatch, RootState } from 'pl-fe/store';
 import type { History } from 'pl-fe/types/history';

packages/pl-fe/src/actions/auth.ts

@@ -49,7 +49,6 @@ const AUTH_APP_AUTHORIZED = 'AUTH_APP_AUTHORIZED' as const;
 const AUTH_LOGGED_IN = 'AUTH_LOGGED_IN' as const;
 const AUTH_LOGGED_OUT = 'AUTH_LOGGED_OUT' as const;
 
-const VERIFY_CREDENTIALS_REQUEST = 'VERIFY_CREDENTIALS_REQUEST' as const;
 const VERIFY_CREDENTIALS_SUCCESS = 'VERIFY_CREDENTIALS_SUCCESS' as const;
 const VERIFY_CREDENTIALS_FAIL = 'VERIFY_CREDENTIALS_FAIL' as const;
 
@@ -158,11 +157,6 @@ const otpVerify = (code: string, mfa_token: string) =>
     }).then((token) => dispatch(authLoggedIn(token)));
   };
 
-interface VerifyCredentialsRequestAction {
-  type: typeof VERIFY_CREDENTIALS_REQUEST;
-  token: string;
-}
-
 interface VerifyCredentialsSuccessAction {
   type: typeof VERIFY_CREDENTIALS_SUCCESS;
   token: string;
@@ -179,8 +173,6 @@ const verifyCredentials = (token: string, accountUrl?: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     const baseURL = parseBaseURL(accountUrl) || BuildConfig.BACKEND_URL;
 
-    dispatch<VerifyCredentialsRequestAction>({ type: VERIFY_CREDENTIALS_REQUEST, token });
-
     const client = new PlApiClient(baseURL, token);
 
     return client.settings.verifyCredentials().then((account) => {
@@ -336,7 +328,6 @@ type AuthAction =
   | AuthAppAuthorizedAction
   | AuthLoggedInAction
   | AuthLoggedOutAction
-  | VerifyCredentialsRequestAction
   | VerifyCredentialsSuccessAction
   | VerifyCredentialsFailAction
   | AuthAccountRememberSuccessAction;
@@ -347,7 +338,6 @@ export {
   AUTH_APP_AUTHORIZED,
   AUTH_LOGGED_IN,
   AUTH_LOGGED_OUT,
-  VERIFY_CREDENTIALS_REQUEST,
   VERIFY_CREDENTIALS_SUCCESS,
   VERIFY_CREDENTIALS_FAIL,
   AUTH_ACCOUNT_REMEMBER_SUCCESS,

packages/pl-fe/src/actions/domain-blocks.ts

@@ -7,7 +7,7 @@ import { getClient } from '../api';
 import type { PaginatedResponse } from 'pl-api';
 import type { EntityStore } from 'pl-fe/entity-store/types';
 import type { Account } from 'pl-fe/normalizers/account';
-import type { MinifiedSuggestion } from 'pl-fe/queries/trends/use-suggested-accounts';
+import type { MinifiedSuggestion } from 'pl-fe/queries/trends/suggested-accounts';
 import type { AppDispatch, RootState } from 'pl-fe/store';
 
 const DOMAIN_UNBLOCK_SUCCESS = 'DOMAIN_UNBLOCK_SUCCESS' as const;

packages/pl-fe/src/actions/events.ts

@@ -9,12 +9,6 @@ import { STATUS_FETCH_SOURCE_FAIL, STATUS_FETCH_SOURCE_REQUEST, STATUS_FETCH_SOU
 import type { CreateEventParams, Location, MediaAttachment, PaginatedResponse, Status } from 'pl-api';
 import type { AppDispatch, RootState } from 'pl-fe/store';
 
-const EVENT_JOIN_REQUEST = 'EVENT_JOIN_REQUEST' as const;
-const EVENT_JOIN_FAIL = 'EVENT_JOIN_FAIL' as const;
-
-const EVENT_LEAVE_REQUEST = 'EVENT_LEAVE_REQUEST' as const;
-const EVENT_LEAVE_FAIL = 'EVENT_LEAVE_FAIL' as const;
-
 const EVENT_COMPOSE_CANCEL = 'EVENT_COMPOSE_CANCEL' as const;
 
 const EVENT_FORM_SET = 'EVENT_FORM_SET' as const;
@@ -26,8 +20,6 @@ const JOINED_EVENTS_FETCH_REQUEST = 'JOINED_EVENTS_FETCH_REQUEST' as const;
 const JOINED_EVENTS_FETCH_SUCCESS = 'JOINED_EVENTS_FETCH_SUCCESS' as const;
 const JOINED_EVENTS_FETCH_FAIL = 'JOINED_EVENTS_FETCH_FAIL' as const;
 
-const noOp = () => new Promise(f => f(undefined));
-
 const messages = defineMessages({
   exceededImageSizeLimit: { id: 'upload_error.image_size_limit', defaultMessage: 'Image exceeds the current file size limit ({limit})' },
   success: { id: 'compose_event.submit_success', defaultMessage: 'Your event was created' },
@@ -95,75 +87,6 @@ const submitEvent = ({
     });
   };
 
-const joinEvent = (statusId: string, participationMessage?: string) =>
-  (dispatch: AppDispatch, getState: () => RootState) => {
-    const status = getState().statuses[statusId];
-
-    if (!status || !status.event || status.event.join_state) {
-      return dispatch(noOp);
-    }
-
-    dispatch(joinEventRequest(status.id));
-
-    return getClient(getState).events.joinEvent(statusId, participationMessage).then((data) => {
-      dispatch(importEntities({ statuses: [data] }));
-      toast.success(
-        data.event?.join_state === 'pending' ? messages.joinRequestSuccess : messages.joinSuccess,
-        {
-          actionLabel: messages.view,
-          actionLink: `/@${data.account.acct}/events/${data.id}`,
-        },
-      );
-    }).catch((error) => {
-      dispatch(joinEventFail(error, status.id, status?.event?.join_state || null));
-    });
-  };
-
-const joinEventRequest = (statusId: string) => ({
-  type: EVENT_JOIN_REQUEST,
-  statusId,
-});
-
-const joinEventFail = (error: unknown, statusId: string, previousState: Exclude<Status['event'], null>['join_state'] | null) => ({
-  type: EVENT_JOIN_FAIL,
-  error,
-  statusId,
-  previousState,
-});
-
-const leaveEvent = (statusId: string) =>
-  (dispatch: AppDispatch, getState: () => RootState) => {
-    const status = getState().statuses[statusId];
-
-    if (!status || !status.event || !status.event.join_state) {
-      return dispatch(noOp);
-    }
-
-    dispatch(leaveEventRequest(status.id));
-
-    return getClient(getState).events.leaveEvent(statusId).then((data) => {
-      dispatch(importEntities({ statuses: [data] }));
-    }).catch((error) => {
-      dispatch(leaveEventFail(error, status.id, status?.event?.join_state || null));
-    });
-  };
-
-const leaveEventRequest = (statusId: string) => ({
-  type: EVENT_LEAVE_REQUEST,
-  statusId,
-});
-
-const leaveEventFail = (error: unknown, statusId: string, previousState: Exclude<Status['event'], null>['join_state'] | null) => ({
-  type: EVENT_LEAVE_FAIL,
-  statusId,
-  error,
-  previousState,
-});
-
-const fetchEventIcs = (statusId: string) =>
-  (dispatch: AppDispatch, getState: () => RootState) =>
-    getClient(getState).events.getEventIcs(statusId);
-
 const cancelEventCompose = () => ({
   type: EVENT_COMPOSE_CANCEL,
 });
@@ -233,10 +156,6 @@ const fetchJoinedEvents = () =>
   };
 
 type EventsAction =
-  | ReturnType<typeof joinEventRequest>
-  | ReturnType<typeof joinEventFail>
-  | ReturnType<typeof leaveEventRequest>
-  | ReturnType<typeof leaveEventFail>
   | ReturnType<typeof cancelEventCompose>
   | EventFormSetAction
   | { type: typeof RECENT_EVENTS_FETCH_REQUEST }
@@ -247,10 +166,6 @@ type EventsAction =
   | { type: typeof JOINED_EVENTS_FETCH_FAIL; error: unknown }
 
 export {
-  EVENT_JOIN_REQUEST,
-  EVENT_JOIN_FAIL,
-  EVENT_LEAVE_REQUEST,
-  EVENT_LEAVE_FAIL,
   EVENT_COMPOSE_CANCEL,
   EVENT_FORM_SET,
   RECENT_EVENTS_FETCH_REQUEST,
@@ -260,9 +175,6 @@ export {
   JOINED_EVENTS_FETCH_SUCCESS,
   JOINED_EVENTS_FETCH_FAIL,
   submitEvent,
-  joinEvent,
-  leaveEvent,
-  fetchEventIcs,
   cancelEventCompose,
   initEventEdit,
   fetchRecentEvents,