diff --git a/type/__jitsi_meet_domain/files/_update_jitsi_configurations.sh b/type/__jitsi_meet_domain/files/_update_jitsi_configurations.sh index 9355ed2..31ac655 100755 --- a/type/__jitsi_meet_domain/files/_update_jitsi_configurations.sh +++ b/type/__jitsi_meet_domain/files/_update_jitsi_configurations.sh @@ -7,7 +7,7 @@ # We could automate this, but are using it as an indicator for the # latest branch with which we conciliated changes. -BRANCH="jitsi-meet_10431" +BRANCH="jitsi-meet_10655" REPO="https://github.com/jitsi/jitsi-meet" get_url() { diff --git a/type/__jitsi_meet_domain/files/config.js.sh b/type/__jitsi_meet_domain/files/config.js.sh index 7555b68..ff976b2 100644 --- a/type/__jitsi_meet_domain/files/config.js.sh +++ b/type/__jitsi_meet_domain/files/config.js.sh @@ -146,6 +146,9 @@ var config = { // Disables polls feature. // disablePolls: false, + // Disables chat feature entirely including notifications, sounds, and private messages. + // disableChat: false, + // Disables demote button from self-view // disableSelfDemote: false, @@ -371,6 +374,7 @@ $(if [ -n "${VIDEO_CONSTRAINTS}" ]; then echo "${VIDEO_CONSTRAINTS},"; fi) // Desktop sharing // Optional desktop sharing frame rate options. Default value: min:5, max:5. + // Setting higher min/max values will affect the resolution, it makes it worse. // desktopSharingFrameRate: { // min: 5, // max: 5, @@ -730,6 +734,8 @@ $(if [ -n "${VIDEO_CONSTRAINTS}" ]; then echo "${VIDEO_CONSTRAINTS},"; fi) // autoKnock: false, // // Enables the lobby chat. Replaces \`enableLobbyChat\`. // enableChat: true, + // // Shows the hangup button in the lobby screen. + // showHangUp: true, // }, // Configs for the security related UI elements. @@ -769,7 +775,7 @@ $(if [ -n "${VIDEO_CONSTRAINTS}" ]; then echo "${VIDEO_CONSTRAINTS},"; fi) // hideDominantSpeakerBadge: false, // Default language for the user interface. Cannot be overwritten. - // DEPRECATED! Use the \`lang\` iframe option directly instead. + // For iframe integrations, use the \`lang\` option directly instead. defaultLanguage: '${DEFAULT_LANGUAGE}', // Disables profile and the edit of all fields from the profile settings (display name and email) @@ -799,7 +805,6 @@ $(if [ -n "${VIDEO_CONSTRAINTS}" ]; then echo "${VIDEO_CONSTRAINTS},"; fi) // Configs for prejoin page. // prejoinConfig: { // // When 'true', it shows an intermediate page before joining, where the user can configure their devices. - // // This replaces \`prejoinPageEnabled\`. Defaults to true. // enabled: true, // // Hides the participant name editing field in the prejoin screen. // // If requireDisplayName is also set as true, a name should still be provided through @@ -811,7 +816,9 @@ $(if [ -n "${VIDEO_CONSTRAINTS}" ]; then echo "${VIDEO_CONSTRAINTS},"; fi) // // By setting preCallTestEnabled, you enable the pre-call test in the prejoin page. // // ICE server credentials need to be provided over the preCallTestICEUrl // preCallTestEnabled: false, - // preCallTestICEUrl: '' + // preCallTestICEUrl: '', + // // Shows the hangup button in the lobby screen. + // showHangUp: true, // }, // When 'true', the user cannot edit the display name. @@ -908,6 +915,8 @@ $(if [ -n "${VIDEO_CONSTRAINTS}" ]; then echo "${VIDEO_CONSTRAINTS},"; fi) // alwaysVisible: false, // // Indicates whether the toolbar should still autohide when chat is open // autoHideWhileChatIsOpen: false, + // // Default background color for the main toolbar. Accepts any valid CSS color. + // // backgroundColor: '#ffffff', // }, // Overrides the buttons displayed in the main toolbar. Depending on the screen size the number of displayed @@ -1376,7 +1385,9 @@ ${ANALYTICS_SETTINGS} // disableGrantModerator: true, // // If set to 'all' the 'Private chat' button will be disabled for all participants. // // If set to 'allow-moderator-chat' the 'Private chat' button will be available for chats with moderators. - // disablePrivateChat: 'all' | 'allow-moderator-chat', + // // If set to 'disable-visitor-chat' the 'Private chat' button will be disabled for visitor-main participant + // // conversations. + // disablePrivateChat: 'all' | 'allow-moderator-chat' | 'disable-visitor-chat', // }, @@ -1614,6 +1625,10 @@ ${ANALYTICS_SETTINGS} // audio: true, // video: true // }, + // // Hides the visitor count for visitors. + // // hideVisitorCountForVisitors: false, + // // Whether to show the join meeting dialog when joining as a visitor. + // // showJoinMeetingDialog: true, // }, // The default type of desktop sharing sources that will be used in the electron app. // desktopSharingSources: ['screen', 'window'], diff --git a/type/__jitsi_meet_domain/files/config.js.sh.orig b/type/__jitsi_meet_domain/files/config.js.sh.orig index 23f7df6..07c9095 100644 --- a/type/__jitsi_meet_domain/files/config.js.sh.orig +++ b/type/__jitsi_meet_domain/files/config.js.sh.orig @@ -139,6 +139,9 @@ var config = { // Disables polls feature. // disablePolls: false, + // Disables chat feature entirely including notifications, sounds, and private messages. + // disableChat: false, + // Disables demote button from self-view // disableSelfDemote: false, @@ -363,6 +366,7 @@ var config = { // Desktop sharing // Optional desktop sharing frame rate options. Default value: min:5, max:5. + // Setting higher min/max values will affect the resolution, it makes it worse. // desktopSharingFrameRate: { // min: 5, // max: 5, @@ -722,6 +726,8 @@ var config = { // autoKnock: false, // // Enables the lobby chat. Replaces `enableLobbyChat`. // enableChat: true, + // // Shows the hangup button in the lobby screen. + // showHangUp: true, // }, // Configs for the security related UI elements. @@ -761,7 +767,7 @@ var config = { // hideDominantSpeakerBadge: false, // Default language for the user interface. Cannot be overwritten. - // DEPRECATED! Use the `lang` iframe option directly instead. + // For iframe integrations, use the `lang` option directly instead. // defaultLanguage: 'en', // Disables profile and the edit of all fields from the profile settings (display name and email) @@ -791,7 +797,6 @@ var config = { // Configs for prejoin page. // prejoinConfig: { // // When 'true', it shows an intermediate page before joining, where the user can configure their devices. - // // This replaces `prejoinPageEnabled`. Defaults to true. // enabled: true, // // Hides the participant name editing field in the prejoin screen. // // If requireDisplayName is also set as true, a name should still be provided through @@ -803,7 +808,9 @@ var config = { // // By setting preCallTestEnabled, you enable the pre-call test in the prejoin page. // // ICE server credentials need to be provided over the preCallTestICEUrl // preCallTestEnabled: false, - // preCallTestICEUrl: '' + // preCallTestICEUrl: '', + // // Shows the hangup button in the lobby screen. + // showHangUp: true, // }, // When 'true', the user cannot edit the display name. @@ -900,6 +907,8 @@ var config = { // alwaysVisible: false, // // Indicates whether the toolbar should still autohide when chat is open // autoHideWhileChatIsOpen: false, + // // Default background color for the main toolbar. Accepts any valid CSS color. + // // backgroundColor: '#ffffff', // }, // Overrides the buttons displayed in the main toolbar. Depending on the screen size the number of displayed @@ -1363,7 +1372,9 @@ var config = { // disableGrantModerator: true, // // If set to 'all' the 'Private chat' button will be disabled for all participants. // // If set to 'allow-moderator-chat' the 'Private chat' button will be available for chats with moderators. - // disablePrivateChat: 'all' | 'allow-moderator-chat', + // // If set to 'disable-visitor-chat' the 'Private chat' button will be disabled for visitor-main participant + // // conversations. + // disablePrivateChat: 'all' | 'allow-moderator-chat' | 'disable-visitor-chat', // }, @@ -1601,6 +1612,10 @@ var config = { // audio: true, // video: true // }, + // // Hides the visitor count for visitors. + // // hideVisitorCountForVisitors: false, + // // Whether to show the join meeting dialog when joining as a visitor. + // // showJoinMeetingDialog: true, // }, // The default type of desktop sharing sources that will be used in the electron app. // desktopSharingSources: ['screen', 'window'], diff --git a/type/__jitsi_meet_domain/files/jitsi-version b/type/__jitsi_meet_domain/files/jitsi-version index cb73109..0459f40 100644 --- a/type/__jitsi_meet_domain/files/jitsi-version +++ b/type/__jitsi_meet_domain/files/jitsi-version @@ -1 +1 @@ -2.0.10431-1 \ No newline at end of file +2.0.10655-1 \ No newline at end of file diff --git a/type/__jitsi_meet_domain/files/prosody.cfg.lua.sh b/type/__jitsi_meet_domain/files/prosody.cfg.lua.sh index 9683d07..97c9853 100644 --- a/type/__jitsi_meet_domain/files/prosody.cfg.lua.sh +++ b/type/__jitsi_meet_domain/files/prosody.cfg.lua.sh @@ -216,12 +216,13 @@ Component "lobby.${JITSI_DOMAIN:?}" "muc" modules_enabled = { "muc_hide_all"; "muc_rate_limit"; - "polls"; } Component "metadata.${JITSI_DOMAIN:?}" "room_metadata_component" muc_component = "conference.${JITSI_DOMAIN:?}" breakout_rooms_component = "breakout.${JITSI_DOMAIN:?}" + +Component "polls.${JITSI_DOMAIN:?}" "polls_component" ${PROSODY_DOMAIN_END} ${PROSODY_SECUREDOMAIN_START} diff --git a/type/__jitsi_meet_domain/files/prosody.cfg.lua.sh.orig b/type/__jitsi_meet_domain/files/prosody.cfg.lua.sh.orig index a98abdf..bfd5e6a 100644 --- a/type/__jitsi_meet_domain/files/prosody.cfg.lua.sh.orig +++ b/type/__jitsi_meet_domain/files/prosody.cfg.lua.sh.orig @@ -83,7 +83,6 @@ Component "conference.jitmeet.example.com" "muc" "muc_hide_all"; "muc_meeting_id"; "muc_domain_mapper"; - "polls"; --"token_verification"; "muc_rate_limit"; "muc_password_whitelist"; @@ -159,9 +158,10 @@ Component "lobby.jitmeet.example.com" "muc" modules_enabled = { "muc_hide_all"; "muc_rate_limit"; - "polls"; } Component "metadata.jitmeet.example.com" "room_metadata_component" muc_component = "conference.jitmeet.example.com" breakout_rooms_component = "breakout.jitmeet.example.com" + +Component "polls.jitmeet.example.com" "polls_component"