Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1136 from DEVTomatoCake/fix/load-connection-config

Browse Source 
Fix loading connection settings
This commit is contained in:
Puyodead1 2024-07-06 00:55:05 -04:00 committed by GitHub
commit b92366db5c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 95 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/connections/BattleNet/index.ts
View File

@ -47,13 +47,15 @@ export default class BattleNetConnection extends Connection {
settings: BattleNetSettings = new BattleNetSettings(); settings: BattleNetSettings = new BattleNetSettings();
init(): void { init(): void {
const settings = this.settings = ConnectionLoader.getConnectionConfig<BattleNetSettings>(
ConnectionLoader.getConnectionConfig<BattleNetSettings>( this.id,
this.id, this.settings,
this.settings, );
);
if (settings.enabled && (!settings.clientId || !settings.clientSecret)) if (
this.settings.enabled &&
(!this.settings.clientId || !this.settings.clientSecret)
)
throw new Error(`Invalid settings for connection ${this.id}`); throw new Error(`Invalid settings for connection ${this.id}`);
} }

7
src/connections/Discord/index.ts
View File

@ -43,12 +43,15 @@ export default class DiscordConnection extends Connection {
settings: DiscordSettings = new DiscordSettings(); settings: DiscordSettings = new DiscordSettings();
init(): void { init(): void {
const settings = ConnectionLoader.getConnectionConfig<DiscordSettings>( this.settings = ConnectionLoader.getConnectionConfig<DiscordSettings>(
this.id, this.id,
this.settings, this.settings,
); );
if (settings.enabled && (!settings.clientId || !settings.clientSecret)) if (
this.settings.enabled &&
(!this.settings.clientId || !this.settings.clientSecret)
)
throw new Error(`Invalid settings for connection ${this.id}`); throw new Error(`Invalid settings for connection ${this.id}`);
} }

14
src/connections/EpicGames/index.ts
View File

@ -53,13 +53,15 @@ export default class EpicGamesConnection extends Connection {
settings: EpicGamesSettings = new EpicGamesSettings(); settings: EpicGamesSettings = new EpicGamesSettings();
init(): void { init(): void {
const settings = this.settings = ConnectionLoader.getConnectionConfig<EpicGamesSettings>(
ConnectionLoader.getConnectionConfig<EpicGamesSettings>( this.id,
this.id, this.settings,
this.settings, );
);
if (settings.enabled && (!settings.clientId || !settings.clientSecret)) if (
this.settings.enabled &&
(!this.settings.clientId || !this.settings.clientSecret)
)
throw new Error(`Invalid settings for connection ${this.id}`); throw new Error(`Invalid settings for connection ${this.id}`);
} }

7
src/connections/Facebook/index.ts
View File

@ -52,12 +52,15 @@ export default class FacebookConnection extends Connection {
settings: FacebookSettings = new FacebookSettings(); settings: FacebookSettings = new FacebookSettings();
init(): void { init(): void {
const settings = ConnectionLoader.getConnectionConfig<FacebookSettings>( this.settings = ConnectionLoader.getConnectionConfig<FacebookSettings>(
this.id, this.id,
this.settings, this.settings,
); );
if (settings.enabled && (!settings.clientId || !settings.clientSecret)) if (
this.settings.enabled &&
(!this.settings.clientId || !this.settings.clientSecret)
)
throw new Error(`Invalid settings for connection ${this.id}`); throw new Error(`Invalid settings for connection ${this.id}`);
} }

7
src/connections/GitHub/index.ts
View File

@ -42,12 +42,15 @@ export default class GitHubConnection extends Connection {
settings: GitHubSettings = new GitHubSettings(); settings: GitHubSettings = new GitHubSettings();
init(): void { init(): void {
const settings = ConnectionLoader.getConnectionConfig<GitHubSettings>( this.settings = ConnectionLoader.getConnectionConfig<GitHubSettings>(
this.id, this.id,
this.settings, this.settings,
); );
if (settings.enabled && (!settings.clientId || !settings.clientSecret)) if (
this.settings.enabled &&
(!this.settings.clientId || !this.settings.clientSecret)
)
throw new Error(`Invalid settings for connection ${this.id}`); throw new Error(`Invalid settings for connection ${this.id}`);
} }

7
src/connections/Reddit/index.ts
View File

@ -54,12 +54,15 @@ export default class RedditConnection extends Connection {
settings: RedditSettings = new RedditSettings(); settings: RedditSettings = new RedditSettings();
init(): void { init(): void {
const settings = ConnectionLoader.getConnectionConfig<RedditSettings>( this.settings = ConnectionLoader.getConnectionConfig<RedditSettings>(
this.id, this.id,
this.settings, this.settings,
); );
if (settings.enabled && (!settings.clientId || !settings.clientSecret)) if (
this.settings.enabled &&
(!this.settings.clientId || !this.settings.clientSecret)
)
throw new Error(`Invalid settings for connection ${this.id}`); throw new Error(`Invalid settings for connection ${this.id}`);
} }

8
src/connections/Spotify/index.ts
View File

@ -63,12 +63,16 @@ export default class SpotifyConnection extends RefreshableConnection {
* So to prevent spamming the spotify api we disable the ability to refresh. * So to prevent spamming the spotify api we disable the ability to refresh.
*/ */
this.refreshEnabled = false; this.refreshEnabled = false;
const settings = ConnectionLoader.getConnectionConfig<SpotifySettings>(
this.settings = ConnectionLoader.getConnectionConfig<SpotifySettings>(
this.id, this.id,
this.settings, this.settings,
); );
if (settings.enabled && (!settings.clientId || !settings.clientSecret)) if (
this.settings.enabled &&
(!this.settings.clientId || !this.settings.clientSecret)
)
throw new Error(`Invalid settings for connection ${this.id}`); throw new Error(`Invalid settings for connection ${this.id}`);
} }

7
src/connections/Twitch/index.ts
View File

@ -55,12 +55,15 @@ export default class TwitchConnection extends RefreshableConnection {
settings: TwitchSettings = new TwitchSettings(); settings: TwitchSettings = new TwitchSettings();
init(): void { init(): void {
const settings = ConnectionLoader.getConnectionConfig<TwitchSettings>( this.settings = ConnectionLoader.getConnectionConfig<TwitchSettings>(
this.id, this.id,
this.settings, this.settings,
); );
if (settings.enabled && (!settings.clientId || !settings.clientSecret)) if (
this.settings.enabled &&
(!this.settings.clientId || !this.settings.clientSecret)
)
throw new Error(`Invalid settings for connection ${this.id}`); throw new Error(`Invalid settings for connection ${this.id}`);
} }

7
src/connections/Twitter/index.ts
View File

@ -55,12 +55,15 @@ export default class TwitterConnection extends RefreshableConnection {
settings: TwitterSettings = new TwitterSettings(); settings: TwitterSettings = new TwitterSettings();
init(): void { init(): void {
const settings = ConnectionLoader.getConnectionConfig<TwitterSettings>( this.settings = ConnectionLoader.getConnectionConfig<TwitterSettings>(
this.id, this.id,
this.settings, this.settings,
); );
if (settings.enabled && (!settings.clientId || !settings.clientSecret)) if (
this.settings.enabled &&
(!this.settings.clientId || !this.settings.clientSecret)
)
throw new Error(`Invalid settings for connection ${this.id}`); throw new Error(`Invalid settings for connection ${this.id}`);
} }

7
src/connections/Xbox/index.ts
View File

@ -62,12 +62,15 @@ export default class XboxConnection extends Connection {
settings: XboxSettings = new XboxSettings(); settings: XboxSettings = new XboxSettings();
init(): void { init(): void {
const settings = ConnectionLoader.getConnectionConfig<XboxSettings>( this.settings = ConnectionLoader.getConnectionConfig<XboxSettings>(
this.id, this.id,
this.settings, this.settings,
); );
if (settings.enabled && (!settings.clientId || !settings.clientSecret)) if (
this.settings.enabled &&
(!this.settings.clientId || !this.settings.clientSecret)
)
throw new Error(`Invalid settings for connection ${this.id}`); throw new Error(`Invalid settings for connection ${this.id}`);
} }

7
src/connections/Youtube/index.ts
View File

@ -62,12 +62,15 @@ export default class YoutubeConnection extends Connection {
settings: YoutubeSettings = new YoutubeSettings(); settings: YoutubeSettings = new YoutubeSettings();
init(): void { init(): void {
const settings = ConnectionLoader.getConnectionConfig<YoutubeSettings>( this.settings = ConnectionLoader.getConnectionConfig<YoutubeSettings>(
this.id, this.id,
this.settings, this.settings,
); );
if (settings.enabled && (!settings.clientId || !settings.clientSecret)) if (
this.settings.enabled &&
(!this.settings.clientId || !this.settings.clientSecret)
)
throw new Error(`Invalid settings for connection ${this.id}`); throw new Error(`Invalid settings for connection ${this.id}`);
} }