Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ export default [
ignores: [
// Generated files
'src/types/openapi/*',
'js/*',
// Vendor code
'src/utils/**/vendor/*',
// Temporary ignore code in documentation examples
'docs',
// TODO: upstream
Expand Down Expand Up @@ -47,6 +50,7 @@ export default [
name: 'talk/disabled-during-migration',
rules: {
'@nextcloud-l10n/non-breaking-space': 'off', // changes translation strings
'@nextcloud-l10n/non-breaking-space-vue': 'off', // changes translation strings
'@stylistic/array-bracket-newline': 'off', // changes array formatting
'@stylistic/max-statements-per-line': 'off', // non-fixable
'@typescript-eslint/no-unused-expressions': 'off', // non-fixable
Expand Down
956 changes: 510 additions & 446 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"@jest/globals": "^29.7.0",
"@nextcloud/babel-config": "^1.2.0",
"@nextcloud/browserslist-config": "^3.0.1",
"@nextcloud/eslint-config": "^9.0.0-rc.2",
"@nextcloud/eslint-config": "^9.0.0-rc.4",
"@nextcloud/stylelint-config": "^3.1.0",
"@nextcloud/webpack-vue-config": "^6.3.0",
"@total-typescript/ts-reset": "^0.6.1",
Expand Down
17 changes: 8 additions & 9 deletions src/components/RightSidebar/SearchMessages/SearchMessagesTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,15 @@ const searchBox = ref<InstanceType<typeof SearchBox> | null>(null)
const { initializeNavigation, resetNavigation } = useArrowNavigation(searchMessagesTab, searchBox)

const isFocused = ref(false)
const searchResults = ref<(UnifiedSearchResultEntry &
{
to: {
name: string
hash: string
params: {
token: string
}
const searchResults = ref<(UnifiedSearchResultEntry & {
to: {
name: string
hash: string
params: {
token: string
}
})[]>([])
}
})[]>([])
const searchText = ref('')
const fromUser = ref<IUserData | undefined>(undefined)
const sinceDate = ref<Date | null>(null)
Expand Down
3 changes: 1 addition & 2 deletions src/services/coreService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ const canInviteToFederation = hasTalkFeature('local', 'federation-v1')
&& getTalkConfig('local', 'federation', 'outgoing-enabled')

// Only explicit share types are allowed to use in autocompleteQuery
type ShareType =
| typeof SHARE.TYPE.USER
type ShareType = typeof SHARE.TYPE.USER
| typeof SHARE.TYPE.GROUP
| typeof SHARE.TYPE.EMAIL
| typeof SHARE.TYPE.REMOTE
Expand Down
6 changes: 2 additions & 4 deletions src/types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,7 @@ export type StandaloneSignalingUpdateSession = {
virtual?: boolean
}

export type SignalingSessionPayload =
| InternalSignalingSession
Comment on lines -147 to -148
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🥲

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like our style more

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Me too, but I'm afraid, If we disable this rule, it might fire back in some unexpected places

export type SignalingSessionPayload = InternalSignalingSession
| StandaloneSignalingJoinSession
| StandaloneSignalingUpdateSession

Expand Down Expand Up @@ -457,8 +456,7 @@ export type IUserData = {
// SIP call message payload
// TODO unify this type
// hint: check TYPE_ENCRYPTION* in "encryption.js"
export type CallSIPSendCallMessagePayload =
| { type: 'control' | 'hangup' }
export type CallSIPSendCallMessagePayload = { type: 'control' | 'hangup' }
| { type: 'dtmf', digit: string }
| { type: 'mute', audio: number }

Expand Down
6 changes: 2 additions & 4 deletions src/types/vendor/@nextcloud/cdav-library.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@
declare module '@nextcloud/cdav-library'

declare class DavClient {

constructor(options: { rootUrl: string, defaultHeaders: Record<string, any> }, factories = {});
connect(options?: { enableCalDAV?: boolean, enableCardDAV?: boolean }): Promise<void>;
constructor(options: { rootUrl: string, defaultHeaders: Record<string, unknown> }, factories = {})
connect(options?: { enableCalDAV?: boolean, enableCardDAV?: boolean }): Promise<void>

currentUserPrincipal: DavPrincipal
calendarHomes: DavCalendarHome[]

}
2 changes: 1 addition & 1 deletion src/types/vendor/vuex.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

declare module 'vuex' {
export {
Store,
createStore,
Store,
useStore,
} from 'vuex/types/index.d.ts'
}