Skip to content

Do not show Talk sidebar if Talk is disabled for the user #8231

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 2 commits into from
Oct 28, 2022
Merged

Do not show Talk sidebar if Talk is disabled for the user #8231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
828aac8
Do not show Talk sidebar in Files app if Talk is disabled for the user
danxuliu Oct 26, 2022
f287b8b
Show error when failing to join a conversation in the public share page
danxuliu Oct 27, 2022
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
6 changes: 5 additions & 1 deletion lib/Files/TemplateLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,15 @@ public function handle(Event $event): void {
return;
}

$user = $this->userSession->getUser();
if ($user instanceof IUser && $this->talkConfig->isDisabledForUser($user)) {
return;
}

Util::addStyle(Application::APP_ID, 'At');
Util::addStyle(Application::APP_ID, 'icons');
Util::addScript(Application::APP_ID, 'talk-files-sidebar');

$user = $this->userSession->getUser();
if ($user instanceof IUser) {
$this->publishInitialStateForUser($user, $this->rootFolder, $this->appManager);
} else {
Expand Down
15 changes: 13 additions & 2 deletions src/PublicShareSidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
<script>
import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import PreventUnload from 'vue-prevent-unload'
import { showError } from '@nextcloud/dialogs'
import { loadState } from '@nextcloud/initial-state'
import CallView from './components/CallView/CallView.vue'
import ChatView from './components/ChatView.vue'
Expand Down Expand Up @@ -154,9 +155,19 @@ export default {

this.joiningConversation = true

await this.getPublicShareConversationData()
try {
await this.getPublicShareConversationData()

await this.$store.dispatch('joinConversation', { token: this.token })
} catch (exception) {
this.joiningConversation = false

showError(t('spreed', 'Error occurred when joining the conversation'))

await this.$store.dispatch('joinConversation', { token: this.token })
console.error(exception)

return
}

// No need to wait for it, but fetching the conversation needs to be
// done once the user has joined the conversation (otherwise only
Expand Down