Skip to content

Commit

Permalink
Override jitsi meeting url with jitsi tag (#248)
Browse files Browse the repository at this point in the history
If present, used instead of roomType_roomId to generate the jitsi meeting URL. Useful if certain URLs have problems because of server issues.
fixes #247
  • Loading branch information
Torgen authored Jan 12, 2021
1 parent 11089a3 commit 820e641
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
8 changes: 6 additions & 2 deletions client/imports/jitsi.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,14 @@ import { StaticJitsiMeeting } from '/lib/imports/settings.coffee'

export jitsiRoom = (roomType, roomId) ->
return unless roomId
meeting = "#{roomType}_#{roomId}"
if roomId is '0'
return unless StaticJitsiMeeting.get()
return "#{canonical(share.settings.TEAM_NAME)}_#{StaticJitsiMeeting.get()}"
"#{canonical(share.settings.TEAM_NAME)}_#{roomType}_#{roomId}"
meeting = StaticJitsiMeeting.get()
else
override = share.model.collection(roomType)?.findOne(_id: roomId)?.tags?.jitsi?.value
meeting = override if override?
"#{canonical(share.settings.TEAM_NAME)}_#{meeting}"

export default jitsiUrl = (roomType, roomId) ->
return unless share.settings.JITSI_SERVER
Expand Down
6 changes: 6 additions & 0 deletions docs/Solving.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ When you first log into the blackboard, you join the main Jitsi Meeting. (You ma
* **By default, you enter meetings with your microphone muted and your camera disabled.**
* To change your mute/video status within a meeting, click on the mic or video icon in that meeting.
* To change your default mute/video status, click on the Settings Dropdown at the top of any blackboard page, and toggle the appropriate option.

* It's broken!
* Normally the meeting URL for a puzzle is generated automatically from the randomly generated puzzle ID.
* Sometimes a specific meeting URL will have issues when other meetings are fine, possibly because of issues on the Jitsi server hosting that meeting.
* You can force a different meeting URL by (setting the `jitsi` tag)[#tags] on a puzzle.
* You can also use this to cause multiple puzzles to share one meeting, if that would be useful.

Notifications
=============
Expand Down

0 comments on commit 820e641

Please sign in to comment.