Merge with scrobbler

src/api/TraktScrobble.ts

@@ -1,7 +1,7 @@
 import { TraktItem } from '../models/TraktItem';
-import { EventDispatcher, Events } from '../services/Events';
+import { EventDispatcher } from '../services/Events';
 import { Messaging } from '../services/Messaging';
-import { Requests } from '../services/Requests';
+import { RequestException, Requests } from '../services/Requests';
 import { Shared } from '../services/Shared';
 import { TraktApi } from './TraktApi';
 
@@ -81,12 +81,12 @@ class _TraktScrobble extends TraktApi {
 				method: 'POST',
 				body: data,
 			});
-			await EventDispatcher.dispatch(Events.SCROBBLE_SUCCESS, null, { item, scrobbleType });
+			await EventDispatcher.dispatch('SCROBBLE_SUCCESS', null, { item, scrobbleType });
 		} catch (err) {
-			await EventDispatcher.dispatch(Events.SCROBBLE_ERROR, null, {
+			await EventDispatcher.dispatch('SCROBBLE_ERROR', null, {
 				item,
 				scrobbleType,
-				error: err as Error,
+				error: err as RequestException,
 			});
 		}
 	};

src/api/TraktSearch.ts

@@ -1,6 +1,6 @@
 import { Item } from '../models/Item';
 import { TraktItem } from '../models/TraktItem';
-import { EventDispatcher, Events } from '../services/Events';
+import { EventDispatcher } from '../services/Events';
 import { Requests } from '../services/Requests';
 import { TraktApi } from './TraktApi';
 
@@ -95,9 +95,9 @@ class _TraktSearch extends TraktApi {
 					year,
 				});
 			}
-			await EventDispatcher.dispatch(Events.SEARCH_SUCCESS, null, { searchItem });
+			await EventDispatcher.dispatch('SEARCH_SUCCESS', null, { searchItem });
 		} catch (err) {
-			await EventDispatcher.dispatch(Events.SEARCH_ERROR, null, { error: err as Error });
+			await EventDispatcher.dispatch('SEARCH_ERROR', null, { error: err as Error });
 		}
 		return traktItem;
 	};

src/api/TraktSync.ts

@@ -1,7 +1,7 @@
 import * as moment from 'moment';
 import { Item } from '../models/Item';
 import { Errors } from '../services/Errors';
-import { EventDispatcher, Events } from '../services/Events';
+import { EventDispatcher } from '../services/Events';
 import { Requests } from '../services/Requests';
 import { TraktApi } from './TraktApi';
 
@@ -94,12 +94,12 @@ class _TraktSync extends TraktApi {
 					}
 				}
 			}
-			await EventDispatcher.dispatch(Events.HISTORY_SYNC_SUCCESS, null, {
+			await EventDispatcher.dispatch('HISTORY_SYNC_SUCCESS', null, {
 				added: responseJson.added,
 			});
 		} catch (err) {
 			Errors.error('Failed to sync history.', err);
-			await EventDispatcher.dispatch(Events.HISTORY_SYNC_ERROR, null, { error: err as Error });
+			await EventDispatcher.dispatch('HISTORY_SYNC_ERROR', null, { error: err as Error });
 		}
 	};
 }

src/components/UtsDialog.tsx

@@ -8,16 +8,9 @@ import {
 } from '@material-ui/core';
 import * as React from 'react';
 import { useEffect, useState } from 'react';
-import { EventDispatcher, Events } from '../services/Events';
+import { EventDispatcher, DialogShowData } from '../services/Events';
 
-interface DialogData {
-	title: string;
-	message: string;
-	onConfirm?: () => void;
-	onDeny?: () => void;
-}
-
-interface DialogState extends DialogData {
+interface DialogState extends DialogShowData {
 	isOpen: boolean;
 }
 
@@ -41,14 +34,14 @@ export const UtsDialog: React.FC = () => {
 
 	useEffect(() => {
 		const startListeners = () => {
-			EventDispatcher.subscribe(Events.DIALOG_SHOW, null, showDialog);
+			EventDispatcher.subscribe('DIALOG_SHOW', null, showDialog);
 		};
 
 		const stopListeners = () => {
-			EventDispatcher.unsubscribe(Events.DIALOG_SHOW, null, showDialog);
+			EventDispatcher.unsubscribe('DIALOG_SHOW', null, showDialog);
 		};
 
-		const showDialog = (data: DialogData) => {
+		const showDialog = (data: DialogShowData) => {
 			setDialog({
 				isOpen: true,
 				title: data.title,

src/components/UtsSnackbar.tsx

@@ -2,13 +2,7 @@ import { Snackbar } from '@material-ui/core';
 import { Alert, Color } from '@material-ui/lab';
 import * as React from 'react';
 import { useEffect, useState } from 'react';
-import { EventDispatcher, Events } from '../services/Events';
-
-interface SnackbarData {
-	messageName: string;
-	messageArgs: string[];
-	severity: Color;
-}
+import { EventDispatcher, SnackbarShowData } from '../services/Events';
 
 interface SnackBarState {
 	isOpen: boolean;
@@ -32,14 +26,14 @@ export const UtsSnackbar: React.FC = () => {
 
 	useEffect(() => {
 		const startListeners = () => {
-			EventDispatcher.subscribe(Events.SNACKBAR_SHOW, null, showSnackbar);
+			EventDispatcher.subscribe('SNACKBAR_SHOW', null, showSnackbar);
 		};
 
 		const stopListeners = () => {
-			EventDispatcher.unsubscribe(Events.SNACKBAR_SHOW, null, showSnackbar);
+			EventDispatcher.unsubscribe('SNACKBAR_SHOW', null, showSnackbar);
 		};
 
-		const showSnackbar = (data: SnackbarData) => {
+		const showSnackbar = (data: SnackbarShowData) => {
 			setSnackbar({
 				isOpen: true,
 				message: browser.i18n.getMessage(data.messageName, data.messageArgs || []),

src/components/WrongItemDialog.tsx

@@ -12,7 +12,7 @@ import * as React from 'react';
 import { Item } from '../models/Item';
 import { BrowserStorage } from '../services/BrowserStorage';
 import { Errors } from '../services/Errors';
-import { EventDispatcher, Events, WrongItemDialogData } from '../services/Events';
+import { EventDispatcher, WrongItemDialogShowData } from '../services/Events';
 import { StreamingServiceId, streamingServices } from '../streaming-services/streaming-services';
 import { UtsCenter } from './UtsCenter';
 
@@ -68,13 +68,13 @@ export const WrongItemDialog: React.FC = () => {
 			}
 			correctUrls[dialog.serviceId][dialog.item.id] = url;
 			await BrowserStorage.set({ correctUrls }, true);
-			await EventDispatcher.dispatch(Events.WRONG_ITEM_CORRECTED, dialog.serviceId, {
+			await EventDispatcher.dispatch('WRONG_ITEM_CORRECTED', dialog.serviceId, {
 				item: dialog.item,
 				url,
 			});
 		} catch (err) {
 			Errors.error('Failed to correct item.', err);
-			await EventDispatcher.dispatch(Events.SNACKBAR_SHOW, null, {
+			await EventDispatcher.dispatch('SNACKBAR_SHOW', null, {
 				messageName: 'correctWrongItemFailed',
 				severity: 'error',
 			});
@@ -104,14 +104,14 @@ export const WrongItemDialog: React.FC = () => {
 
 	React.useEffect(() => {
 		const startListeners = () => {
-			EventDispatcher.subscribe(Events.WRONG_ITEM_DIALOG_SHOW, null, openDialog);
+			EventDispatcher.subscribe('WRONG_ITEM_DIALOG_SHOW', null, openDialog);
 		};
 
 		const stopListeners = () => {
-			EventDispatcher.unsubscribe(Events.WRONG_ITEM_DIALOG_SHOW, null, openDialog);
+			EventDispatcher.unsubscribe('WRONG_ITEM_DIALOG_SHOW', null, openDialog);
 		};
 
-		const openDialog = (data: WrongItemDialogData) => {
+		const openDialog = (data: WrongItemDialogShowData) => {
 			setDialog({
 				isOpen: true,
 				isLoading: false,

src/modules/history/HistoryApp.tsx

@@ -6,7 +6,7 @@ import { Redirect, Route, Router, Switch } from 'react-router-dom';
 import { ErrorBoundary } from '../../components/ErrorBoundary';
 import { UtsDialog } from '../../components/UtsDialog';
 import { UtsSnackbar } from '../../components/UtsSnackbar';
-import { EventDispatcher, Events } from '../../services/Events';
+import { EventDispatcher } from '../../services/Events';
 import { Session } from '../../services/Session';
 import { HistoryHeader } from './components/HistoryHeader';
 import { AboutPage } from './pages/AboutPage';
@@ -21,13 +21,13 @@ export const HistoryApp: React.FC = () => {
 
 	useEffect(() => {
 		const startListeners = () => {
-			EventDispatcher.subscribe(Events.LOGIN_SUCCESS, null, onLogin);
-			EventDispatcher.subscribe(Events.LOGOUT_SUCCESS, null, onLogout);
+			EventDispatcher.subscribe('LOGIN_SUCCESS', null, onLogin);
+			EventDispatcher.subscribe('LOGOUT_SUCCESS', null, onLogout);
 		};
 
 		const stopListeners = () => {
-			EventDispatcher.unsubscribe(Events.LOGIN_SUCCESS, null, onLogin);
-			EventDispatcher.unsubscribe(Events.LOGOUT_SUCCESS, null, onLogout);
+			EventDispatcher.unsubscribe('LOGIN_SUCCESS', null, onLogin);
+			EventDispatcher.unsubscribe('LOGOUT_SUCCESS', null, onLogout);
 		};
 
 		const onLogin = () => {

src/modules/history/components/history/HistoryListItem.tsx

@@ -3,7 +3,7 @@ import { green, red } from '@material-ui/core/colors';
 import SyncIcon from '@material-ui/icons/Sync';
 import * as React from 'react';
 import { Item } from '../../../../models/Item';
-import { EventDispatcher, Events } from '../../../../services/Events';
+import { EventDispatcher } from '../../../../services/Events';
 import { StreamingServiceId } from '../../../../streaming-services/streaming-services';
 import { HistoryListItemCard } from './HistoryListItemCard';
 
@@ -18,14 +18,14 @@ export const HistoryListItem: React.FC<HistoryListItemProps> = (props: HistoryLi
 	const { dateFormat, item, serviceId, serviceName } = props;
 
 	const onCheckboxChange = async () => {
-		await EventDispatcher.dispatch(Events.STREAMING_SERVICE_HISTORY_CHANGE, null, {
+		await EventDispatcher.dispatch('STREAMING_SERVICE_HISTORY_CHANGE', null, {
 			index: item.index,
 			checked: !item.isSelected,
 		});
 	};
 
 	const openWrongItemDialog = async () => {
-		await EventDispatcher.dispatch(Events.WRONG_ITEM_DIALOG_SHOW, null, {
+		await EventDispatcher.dispatch('WRONG_ITEM_DIALOG_SHOW', null, {
 			serviceId,
 			item,
 		});

src/modules/history/components/history/HistoryOptionsListItem.tsx

@@ -1,22 +1,22 @@
 import { FormControlLabel, Switch, TextField } from '@material-ui/core';
 import * as React from 'react';
 import { SyncOption } from '../../../../services/BrowserStorage';
-import { EventDispatcher, Events } from '../../../../services/Events';
+import { EventDispatcher } from '../../../../services/Events';
 
 interface HistoryOptionsListItemProps {
 	option: SyncOption;
 }
 
 export const HistoryOptionsListItem: React.FC<HistoryOptionsListItemProps> = ({ option }) => {
 	const onSwitchChange = async (): Promise<void> => {
-		await EventDispatcher.dispatch(Events.HISTORY_OPTIONS_CHANGE, null, {
+		await EventDispatcher.dispatch('HISTORY_OPTIONS_CHANGE', null, {
 			id: option.id,
 			value: !option.value,
 		});
 	};
 
 	const onNumberInputChange = async (event: React.ChangeEvent<HTMLInputElement>): Promise<void> => {
-		await EventDispatcher.dispatch(Events.HISTORY_OPTIONS_CHANGE, null, {
+		await EventDispatcher.dispatch('HISTORY_OPTIONS_CHANGE', null, {
 			id: option.id,
 			value: parseInt(event.currentTarget.value),
 		});

src/modules/history/pages/LoginPage.tsx

@@ -3,7 +3,7 @@ import * as React from 'react';
 import { useEffect, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 import { UtsCenter } from '../../../components/UtsCenter';
-import { EventDispatcher, Events } from '../../../services/Events';
+import { EventDispatcher } from '../../../services/Events';
 import { Session } from '../../../services/Session';
 
 export const LoginPage: React.FC = () => {
@@ -17,13 +17,13 @@ export const LoginPage: React.FC = () => {
 
 	useEffect(() => {
 		const startListeners = () => {
-			EventDispatcher.subscribe(Events.LOGIN_SUCCESS, null, onLoginSuccess);
-			EventDispatcher.subscribe(Events.LOGIN_ERROR, null, onLoginError);
+			EventDispatcher.subscribe('LOGIN_SUCCESS', null, onLoginSuccess);
+			EventDispatcher.subscribe('LOGIN_ERROR', null, onLoginError);
 		};
 
 		const stopListeners = () => {
-			EventDispatcher.unsubscribe(Events.LOGIN_SUCCESS, null, onLoginSuccess);
-			EventDispatcher.unsubscribe(Events.LOGIN_ERROR, null, onLoginError);
+			EventDispatcher.unsubscribe('LOGIN_SUCCESS', null, onLoginSuccess);
+			EventDispatcher.unsubscribe('LOGIN_ERROR', null, onLoginError);
 		};
 
 		const onLoginSuccess = () => {

src/modules/options/OptionsApp.tsx

@@ -14,9 +14,8 @@ import {
 import { Errors } from '../../services/Errors';
 import {
 	EventDispatcher,
-	Events,
-	OptionEventData,
-	StreamingServiceOptionEventData,
+	OptionsChangeData,
+	StreamingServiceOptionsChangeData,
 } from '../../services/Events';
 import { StreamingServiceId, streamingServices } from '../../streaming-services/streaming-services';
 import { OptionsActions } from './components/OptionsActions';
@@ -43,26 +42,26 @@ export const OptionsApp: React.FC = () => {
 
 	useEffect(() => {
 		const startListeners = () => {
-			EventDispatcher.subscribe(Events.OPTIONS_CLEAR, null, resetOptions);
-			EventDispatcher.subscribe(Events.OPTIONS_CHANGE, null, onOptionChange);
+			EventDispatcher.subscribe('OPTIONS_CLEAR', null, resetOptions);
+			EventDispatcher.subscribe('OPTIONS_CHANGE', null, onOptionChange);
 			EventDispatcher.subscribe(
-				Events.STREAMING_SERVICE_OPTIONS_CHANGE,
+				'STREAMING_SERVICE_OPTIONS_CHANGE',
 				null,
 				onStreamingServiceOptionChange
 			);
 		};
 
 		const stopListeners = () => {
-			EventDispatcher.unsubscribe(Events.OPTIONS_CLEAR, null, resetOptions);
-			EventDispatcher.unsubscribe(Events.OPTIONS_CHANGE, null, onOptionChange);
+			EventDispatcher.unsubscribe('OPTIONS_CLEAR', null, resetOptions);
+			EventDispatcher.unsubscribe('OPTIONS_CHANGE', null, onOptionChange);
 			EventDispatcher.unsubscribe(
-				Events.STREAMING_SERVICE_OPTIONS_CHANGE,
+				'STREAMING_SERVICE_OPTIONS_CHANGE',
 				null,
 				onStreamingServiceOptionChange
 			);
 		};
 
-		const onOptionChange = (data: OptionEventData<keyof StorageValuesOptions>) => {
+		const onOptionChange = (data: OptionsChangeData<keyof StorageValuesOptions>) => {
 			const optionsToSave = {} as StorageValuesOptions;
 			const options = {
 				...content.options,
@@ -98,7 +97,7 @@ export const OptionsApp: React.FC = () => {
 					})
 					.catch(async (err) => {
 						Errors.error('Failed to save option.', err);
-						await EventDispatcher.dispatch(Events.SNACKBAR_SHOW, null, {
+						await EventDispatcher.dispatch('SNACKBAR_SHOW', null, {
 							messageName: 'saveOptionFailed',
 							severity: 'error',
 						});
@@ -109,7 +108,7 @@ export const OptionsApp: React.FC = () => {
 		};
 
 		const onStreamingServiceOptionChange = (
-			data: StreamingServiceOptionEventData<StreamingServiceId>
+			data: StreamingServiceOptionsChangeData<StreamingServiceId>
 		) => {
 			const optionsToSave = {} as StorageValuesOptions;
 			const options = {
@@ -161,7 +160,7 @@ export const OptionsApp: React.FC = () => {
 					})
 					.catch(async (err) => {
 						Errors.error('Failed to save option.', err);
-						await EventDispatcher.dispatch(Events.SNACKBAR_SHOW, null, {
+						await EventDispatcher.dispatch('SNACKBAR_SHOW', null, {
 							messageName: 'saveOptionFailed',
 							severity: 'error',
 						});
@@ -185,13 +184,13 @@ export const OptionsApp: React.FC = () => {
 					isLoading: false,
 					options,
 				});
-				await EventDispatcher.dispatch(Events.SNACKBAR_SHOW, null, {
+				await EventDispatcher.dispatch('SNACKBAR_SHOW', null, {
 					messageName: 'saveOptionSuccess',
 					severity: 'success',
 				});
 			} catch (err) {
 				Errors.error('Failed to save option.', err);
-				await EventDispatcher.dispatch(Events.SNACKBAR_SHOW, null, {
+				await EventDispatcher.dispatch('SNACKBAR_SHOW', null, {
 					messageName: 'saveOptionFailed',
 					severity: 'error',
 				});