diff --git a/src/api.ts b/src/api.ts index f8cf0fe..17b9d05 100644 --- a/src/api.ts +++ b/src/api.ts @@ -27,13 +27,6 @@ export interface OutgoingMessage { export type Credentials = string | Token | void; -const apiPrefix = "https://api.bitwave.tv/api/"; -const chatServer = "https://chat.bitwave.tv"; -const whisperEndpoint: [string, string] = [ - "api.bitwave.tv", - "/v1/whispers/send", -]; - export interface Token { recaptcha: any; page: string; @@ -114,7 +107,8 @@ export class FedwaveChat { */ public async updateUsernames(): Promise { try { - const data = await $http.get(this._apiPrefix + "/v1/chat/channels"); + const res = await $http.get(this._apiPrefix + "/v1/chat/channels"); + const data = JSON.parse(res); if (data && data.success) { await this.onUpdateUsernames(data.data); this.channelViewers = data.data; @@ -301,7 +295,7 @@ export class FedwaveChat { } async sendWhisper(recipient: string, msg: string): Promise { - await $http.post(this._whisperEndpoint[0], this._whisperEndpoint[1], { + await $http.post(this._apiPrefix + this._whisperEndpoint, { chatToken: this.userProfile.jwt, receiver: recipient, message: msg, diff --git a/src/httpClient.ts b/src/httpClient.ts index 1d61306..0b49a2f 100644 --- a/src/httpClient.ts +++ b/src/httpClient.ts @@ -11,19 +11,14 @@ const $get = (url: string, cb: Function): void => { req.send(null); }; -const $post = ( - url: string, - path: string, - data: any, - cb: (...args: any[]) => void -): void => { +const $post = (url: string, data: any, cb: (...args: any[]) => void): void => { const req = new XMLHttpRequest(); req.onreadystatechange = () => { if (req.readyState === 4 && req.status === 200) { cb(JSON.parse(req.responseText)); } }; - req.open("POST", url + path); + req.open("POST", url); req.setRequestHeader("Content-Type", "application/x-www-form-urlencoded"); req.setRequestHeader("X-Requested-With", "XMLHttpRequest"); @@ -37,9 +32,9 @@ export default { $get(url, (response) => resolve(response)); }); }, - post: (url: string, path: string, data: Object): Promise => { + post: (url: string, data: Object): Promise => { return new Promise((resolve) => { - $post(url, path, data, (response) => resolve(response)); + $post(url, data, (response) => resolve(response)); }); }, };