Okupa_Mi_Coche/Okupa_mi_coche_-_Angular
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finally typed matrix-js-sdk

Browse Source
This commit is contained in:
Eneko Nieto
2021-04-26 00:59:23 +02:00
parent 2926126100
commit 7b52bfba88
5 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
package-lock.json generated
View File

@@ -21,7 +21,7 @@
"@angular/platform-browser-dynamic": "~11.2.11",
"@angular/router": "~11.2.11",
"angular-auth-oidc-client": "^11.6.6",
"matrix-js-sdk": "^9.2.0",
"matrix-js-sdk": "^9.11.0",
"moment": "^2.29.1",
"olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
"path": "^0.12.7",
@@ -9365,17 +9365,17 @@
}
},
"node_modules/matrix-js-sdk": {
"version": "9.2.0",
"resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-9.2.0.tgz",
"integrity": "sha512-3lPgCB2in+AHDd+tLT8HbJ9elqDeJjYCE8i8Ti+NO2Myua62HIsf3pE/C/FE/QCDTuZBTjN0vgjym22M+GO65g==",
"version": "9.11.0",
"resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-9.11.0.tgz",
"integrity": "sha512-wP28ybOxyQ7lbC48QddRORYr8atEwbTqDOsu8H6u9jTTgB2qqczI/bkSoXHtutODuSeLY5x0UuwLcxVCy4yxVQ==",
"dependencies": {
"@babel/runtime": "^7.11.2",
"@babel/runtime": "^7.12.5",
"another-json": "^0.2.0",
"browser-request": "^0.3.3",
"bs58": "^4.0.1",
"content-type": "^1.0.4",
"loglevel": "^1.7.0",
"qs": "^6.9.4",
"loglevel": "^1.7.1",
"qs": "^6.9.6",
"request": "^2.88.2",
"unhomoglyph": "^1.0.6"
}
@@ -25926,17 +25926,17 @@
}
},
"matrix-js-sdk": {
"version": "9.2.0",
"resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-9.2.0.tgz",
"integrity": "sha512-3lPgCB2in+AHDd+tLT8HbJ9elqDeJjYCE8i8Ti+NO2Myua62HIsf3pE/C/FE/QCDTuZBTjN0vgjym22M+GO65g==",
"version": "9.11.0",
"resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-9.11.0.tgz",
"integrity": "sha512-wP28ybOxyQ7lbC48QddRORYr8atEwbTqDOsu8H6u9jTTgB2qqczI/bkSoXHtutODuSeLY5x0UuwLcxVCy4yxVQ==",
"requires": {
"@babel/runtime": "^7.11.2",
"@babel/runtime": "^7.12.5",
"another-json": "^0.2.0",
"browser-request": "^0.3.3",
"bs58": "^4.0.1",
"content-type": "^1.0.4",
"loglevel": "^1.7.0",
"qs": "^6.9.4",
"loglevel": "^1.7.1",
"qs": "^6.9.6",
"request": "^2.88.2",
"unhomoglyph": "^1.0.6"
},

2
package.json
View File

@@ -24,7 +24,7 @@
"@angular/platform-browser-dynamic": "~11.2.11",
"@angular/router": "~11.2.11",
"angular-auth-oidc-client": "^11.6.6",
"matrix-js-sdk": "^9.2.0",
"matrix-js-sdk": "^9.11.0",
"moment": "^2.29.1",
"olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
"path": "^0.12.7",

14
src/app/services/chat.service.ts
View File

@@ -1,14 +1,10 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import * as matrixsdk from 'matrix-js-sdk';
import { Observable } from 'rxjs';
import { MatrixLoginDto } from '../entities/matrix-login-dto';
import { ChatMessageHandler } from './chat-message-handler';
// global.Olm = olm;
export type MatrixClient = matrixsdk.MatrixClient;
export type MatrixEvent = matrixsdk.MatrixEvent;
export type Room = matrixsdk.Room;
export type RoomMember = matrixsdk.RoomMember;
import { MatrixEvent, MatrixClient, Room, RoomMember } from 'matrix-js-sdk';
import { createClient, ICreateClientOpts } from '../../../node_modules/matrix-js-sdk';
const FORWARDS = 'f';
@@ -94,7 +90,7 @@ export class ChatService {
}
catch (error) { return true; }
}
const joinRule = room.getLiveTimeline().getState(FORWARDS).getJoinRule();
const joinRule = room.currentState.getJoinRule();
return joinRule === 'invite';
}
@@ -109,12 +105,12 @@ export class ChatService {
).toPromise();
console.log('LOGGED TO CHAT');
console.log({ matrixLogin });
const ops: matrixsdk.CreateClientOption = {
const ops: ICreateClientOpts = {
baseUrl: 'http://okupamicoche-synapse:8008',
accessToken: matrixLogin.access_token,
userId: matrixLogin.user_id
};
this.matrixClient = matrixsdk.createClient(ops);
this.matrixClient = createClient(ops);
await this.matrixClient.startClient({ initialSyncLimit: 100 });

4
src/app/views/chat/chat.component.ts
View File

@@ -1,6 +1,6 @@
import { AfterViewInit, ChangeDetectorRef, Component, ElementRef, Input, OnInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
import { MatrixEvent, RoomMember, ChatService } from 'src/app/services/chat.service';
import { ChatService } from 'src/app/services/chat.service';
import { MatrixEvent, RoomMember } from 'matrix-js-sdk';
@Component({
selector: 'app-chat',

7
tsconfig.json
View File

@@ -25,9 +25,10 @@
]
}
},
// "exclude": [
// "node_modules/matrix-js-sdk/lib/*.d.ts"
// ],
"exclude": [
"node_modules/matrix-js-sdk/lib/*.d.ts",
"node_modules/matrix-js-sdk/lib/*/*.d.ts"
],
"angularCompilerOptions": {
"strictInjectionParameters": true,
"strictTemplates": true