Skip to content
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

Jump to bottom

Implement MAB's UserActivityTracker and blocking the bridge upon exceeding the user limit #1472

Merged
merged 10 commits into from
Oct 8, 2021
Merged

Implement MAB's UserActivityTracker and blocking the bridge upon exceeding the user limit #1472

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
eb4fdff
Implement MAB's UserActivityTracker and blocking the bridge upon exce…
tadzik Sep 2, 2021
9c01fff
Chase MAB API changes
tadzik Sep 6, 2021
6c0b174
Make sendIrcAction return consistently nothing
tadzik Sep 6, 2021
b139fb2
Fix linter warnings
tadzik Sep 6, 2021
ba41a0a
Add RMAUlimit to config.sample.yaml
tadzik Sep 6, 2021
88cffba
Add changelog entry
tadzik Sep 6, 2021
ad7468e
Add a metric for bridge being blocked (or not)
tadzik Sep 15, 2021
5f1bb78
Add RMAUlimit to config.schema
tadzik Sep 15, 2021
16402ac
Make UserActivityTracker configurable
tadzik Oct 8, 2021
c0e3c2e
Add sample config for UserActivityTracker
tadzik Oct 8, 2021
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
7 changes: 7 additions & 0 deletions config.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,13 @@ properties:
type: "string"
RMAUlimit:
type: "integer"
userActivity:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also the sample config?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In in c0e3c2e

type: "object"
properties:
minUserActiveDays:
type: "number"
inactiveAfterDays:
type: "number"
matrixHandler:
type: "object"
properties:
Expand Down
11 changes: 10 additions & 1 deletion src/bridge/IrcBridge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,8 +655,17 @@ export class IrcBridge {
throw Error("No IRC servers specified.");
}

const uatConfig = {
...UserActivityTrackerConfig.DEFAULT,
};
if (this.config.ircService.userActivity?.minUserActiveDays !== undefined) {
uatConfig.minUserActiveDays = this.config.ircService.userActivity.minUserActiveDays;
}
if (this.config.ircService.userActivity?.inactiveAfterDays !== undefined) {
uatConfig.inactiveAfterDays = this.config.ircService.userActivity.inactiveAfterDays;
}
this.bridge.opts.controller.userActivityTracker = new UserActivityTracker(
UserActivityTrackerConfig.DEFAULT,
uatConfig,
await this.getStore().getUserActivity(),
(changes) => this.onUserActivityChanged(changes),
);
Expand Down
4 changes: 4 additions & 0 deletions src/config/BridgeConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ export interface BridgeConfig {
};
perRoomConfig?: RoomConfigConfig;
RMAUlimit?: number;
userActivity?: {
minUserActiveDays?: number;
inactiveAfterDays?: number;
};
};
sentry?: {
enabled: boolean;
Expand Down