-
Notifications
You must be signed in to change notification settings - Fork 155
optionally make users wait to join bridged rooms #1645
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
Open
jesopo
wants to merge
10
commits into
develop
Choose a base branch
from
jess/delay-joins
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
bf6d09c
optionally make users wait to join bridged rooms
jesopo c14c7c9
store first seen time in last_seen, move setFirstSeen
jesopo a6a4308
add schema migration script
jesopo 2304333
else block lints
jesopo 3cc0a91
add delayBridging to config
jesopo bb9030b
else/return lints
jesopo eec46e2
errant speech mark in schema/v9.ts
jesopo 07760d3
protect from overwiring first_seen in setFirstSeenTimeForUser
jesopo 7fde752
refactor delayed join lookup in to its own function
jesopo 4fae8fd
make it clear that block times are seconds
jesopo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -538,6 +538,35 @@ export class MatrixHandler { | |
| } | ||
| // get the virtual IRC user for this user | ||
| promises.push((async () => { | ||
| const entry = await this.ircBridge.getStore().getRoom(event.room_id, room.server.domain, room.channel); | ||
| // is this a portal room? | ||
| const delayTime = ["alias", "join"].includes( | ||
| (entry?.data?.origin as string|null) ?? "unknown" | ||
| //TODO: pull these two numbers from the config file | ||
| ) ? 3600 : 0; | ||
|
|
||
| if (delayTime > 0) { | ||
| let remaining = delayTime; | ||
| const firstSeen = await this.ircBridge.getStore().getAccountFirstSeen(user.getId()); | ||
| if (firstSeen === null) { | ||
| await this.ircBridge.getStore().setAccountFirstSeen(user.getId(), new Date()); | ||
| } else { | ||
| remaining = Math.max(0, ((firstSeen.getTime() / 1000) + delayTime) - (new Date().getTime() / 1000)); | ||
| } | ||
|
|
||
| if (remaining > 0) { | ||
| await this.membershipQueue.leave( | ||
| event.room_id, | ||
| user.getId(), | ||
| req, | ||
| true, | ||
| `Please wait ${remaining} seconds`, | ||
|
||
| this.ircBridge.appServiceUserId, | ||
| ); | ||
| return; | ||
| } | ||
| } | ||
|
|
||
| let bridgedClient: BridgedClient|null = null; | ||
| try { | ||
| bridgedClient = await this.ircBridge.getBridgedClient( | ||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
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.
Uh oh!
There was an error while loading. Please reload this page.