mirror of
https://github.com/Sevichecc/raycast-akkoma-extension.git
synced 2025-04-30 14:49:29 +08:00
refactor: more friendly error toast
This commit is contained in:
parent
bca2f2e23a
commit
e4663cd121
4 changed files with 28 additions and 25 deletions
12
src/api.ts
12
src/api.ts
|
@ -1,6 +1,6 @@
|
|||
import fetch from "node-fetch";
|
||||
import { OAuth, getPreferenceValues } from "@raycast/api";
|
||||
import { Credentials, Preference, Status ,StatusResponse} from "./types";
|
||||
import { Credentials, Preference, Status, StatusResponse } from "./types";
|
||||
import { client } from "./oauth";
|
||||
|
||||
export const fetchToken = async (params: URLSearchParams, errorMessage: string): Promise<OAuth.TokenResponse> => {
|
||||
|
@ -12,8 +12,7 @@ export const fetchToken = async (params: URLSearchParams, errorMessage: string):
|
|||
});
|
||||
|
||||
if (!response.ok) {
|
||||
console.error(errorMessage, await response.text());
|
||||
throw new Error(response.statusText);
|
||||
throw new Error(errorMessage);
|
||||
}
|
||||
|
||||
return (await response.json()) as OAuth.TokenResponse;
|
||||
|
@ -35,9 +34,7 @@ export const createApp = async (): Promise<Credentials> => {
|
|||
}),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error("Failed to create Akkoma app");
|
||||
}
|
||||
if (!response.ok) throw new Error("Failed to create Akkoma app");
|
||||
|
||||
return (await response.json()) as Credentials;
|
||||
};
|
||||
|
@ -70,8 +67,9 @@ export const postNewStatus = async ({
|
|||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error("Failed to pulish new status!");
|
||||
throw new Error("Failed to pulish :(");
|
||||
}
|
||||
|
||||
|
||||
return (await response.json()) as StatusResponse;
|
||||
};
|
||||
|
|
|
@ -15,15 +15,11 @@ const StatusContent = ({ isMarkdown, draftStatus }: statusProps) => {
|
|||
<Form.TextArea
|
||||
id="status"
|
||||
title="Content"
|
||||
placeholder="Write something down"
|
||||
placeholder={`Write something down ${isMarkdown ? "with Markdown" : ""}`}
|
||||
enableMarkdown={isMarkdown}
|
||||
autoFocus={true}
|
||||
value={statusContent}
|
||||
error={error ? "Content should not be empty!" : ""}
|
||||
onChange={setStatusContent}
|
||||
onBlur={() => {
|
||||
setError(!statusContent.trim());
|
||||
}}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
import { useEffect, useState } from "react";
|
||||
import { Form, ActionPanel, Action, showToast, popToRoot, LaunchProps, Toast } from "@raycast/api";
|
||||
import { postNewStatus } from "./api";
|
||||
import { Status } from "./types";
|
||||
import { Status, AkkomaError } from "./types";
|
||||
import { authorize } from "./oauth";
|
||||
|
||||
import VisibilityDropdown from "./components/VisibilityDropdown";
|
||||
import StatusContent from "./components/statusContent";
|
||||
|
||||
|
@ -17,17 +18,19 @@ export default function Command(props: LaunchProps<{ draftValues: Partial<Status
|
|||
|
||||
const handleSubmit = async (values: Partial<Status>) => {
|
||||
try {
|
||||
if (!values.status) throw new Error("You might forget the content, right ? |・ω・)");
|
||||
showToast(Toast.Style.Animated, "Publishing to the Fediverse ... ᕕ( ᐛ )ᕗ");
|
||||
|
||||
await postNewStatus({
|
||||
...values,
|
||||
content_type: isMarkdown ? "text/markdown" : "text/plain",
|
||||
});
|
||||
})
|
||||
|
||||
setCw("");
|
||||
showToast({ title: "Success", message: "Status has been posted!" });
|
||||
showToast(Toast.Style.Success, "Status has been published (≧∇≦)/ ! ");
|
||||
popToRoot();
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
showToast({ title: "Error", message: "Something went wrong!", style: Toast.Style.Failure });
|
||||
const requestErr = error as AkkomaError;
|
||||
showToast(Toast.Style.Failure, "Error", requestErr.message);
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -40,7 +43,7 @@ export default function Command(props: LaunchProps<{ draftValues: Partial<Status
|
|||
</ActionPanel>
|
||||
}
|
||||
>
|
||||
<Form.TextField id="spoiler_text" title="CW" placeholder="content warning" value={cw} onChange={setCw} />
|
||||
<Form.TextField id="spoiler_text" title="CW" placeholder={"content warning"} value={cw} onChange={setCw} />
|
||||
<StatusContent isMarkdown={isMarkdown} draftStatus={draftValues?.status} />
|
||||
<VisibilityDropdown />
|
||||
<Form.Checkbox
|
||||
|
|
12
src/types.ts
12
src/types.ts
|
@ -1,4 +1,10 @@
|
|||
import type {Icon} from '@raycast/api'
|
||||
import type { Icon } from "@raycast/api";
|
||||
|
||||
export interface AkkomaError {
|
||||
code: string;
|
||||
message: string;
|
||||
}
|
||||
|
||||
export interface Preference {
|
||||
instance: string;
|
||||
defaultVisibility: VisibilityScope;
|
||||
|
@ -9,7 +15,7 @@ export type VisibilityScope = "public" | "unlisted" | "direct" | "private" | "lo
|
|||
export interface VisibilityOption {
|
||||
title: string;
|
||||
value: VisibilityScope;
|
||||
icon: Icon
|
||||
icon: Icon;
|
||||
}
|
||||
|
||||
interface Application {
|
||||
|
@ -61,5 +67,5 @@ export interface StatusResponse {
|
|||
id: string;
|
||||
create_at: Date;
|
||||
content: string;
|
||||
application: Application
|
||||
application: Application;
|
||||
}
|
Loading…
Reference in a new issue