Skip to content

config: set missing defaults #917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

config: set missing defaults #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/917.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix some config parameters not being overridable with env vars.
40 changes: 20 additions & 20 deletions src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,18 +81,18 @@ export class DiscordBridgeConfig {
}

export class DiscordBridgeConfigBridge {
public domain: string;
public homeserverUrl: string;
public port: number;
public bindAddress: string;
public domain: string = "";
public homeserverUrl: string = "";
public port: number = 0;
public bindAddress: string = "";
public presenceInterval: number = 500;
public disablePresence: boolean;
public disableTypingNotifications: boolean;
public disableDiscordMentions: boolean;
public disableDeletionForwarding: boolean;
public enableSelfServiceBridging: boolean;
public disablePortalBridging: boolean;
public disableReadReceipts: boolean;
public disablePresence: boolean = false;
public disableTypingNotifications: boolean = false;
public disableDiscordMentions: boolean = false;
public disableDeletionForwarding: boolean = false;
public enableSelfServiceBridging: boolean = false;
public disablePortalBridging: boolean = false;
public disableReadReceipts: boolean = false;
public disableEveryoneMention: boolean = false;
public disableHereMention: boolean = false;
public disableJoinLeaveNotifications: boolean = false;
Expand All @@ -106,17 +106,17 @@ export class DiscordBridgeConfigBridge {
}

export class DiscordBridgeConfigDatabase {
public connString: string;
public filename: string;
public connString: string = "";
public filename: string = "";
// These parameters are legacy, and will stop the bridge if defined.
public userStorePath: string;
public roomStorePath: string;
public userStorePath: string = "";
public roomStorePath: string = "";
}

export class DiscordBridgeConfigAuth {
public clientID: string;
public botToken: string;
public usePrivilegedIntents: boolean;
public clientID: string = "";
public botToken: string = "";
public usePrivilegedIntents: boolean = false;
}

export class DiscordBridgeConfigLogging {
Expand All @@ -126,7 +126,7 @@ export class DiscordBridgeConfigLogging {
}

class DiscordBridgeConfigRoom {
public defaultVisibility: string;
public defaultVisibility: string = "";
public kickFor: number = 30000;
}

Expand All @@ -152,7 +152,7 @@ class DiscordBridgeConfigLimits {
}

export class LoggingFile {
public file: string;
public file: string = "";
public level: string = "info";
public maxFiles: string = "14d";
public maxSize: string|number = "50m";
Expand Down
2 changes: 2 additions & 0 deletions test/test_config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,15 @@ describe("DiscordBridgeConfig.applyConfig", () => {
APPSERVICE_DISCORD_BRIDGE_DISABLE_INVITE_NOTIFICATIONS: true,
APPSERVICE_DISCORD_BRIDGE_DISABLE_JOIN_LEAVE_NOTIFICATIONS: true,
APPSERVICE_DISCORD_LOGGING_CONSOLE: "debug",
APPSERVICE_DISCORD_DATABASE_CONN_STRING: "abcd",
});
expect(config.bridge.disableJoinLeaveNotifications).to.be.true;
expect(config.bridge.disableInviteNotifications).to.be.true;
expect(config.bridge.disableDeletionForwarding).to.be.false;
expect(config.bridge.disableDiscordMentions).to.be.false;
expect(config.bridge.homeserverUrl).to.equal("blah");
expect(config.logging.console).to.equal("debug");
expect(config.database.connString).to.equal("abcd");
});
it("should merge logging.files correctly", () => {
const config = new DiscordBridgeConfig();
Expand Down