ash/WebStudio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Couple fixes.

Browse source
This commit is contained in:
Matthew Stratford 2020-03-29 14:07:42 +01:00
parent 99cd1f8c22
commit b984d755e1
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/api.ts
View file

@ -106,7 +106,6 @@ export function getShowplan(showId: number): Promise<Showplan> {
"GET",
{}
).then(res => {
console.log(res);
return Object.keys(res).map(x => res[x]);
});
}
@ -214,17 +213,16 @@ export function updateShowplan(
export interface Timeslot {
timeslotid: number,
time: number,
timeStr: string
starttime: number,
starttimeStr: string,
title: string
}
export function getCurrentAPITimeslot(): Promise<Timeslot> {
export function getCurrentApiTimeslot(): Promise<Timeslot> {
return myradioApiRequest(`/timeslot/userselectedtimeslot`, "GET", {}
).then(res => {
console.log(res);
return res;
});
};
@ -236,15 +234,13 @@ export interface User {
sname: string,
url: string,
photo: string
}
export function getCurrentAPIUser(): Promise<User> {
export function getCurrentApiUser(): Promise<User> {
return myradioApiRequest(`/user/currentuser`, "GET", {}
).then(res => {
console.log(res);
return res;
});
};

4
src/broadcast/state.ts
View file

@ -48,15 +48,15 @@ export const toggleTracklisting = (): AppThunk => dispatch => {
};
export const tracklistStart = (player: number, trackid: number): AppThunk =>async (dispatch, getState) => {
console.log("Attempting to tracklist: " + trackid);
if (getState().broadcast.tracklisting) {
console.log("Attempting to tracklist: " + trackid);
getState().mixer.players[player].tracklistItemID = (await sendTracklistStart(trackid)).audiologid;
}
};
export const tracklistEnd = (tracklistitemid: number): AppThunk => async (dispatch, getState) => {
console.log("Attempting to end tracklistitem: " + tracklistitemid);
if (getState().broadcast.tracklisting) {
console.log("Attempting to end tracklistitem: " + tracklistitemid);
myradioApiRequest("/tracklistItem/" + tracklistitemid + "/endtime", "PUT", {});
}
};