refactor progress
This commit is contained in:
@@ -17,25 +17,26 @@
|
||||
* along with Fluxer. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import * as ModalActionCreators from '@app/actions/ModalActionCreators';
|
||||
import {modal} from '@app/actions/ModalActionCreators';
|
||||
import * as ToastActionCreators from '@app/actions/ToastActionCreators';
|
||||
import {MaxBookmarksModal} from '@app/components/alerts/MaxBookmarksModal';
|
||||
import {Endpoints} from '@app/Endpoints';
|
||||
import http from '@app/lib/HttpClient';
|
||||
import {Logger} from '@app/lib/Logger';
|
||||
import {type SavedMessageEntry, SavedMessageEntryRecord} from '@app/records/SavedMessageEntryRecord';
|
||||
import SavedMessagesStore from '@app/stores/SavedMessagesStore';
|
||||
import {getApiErrorCode} from '@app/utils/ApiErrorUtils';
|
||||
import {APIErrorCodes} from '@fluxer/constants/src/ApiErrorCodes';
|
||||
import type {I18n} from '@lingui/core';
|
||||
import {msg} from '@lingui/core/macro';
|
||||
import * as ModalActionCreators from '~/actions/ModalActionCreators';
|
||||
import {modal} from '~/actions/ModalActionCreators';
|
||||
import * as ToastActionCreators from '~/actions/ToastActionCreators';
|
||||
import {APIErrorCodes} from '~/Constants';
|
||||
import {MaxBookmarksModal} from '~/components/alerts/MaxBookmarksModal';
|
||||
import {Endpoints} from '~/Endpoints';
|
||||
import http, {HttpError} from '~/lib/HttpClient';
|
||||
import {Logger} from '~/lib/Logger';
|
||||
import {SavedMessageEntryRecord, type SavedMessageEntryResponse} from '~/records/SavedMessageEntryRecord';
|
||||
import SavedMessagesStore from '~/stores/SavedMessagesStore';
|
||||
|
||||
const logger = new Logger('SavedMessages');
|
||||
|
||||
export const fetch = async (): Promise<Array<SavedMessageEntryRecord>> => {
|
||||
export async function fetch(): Promise<Array<SavedMessageEntryRecord>> {
|
||||
try {
|
||||
logger.debug('Fetching saved messages');
|
||||
const response = await http.get<Array<SavedMessageEntryResponse>>({url: Endpoints.USER_SAVED_MESSAGES});
|
||||
const response = await http.get<Array<SavedMessageEntry>>({url: Endpoints.USER_SAVED_MESSAGES});
|
||||
const data = response.body ?? [];
|
||||
const entries = data.map(SavedMessageEntryRecord.fromResponse);
|
||||
SavedMessagesStore.fetchSuccess(entries);
|
||||
@@ -46,9 +47,9 @@ export const fetch = async (): Promise<Array<SavedMessageEntryRecord>> => {
|
||||
logger.error('Failed to fetch saved messages:', error);
|
||||
throw error;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
export const create = async (i18n: I18n, channelId: string, messageId: string): Promise<void> => {
|
||||
export async function create(i18n: I18n, channelId: string, messageId: string): Promise<void> {
|
||||
try {
|
||||
logger.debug(`Saving message ${messageId} from channel ${channelId}`);
|
||||
await http.post({url: Endpoints.USER_SAVED_MESSAGES, body: {channel_id: channelId, message_id: messageId}});
|
||||
@@ -60,22 +61,16 @@ export const create = async (i18n: I18n, channelId: string, messageId: string):
|
||||
} catch (error) {
|
||||
logger.error(`Failed to save message ${messageId}:`, error);
|
||||
|
||||
if (
|
||||
error instanceof HttpError &&
|
||||
typeof error.body === 'object' &&
|
||||
error.body != null &&
|
||||
'code' in error.body &&
|
||||
(error.body as {code?: string}).code === APIErrorCodes.MAX_BOOKMARKS
|
||||
) {
|
||||
if (getApiErrorCode(error) === APIErrorCodes.MAX_BOOKMARKS) {
|
||||
ModalActionCreators.push(modal(() => <MaxBookmarksModal />));
|
||||
return;
|
||||
}
|
||||
|
||||
throw error;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
export const remove = async (i18n: I18n, messageId: string): Promise<void> => {
|
||||
export async function remove(i18n: I18n, messageId: string): Promise<void> {
|
||||
try {
|
||||
SavedMessagesStore.handleMessageDelete(messageId);
|
||||
logger.debug(`Removing message ${messageId} from saved messages`);
|
||||
@@ -89,4 +84,4 @@ export const remove = async (i18n: I18n, messageId: string): Promise<void> => {
|
||||
logger.error(`Failed to remove message ${messageId} from saved messages:`, error);
|
||||
throw error;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user