wip

src/acct.ts

@@ -0,0 +1,14 @@
+export type Acct = {
+	username: string;
+	host: string | null;
+};
+
+export function parse(acct: string): Acct {
+	if (acct.startsWith('@')) acct = acct.substr(1);
+	const split = acct.split('@', 2);
+	return { username: split[0], host: split[1] || null };
+}
+
+export function render(acct: Acct): string {
+	return acct.host == null ? acct.username : `${acct.username}@${acct.host}`;
+}

src/api.ts

@@ -1,25 +1,17 @@
 import { Endpoints } from './endpoints';
 
-export class APIClient {
+export function request<E extends keyof Endpoints>(
-	public i: { token: string; } | null = null;
+	origin: string,
-	private apiUrl: string;
+	endpoint: E,
-
+	data: Endpoints[E]['req'] = {},
-	constructor(opts: {
+	credential: string | null | undefined,
-		apiUrl: APIClient['apiUrl'];
-	}) {
-		this.apiUrl = opts.apiUrl;
-	}
-
-	public request<E extends keyof Endpoints>(
-		endpoint: E, data: Endpoints[E]['req'] = {}, token?: string | null | undefined
 ): Promise<Endpoints[E]['res']> {
 	const promise = new Promise<Endpoints[E]['res']>((resolve, reject) => {
 		// Append a credential
-			if (this.i) (data as Record<string, any>).i = this.i.token;
+		if (credential !== undefined) (data as Record<string, any>).i = credential;
-			if (token !== undefined) (data as Record<string, any>).i = token;
 
 		// Send request
-			fetch(endpoint.indexOf('://') > -1 ? endpoint : `${this.apiUrl}/${endpoint}`, {
+		fetch(`${origin}/api/${endpoint}`, {
 			method: 'POST',
 			body: JSON.stringify(data),
 			credentials: 'omit',
@@ -39,4 +31,20 @@ export class APIClient {
 
 	return promise;
 }
+
+export class APIClient {
+	public i: { token: string; } | null = null;
+	private origin: string;
+
+	constructor(opts: {
+		origin: APIClient['origin'];
+	}) {
+		this.origin = opts.origin;
+	}
+
+	public request<E extends keyof Endpoints>(
+		endpoint: E, data: Endpoints[E]['req'] = {}, credential?: string | null | undefined,
+	): Promise<Endpoints[E]['res']> {
+		return request(this.origin, endpoint, data, credential === undefined ? this.i?.token : credential);
+	}
 }