Skip to content
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

Jump to bottom

feat: api v3 support for typing endpoint [FS-1311] #14274

Merged
merged 2 commits into from
Dec 8, 2022
Merged

feat: api v3 support for typing endpoint [FS-1311] #14274

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
086e2b4
feat: api v3 support for typing endpoint
PatrykBuniX Dec 8, 2022
14fda52
chore: bump core
PatrykBuniX Dec 8, 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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"@emotion/react": "11.10.5",
"@types/eslint": "^8.4.10",
"@wireapp/avs": "8.2.17",
"@wireapp/core": "37.2.3",
"@wireapp/core": "37.3.0",
"@wireapp/react-ui-kit": "9.2.2",
"@wireapp/store-engine-dexie": "2.0.3",
"@wireapp/store-engine-sqleet": "1.8.9",
Expand Down
20 changes: 2 additions & 18 deletions src/script/conversation/ConversationRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1717,27 +1717,11 @@ export class ConversationRepository {
}

public async sendTypingStart(conversationEntity: Conversation) {
/*
Currently typing endpoint is not implemented on backend for federated environments
@todo: remove this condition when backend is ready and api-client in packages is updated to support domain in typing endpoint
*/
const isFederated = this.core.backendFeatures?.isFederated;
if (isFederated) {
return;
}
this.core.service!.conversation.sendTypingStart(conversationEntity.id);
this.core.service!.conversation.sendTypingStart(conversationEntity.qualifiedId);
Copy link
Contributor Author

@PatrykBuniX PatrykBuniX Dec 8, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

conversationEntity.qualifiedId is a getter that returns {domain: conversationEntity.domain, id: conversationEntity.id};

api version and federation checks are included in api-client

}

public async sendTypingStop(conversationEntity: Conversation) {
/*
Currently typing endpoint is not implemented on backend for federated environments
@todo: remove this condition when backend is ready and api-client in packages is updated to support domain in typing endpoint
*/
const isFederated = this.core.backendFeatures?.isFederated;
if (isFederated) {
return;
}
this.core.service!.conversation.sendTypingStop(conversationEntity.id);
this.core.service!.conversation.sendTypingStop(conversationEntity.qualifiedId);
}

private async toggleArchiveConversation(
Expand Down
20 changes: 10 additions & 10 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4034,9 +4034,9 @@ __metadata:
languageName: node
linkType: hard

"@wireapp/api-client@npm:^22.9.0":
version: 22.9.0
resolution: "@wireapp/api-client@npm:22.9.0"
"@wireapp/api-client@npm:^22.10.0":
version: 22.10.0
resolution: "@wireapp/api-client@npm:22.10.0"
dependencies:
"@wireapp/commons": ^5.0.4
"@wireapp/priority-queue": ^2.0.3
Expand All @@ -4049,7 +4049,7 @@ __metadata:
spark-md5: 3.0.2
tough-cookie: 4.1.2
ws: 8.11.0
checksum: 36b0f95baed6c7b1ec0e8cb9ded30ea4fe85eaace4709185c47f60ab02d8391a0dd350b9d2811cee1361a223dea9c082c40c194ec0b1dc3dc5edcb2faaec790b
checksum: 4e6f330d7ef18c138a281fc08aec800ec6a3925e9d663275b46246ed336249e12241a0a928b058cd88d548cf3a1aad2dd2fd0e55caf86e0cd274226e6345d049
languageName: node
linkType: hard

Expand Down Expand Up @@ -4102,11 +4102,11 @@ __metadata:
languageName: node
linkType: hard

"@wireapp/core@npm:37.2.3":
version: 37.2.3
resolution: "@wireapp/core@npm:37.2.3"
"@wireapp/core@npm:37.3.0":
version: 37.3.0
resolution: "@wireapp/core@npm:37.3.0"
dependencies:
"@wireapp/api-client": ^22.9.0
"@wireapp/api-client": ^22.10.0
"@wireapp/commons": ^5.0.4
"@wireapp/core-crypto": 0.6.0-pre.4
"@wireapp/cryptobox": 12.8.0
Expand All @@ -4121,7 +4121,7 @@ __metadata:
logdown: 3.3.1
long: ^5.2.0
uuidjs: 4.2.12
checksum: 7cfda05e9d1b1021a694109ed161504537c476079ceffdb2b5d7a045f3fa656e387e024507e47c89bf89d2c231adb42579bbc1faa86b9230b3d0e0e927963469
checksum: 202d1bc8a4d441805bd74e5120fc81ff2ac9c677e361bd7e7bf5354bd1b25aae91356b4069dd9f9ad04ecd4024a1db2e25bf33a9e38682b13029c807ccaf1605
languageName: node
linkType: hard

Expand Down Expand Up @@ -16238,7 +16238,7 @@ __metadata:
"@typescript-eslint/parser": ^5.45.0
"@wireapp/avs": 8.2.17
"@wireapp/copy-config": 2.0.3
"@wireapp/core": 37.2.3
"@wireapp/core": 37.3.0
"@wireapp/eslint-config": 2.1.0
"@wireapp/prettier-config": 0.5.2
"@wireapp/react-ui-kit": 9.2.2
Expand Down