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.

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

Add configuration to limit teams and rooms counts #397

Merged
merged 19 commits into from May 7, 2020
Merged

Conversation

Half-Shot
Copy link
Contributor

@Half-Shot Half-Shot commented Apr 23, 2020

This is still missing functionality to handle the removal of team clients Punting to #399

This PR does 4 things:

  • It limits the number of bridged rooms that can be created by config.
  • It limits the number of teams that can be connected.
  • It exposes a flag for whether the configured instance allows private rooms to be bridged to channels.
  • It exposes these limits in a config endpoint.

@Half-Shot Half-Shot requested a review from jaller94 May 4, 2020 15:13
@Half-Shot Half-Shot marked this pull request as ready for review May 6, 2020 14:17
Copy link
Contributor

@jaller94 jaller94 left a comment

Choose a reason for hiding this comment

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

Further worries, that I didn't to check:

  • Admin rooms are not in the rooms table, right?
  • We do remove rooms from the rooms table when they get unlinked, right?

config/config.sample.yaml Show resolved Hide resolved
src/IConfig.ts Outdated Show resolved Hide resolved
src/Main.ts Show resolved Hide resolved
src/SlackHookHandler.ts Outdated Show resolved Hide resolved
src/SlackHookHandler.ts Outdated Show resolved Hide resolved
src/SlackHookHandler.ts Outdated Show resolved Hide resolved
Half-Shot and others added 6 commits May 7, 2020 10:21
Co-authored-by: Christian Paul <christianp@matrix.org>
Co-authored-by: Christian Paul <christianp@matrix.org>
@Half-Shot Half-Shot requested a review from jaller94 May 7, 2020 09:27
@Half-Shot
Copy link
Contributor Author

Admin rooms are not in the rooms table, right?

Correct.

We do remove rooms from the rooms table when they get unlinked, right?

Correct

Copy link
Contributor

@jaller94 jaller94 left a comment

Choose a reason for hiding this comment

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

LGTM
giphub

@Half-Shot Half-Shot merged commit 3ed2367 into develop May 7, 2020
@jaller94 jaller94 deleted the hs/limit-teams branch May 7, 2020 12:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants