Merge pull request #13703 from nextcloud/backport/13658/stable30.0

[stable30.0] fix(chat): Edit last message hotkey on macOS

package.json

@@ -82,6 +82,7 @@
     "@nextcloud/stylelint-config": "^3.0.1",
     "@nextcloud/webpack-vue-config": "^6.2.0",
     "@types/jest": "^29.5.13",
+    "@types/ua-parser-js": "^0.7.39",
     "@vue/test-utils": "^1.3.6",
     "@vue/tsconfig": "^0.5.1",
     "@vue/vue2-jest": "^29.2.6",

src/App.vue

@@ -49,7 +49,7 @@ import { EventBus } from './services/EventBus.js'
 import { leaveConversationSync } from './services/participantsService.js'
 import { useFederationStore } from './stores/federation.ts'
 import { useSidebarStore } from './stores/sidebar.js'
-import { checkBrowser } from './utils/browserCheck.js'
+import { checkBrowser } from './utils/browserCheck.ts'
 import { signalingKill } from './utils/webrtc/index.js'
 
 export default {

src/FilesSidebarTabApp.vue

@@ -43,7 +43,7 @@ import { getFileConversation } from './services/filesIntegrationServices.js'
 import {
 	leaveConversationSync,
 } from './services/participantsService.js'
-import { checkBrowser } from './utils/browserCheck.js'
+import { checkBrowser } from './utils/browserCheck.ts'
 import CancelableRequest from './utils/cancelableRequest.js'
 import { signalingKill } from './utils/webrtc/index.js'
 

src/PublicShareAuthRequestPasswordButton.vue

@@ -30,7 +30,7 @@ import { t } from '@nextcloud/l10n'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 
 import { getPublicShareAuthConversationToken } from './services/publicShareAuthService.js'
-import { checkBrowser } from './utils/browserCheck.js'
+import { checkBrowser } from './utils/browserCheck.ts'
 
 export default {
 

src/PublicShareSidebar.vue

@@ -55,7 +55,7 @@ import { getPublicShareConversationData } from './services/filesIntegrationServi
 import {
 	leaveConversationSync,
 } from './services/participantsService.js'
-import { checkBrowser } from './utils/browserCheck.js'
+import { checkBrowser } from './utils/browserCheck.ts'
 import { signalingKill } from './utils/webrtc/index.js'
 
 export default {

src/components/NewMessage/NewMessage.vue

@@ -82,6 +82,7 @@
 					dir="auto"
 					@keydown.esc="handleInputEsc"
 					@keydown.ctrl.up="handleEditLastMessage"
+					@keydown.meta.up="handleEditLastMessage"
 					@input="handleTyping"
 					@paste="handlePastedFiles"
 					@submit="handleSubmit" />

src/components/SettingsDialog/SettingsDialog.vue

@@ -136,7 +136,7 @@
 					</dd>
 				</div>
 				<div>
-					<dt><kbd>Ctrl</kbd> + <kbd>↑</kbd></dt>
+					<dt><kbd>{{ CmdOrCtrl }}</kbd> + <kbd>↑</kbd></dt>
 					<dd class="shortcut-description">
 						{{ t('spreed', 'Edit your last message') }}
 					</dd>
@@ -148,7 +148,7 @@
 					</dd>
 				</div>
 				<div>
-					<dt><kbd>Ctrl</kbd> + <kbd>F</kbd></dt>
+					<dt><kbd>{{ CmdOrCtrl }}</kbd> + <kbd>F</kbd></dt>
 					<dd class="shortcut-description">
 						{{ t('spreed', 'Search') }}
 					</dd>
@@ -210,6 +210,7 @@ import { getTalkConfig } from '../../services/CapabilitiesManager.ts'
 import { useCustomSettings } from '../../services/SettingsAPI.ts'
 import { useSettingsStore } from '../../stores/settings.js'
 import { useSoundsStore } from '../../stores/sounds.js'
+import { isMac } from '../../utils/browserCheck.ts'
 import { satisfyVersion } from '../../utils/satisfyVersion.ts'
 
 const serverVersion = loadState('core', 'config', {}).version ?? '29.0.0.0'
@@ -237,8 +238,10 @@ export default {
 		const soundsStore = useSoundsStore()
 		const { customSettingsSections } = useCustomSettings()
 		const isBackgroundBlurred = ref(isBackgroundBlurredState)
+		const CmdOrCtrl = isMac ? 'Cmd' : 'Ctrl'
 
 		return {
+			CmdOrCtrl,
 			settingsStore,
 			soundsStore,
 			supportTypingStatus,

src/components/TopBar/CallButton.vue

@@ -107,7 +107,7 @@ import { useBreakoutRoomsStore } from '../../stores/breakoutRooms.ts'
 import { useSettingsStore } from '../../stores/settings.js'
 import { useSoundsStore } from '../../stores/sounds.js'
 import { useTalkHashStore } from '../../stores/talkHash.js'
-import { blockCalls, unsupportedWarning } from '../../utils/browserCheck.js'
+import { blockCalls, unsupportedWarning } from '../../utils/browserCheck.ts'
 
 export default {
 	name: 'CallButton',

src/utils/browserCheck.js → src/utils/browserCheck.ts

@@ -10,6 +10,13 @@ import { t } from '@nextcloud/l10n'
 
 const parser = new UAParser()
 const browser = parser.getBrowser()
+const os = parser.getOS()
+
+/**
+ * Per-OS flags
+ */
+
+export const isMac = os.name === 'Mac OS'
 
 /**
  * Per-browser flags and a major version

src/utils/media/pipeline/MediaDevicesSource.js

@@ -4,7 +4,7 @@
  */
 
 import TrackSource from './TrackSource.js'
-import { isChromium } from '../../browserCheck.js'
+import { isChromium } from '../../browserCheck.ts'
 import { mediaDevicesManager } from '../../webrtc/index.js'
 
 /**

src/utils/webrtc/index.js

@@ -21,7 +21,7 @@ import BrowserStorage from '../../services/BrowserStorage.js'
 import { getTalkConfig } from '../../services/CapabilitiesManager.ts'
 import { fetchSignalingSettings } from '../../services/signalingService.js'
 import store from '../../store/index.js'
-import { isSafari } from '../browserCheck.js'
+import { isSafari } from '../browserCheck.ts'
 import CancelableRequest from '../cancelableRequest.js'
 import Signaling from '../signaling.js'
 import SignalingTypingHandler from '../SignalingTypingHandler.js'

src/utils/webrtc/simplewebrtc/peer.js

@@ -9,7 +9,7 @@ import adapter from 'webrtc-adapter'
 import webrtcSupport from 'webrtcsupport'
 import WildEmitter from 'wildemitter'
 
-import { isSafari } from '../../../utils/browserCheck.js'
+import { isSafari } from '../../browserCheck.ts'
 
 /**
  * @param {object} stream the stream object.