feat(rooms): add option to automatically lock public and group rooms #13779
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
…if they are inactive Signed-off-by: Anna Larch <[email protected]>
miaulalala
added
2. developing
feature: api 🛠️
|
/backport to stable30 |
… rooms if they are inactive
… rooms if they are inactive
Not for now |
| @@ -111,3 +111,4 @@ Legend: | |||
| | `conversations_files` | string<br>`1` or `0` | `1` | No | 🖌️ | Whether the files app integration is enabled allowing to start conversations in the right sidebar | | |||
| | `conversations_files_public_shares` | string<br>`1` or `0` | `1` | No | 🖌️ | Whether the public share integration is enabled allowing to start conversations in the right sidebar on the public share page (Requires `conversations_files` also to be enabled) | | |||
| | `enable_matterbridge` | string<br>`1` or `0` | `0` | No | 🖌️ | Whether the Matterbridge integration is enabled and can be configured | | |||
| | `inactivity_lock_time` | int | `0` | No | | A duration (in seconds) after which rooms are locked. Calculated from the last activity in the room. | | |||
There was a problem hiding this comment.
since the background jobs are only run hourly (I would even change it to daily),
I would make this config "days" of inactivity
Comment on lines
+686
to
+687
| * | ||
| * @return int |
There was a problem hiding this comment.
Suggested change
| * | |
| * @return int |
Not needed when the method has ): int {
| $helper->selectRoomsTable($query); | ||
| $query->from('talk_rooms', 'r') | ||
| ->andWhere($query->expr()->lte('r.last_activity', $query->createNamedParameter($inactiveSince, IQueryBuilder::PARAM_DATETIME_MUTABLE))) | ||
| ->andWhere($query->expr()->lte('r.read_only', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))) |
There was a problem hiding this comment.
Suggested change
| ->andWhere($query->expr()->lte('r.read_only', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))) | |
| ->andWhere($query->expr()->neq('r.read_only', $query->createNamedParameter(Room::READ_ONLY, IQueryBuilder::PARAM_INT))) |
| return; | ||
| } | ||
| $timestamp = $this->time->getTime() - $interval; | ||
| $time = (new \DateTime())->setTimestamp($timestamp); |
There was a problem hiding this comment.
Suggested change
| $time = (new \DateTime())->setTimestamp($timestamp); | |
| $time = $this->time->getDateTime('@' . $timestamp); |
| $time = (new \DateTime())->setTimestamp($timestamp); | ||
| $rooms = $this->roomService->getInactiveRooms($time); | ||
| array_map(function (Room $room) { | ||
| $this->roomService->setReadOnly($room, Room::READ_ONLY); |
There was a problem hiding this comment.
Log as info (or at least debug)?
| @@ -1212,4 +1212,12 @@ public function deleteRoom(Room $room): void { | |||
| )); | |||
| } | |||
| } | |||
|
|
|||
| /** | |||
| * @param \DateTime $inactiveSince | |||
There was a problem hiding this comment.
Suggested change
| * @param \DateTime $inactiveSince |
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.
…if they are inactive
Question - do we need to limit the room numbers to a certain amount per run of the BG job?
☑️ Resolves
🛠️ API Checklist
🚧 Tasks
🏁 Checklist
docs/has been updated or is not required