Add config limits for portal rooms #469
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tulir
reviewed
May 21, 2020
|
This works for portals, but we'd also like to limit for puppeted users. Looking at that now... |
Half-Shot
force-pushed
the
hs/portal-limit
branch
from
7f8e7cf to
6754c3f
Compare
jaller94
reviewed
Nov 25, 2020
jaller94
reviewed
Nov 25, 2020
Co-authored-by: Christian Paul <[email protected]>
Co-authored-by: Christian Paul <[email protected]>
jaller94
reviewed
Nov 26, 2020
Co-authored-by: Christian Paul <[email protected]>
jaller94
suggested changes
Nov 26, 2020
jaller94
reviewed
Nov 26, 2020
mautrix_telegram/db/portal.py
Outdated
Comment on lines
58
to
63
| rows = cls.db.execute(select([func.count()])) | ||
| try: | ||
| count, = next(rows) | ||
| return count | ||
| except StopIteration: | ||
| return 0 |
There was a problem hiding this comment.
Baby's first Python commits (don't commit blindly):
Suggested change
| rows = cls.db.execute(select([func.count()])) | |
| try: | |
| count, = next(rows) | |
| return count | |
| except StopIteration: | |
| return 0 | |
| return cls.db.query(func.count('*')).scalar() |
Please test this. I haven't actually run this.
There was a problem hiding this comment.
No good unfortunately,
AttributeError: 'Engine' object has no attribute 'query'
There was a problem hiding this comment.
The table to count rows in probably needs to be specified somewhere 🤔
There was a problem hiding this comment.
oh derp, I thought that was implied somewhere
tulir
reviewed
Nov 26, 2020
mautrix_telegram/db/portal.py
Outdated
| @@ -64,3 +69,7 @@ def get_by_username(cls, username: str) -> Optional['Portal']: | |||
| @classmethod | |||
| def all(cls) -> Iterable['Portal']: | |||
| yield from cls._select_all() | |||
|
|
|||
| @classmethod | |||
| def get_by_mxid(cls, mxid: RoomID) -> Integer: | |||
There was a problem hiding this comment.
this seems to have been changed accidentally
tulir
reviewed
Nov 26, 2020
| @@ -53,6 +53,11 @@ def get_by_tgid(cls, tgid: TelegramID, tg_receiver: TelegramID) -> Optional['Por | |||
| def find_private_chats(cls, tg_receiver: TelegramID) -> Iterable['Portal']: | |||
| yield from cls._select_all(cls.c.tg_receiver == tg_receiver, cls.c.peer_type == "user") | |||
|
|
|||
| @classmethod | |||
| def count(cls) -> int: | |||
| count = cls.db.execute(select([func.count('*')]).select_from(Table("portal", MetaData()))).scalar() | |||
There was a problem hiding this comment.
I think this might work
Suggested change
| count = cls.db.execute(select([func.count('*')]).select_from(Table("portal", MetaData()))).scalar() | |
| count = cls.db.execute(cls.t.select([func.count('*')])).scalar() |
jaller94
approved these changes
Nov 26, 2020
|
This needs to count the number of rooms where mxid is not null |
JaemarieA
approved these changes
Oct 3, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Trying to solve #466
I'm not sure if this works, but would value a review to see how close I am.