Merge pull request #1376 from nextcloud/bugfix/1375/update-user-status-with-event-data

Update user status with event data

Author: PVince81

js/notifications-admin-settings.js

@@ -15,6 +15,7 @@
 		"stylelint:fix": "stylelint css/*.css css/*.scss src/**/*.scss src/**/*.vue --fix"
 	},
 	"dependencies": {
+		"@nextcloud/auth": "^2.0.0",
 		"@nextcloud/axios": "^2.1.0",
 		"@nextcloud/browser-storage": "^0.2.0",
 		"@nextcloud/capabilities": "^1.0.4",

js/notifications-admin-settings.js.map

@@ -99,6 +99,7 @@ import Notification from './Components/Notification.vue'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import Close from 'vue-material-design-icons/Close.vue'
 import axios from '@nextcloud/axios'
+import { getCurrentUser } from '@nextcloud/auth'
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { showError } from '@nextcloud/dialogs'
 import { loadState } from '@nextcloud/initial-state'
@@ -233,20 +234,28 @@ export default {
 			this.hasNotifyPush = true
 		}
 
-		// Setup the background checker
+		// Set up the background checker
 		this._setPollingInterval(this.pollIntervalBase)
 
 		this._watchTabVisibility()
 		subscribe('networkOffline', this.handleNetworkOffline)
 		subscribe('networkOnline', this.handleNetworkOnline)
+		subscribe('user_status:status.updated', this.userStatusUpdated)
 	},
 
 	beforeDestroy() {
+		unsubscribe('user_status:status.updated', this.userStatusUpdated)
 		unsubscribe('networkOffline', this.handleNetworkOffline)
 		unsubscribe('networkOnline', this.handleNetworkOnline)
 	},
 
 	methods: {
+		userStatusUpdated(state) {
+			if (getCurrentUser().uid === state.userId) {
+				this.userStatus = state.status
+			}
+		},
+
 		onOpen() {
 			this.focusFirstFocusable()
 			this.requestWebNotificationPermissions()