Skip to content

When locking a conversation, kick out everyone #5215

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.

Sign up for GitHub

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

Merged
nickvergessen merged 3 commits into from
Mar 1, 2021
Merged

When locking a conversation, kick out everyone #5215

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3bfb611
When locking a conversation, kick out everyone
PVince81 Feb 19, 2021
9d6d6a0
Add warning about kicking out people in settings
PVince81 Feb 19, 2021
e511e5d
Ongoing call warnings are now condition
PVince81 Feb 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Ongoing call warnings are now condition 
Only show ongoing call warnings in settings dialog when a call is
actually in progress.

Signed-off-by: Vincent Petry <[email protected]>
  • Loading branch information
@PVince81
PVince81 committed Feb 25, 2021
commit e511e5defddb3c3b62e2ef0bd7339d963d9da16c
8 changes: 7 additions & 1 deletion src/components/ConversationSettings/LobbySettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
<div class="app-settings-subsection">
<div id="moderation_settings_enable_lobby_hint" class="app-settings-section__hint">
{{ t('spreed', 'Enabling the lobby only allows moderators to post messages.') }}
{{ t('spreed', 'This will also remove non-moderators from ongoing calls.') }}
</div>
<div v-if="hasCall" class="app-settings-section__hint">
{{ t('spreed', 'This will also remove non-moderators from the ongoing call.') }}
</div>
<div>
<input id="moderation_settings_enable_lobby_checkbox"
Expand Down Expand Up @@ -94,6 +96,10 @@ export default {
},

computed: {
hasCall() {
return this.conversation.hasCall
},

conversation() {
return this.$store.getters.conversation(this.token) || this.$store.getters.dummyConversation
},
Expand Down
8 changes: 7 additions & 1 deletion src/components/ConversationSettings/LockingSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
<div class="app-settings-subsection">
<div id="moderation_settings_lock_conversation_hint" class="app-settings-section__hint">
{{ t('spreed', 'Locking the conversation prevents anyone to post messages or start calls.') }}
{{ t('spreed', 'This will also terminate ongoing calls.') }}
</div>
<div v-if="hasCall" class="app-settings-section__hint">
{{ t('spreed', 'This will also terminate the ongoing call.') }}
</div>
<div>
<input id="moderation_settings_lock_conversation_checkbox"
Expand Down Expand Up @@ -60,6 +62,10 @@ export default {
},

computed: {
hasCall() {
return this.conversation.hasCall
},

conversation() {
return this.$store.getters.conversation(this.token) || this.$store.getters.dummyConversation
},
Expand Down