From c71accd08144d6acad5e8081e011c0f2f9a11a55 Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Tue, 25 Feb 2020 19:04:39 +0800 Subject: [PATCH 01/71] feat: support connecting to community server --- src/app/Controllers/about.component.ts | 9 +++- src/app/Controllers/signin.component.ts | 69 +++++++++++++++++++++--- src/app/Models/ServerConfig.ts | 10 ++++ src/app/Services/ApiService.ts | 11 ++-- src/app/Services/InitService.ts | 18 ++++++- src/app/Styles/button.scss | 4 +- src/app/Styles/signin.scss | 71 +++++++++++++++++++++---- src/app/Views/about.html | 23 ++++---- src/app/Views/signin.html | 52 +++++++++++++----- src/main.ts | 2 - 10 files changed, 220 insertions(+), 49 deletions(-) create mode 100644 src/app/Models/ServerConfig.ts diff --git a/src/app/Controllers/about.component.ts b/src/app/Controllers/about.component.ts index ff9ef7bb..1c3c1714 100644 --- a/src/app/Controllers/about.component.ts +++ b/src/app/Controllers/about.component.ts @@ -1,6 +1,7 @@ import { Component } from '@angular/core'; import { CheckService } from '../Services/CheckService'; import { Values } from '../values'; +import { ApiService } from '../Services/ApiService'; @Component({ templateUrl: '../Views/about.html', @@ -12,12 +13,18 @@ import { Values } from '../values'; export class AboutComponent { public sourceCodeURL = Values.sourceCodeURL; + constructor( - public checkService: CheckService + public checkService: CheckService, + public apiService: ApiService ) { } public check(): void { this.checkService.checkVersion(true); } + + public getCurrentYear(): number { + return new Date().getFullYear(); + } } diff --git a/src/app/Controllers/signin.component.ts b/src/app/Controllers/signin.component.ts index 10b885e8..8c04d0c3 100644 --- a/src/app/Controllers/signin.component.ts +++ b/src/app/Controllers/signin.component.ts @@ -1,18 +1,73 @@ -import { Component } from '@angular/core'; -import { ApiService } from '../Services/ApiService'; +import { Component, OnInit } from '@angular/core'; import { ElectronService } from 'ngx-electron'; +import { ApiService } from '../Services/ApiService'; +import { InitService } from '../Services/InitService'; +import Swal from 'sweetalert2'; +import { HttpClient } from '@angular/common/http'; +import { ServerConfig } from '../Models/ServerConfig'; @Component({ templateUrl: '../Views/signin.html', styleUrls: ['../Styles/signin.scss', - '../Styles/button.scss'] + '../Styles/button.scss'] }) -export class SignInComponent { - public OAuthURL: string; +export class SignInComponent implements OnInit { + + public changingServer = false; + public serverAddr; constructor( public _electronService: ElectronService, - ) { - this.OAuthURL = ApiService.serverAddress; + public apiService: ApiService, + public initService: InitService, + public http: HttpClient, + ) { + } + + public clearCommunityServerData() { + localStorage.removeItem('serverConfig'); + this.changingServer = false; + this.initService.init(); + } + + public connectCommunity() { + if (!this.serverAddr) { + Swal.fire('Please input an valid server url!', '', 'error'); + return; } + if (!this.serverAddr.match(/^https?:\/\/.+/g)) { + this.serverAddr = 'https://' + this.serverAddr; + } + + Swal.fire({ + icon: 'info', + title: 'Fetching manifest from your community server...', + text: this.serverAddr, + showConfirmButton: false, + showCancelButton: false + }); + Swal.showLoading(); + this.http.get(this.serverAddr).subscribe({ + next: t => { + Swal.close(); + if (t.code !== 0) { + this.fireFailed(); + return; + } + t.officialServer = false; + t.serverUrl = this.serverAddr; + localStorage.setItem('serverConfig', JSON.stringify(t)); + this.changingServer = false; + this.initService.init(); + }, + error: _t => this.fireFailed() + }); + } + + fireFailed() { + Swal.fire('Failed to fetch manifest from server.', 'Check syntax, then contract the server\'s owner.', 'error'); + } + + ngOnInit(): void { + } } diff --git a/src/app/Models/ServerConfig.ts b/src/app/Models/ServerConfig.ts new file mode 100644 index 00000000..99828a37 --- /dev/null +++ b/src/app/Models/ServerConfig.ts @@ -0,0 +1,10 @@ +import { AiurProtocal } from './AiurProtocal'; + +export class ServerConfig extends AiurProtocal { + public serverUrl: string; + public apiVersion: string; + public vapidPublicKey: string; + public serverName: string; + public mode: string; + public officialServer: boolean; +} diff --git a/src/app/Services/ApiService.ts b/src/app/Services/ApiService.ts index bfcfd205..8f6b29c9 100644 --- a/src/app/Services/ApiService.ts +++ b/src/app/Services/ApiService.ts @@ -3,10 +3,13 @@ import { Observable } from 'rxjs/'; import { ParamService } from './ParamService'; import { HttpClient, HttpHeaders } from '@angular/common/http'; import { catchError } from 'rxjs/operators'; +import { ServerConfig } from '../Models/ServerConfig'; -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class ApiService { - public static serverAddress; + public serverConfig: ServerConfig; private _headers: HttpHeaders = new HttpHeaders({ @@ -19,14 +22,14 @@ export class ApiService { } public Get(address: string): Observable { - return this.http.get(`${ApiService.serverAddress}${address}`, { + return this.http.get(`${this.serverConfig.serverUrl}${address}`, { headers: this._headers, withCredentials: true }).pipe(catchError(this.handleError)); } public Post(address: string, data: any): Observable { - return this.http.post(`${ApiService.serverAddress}${address}`, this.paramTool.param(data), { + return this.http.post(`${this.serverConfig.serverUrl}${address}`, this.paramTool.param(data), { headers: this._headers, withCredentials: true }).pipe(catchError(this.handleError)); diff --git a/src/app/Services/InitService.ts b/src/app/Services/InitService.ts index 1d73872f..1da64a04 100644 --- a/src/app/Services/InitService.ts +++ b/src/app/Services/InitService.ts @@ -10,6 +10,8 @@ import { DevicesApiService } from './DevicesApiService'; import { ThemeService } from './ThemeService'; import Swal from 'sweetalert2'; import { ProbeService } from './ProbeService'; +import { ServerConfig } from '../Models/ServerConfig'; +import { ApiService } from './ApiService'; @Injectable({ providedIn: 'root' @@ -25,10 +27,11 @@ export class InitService { private closeWebSocket = false; private options = { userVisibleOnly: true, - applicationServerKey: this.urlBase64ToUint8Array(environment.applicationServerKey) + applicationServerKey: null }; constructor( + private apiService: ApiService, private checkService: CheckService, private authApiService: AuthApiService, private router: Router, @@ -42,6 +45,19 @@ export class InitService { } public init(): void { + // load server config + if (localStorage.getItem('serverConfig')) { + const communityServerConfig = JSON.parse(localStorage.getItem('serverConfig')) as ServerConfig; + this.apiService.serverConfig = communityServerConfig; + this.options.applicationServerKey = this.urlBase64ToUint8Array(communityServerConfig.vapidPublicKey); + } else { + const serv = new ServerConfig(); + serv.serverUrl = environment.server; + serv.vapidPublicKey = environment.applicationServerKey; + serv.officialServer = true; + this.apiService.serverConfig = serv; + this.options.applicationServerKey = this.urlBase64ToUint8Array(serv.vapidPublicKey); + } this.online = navigator.onLine; this.closeWebSocket = false; this.checkService.checkVersion(false); diff --git a/src/app/Styles/button.scss b/src/app/Styles/button.scss index f8563f50..3c7a26a7 100644 --- a/src/app/Styles/button.scss +++ b/src/app/Styles/button.scss @@ -85,11 +85,11 @@ button, background-color: #f5f5f5; color: black; - &:hover:enabled { + &:hover { background-color: #e9e9e9; } - &:focus:enabled { + &:active { background-color: #bbb; } } diff --git a/src/app/Styles/signin.scss b/src/app/Styles/signin.scss index 72fee272..677a7483 100644 --- a/src/app/Styles/signin.scss +++ b/src/app/Styles/signin.scss @@ -1,3 +1,12 @@ +%header { + color: #339bf9; + font-weight: 400; + text-transform: uppercase; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, Helvetica, sans-serif; + text-shadow: 2px 2px 10px rgba(0, 0, 0, 0.2); + margin: 0; +} + .signin-back { width: 100%; height: 100%; @@ -25,21 +34,13 @@ overflow: hidden; } - h1, h3 { - color: #339bf9; - font-weight: 400; - text-transform: uppercase; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, Helvetica, sans-serif; - text-shadow: 2px 2px 10px rgba(0, 0, 0, 0.2); - margin: 0; - overflow: hidden; - } - h1 { + @extend %header; font-size: 2em; } h3 { + @extend %header; font-size: 1.5em; } } @@ -64,7 +65,7 @@ } p { - margin: 0 auto 8% auto; + margin: 4px 0 4px 0; } a { @@ -76,3 +77,51 @@ a { padding: 0 !important; margin-top: 8%; } + +.split-bar { + @extend %header; + clear: both; + user-select: none; + margin: 32px 0 32px 0; + position: relative; + display: inline-block; + font-size: 1.5em; + + &::before, &::after { + content: ' '; + display: block; + position: absolute; + top: 50%; + left: -120px; + width: 100px; // 100px line on either side + border-bottom: 2px solid #339bf9; + } + + &::after { + left: auto; + right: -120px; + } +} + +.text-warn { + color: #c62828; + font-size: 13px; +} + +.text-secure { + color: #5cb85c; + font-size: 13px; +} + +.inputAddr { + border: 1px solid var(--text-input-border-color); + color: var(--default-textcolor); + background-color: var(--text-input-bg); + border-radius: 6px; + height: 35px; + padding: 6px 12px; + font-size: 14px; + box-sizing: border-box; + outline: none; + width: 100%; +} diff --git a/src/app/Views/about.html b/src/app/Views/about.html index 23035472..d9213c48 100644 --- a/src/app/Views/about.html +++ b/src/app/Views/about.html @@ -41,17 +41,22 @@

Kahla {{checkService.version}}

Update history
- -
+ +
-
+
Download Kahla App
- Terms - | - Privacy Policy - | - Feedback -

Copyright © 2018 Aiursoft Corporation

+

Server connected: {{apiService.serverConfig.serverName}} ({{apiService.serverConfig.serverUrl}})

+

An aiursoft official server.

+

A community server.

+

+ Terms + | + Privacy Policy + | + Feedback +

+

Copyright © {{getCurrentYear()}} Aiursoft Corporation

diff --git a/src/app/Views/signin.html b/src/app/Views/signin.html index 05d7deb1..fa873128 100644 --- a/src/app/Views/signin.html +++ b/src/app/Views/signin.html @@ -3,19 +3,47 @@

Kahla

+

Select server

+

Login

-
-
- - - Forgot password? -
+
+ + + Forgot password? + +

+ You are connecting to {{this.apiService.serverConfig.serverUrl}} + {{this.apiService.serverConfig.officialServer ? '(Aiursoft official server)' : '(Not an official server)'}} + .

+ + +
+ +
+ +
community server
+
+ + +
+
+

Aiursoft CANNOT prove the community server is secure. You should NEVER connect to a server you don't + trust.

+

Chat data in community server will never be synced with one in official server.

+
diff --git a/src/main.ts b/src/main.ts index 6a474323..801054aa 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,12 +1,10 @@ import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { AppModule } from './app/app.module'; -import { ApiService } from './app/Services/ApiService'; import { environment } from './environments/environment'; if (environment.production) { enableProdMode(); } -ApiService.serverAddress = environment.server; platformBrowserDynamic().bootstrapModule(AppModule); From 4d5767f2a9cb006acf70519a1540ab2ba54c7a0c Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Mon, 2 Mar 2020 10:03:00 +0800 Subject: [PATCH 02/71] Downgrade Kahla version. --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index bd79fabd..3283bede 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "kahla", - "version": "4.0.0", + "version": "3.9.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0f185589..6b1942a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "kahla", - "version": "4.0.0", + "version": "3.9.3", "description": "Kahla is a cross-platform business messaging app.", "author": "Aiursoft (https://www.aiursoft.com/)", "build": { From fca725bf22b32d3c79216e9e0fea4efeb7b610a6 Mon Sep 17 00:00:00 2001 From: Anduin Xue Date: Mon, 2 Mar 2020 10:53:13 +0800 Subject: [PATCH 03/71] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6b1942a0..0f185589 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "kahla", - "version": "3.9.3", + "version": "4.0.0", "description": "Kahla is a cross-platform business messaging app.", "author": "Aiursoft (https://www.aiursoft.com/)", "build": { From 04eefd82b3b51f01f0e3e215c534980b2d8be748 Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Tue, 3 Mar 2020 00:08:28 +0800 Subject: [PATCH 04/71] feat: fetching official server config by server list api --- src/app/Controllers/signin.component.ts | 3 +- src/app/Models/ServerConfig.ts | 5 +- src/app/Services/ApiService.ts | 11 +++- src/app/Services/InitService.ts | 84 ++++++++++++++----------- src/app/Views/about.html | 2 +- src/app/Views/header.html | 4 +- src/app/Views/signin.html | 8 +-- src/environments/environment.ts | 5 +- 8 files changed, 70 insertions(+), 52 deletions(-) diff --git a/src/app/Controllers/signin.component.ts b/src/app/Controllers/signin.component.ts index 8c04d0c3..bd224061 100644 --- a/src/app/Controllers/signin.component.ts +++ b/src/app/Controllers/signin.component.ts @@ -50,12 +50,11 @@ export class SignInComponent implements OnInit { this.http.get(this.serverAddr).subscribe({ next: t => { Swal.close(); - if (t.code !== 0) { + if (t.code !== 0 || t.domain.server !== this.serverAddr) { this.fireFailed(); return; } t.officialServer = false; - t.serverUrl = this.serverAddr; localStorage.setItem('serverConfig', JSON.stringify(t)); this.changingServer = false; this.initService.init(); diff --git a/src/app/Models/ServerConfig.ts b/src/app/Models/ServerConfig.ts index 99828a37..489b4067 100644 --- a/src/app/Models/ServerConfig.ts +++ b/src/app/Models/ServerConfig.ts @@ -1,10 +1,13 @@ import { AiurProtocal } from './AiurProtocal'; export class ServerConfig extends AiurProtocal { - public serverUrl: string; public apiVersion: string; public vapidPublicKey: string; public serverName: string; public mode: string; public officialServer: boolean; + public domain: { + server: string, + client: string, + }; } diff --git a/src/app/Services/ApiService.ts b/src/app/Services/ApiService.ts index 8f6b29c9..7d6e5da1 100644 --- a/src/app/Services/ApiService.ts +++ b/src/app/Services/ApiService.ts @@ -9,6 +9,7 @@ import { ServerConfig } from '../Models/ServerConfig'; providedIn: 'root' }) export class ApiService { + public readonly STORAGE_SERVER_CONFIG = 'serverConfig'; public serverConfig: ServerConfig; private _headers: HttpHeaders = @@ -22,14 +23,18 @@ export class ApiService { } public Get(address: string): Observable { - return this.http.get(`${this.serverConfig.serverUrl}${address}`, { + return this.GetByFullUrl(`${this.serverConfig.domain.server}${address}`); + } + + public GetByFullUrl(address: string, withCredentials = true): Observable { + return this.http.get(address, { headers: this._headers, - withCredentials: true + withCredentials: withCredentials }).pipe(catchError(this.handleError)); } public Post(address: string, data: any): Observable { - return this.http.post(`${this.serverConfig.serverUrl}${address}`, this.paramTool.param(data), { + return this.http.post(`${this.serverConfig.domain.server}${address}`, this.paramTool.param(data), { headers: this._headers, withCredentials: true }).pipe(catchError(this.handleError)); diff --git a/src/app/Services/InitService.ts b/src/app/Services/InitService.ts index 1da64a04..e6ac2f8b 100644 --- a/src/app/Services/InitService.ts +++ b/src/app/Services/InitService.ts @@ -45,22 +45,6 @@ export class InitService { } public init(): void { - // load server config - if (localStorage.getItem('serverConfig')) { - const communityServerConfig = JSON.parse(localStorage.getItem('serverConfig')) as ServerConfig; - this.apiService.serverConfig = communityServerConfig; - this.options.applicationServerKey = this.urlBase64ToUint8Array(communityServerConfig.vapidPublicKey); - } else { - const serv = new ServerConfig(); - serv.serverUrl = environment.server; - serv.vapidPublicKey = environment.applicationServerKey; - serv.officialServer = true; - this.apiService.serverConfig = serv; - this.options.applicationServerKey = this.urlBase64ToUint8Array(serv.vapidPublicKey); - } - this.online = navigator.onLine; - this.closeWebSocket = false; - this.checkService.checkVersion(false); if (navigator.userAgent.match(/MSIE|Trident/)) { Swal.fire( 'Oops, it seems that you are opening Kahla in IE.', @@ -70,28 +54,56 @@ export class InitService { 'or Microsoft Edge.' ); } + + // load server config + if (localStorage.getItem(this.apiService.STORAGE_SERVER_CONFIG)) { + const communityServerConfig = JSON.parse(localStorage.getItem(this.apiService.STORAGE_SERVER_CONFIG)) as ServerConfig; + this.apiService.serverConfig = communityServerConfig; + } else { + this.router.navigate(['/signin'], {replaceUrl: true}); + this.apiService.GetByFullUrl>(environment.officialServerList, false).subscribe(servers => { + const target = servers.find(t => t.domain.client === window.location.origin); + if (target) { + target.officialServer = true; + this.apiService.serverConfig = target; + localStorage.setItem(this.apiService.STORAGE_SERVER_CONFIG, JSON.stringify(target)); + } + this.init(); + }); + return; + } + + this.online = navigator.onLine; + this.closeWebSocket = false; this.cacheService.initCache(); - this.authApiService.SignInStatus().subscribe(signInStatus => { - if (signInStatus.value === false) { - this.router.navigate(['/signin'], { replaceUrl: true }); - } else { - this.authApiService.Me().subscribe(p => { - if (p.code === 0) { - this.cacheService.cachedData.me = p.value; - this.cacheService.cachedData.me.avatarURL = this.probeService.encodeProbeFileUrl(p.value.iconFilePath); - this.themeService.ApplyThemeFromRemote(p.value); - if (!this._electronService.isElectronApp && navigator.serviceWorker) { - this.subscribeUser(); - this.updateSubscription(); + + if (this.apiService.serverConfig) { + this.options.applicationServerKey = this.urlBase64ToUint8Array(this.apiService.serverConfig.vapidPublicKey); + this.checkService.checkVersion(false); + this.authApiService.SignInStatus().subscribe(signInStatus => { + if (signInStatus.value === false) { + this.router.navigate(['/signin'], {replaceUrl: true}); + } else { + this.authApiService.Me().subscribe(p => { + if (p.code === 0) { + this.cacheService.cachedData.me = p.value; + this.cacheService.cachedData.me.avatarURL = this.probeService.encodeProbeFileUrl(p.value.iconFilePath); + this.themeService.ApplyThemeFromRemote(p.value); + if (!this._electronService.isElectronApp && navigator.serviceWorker) { + this.subscribeUser(); + this.updateSubscription(); + } + this.loadPusher(false); + this.cacheService.updateConversation(); + this.cacheService.updateFriends(); + this.cacheService.updateRequests(); } - this.loadPusher(false); - this.cacheService.updateConversation(); - this.cacheService.updateFriends(); - this.cacheService.updateRequests(); - } - }); - } - }); + }); + } + }); + } else { + this.router.navigate(['/signin'], {replaceUrl: true}); + } } private loadPusher(reconnect: boolean): void { diff --git a/src/app/Views/about.html b/src/app/Views/about.html index 507c4511..9b75012d 100644 --- a/src/app/Views/about.html +++ b/src/app/Views/about.html @@ -49,7 +49,7 @@

Kahla {{checkService.version}}

{{electronService.isElectronApp ? 'Open Kahla official site' : 'Download Kahla App'}}
-

Server connected: {{apiService.serverConfig.serverName}} ({{apiService.serverConfig.serverUrl}})

+

Server connected: {{apiService.serverConfig.serverName}} ({{apiService.serverConfig.domain.server}})

An aiursoft official server.

A community server.

diff --git a/src/app/Views/header.html b/src/app/Views/header.html index aaac7f38..60327eae 100644 --- a/src/app/Views/header.html +++ b/src/app/Views/header.html @@ -27,7 +27,7 @@

+ *ngIf="((!this.returnButton || !homeService.wideScreenEnabled) && initService.connecting)">
Connecting... @@ -35,7 +35,7 @@
+ *ngIf="((!this.returnButton || !homeService.wideScreenEnabled) && (!initService.online && !initService.connecting))">
Disconnected diff --git a/src/app/Views/signin.html b/src/app/Views/signin.html index fa873128..1d5c8001 100644 --- a/src/app/Views/signin.html +++ b/src/app/Views/signin.html @@ -6,12 +6,12 @@

Kahla

Select server

Login

-
- - @@ -19,7 +19,7 @@

Login

target="_blank" rel="noopener noreferrer">Forgot password?

- You are connecting to {{this.apiService.serverConfig.serverUrl}} + You are connecting to {{this.apiService.serverConfig.domain.server}} {{this.apiService.serverConfig.officialServer ? '(Aiursoft official server)' : '(Not an official server)'}} .

diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 1b9d6efd..ba8c7e0d 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,5 +1,4 @@ export const environment = { - production: false, - server: 'https://dev.server.kahla.app', - applicationServerKey: 'BJOTNmtE1V5GyDiYtoUzWbWLiaVMyfdnXFTvneJCbi9mwpw7FAVgQgIR9JN43TWkpT7ezBes1fPYr4nPqV6qXA0' + production: false, + officialServerList: 'https://staging.kahla.app/servers', }; From b3d66021dce958a22f46d89a14ea1f68a40392e7 Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Tue, 3 Mar 2020 08:08:34 +0800 Subject: [PATCH 05/71] Correct version num. --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3283bede..bd79fabd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "kahla", - "version": "3.9.3", + "version": "4.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 6b1942a0..0f185589 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "kahla", - "version": "3.9.3", + "version": "4.0.0", "description": "Kahla is a cross-platform business messaging app.", "author": "Aiursoft (https://www.aiursoft.com/)", "build": { From b287e0a215d13d830e46a8a6c09335067f9269bc Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Tue, 3 Mar 2020 15:54:32 +0800 Subject: [PATCH 06/71] Check if server version is outdated. --- src/app/Services/CheckService.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/app/Services/CheckService.ts b/src/app/Services/CheckService.ts index 2fc5a368..57b7251e 100644 --- a/src/app/Services/CheckService.ts +++ b/src/app/Services/CheckService.ts @@ -3,6 +3,7 @@ import { AuthApiService } from './AuthApiService'; import Swal from 'sweetalert2'; import { versions } from '../../environments/versions'; import { ElectronService } from 'ngx-electron'; +import { ApiService } from './ApiService'; @Injectable({ providedIn: 'root' @@ -16,7 +17,8 @@ export class CheckService { constructor( private authApiService: AuthApiService, - private _electronService: ElectronService + private _electronService: ElectronService, + private apiService: ApiService ) { if (this.checkSwCache()) { navigator.serviceWorker.addEventListener('message', (t: MessageEvent) => { @@ -56,6 +58,12 @@ export class CheckService { latestAPIVersion[1] > currentVersion[1]) { Swal.fire('API version mismatch', 'API level is too far from client! You have to upgrade now!', 'warning'); this.redirectToDownload(downloadAddress, true); + } else if (latestVersion[0] < currentVersion[0] || + latestVersion[1] < currentVersion[1] || + latestVersion[2] < currentVersion[2] || + !this.apiService.serverConfig.officialServer) { + Swal.fire('Community server outdated!', 'The Client version is newer then the Server version.\n' + + 'Consider contact the host of the server for updating the kahla.server version to latest.', 'warning'); } else if (showAlert) { Swal.fire('Success', 'You are running the latest version of Kahla!', 'success'); } From 6aa671b422849705084ebe700a97284859dfcdc1 Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Tue, 3 Mar 2020 17:19:29 +0800 Subject: [PATCH 07/71] Fix the misreport of server outdated --- src/app/Services/CheckService.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/Services/CheckService.ts b/src/app/Services/CheckService.ts index 57b7251e..84b3e165 100644 --- a/src/app/Services/CheckService.ts +++ b/src/app/Services/CheckService.ts @@ -58,9 +58,9 @@ export class CheckService { latestAPIVersion[1] > currentVersion[1]) { Swal.fire('API version mismatch', 'API level is too far from client! You have to upgrade now!', 'warning'); this.redirectToDownload(downloadAddress, true); - } else if (latestVersion[0] < currentVersion[0] || + } else if ((latestVersion[0] < currentVersion[0] || latestVersion[1] < currentVersion[1] || - latestVersion[2] < currentVersion[2] || + latestVersion[2] < currentVersion[2]) && !this.apiService.serverConfig.officialServer) { Swal.fire('Community server outdated!', 'The Client version is newer then the Server version.\n' + 'Consider contact the host of the server for updating the kahla.server version to latest.', 'warning'); From b865d04cb6667f9acf4bebd359a5e55e4112ae78 Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Tue, 3 Mar 2020 17:27:17 +0800 Subject: [PATCH 08/71] Better server choose UI --- src/app/Views/signin.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/app/Views/signin.html b/src/app/Views/signin.html index 1d5c8001..201eda77 100644 --- a/src/app/Views/signin.html +++ b/src/app/Views/signin.html @@ -19,13 +19,17 @@

Login

target="_blank" rel="noopener noreferrer">Forgot password?

- You are connecting to {{this.apiService.serverConfig.domain.server}} + Server + connected: {{this.apiService.serverConfig.serverName}} + ({{this.apiService.serverConfig.domain.server}}) +

+

{{this.apiService.serverConfig.officialServer ? '(Aiursoft official server)' : '(Not an official server)'}} - .

+

- +
From abe0b8176f62ee3f4c33c611b35c23b5e8b1b2d2 Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Wed, 4 Mar 2020 10:43:54 +0800 Subject: [PATCH 09/71] Simplify server change UI --- src/app/Controllers/signin.component.ts | 3 +++ src/app/Styles/signin.scss | 2 +- src/app/Views/signin.html | 17 +++++------------ 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/app/Controllers/signin.component.ts b/src/app/Controllers/signin.component.ts index bd224061..0b668e36 100644 --- a/src/app/Controllers/signin.component.ts +++ b/src/app/Controllers/signin.component.ts @@ -68,5 +68,8 @@ export class SignInComponent implements OnInit { } ngOnInit(): void { + if (this.apiService.serverConfig && !this.apiService.serverConfig.officialServer) { + this.serverAddr = this.apiService.serverConfig.domain.server; + } } } diff --git a/src/app/Styles/signin.scss b/src/app/Styles/signin.scss index 677a7483..4bb4ca7c 100644 --- a/src/app/Styles/signin.scss +++ b/src/app/Styles/signin.scss @@ -56,7 +56,7 @@ color: #2391D3 !important; } -.forgetPassword { +.actionLink { margin: 5% auto; display: block; text-decoration: underline; diff --git a/src/app/Views/signin.html b/src/app/Views/signin.html index 201eda77..ecd848e1 100644 --- a/src/app/Views/signin.html +++ b/src/app/Views/signin.html @@ -4,7 +4,6 @@

Kahla

Select server

-

Login

- Forgot password? -

- Server - connected: {{this.apiService.serverConfig.serverName}} - ({{this.apiService.serverConfig.domain.server}}) -

+ Server: {{this.apiService.serverConfig.serverName}}

{{this.apiService.serverConfig.officialServer ? '(Aiursoft official server)' : '(Not an official server)'}}

- -
@@ -38,7 +30,8 @@

Login

community server
- + From 8f01b876b2bc76e5518f0ac938425402ade8f3f4 Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Wed, 4 Mar 2020 10:57:05 +0800 Subject: [PATCH 10/71] minimal useless info when connecting to official server --- src/app/Styles/signin.scss | 5 ----- src/app/Views/signin.html | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/app/Styles/signin.scss b/src/app/Styles/signin.scss index 4bb4ca7c..503f014c 100644 --- a/src/app/Styles/signin.scss +++ b/src/app/Styles/signin.scss @@ -108,11 +108,6 @@ a { font-size: 13px; } -.text-secure { - color: #5cb85c; - font-size: 13px; -} - .inputAddr { border: 1px solid var(--text-input-border-color); color: var(--default-textcolor); diff --git a/src/app/Views/signin.html b/src/app/Views/signin.html index ecd848e1..5563a6eb 100644 --- a/src/app/Views/signin.html +++ b/src/app/Views/signin.html @@ -19,8 +19,8 @@

Select server

Server: {{this.apiService.serverConfig.serverName}} -

- {{this.apiService.serverConfig.officialServer ? '(Aiursoft official server)' : '(Not an official server)'}} +

+ (Not an official server)

From 3d7b35ad82c2ad3c10fd044ced9d649fceb1845a Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Sat, 7 Mar 2020 12:07:43 +0800 Subject: [PATCH 11/71] fix: don't make the user scare when switching server close #811 --- src/app/Controllers/signin.component.ts | 41 ++++++++++++++++++++----- src/app/Styles/signin.scss | 5 --- src/app/Views/signin.html | 17 +++------- 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/src/app/Controllers/signin.component.ts b/src/app/Controllers/signin.component.ts index 0b668e36..9f6bd0da 100644 --- a/src/app/Controllers/signin.component.ts +++ b/src/app/Controllers/signin.component.ts @@ -5,6 +5,7 @@ import { InitService } from '../Services/InitService'; import Swal from 'sweetalert2'; import { HttpClient } from '@angular/common/http'; import { ServerConfig } from '../Models/ServerConfig'; +import { environment } from '../../environments/environment'; @Component({ templateUrl: '../Views/signin.html', @@ -38,7 +39,6 @@ export class SignInComponent implements OnInit { if (!this.serverAddr.match(/^https?:\/\/.+/g)) { this.serverAddr = 'https://' + this.serverAddr; } - Swal.fire({ icon: 'info', title: 'Fetching manifest from your community server...', @@ -48,16 +48,41 @@ export class SignInComponent implements OnInit { }); Swal.showLoading(); this.http.get(this.serverAddr).subscribe({ - next: t => { - Swal.close(); - if (t.code !== 0 || t.domain.server !== this.serverAddr) { + next: serverConfig => { + if (serverConfig.code !== 0 || serverConfig.domain.server !== this.serverAddr) { + Swal.close(); this.fireFailed(); return; } - t.officialServer = false; - localStorage.setItem('serverConfig', JSON.stringify(t)); - this.changingServer = false; - this.initService.init(); + this.apiService.GetByFullUrl>(environment.officialServerList, false).subscribe(officialServer => { + Swal.close(); + const last = () => { + localStorage.setItem('serverConfig', JSON.stringify(serverConfig)); + this.changingServer = false; + this.initService.init(); + }; + if (officialServer.map(t => t.domain.server).includes(serverConfig.domain.server)) { + // an official server + serverConfig.officialServer = true; + last(); + } else { + Swal.fire({ + title: 'Connecting to a community server...', + text: 'Aiursoft CANNOT prove the community server is secure.\n' + + ' You should NEVER connect to a server you don\'t trust.\n' + + 'Chat data in community server will never be synced with one in official server.', + icon: 'warning', + showCancelButton: true, + confirmButtonText: 'Continue' + }).then(res => { + if (res.dismiss) { + return; + } + serverConfig.officialServer = false; + last(); + }); + } + }); }, error: _t => this.fireFailed() }); diff --git a/src/app/Styles/signin.scss b/src/app/Styles/signin.scss index 503f014c..780e459e 100644 --- a/src/app/Styles/signin.scss +++ b/src/app/Styles/signin.scss @@ -103,11 +103,6 @@ a { } } -.text-warn { - color: #c62828; - font-size: 13px; -} - .inputAddr { border: 1px solid var(--text-input-border-color); color: var(--default-textcolor); diff --git a/src/app/Views/signin.html b/src/app/Views/signin.html index 5563a6eb..4a44a68a 100644 --- a/src/app/Views/signin.html +++ b/src/app/Views/signin.html @@ -29,18 +29,11 @@

Select server

Aiursoft official server
community server
-
- - -
-
-

Aiursoft CANNOT prove the community server is secure. You should NEVER connect to a server you don't - trust.

-

Chat data in community server will never be synced with one in official server.

-
+ +
From 63f1254ccef9a79f46d2abdf948fa738ca004bbc Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Sun, 8 Mar 2020 13:00:36 +0800 Subject: [PATCH 12/71] feat: Allow set `Broswer Default` accent color. --- src/app/Controllers/theme.component.ts | 8 ++++---- src/app/Models/Themes.ts | 5 +++++ src/app/Services/ThemeService.ts | 10 +++++++++- src/app/Styles/menu.scss | 1 + src/app/Views/theme.html | 6 +++++- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/app/Controllers/theme.component.ts b/src/app/Controllers/theme.component.ts index 1b08a749..40480df0 100644 --- a/src/app/Controllers/theme.component.ts +++ b/src/app/Controllers/theme.component.ts @@ -12,18 +12,18 @@ export class ThemeComponent implements OnInit { ) { } - public currentTheme: Themes = Themes.kahlaLight; + public currentTheme: Themes = Themes.kahlaAuto; public primaryColor: number; public accentColor: number; ngOnInit(): void { this.currentTheme = this.themeService.LocalThemeSetting; - this.primaryColor = Math.floor(this.currentTheme / 2); - this.accentColor = this.currentTheme % 2; + this.primaryColor = Math.floor(this.currentTheme / 3); + this.accentColor = this.currentTheme % 3; } public applyTheme() { - this.changeTheme(this.primaryColor * 2 + this.accentColor); + this.changeTheme(this.primaryColor * 3 + this.accentColor); } public changeTheme(theme: Themes) { diff --git a/src/app/Models/Themes.ts b/src/app/Models/Themes.ts index 602515f3..b578140d 100644 --- a/src/app/Models/Themes.ts +++ b/src/app/Models/Themes.ts @@ -1,12 +1,17 @@ export enum Themes { + kahlaAuto, kahlaLight, kahlaDark, + sakuraAuto, sakuraLight, sakuraDark, + violetAuto, violetLight, violetDark, + communistAuto, communistLight, communistDark, + grassAuto, grassLight, grassDark } diff --git a/src/app/Services/ThemeService.ts b/src/app/Services/ThemeService.ts index b52f8e08..05bda445 100644 --- a/src/app/Services/ThemeService.ts +++ b/src/app/Services/ThemeService.ts @@ -22,7 +22,15 @@ export class ThemeService { } ApplyTheme(theme: Themes) { - switch (theme) { + let themeComputed = theme; + if (theme % 3 === 0) { + if (matchMedia('(prefers-color-scheme: dark)').matches) { + themeComputed = theme + 2; + } else { + themeComputed = theme + 1; + } + } + switch (themeComputed) { case Themes.sakuraLight: document.body.className = 'theme-sakura-light'; document.querySelector('meta[name=theme-color]') diff --git a/src/app/Styles/menu.scss b/src/app/Styles/menu.scss index 55fb37b4..9d1d70b8 100644 --- a/src/app/Styles/menu.scss +++ b/src/app/Styles/menu.scss @@ -154,6 +154,7 @@ a { .select-button-group { margin: 4px 10px 4px 10px; + display: flex; } .select-button { diff --git a/src/app/Views/theme.html b/src/app/Views/theme.html index a65e5793..1bab161b 100644 --- a/src/app/Views/theme.html +++ b/src/app/Views/theme.html @@ -31,11 +31,15 @@
Accent color
+ Browser default + + + Light - + Dark From 459c1466a9701ab223041d91d789eec313d57c1f Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Sun, 8 Mar 2020 19:52:10 +0800 Subject: [PATCH 13/71] fix: change accent color instantly when the system color changed. --- src/app/Services/ThemeService.ts | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/app/Services/ThemeService.ts b/src/app/Services/ThemeService.ts index 05bda445..5c304508 100644 --- a/src/app/Services/ThemeService.ts +++ b/src/app/Services/ThemeService.ts @@ -3,12 +3,17 @@ import { AuthApiService } from './AuthApiService'; import { Themes } from '../Models/Themes'; import { KahlaUser } from '../Models/KahlaUser'; -@Injectable() +@Injectable({ + providedIn: 'root', +}) export class ThemeService { constructor( private authApiService: AuthApiService, - ) { } + ) { + } + + public mediaListener: MediaQueryList; ApplyThemeFromRemote(remoteInfo: KahlaUser) { if (this.LocalThemeSetting !== remoteInfo.themeId) { @@ -24,11 +29,21 @@ export class ThemeService { ApplyTheme(theme: Themes) { let themeComputed = theme; if (theme % 3 === 0) { - if (matchMedia('(prefers-color-scheme: dark)').matches) { + if (!this.mediaListener) { + this.mediaListener = matchMedia('(prefers-color-scheme: dark)'); + this.mediaListener.onchange = () => this.ApplyThemeFromLocal(); + } + if (this.mediaListener.matches) { themeComputed = theme + 2; } else { themeComputed = theme + 1; } + } else { + // make sure all media listener detached + if (this.mediaListener) { + this.mediaListener.onchange = null; + this.mediaListener = null; + } } switch (themeComputed) { case Themes.sakuraLight: From 414f2df885e4a38f3b61429bf4408db29d9dd341 Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Mon, 9 Mar 2020 09:56:17 +0800 Subject: [PATCH 14/71] Rename advanced settings button. --- src/app/Views/settings.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/Views/settings.html b/src/app/Views/settings.html index 44f43c76..6f92a6be 100644 --- a/src/app/Views/settings.html +++ b/src/app/Views/settings.html @@ -60,7 +60,7 @@
-
Advanced Setting
+
Settings
From 70a4f0c0a027e87ed928257461f05f63965636fb Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Mon, 9 Mar 2020 10:03:06 +0800 Subject: [PATCH 15/71] New trigger as show my online status. --- src/app/Views/advanced-settings.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/Views/advanced-settings.html b/src/app/Views/advanced-settings.html index af20d518..c70249a7 100644 --- a/src/app/Views/advanced-settings.html +++ b/src/app/Views/advanced-settings.html @@ -37,8 +37,8 @@
-
Always offline
- +
Show my online status
+
Date: Mon, 9 Mar 2020 15:50:28 +0800 Subject: [PATCH 16/71] Ctrl + Alt + S to toogle display electron. --- package-lock.json | 6 +++--- src/app/Models/NewFriendRequest.ts | 5 ----- src/index.js | 18 +++++++++++++++--- 3 files changed, 18 insertions(+), 11 deletions(-) delete mode 100644 src/app/Models/NewFriendRequest.ts diff --git a/package-lock.json b/package-lock.json index bd79fabd..cdab29af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10354,9 +10354,9 @@ }, "dependencies": { "acorn": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz", - "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", + "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==", "dev": true } } diff --git a/src/app/Models/NewFriendRequest.ts b/src/app/Models/NewFriendRequest.ts deleted file mode 100644 index 07b30adb..00000000 --- a/src/app/Models/NewFriendRequest.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { AiurEvent } from './AiurEvent'; - -export class NewFriendRequest extends AiurEvent { - public requesterId: string; -} diff --git a/src/index.js b/src/index.js index d29b4f2d..7afd84b8 100644 --- a/src/index.js +++ b/src/index.js @@ -1,5 +1,5 @@ const electron = require('electron'); -const {Menu, Tray, Notification, shell, session} = require('electron'); +const { Menu, Tray, Notification, shell, globalShortcut } = require('electron'); const app = electron.app; const BrowserWindow = electron.BrowserWindow; const path = require('path'); @@ -96,6 +96,11 @@ app.on('window-all-closed', function () { app.quit(); }); +app.on('will-quit', () => { + globalShortcut.unregister('CommandOrControl+Alt+S') + globalShortcut.unregisterAll() +}) + app.setAppUserModelId('com.example.kahla'); app.on('activate', function () { @@ -106,8 +111,8 @@ app.on('activate', function () { } }); -app.on("second-instance",(event, commandLine, workingDirectory) => { - if(mainWindow !== null){ +app.on("second-instance", (event, commandLine, workingDirectory) => { + if (mainWindow !== null) { mainWindow.show(); } }); @@ -122,6 +127,13 @@ app.on('ready', () => { tray.addListener('double-click', function () { mainWindow.show(); }); + globalShortcut.register('CommandOrControl+Alt+S', () => { + if (mainWindow.isVisible() && mainWindow.isFocused()) { + mainWindow.hide(); + } else { + mainWindow.show(); + } + }) const contextMenu = Menu.buildFromTemplate([ { label: 'Kahla', click: function () { mainWindow.show(); } From 55bbbdca212be21ebfbd5580864427417e06743d Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Mon, 9 Mar 2020 15:53:51 +0800 Subject: [PATCH 17/71] fix: Fix a bug that user cannot connect to any server in electron. --- src/app/Services/InitService.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/Services/InitService.ts b/src/app/Services/InitService.ts index e6ac2f8b..ceebd4cb 100644 --- a/src/app/Services/InitService.ts +++ b/src/app/Services/InitService.ts @@ -62,7 +62,13 @@ export class InitService { } else { this.router.navigate(['/signin'], {replaceUrl: true}); this.apiService.GetByFullUrl>(environment.officialServerList, false).subscribe(servers => { - const target = servers.find(t => t.domain.client === window.location.origin); + let target: ServerConfig; + if (this._electronService.isElectronApp) { + target = servers[0]; + } else { + target = servers.find(t => t.domain.client === window.location.origin); + } + if (target) { target.officialServer = true; this.apiService.serverConfig = target; From 99b275c2196ce1daf356f3958a56153a3194a772 Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Wed, 11 Mar 2020 00:25:42 +0800 Subject: [PATCH 18/71] Rename browser default to system. --- src/app/Views/theme.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/Views/theme.html b/src/app/Views/theme.html index 1bab161b..8641eb4d 100644 --- a/src/app/Views/theme.html +++ b/src/app/Views/theme.html @@ -31,7 +31,7 @@
Accent color
- Browser default + System From 1220ce42caa0550eb0c67dcd653bdd99ef1a2262 Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Wed, 11 Mar 2020 00:27:48 +0800 Subject: [PATCH 19/71] Add a scope to system color. --- src/app/Views/theme.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/Views/theme.html b/src/app/Views/theme.html index 8641eb4d..ecab3c0f 100644 --- a/src/app/Views/theme.html +++ b/src/app/Views/theme.html @@ -31,6 +31,7 @@
Accent color
+ System From a4e247ba928cd7d029804c4d718ad88148bea0b0 Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Wed, 11 Mar 2020 00:30:36 +0800 Subject: [PATCH 20/71] Fix an issue that the button is not margined to the center. --- src/app/Styles/button.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/app/Styles/button.scss b/src/app/Styles/button.scss index 3c7a26a7..2138408a 100644 --- a/src/app/Styles/button.scss +++ b/src/app/Styles/button.scss @@ -1,10 +1,6 @@ .buttons { padding: 10px; text-align: center; - - .button { - margin: 0 5px 5px 5px; - } } button, From 8e9b5ffabbfe9d3642db93b1caa21033eee49bfd Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Thu, 12 Mar 2020 10:05:41 +0800 Subject: [PATCH 21/71] Use aiur site instead. --- src/app/values.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/values.ts b/src/app/values.ts index d3168b64..c298997b 100644 --- a/src/app/values.ts +++ b/src/app/values.ts @@ -1,5 +1,5 @@ export class Values { - public static fileCompatAddress = 'https://{site}.aiursoft.io/'; + public static fileCompatAddress = 'https://{site}.aiur.site/'; public static fileAddress = 'https://probe.aiursoft.com/Download/Open/'; public static fileDownloadAddress = 'https://probe.aiursoft.com/Download/File/'; public static loadingImgURL = 'https://ui.cdn.aiursoft.com/images/loading.gif'; From 678ca66226cf06679bfc7fac15c0147f9cd98b59 Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Fri, 13 Mar 2020 10:45:32 +0800 Subject: [PATCH 22/71] add a notification that Ctrl Alt S. --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 7afd84b8..0e57658e 100644 --- a/src/index.js +++ b/src/index.js @@ -41,7 +41,7 @@ function createWindow() { app.showExitNotif = false; new Notification({ title: 'Kahla', - body: 'Kahla is running in the background.' + body: 'Kahla is running in the background. Press Ctrl + Alt + S to open.' }).show(); mainWindow.hide(); } From 69619adffe923ed96ec2be1ff7ea5edd07aab863 Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Fri, 13 Mar 2020 10:46:58 +0800 Subject: [PATCH 23/71] Simplify code. --- src/index.js | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/index.js b/src/index.js index 0e57658e..2e783b29 100644 --- a/src/index.js +++ b/src/index.js @@ -38,15 +38,13 @@ function createWindow() { mainWindow.on('close', function (event) { if (!app.isQuiting && app.showExitNotif) { event.preventDefault(); - app.showExitNotif = false; - new Notification({ - title: 'Kahla', - body: 'Kahla is running in the background. Press Ctrl + Alt + S to open.' - }).show(); - mainWindow.hide(); - } - if (!app.isQuiting) { - event.preventDefault(); + if (app.showExitNotif) { + app.showExitNotif = false; + new Notification({ + title: 'Kahla', + body: 'Kahla is running in the background. Press Ctrl + Alt + S to open.' + }).show(); + } mainWindow.hide(); } }); From bfdf894e0ef65e38d4f42d77e12c07cb55602ab0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Mar 2020 21:07:54 +0000 Subject: [PATCH 24/71] Bump acorn from 6.4.0 to 6.4.1 Bumps [acorn](https://github.com/acornjs/acorn) from 6.4.0 to 6.4.1. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/6.4.0...6.4.1) Signed-off-by: dependabot[bot] --- package-lock.json | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index cdab29af..0c83be39 100644 --- a/package-lock.json +++ b/package-lock.json @@ -122,6 +122,12 @@ "worker-plugin": "3.2.0" }, "dependencies": { + "acorn": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", + "dev": true + }, "cacache": { "version": "13.0.1", "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz", @@ -2519,9 +2525,9 @@ } }, "acorn": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz", - "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", + "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==", "dev": true }, "agent-base": { @@ -10351,14 +10357,6 @@ "@types/estree": "*", "@types/node": "*", "acorn": "^7.1.0" - }, - "dependencies": { - "acorn": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz", - "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==", - "dev": true - } } }, "run-async": { @@ -13031,6 +13029,14 @@ "terser-webpack-plugin": "^1.4.3", "watchpack": "^1.6.0", "webpack-sources": "^1.4.1" + }, + "dependencies": { + "acorn": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", + "dev": true + } } }, "webpack-dev-middleware": { From 51d7062c785628fda59e84719b38216132bbedff Mon Sep 17 00:00:00 2001 From: Zach Date: Sat, 14 Mar 2020 15:34:53 +0800 Subject: [PATCH 25/71] change: password valid method change valid method into a regular expression case, in case for future valid improvement. --- src/app/Controllers/changePassword.component.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/Controllers/changePassword.component.ts b/src/app/Controllers/changePassword.component.ts index 23ee2a25..91980a06 100644 --- a/src/app/Controllers/changePassword.component.ts +++ b/src/app/Controllers/changePassword.component.ts @@ -24,10 +24,10 @@ export class ChangePasswordComponent { public checkValid(): void { this.samePassword = this.newPassword === this.confirmPassword; - if (this.oldPassword.length >= 6 && this.oldPassword.length <= 32 && this.newPassword.length >= 6 && - this.newPassword.length <= 32 && this.samePassword) { - this.valid = true; + if(/^.{8,32}$/.test(this.oldPassword) && /^.{8,32}$/.test(this.newPassword)){ + this.valid = true; } + } public onSubmit(): void { From e7a98cbf47810f64fbe3016ce5cce2b8e5b575a1 Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Sat, 14 Mar 2020 15:50:01 +0800 Subject: [PATCH 26/71] Rename about. --- src/app/Views/settings.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/Views/settings.html b/src/app/Views/settings.html index 6f92a6be..8b237d3d 100644 --- a/src/app/Views/settings.html +++ b/src/app/Views/settings.html @@ -66,7 +66,7 @@
-
About Kahla
+
About
From c774205f7e1995b4f562df3055f44120cc09b372 Mon Sep 17 00:00:00 2001 From: Zach Date: Sat, 14 Mar 2020 15:51:45 +0800 Subject: [PATCH 27/71] fix: some dumb mistakes --- src/app/Controllers/changePassword.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/Controllers/changePassword.component.ts b/src/app/Controllers/changePassword.component.ts index 91980a06..f5929ac5 100644 --- a/src/app/Controllers/changePassword.component.ts +++ b/src/app/Controllers/changePassword.component.ts @@ -24,7 +24,7 @@ export class ChangePasswordComponent { public checkValid(): void { this.samePassword = this.newPassword === this.confirmPassword; - if(/^.{8,32}$/.test(this.oldPassword) && /^.{8,32}$/.test(this.newPassword)){ + if(/^.{6,32}$/.test(this.oldPassword) && /^.{6,32}$/.test(this.newPassword)){ this.valid = true; } From fa78be6e92a442ad5b0190458af5ed3cb516c07c Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Sun, 15 Mar 2020 17:25:59 +0800 Subject: [PATCH 28/71] Manually merge and fix linting issues. --- .../Controllers/changePassword.component.ts | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/app/Controllers/changePassword.component.ts b/src/app/Controllers/changePassword.component.ts index f5929ac5..48e017c0 100644 --- a/src/app/Controllers/changePassword.component.ts +++ b/src/app/Controllers/changePassword.component.ts @@ -6,8 +6,8 @@ import { catchError } from 'rxjs/operators'; @Component({ templateUrl: '../Views/changePassword.html', styleUrls: [ - '../Styles/userDetail.scss', - '../Styles/button.scss' + '../Styles/userDetail.scss', + '../Styles/button.scss' ] }) export class ChangePasswordComponent { @@ -24,10 +24,9 @@ export class ChangePasswordComponent { public checkValid(): void { this.samePassword = this.newPassword === this.confirmPassword; - if(/^.{6,32}$/.test(this.oldPassword) && /^.{6,32}$/.test(this.newPassword)){ + if (/^.{6,32}$/.test(this.oldPassword) && /^.{6,32}$/.test(this.newPassword)) { this.valid = true; } - } public onSubmit(): void { @@ -40,17 +39,17 @@ export class ChangePasswordComponent { } if (this.valid) { this.authApiServer.ChangePassword(this.oldPassword, this.newPassword, this.confirmPassword) - .pipe(catchError(error => { - Swal.fire('Network issue', 'Could not connect to Kahla server.', 'error'); - return Promise.reject(error.message || error); - })) - .subscribe(result => { - if (result.code === 0) { - Swal.fire('All set', result.message, 'success'); - } else { - Swal.fire('Try again', result.message, 'error'); - } - }); + .pipe(catchError(error => { + Swal.fire('Network issue', 'Could not connect to Kahla server.', 'error'); + return Promise.reject(error.message || error); + })) + .subscribe(result => { + if (result.code === 0) { + Swal.fire('All set', result.message, 'success'); + } else { + Swal.fire('Try again', result.message, 'error'); + } + }); } } } From e661e67453d66eb00edde03fc6bc43308b649228 Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Sun, 15 Mar 2020 17:27:07 +0800 Subject: [PATCH 29/71] Better grammar style. --- .../Controllers/changePassword.component.ts | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/app/Controllers/changePassword.component.ts b/src/app/Controllers/changePassword.component.ts index 48e017c0..e4b00748 100644 --- a/src/app/Controllers/changePassword.component.ts +++ b/src/app/Controllers/changePassword.component.ts @@ -33,23 +33,23 @@ export class ChangePasswordComponent { this.checkValid(); if (!this.samePassword) { Swal.fire('Passwords are not same!', 'error'); + return; } - if (!this.valid && this.samePassword) { - Swal.fire('Password length should between six and thirty-two'); - } - if (this.valid) { - this.authApiServer.ChangePassword(this.oldPassword, this.newPassword, this.confirmPassword) - .pipe(catchError(error => { - Swal.fire('Network issue', 'Could not connect to Kahla server.', 'error'); - return Promise.reject(error.message || error); - })) - .subscribe(result => { - if (result.code === 0) { - Swal.fire('All set', result.message, 'success'); - } else { - Swal.fire('Try again', result.message, 'error'); - } - }); + if (!this.valid) { + Swal.fire('Password length should between 6 and 32.'); + return } + this.authApiServer.ChangePassword(this.oldPassword, this.newPassword, this.confirmPassword) + .pipe(catchError(error => { + Swal.fire('Network issue', 'Could not connect to Kahla server.', 'error'); + return Promise.reject(error.message || error); + })) + .subscribe(result => { + if (result.code === 0) { + Swal.fire('All set', result.message, 'success'); + } else { + Swal.fire('Try again', result.message, 'error'); + } + }); } } From ce44743504830b20c1fe9f7171cd9bc9d5924b66 Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Sun, 15 Mar 2020 21:56:41 +0800 Subject: [PATCH 30/71] fix: better image height control --- src/app/Services/MessageService.ts | 3 ++- src/app/Styles/talking.scss | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/Services/MessageService.ts b/src/app/Services/MessageService.ts index f8114a52..84921061 100644 --- a/src/app/Services/MessageService.ts +++ b/src/app/Services/MessageService.ts @@ -422,7 +422,8 @@ export class MessageService { let imageWidth = Number(t.content.split('|')[1]), imageHeight = Number(t.content.split('|')[2]); const ratio = imageHeight / imageWidth; - const realMaxWidth = Math.min(this.maxImageWidth, Math.floor(900 / ratio)); + const realMaxWidth = Math.max(Math.min(this.maxImageWidth, Math.floor(500 / ratio)), + Math.min(this.maxImageWidth, 100)); // for too long image, just cut half of it if (realMaxWidth < imageWidth) { imageWidth = realMaxWidth; diff --git a/src/app/Styles/talking.scss b/src/app/Styles/talking.scss index 79651a46..2fafc1e4 100644 --- a/src/app/Styles/talking.scss +++ b/src/app/Styles/talking.scss @@ -266,7 +266,7 @@ .image-container { position: relative; - max-height: 1000px; + max-height: 500px; overflow: hidden; img { From 1fef5c511c2e04ee3ee134019cac3507d890780a Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Sun, 15 Mar 2020 22:20:20 +0800 Subject: [PATCH 31/71] fix typo --- src/app/Controllers/changePassword.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/Controllers/changePassword.component.ts b/src/app/Controllers/changePassword.component.ts index e4b00748..4f3b329e 100644 --- a/src/app/Controllers/changePassword.component.ts +++ b/src/app/Controllers/changePassword.component.ts @@ -37,7 +37,7 @@ export class ChangePasswordComponent { } if (!this.valid) { Swal.fire('Password length should between 6 and 32.'); - return + return; } this.authApiServer.ChangePassword(this.oldPassword, this.newPassword, this.confirmPassword) .pipe(catchError(error => { From e70f063698965578515bd905513c00ba53073372 Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Sun, 15 Mar 2020 22:41:12 +0800 Subject: [PATCH 32/71] fix: fix video height --- src/app/Services/MessageService.ts | 2 ++ src/app/Styles/talking.scss | 4 ---- src/app/Views/talking.html | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/app/Services/MessageService.ts b/src/app/Services/MessageService.ts index 84921061..7b0e7b4b 100644 --- a/src/app/Services/MessageService.ts +++ b/src/app/Services/MessageService.ts @@ -45,6 +45,7 @@ export class MessageService { public newMessages = false; private oldScrollHeight: number; public maxImageWidth = 0; + public videoHeight = 0; private userColors = new Map(); private colors = ['aqua', 'aquamarine', 'bisque', 'blue', 'blueviolet', 'brown', 'burlywood', 'cadetblue', 'chocolate', 'coral', 'cornflowerblue', 'darkcyan', 'darkgoldenrod']; @@ -313,6 +314,7 @@ export class MessageService { public updateMaxImageWidth(): void { this.maxImageWidth = Math.floor((this.homeService.contentWrapper.clientWidth - 40) * 0.7 - 20 - 2); + this.videoHeight = Math.floor(Math.min(this.maxImageWidth * 9 / 21, 400)); } public resetVariables(): void { diff --git a/src/app/Styles/talking.scss b/src/app/Styles/talking.scss index 2fafc1e4..18e8f019 100644 --- a/src/app/Styles/talking.scss +++ b/src/app/Styles/talking.scss @@ -274,10 +274,6 @@ } } -.message-list .message-balloon video { - width: 100%; -} - .chat-action { @extend %full-fixed-width; display: inline-block; diff --git a/src/app/Views/talking.html b/src/app/Views/talking.html index 3ccc571d..df066618 100644 --- a/src/app/Views/talking.html +++ b/src/app/Views/talking.html @@ -110,6 +110,7 @@
{{message.content.split('|')[1]}}
From 494168214c92a0a7ef04d860aafe1da8ffc594a0 Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Mon, 16 Mar 2020 16:38:45 +0800 Subject: [PATCH 33/71] feat: use kahla.app api to check version. --- src/app/Controllers/signin.component.ts | 16 +++++++--------- src/app/Models/VersionViewModel.ts | 2 -- src/app/Services/AuthApiService.ts | 5 ----- src/app/Services/CheckService.ts | 20 +++----------------- src/app/Services/InitService.ts | 11 +++++------ src/app/Services/ServerListApiService.ts | 23 +++++++++++++++++++++++ src/environments/environment.ts | 2 +- 7 files changed, 39 insertions(+), 40 deletions(-) create mode 100644 src/app/Services/ServerListApiService.ts diff --git a/src/app/Controllers/signin.component.ts b/src/app/Controllers/signin.component.ts index 9f6bd0da..02d14a1b 100644 --- a/src/app/Controllers/signin.component.ts +++ b/src/app/Controllers/signin.component.ts @@ -5,7 +5,7 @@ import { InitService } from '../Services/InitService'; import Swal from 'sweetalert2'; import { HttpClient } from '@angular/common/http'; import { ServerConfig } from '../Models/ServerConfig'; -import { environment } from '../../environments/environment'; +import { ServerListApiService } from '../Services/ServerListApiService'; @Component({ templateUrl: '../Views/signin.html', @@ -20,6 +20,7 @@ export class SignInComponent implements OnInit { constructor( public _electronService: ElectronService, public apiService: ApiService, + public serverListApiService: ServerListApiService, public initService: InitService, public http: HttpClient, ) { @@ -47,14 +48,15 @@ export class SignInComponent implements OnInit { showCancelButton: false }); Swal.showLoading(); - this.http.get(this.serverAddr).subscribe({ + const fireFailed = () => Swal.fire('Failed to fetch manifest from server.', 'Check syntax, then contract the server\'s owner.', 'error'); + this.apiService.GetByFullUrl(this.serverAddr, false).subscribe({ next: serverConfig => { if (serverConfig.code !== 0 || serverConfig.domain.server !== this.serverAddr) { Swal.close(); - this.fireFailed(); + fireFailed(); return; } - this.apiService.GetByFullUrl>(environment.officialServerList, false).subscribe(officialServer => { + this.serverListApiService.Servers().subscribe(officialServer => { Swal.close(); const last = () => { localStorage.setItem('serverConfig', JSON.stringify(serverConfig)); @@ -84,14 +86,10 @@ export class SignInComponent implements OnInit { } }); }, - error: _t => this.fireFailed() + error: _t => fireFailed() }); } - fireFailed() { - Swal.fire('Failed to fetch manifest from server.', 'Check syntax, then contract the server\'s owner.', 'error'); - } - ngOnInit(): void { if (this.apiService.serverConfig && !this.apiService.serverConfig.officialServer) { this.serverAddr = this.apiService.serverConfig.domain.server; diff --git a/src/app/Models/VersionViewModel.ts b/src/app/Models/VersionViewModel.ts index 77fe4d0e..a6466dd2 100644 --- a/src/app/Models/VersionViewModel.ts +++ b/src/app/Models/VersionViewModel.ts @@ -2,7 +2,5 @@ import { AiurProtocal } from './AiurProtocal'; export class VersionViewModel extends AiurProtocal { public latestVersion: string; - public oldestSupportedVersion: string; - public apiVersion: string; public downloadAddress: string; } diff --git a/src/app/Services/AuthApiService.ts b/src/app/Services/AuthApiService.ts index c4430b09..c3da41cb 100644 --- a/src/app/Services/AuthApiService.ts +++ b/src/app/Services/AuthApiService.ts @@ -4,7 +4,6 @@ import { KahlaUser } from '../Models/KahlaUser'; import { Observable } from 'rxjs/'; import { AiurProtocal } from '../Models/AiurProtocal'; import { InitPusherViewModel } from '../Models/ApiModels/InitPusherViewModel'; -import { VersionViewModel } from '../Models/VersionViewModel'; import { ApiService } from './ApiService'; @Injectable() @@ -15,10 +14,6 @@ export class AuthApiService { private apiService: ApiService ) {} - public Version(): Observable { - return this.apiService.Get(AuthApiService.serverPath + '/Version'); - } - public SignInStatus(): Observable> { return this.apiService.Get(AuthApiService.serverPath + '/SignInStatus'); } diff --git a/src/app/Services/CheckService.ts b/src/app/Services/CheckService.ts index 84b3e165..224a3e4f 100644 --- a/src/app/Services/CheckService.ts +++ b/src/app/Services/CheckService.ts @@ -1,9 +1,8 @@ import { Injectable } from '@angular/core'; -import { AuthApiService } from './AuthApiService'; import Swal from 'sweetalert2'; import { versions } from '../../environments/versions'; import { ElectronService } from 'ngx-electron'; -import { ApiService } from './ApiService'; +import { ServerListApiService } from './ServerListApiService'; @Injectable({ providedIn: 'root' @@ -16,9 +15,8 @@ export class CheckService { public buildTime = versions.buildTime; constructor( - private authApiService: AuthApiService, private _electronService: ElectronService, - private apiService: ApiService + private serverListApiService: ServerListApiService, ) { if (this.checkSwCache()) { navigator.serviceWorker.addEventListener('message', (t: MessageEvent) => { @@ -43,27 +41,15 @@ export class CheckService { public checkVersion(showAlert: boolean): void { this.checking = true; - this.authApiService.Version() + this.serverListApiService.Version() .subscribe(t => { const latestVersion: Array = t.latestVersion.split('.'); - const latestAPIVersion: Array = t.apiVersion.split('.'); const currentVersion: Array = versions.version.split('.'); const downloadAddress: string = t.downloadAddress; if (latestVersion[0] > currentVersion[0] || latestVersion[1] > currentVersion[1] || latestVersion[2] > currentVersion[2]) { this.redirectToDownload(downloadAddress, showAlert); - } else if ( - latestAPIVersion[0] > currentVersion[0] || - latestAPIVersion[1] > currentVersion[1]) { - Swal.fire('API version mismatch', 'API level is too far from client! You have to upgrade now!', 'warning'); - this.redirectToDownload(downloadAddress, true); - } else if ((latestVersion[0] < currentVersion[0] || - latestVersion[1] < currentVersion[1] || - latestVersion[2] < currentVersion[2]) && - !this.apiService.serverConfig.officialServer) { - Swal.fire('Community server outdated!', 'The Client version is newer then the Server version.\n' + - 'Consider contact the host of the server for updating the kahla.server version to latest.', 'warning'); } else if (showAlert) { Swal.fire('Success', 'You are running the latest version of Kahla!', 'success'); } diff --git a/src/app/Services/InitService.ts b/src/app/Services/InitService.ts index ceebd4cb..3c105feb 100644 --- a/src/app/Services/InitService.ts +++ b/src/app/Services/InitService.ts @@ -4,7 +4,6 @@ import { AuthApiService } from './AuthApiService'; import { Router } from '@angular/router'; import { MessageService } from './MessageService'; import { CacheService } from './CacheService'; -import { environment } from '../../environments/environment'; import { ElectronService } from 'ngx-electron'; import { DevicesApiService } from './DevicesApiService'; import { ThemeService } from './ThemeService'; @@ -12,6 +11,7 @@ import Swal from 'sweetalert2'; import { ProbeService } from './ProbeService'; import { ServerConfig } from '../Models/ServerConfig'; import { ApiService } from './ApiService'; +import { ServerListApiService } from './ServerListApiService'; @Injectable({ providedIn: 'root' @@ -41,6 +41,7 @@ export class InitService { private themeService: ThemeService, private devicesApiService: DevicesApiService, private probeService: ProbeService, + private serverListApiService: ServerListApiService ) { } @@ -54,14 +55,13 @@ export class InitService { 'or Microsoft Edge.' ); } - + this.checkService.checkVersion(false); // load server config if (localStorage.getItem(this.apiService.STORAGE_SERVER_CONFIG)) { - const communityServerConfig = JSON.parse(localStorage.getItem(this.apiService.STORAGE_SERVER_CONFIG)) as ServerConfig; - this.apiService.serverConfig = communityServerConfig; + this.apiService.serverConfig = JSON.parse(localStorage.getItem(this.apiService.STORAGE_SERVER_CONFIG)) as ServerConfig; } else { this.router.navigate(['/signin'], {replaceUrl: true}); - this.apiService.GetByFullUrl>(environment.officialServerList, false).subscribe(servers => { + this.serverListApiService.Servers().subscribe(servers => { let target: ServerConfig; if (this._electronService.isElectronApp) { target = servers[0]; @@ -85,7 +85,6 @@ export class InitService { if (this.apiService.serverConfig) { this.options.applicationServerKey = this.urlBase64ToUint8Array(this.apiService.serverConfig.vapidPublicKey); - this.checkService.checkVersion(false); this.authApiService.SignInStatus().subscribe(signInStatus => { if (signInStatus.value === false) { this.router.navigate(['/signin'], {replaceUrl: true}); diff --git a/src/app/Services/ServerListApiService.ts b/src/app/Services/ServerListApiService.ts new file mode 100644 index 00000000..06b2409c --- /dev/null +++ b/src/app/Services/ServerListApiService.ts @@ -0,0 +1,23 @@ +import { Injectable } from '@angular/core'; +import { ApiService } from './ApiService'; +import { Observable } from 'rxjs'; +import { ServerConfig } from '../Models/ServerConfig'; +import { environment } from '../../environments/environment'; +import { VersionViewModel } from '../Models/VersionViewModel'; + +@Injectable({ + providedIn: 'root', +}) +export class ServerListApiService { + + constructor(private apiService: ApiService) { + } + + public Servers(): Observable> { + return this.apiService.GetByFullUrl(`${environment.officialServerList}/servers`, false); + } + + public Version(): Observable { + return this.apiService.GetByFullUrl(`${environment.officialServerList}/version`, false); + } +} diff --git a/src/environments/environment.ts b/src/environments/environment.ts index ba8c7e0d..883b0334 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,4 +1,4 @@ export const environment = { production: false, - officialServerList: 'https://staging.kahla.app/servers', + officialServerList: 'https://staging.kahla.app', }; From 141c14826ad7a8f0914b08150c4d8e39d3b1fd29 Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Tue, 17 Mar 2020 22:35:55 +0800 Subject: [PATCH 34/71] feat: check api version --- src/app/Controllers/signin.component.ts | 3 +- src/app/Services/CheckService.ts | 37 +++++++++++++++++++----- src/app/Services/InitService.ts | 1 + src/app/Services/ServerListApiService.ts | 4 +++ 4 files changed, 36 insertions(+), 9 deletions(-) diff --git a/src/app/Controllers/signin.component.ts b/src/app/Controllers/signin.component.ts index 02d14a1b..cf050903 100644 --- a/src/app/Controllers/signin.component.ts +++ b/src/app/Controllers/signin.component.ts @@ -4,7 +4,6 @@ import { ApiService } from '../Services/ApiService'; import { InitService } from '../Services/InitService'; import Swal from 'sweetalert2'; import { HttpClient } from '@angular/common/http'; -import { ServerConfig } from '../Models/ServerConfig'; import { ServerListApiService } from '../Services/ServerListApiService'; @Component({ @@ -49,7 +48,7 @@ export class SignInComponent implements OnInit { }); Swal.showLoading(); const fireFailed = () => Swal.fire('Failed to fetch manifest from server.', 'Check syntax, then contract the server\'s owner.', 'error'); - this.apiService.GetByFullUrl(this.serverAddr, false).subscribe({ + this.serverListApiService.getServerConfig(this.serverAddr).subscribe({ next: serverConfig => { if (serverConfig.code !== 0 || serverConfig.domain.server !== this.serverAddr) { Swal.close(); diff --git a/src/app/Services/CheckService.ts b/src/app/Services/CheckService.ts index 224a3e4f..988e2a87 100644 --- a/src/app/Services/CheckService.ts +++ b/src/app/Services/CheckService.ts @@ -3,6 +3,7 @@ import Swal from 'sweetalert2'; import { versions } from '../../environments/versions'; import { ElectronService } from 'ngx-electron'; import { ServerListApiService } from './ServerListApiService'; +import { ApiService } from './ApiService'; @Injectable({ providedIn: 'root' @@ -17,6 +18,7 @@ export class CheckService { constructor( private _electronService: ElectronService, private serverListApiService: ServerListApiService, + private apiService: ApiService, ) { if (this.checkSwCache()) { navigator.serviceWorker.addEventListener('message', (t: MessageEvent) => { @@ -43,13 +45,8 @@ export class CheckService { this.checking = true; this.serverListApiService.Version() .subscribe(t => { - const latestVersion: Array = t.latestVersion.split('.'); - const currentVersion: Array = versions.version.split('.'); - const downloadAddress: string = t.downloadAddress; - if (latestVersion[0] > currentVersion[0] || - latestVersion[1] > currentVersion[1] || - latestVersion[2] > currentVersion[2]) { - this.redirectToDownload(downloadAddress, showAlert); + if (this.compareVersion(t.latestVersion, versions.version) > 0) { + this.redirectToDownload(t.downloadAddress, showAlert); } else if (showAlert) { Swal.fire('Success', 'You are running the latest version of Kahla!', 'success'); } @@ -57,6 +54,32 @@ export class CheckService { }); } + public checkApiVersion(): void { + this.serverListApiService.getServerConfig(this.apiService.serverConfig.domain.server).subscribe(t => { + const delta = this.compareVersion(t.apiVersion, versions.version); + if (delta === 1 || delta === 2) { + Swal.fire('Outdated client.', 'Your Kahla App is too far from the version of the server connected.\n' + + 'Kahla might not work properly if you don\'t upgrade.', 'warning'); + } else if (delta < 0 && !this.apiService.serverConfig.officialServer) { + Swal.fire('Community server outdated!', 'The Client version is newer then the Server version.\n' + + 'Consider contact the host of the server for updating the kahla.server version to latest.', 'warning'); + } + }); + } + + public compareVersion(a: string, b: string): number { + const verA = a.split('.').map(Number); + const verB = b.split('.').map(Number); + + for (let i = 0; i < 3; i++) { + if (verA[i] === verB[i]) { + continue; + } + return Math.sign(verA[i] - verB[i]) * (i + 1); + } + return 0; + } + private redirectToDownload(downloadAddress: string, showAlert: boolean = false): void { if (this._electronService.isElectronApp) { Swal.fire({ diff --git a/src/app/Services/InitService.ts b/src/app/Services/InitService.ts index 3c105feb..68ae00a3 100644 --- a/src/app/Services/InitService.ts +++ b/src/app/Services/InitService.ts @@ -85,6 +85,7 @@ export class InitService { if (this.apiService.serverConfig) { this.options.applicationServerKey = this.urlBase64ToUint8Array(this.apiService.serverConfig.vapidPublicKey); + this.checkService.checkApiVersion(); this.authApiService.SignInStatus().subscribe(signInStatus => { if (signInStatus.value === false) { this.router.navigate(['/signin'], {replaceUrl: true}); diff --git a/src/app/Services/ServerListApiService.ts b/src/app/Services/ServerListApiService.ts index 06b2409c..d52b6c94 100644 --- a/src/app/Services/ServerListApiService.ts +++ b/src/app/Services/ServerListApiService.ts @@ -20,4 +20,8 @@ export class ServerListApiService { public Version(): Observable { return this.apiService.GetByFullUrl(`${environment.officialServerList}/version`, false); } + + public getServerConfig(server: string): Observable { + return this.apiService.GetByFullUrl(server, false); + } } From 597b62779187df51c67271f2cdcf03991467b5d7 Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Tue, 17 Mar 2020 23:32:51 +0800 Subject: [PATCH 35/71] Fit new push request event. --- src/app/Models/NewFriendRequestEvent.ts | 4 ++-- src/app/Services/MessageService.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/Models/NewFriendRequestEvent.ts b/src/app/Models/NewFriendRequestEvent.ts index 1cdd766b..53016f06 100644 --- a/src/app/Models/NewFriendRequestEvent.ts +++ b/src/app/Models/NewFriendRequestEvent.ts @@ -1,6 +1,6 @@ import { AiurEvent } from './AiurEvent'; -import { KahlaUser } from './KahlaUser'; +import { Request } from './Request'; export class NewFriendRequestEvent extends AiurEvent { - public requester: KahlaUser; + public request: Request; } diff --git a/src/app/Services/MessageService.ts b/src/app/Services/MessageService.ts index 7b0e7b4b..90b4cdcb 100644 --- a/src/app/Services/MessageService.ts +++ b/src/app/Services/MessageService.ts @@ -120,7 +120,7 @@ export class MessageService { } case EventType.NewFriendRequest: { if (fireAlert) { - Swal.fire('Friend request', 'New friend request from ' + (ev).requester.nickName, 'info'); + Swal.fire('Friend request', 'New friend request from ' + (ev).request.creator.nickName, 'info'); } this.cacheService.updateRequests(); break; From e9ac2e0c4c6a099aaf490906995aa80bbc0754ad Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Thu, 19 Mar 2020 10:44:58 +0800 Subject: [PATCH 36/71] feat: display the sender on conversation list --- .../Controllers/conversations.component.ts | 20 +++++++++++++++++++ src/app/Models/CacheModel.ts | 2 +- src/app/Models/ContactInfo.ts | 6 +++--- src/app/Services/CacheService.ts | 6 +++--- src/app/Services/MessageService.ts | 4 +++- src/app/Views/conversations.html | 20 ++++++++++--------- 6 files changed, 41 insertions(+), 17 deletions(-) diff --git a/src/app/Controllers/conversations.component.ts b/src/app/Controllers/conversations.component.ts index a75f3442..144c05c8 100644 --- a/src/app/Controllers/conversations.component.ts +++ b/src/app/Controllers/conversations.component.ts @@ -16,6 +16,7 @@ import { HomeService } from '../Services/HomeService'; }) export class ConversationsComponent implements OnInit, OnDestroy { public loadingImgURL = Values.loadingImgURL; + constructor( private router: Router, public cacheService: CacheService, @@ -67,4 +68,23 @@ export class ConversationsComponent implements OnInit, OnDestroy { public ngOnDestroy(): void { this.loadingImgURL = null; } + + public getLatestUserName(info: ContactInfo): string { + if (this.cacheService.cachedData.me && info.latestMessage.senderId === this.cacheService.cachedData.me.id) { + return this.cacheService.cachedData.me.nickName + ':'; + } + if (info.discriminator === 'PrivateConversation') { + if (info.userId === info.latestMessage.senderId) { + return info.displayName + ':'; + } + } else { + const groupDetail = this.cacheService.cachedData.conversationDetail[info.conversationId]; + if (groupDetail) { + const usr = groupDetail.users.find(t => t.userId === info.latestMessage.senderId); + return usr ? usr.user.nickName + ':' : ''; + } + } + + return ''; + } } diff --git a/src/app/Models/CacheModel.ts b/src/app/Models/CacheModel.ts index 39376625..207ccffe 100644 --- a/src/app/Models/CacheModel.ts +++ b/src/app/Models/CacheModel.ts @@ -6,7 +6,7 @@ import { KahlaUser } from './KahlaUser'; import { Conversation } from './Conversation'; export class CacheModel { - public static readonly VERSION = 2; + public static readonly VERSION = 3; public version = CacheModel.VERSION; public me: KahlaUser; public conversations: ContactInfo[]; diff --git a/src/app/Models/ContactInfo.ts b/src/app/Models/ContactInfo.ts index 1ac61422..f2f87c0f 100644 --- a/src/app/Models/ContactInfo.ts +++ b/src/app/Models/ContactInfo.ts @@ -1,9 +1,9 @@ - +import { Message } from './Message'; + export class ContactInfo { public displayName: string; public displayImagePath: string; - public latestMessage: string; - public latestMessageTime: Date; + public latestMessage: Message; public unReadAmount: number; public conversationId: number; public discriminator: string; diff --git a/src/app/Services/CacheService.ts b/src/app/Services/CacheService.ts index 52911f0f..16bf8966 100644 --- a/src/app/Services/CacheService.ts +++ b/src/app/Services/CacheService.ts @@ -31,11 +31,11 @@ export class CacheService { info.forEach(e => { if (e.latestMessage != null) { try { - e.latestMessage = AES.decrypt(e.latestMessage, e.aesKey).toString(enc.Utf8); + e.latestMessage.content = AES.decrypt(e.latestMessage.content, e.aesKey).toString(enc.Utf8); } catch (error) { - e.latestMessage = ''; + e.latestMessage.content = ''; } - e.latestMessage = this.modifyMessage(e.latestMessage); + e.latestMessage.content = this.modifyMessage(e.latestMessage.content); } e.avatarURL = this.probeService.encodeProbeFileUrl(e.displayImagePath); }); diff --git a/src/app/Services/MessageService.ts b/src/app/Services/MessageService.ts index 90b4cdcb..cfae711b 100644 --- a/src/app/Services/MessageService.ts +++ b/src/app/Services/MessageService.ts @@ -77,8 +77,10 @@ export class MessageService { .findIndex(x => x.conversationId === evt.message.conversationId); if (conversationCacheIndex !== -1) { const conversationCache = this.cacheService.cachedData.conversations[conversationCacheIndex]; - conversationCache.latestMessage = this.cacheService.modifyMessage( + const latestMsg = Object.assign({}, evt.message); + latestMsg.content = this.cacheService.modifyMessage( AES.decrypt(evt.message.content, evt.aesKey).toString(enc.Utf8)); + conversationCache.latestMessage = latestMsg; if (!this.conversation || this.conversation.id !== evt.message.conversationId) { conversationCache.unReadAmount++; if (evt.mentioned) { diff --git a/src/app/Views/conversations.html b/src/app/Views/conversations.html index 6639abcf..4e43df01 100644 --- a/src/app/Views/conversations.html +++ b/src/app/Views/conversations.html @@ -5,9 +5,9 @@ (click)="talk(inf.conversationId, inf.unReadAmount)" [class.w-current]="current(inf)"> -
+
{{inf.unReadAmount}} @@ -21,12 +21,14 @@
{{inf.displayName}}
-
- {{inf.latestMessageTime | date:'shortTime'}} -
-
- {{inf.latestMessage}} -
+ +
+ {{inf.latestMessage.sendTime | date:'shortTime'}} +
+
+ {{getLatestUserName(inf)}}{{inf.latestMessage.content}} +
+
No message. Start talking now!
From 2b95348adc7c0eba7fc189f3894b6a8028f2c51f Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Thu, 19 Mar 2020 10:52:07 +0800 Subject: [PATCH 37/71] fix some lint warning --- src/app/Controllers/add-friend.component.ts | 4 ++-- src/app/Controllers/conversations.component.ts | 6 +++--- src/app/Services/MessageService.ts | 4 ++-- src/app/Views/add-friend.html | 3 ++- src/app/Views/advanced-settings.html | 9 +++++---- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/app/Controllers/add-friend.component.ts b/src/app/Controllers/add-friend.component.ts index d93a716e..7e14cbab 100644 --- a/src/app/Controllers/add-friend.component.ts +++ b/src/app/Controllers/add-friend.component.ts @@ -68,10 +68,10 @@ export class AddFriendComponent implements OnInit { this.showUsers = selectUsers; } - SearchBoxKeyUp(event: KeyboardEvent, element: HTMLInputElement) { + SearchBoxKeyUp(event: KeyboardEvent, value: string) { if (event.key === 'Enter') { event.preventDefault(); - this.search(element.value, 0); + this.search(value, 0); } } } diff --git a/src/app/Controllers/conversations.component.ts b/src/app/Controllers/conversations.component.ts index 144c05c8..d9c2af7f 100644 --- a/src/app/Controllers/conversations.component.ts +++ b/src/app/Controllers/conversations.component.ts @@ -71,17 +71,17 @@ export class ConversationsComponent implements OnInit, OnDestroy { public getLatestUserName(info: ContactInfo): string { if (this.cacheService.cachedData.me && info.latestMessage.senderId === this.cacheService.cachedData.me.id) { - return this.cacheService.cachedData.me.nickName + ':'; + return this.cacheService.cachedData.me.nickName + ': '; } if (info.discriminator === 'PrivateConversation') { if (info.userId === info.latestMessage.senderId) { - return info.displayName + ':'; + return info.displayName + ': '; } } else { const groupDetail = this.cacheService.cachedData.conversationDetail[info.conversationId]; if (groupDetail) { const usr = groupDetail.users.find(t => t.userId === info.latestMessage.senderId); - return usr ? usr.user.nickName + ':' : ''; + return usr ? usr.user.nickName + ': ' : ''; } } diff --git a/src/app/Services/MessageService.ts b/src/app/Services/MessageService.ts index cfae711b..6536f3f1 100644 --- a/src/app/Services/MessageService.ts +++ b/src/app/Services/MessageService.ts @@ -421,7 +421,7 @@ export class MessageService { t.contentRaw = t.content; t.sendTimeDate = new Date(t.sendTime); t.timeStamp = t.sendTimeDate.getTime(); - if (t.content.match(/^\[(video|img)\].*/)) { + if (t.content.match(/^\[(video|img)].*/)) { if (t.content.startsWith('[img]')) { let imageWidth = Number(t.content.split('|')[1]), imageHeight = Number(t.content.split('|')[2]); @@ -460,7 +460,7 @@ export class MessageService { t.content = 'Invalid User'; } }); - } else if (!t.content.match(/^\[(file|audio)\].*/)) { + } else if (!t.content.match(/^\[(file|audio)].*/)) { t.isEmoji = this.checkEmoji(t.content); t.content = he.encode(t.content); t.content = Autolinker.link(t.content, { diff --git a/src/app/Views/add-friend.html b/src/app/Views/add-friend.html index 03ae1901..2161d31c 100644 --- a/src/app/Views/add-friend.html +++ b/src/app/Views/add-friend.html @@ -1,7 +1,8 @@ 
- +
diff --git a/src/app/Views/advanced-settings.html b/src/app/Views/advanced-settings.html index c70249a7..f5e93c2c 100644 --- a/src/app/Views/advanced-settings.html +++ b/src/app/Views/advanced-settings.html @@ -1,4 +1,4 @@ - +
General
@@ -41,14 +41,15 @@
-
List me in search result
- - + +
Notification From b4bd9b4eaa98cf4c64544f4c58161542265065d4 Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Thu, 19 Mar 2020 14:54:28 +0800 Subject: [PATCH 38/71] Better privateConversation latestmsg format --- src/app/Controllers/conversations.component.ts | 14 ++++---------- src/app/Models/ContactInfo.ts | 2 +- src/app/Views/conversations.html | 7 ++++++- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/app/Controllers/conversations.component.ts b/src/app/Controllers/conversations.component.ts index d9c2af7f..64e584bf 100644 --- a/src/app/Controllers/conversations.component.ts +++ b/src/app/Controllers/conversations.component.ts @@ -73,16 +73,10 @@ export class ConversationsComponent implements OnInit, OnDestroy { if (this.cacheService.cachedData.me && info.latestMessage.senderId === this.cacheService.cachedData.me.id) { return this.cacheService.cachedData.me.nickName + ': '; } - if (info.discriminator === 'PrivateConversation') { - if (info.userId === info.latestMessage.senderId) { - return info.displayName + ': '; - } - } else { - const groupDetail = this.cacheService.cachedData.conversationDetail[info.conversationId]; - if (groupDetail) { - const usr = groupDetail.users.find(t => t.userId === info.latestMessage.senderId); - return usr ? usr.user.nickName + ': ' : ''; - } + const groupDetail = this.cacheService.cachedData.conversationDetail[info.conversationId]; + if (groupDetail) { + const usr = groupDetail.users.find(t => t.userId === info.latestMessage.senderId); + return usr ? usr.user.nickName + ': ' : ''; } return ''; diff --git a/src/app/Models/ContactInfo.ts b/src/app/Models/ContactInfo.ts index f2f87c0f..fc76fb98 100644 --- a/src/app/Models/ContactInfo.ts +++ b/src/app/Models/ContactInfo.ts @@ -6,7 +6,7 @@ export class ContactInfo { public latestMessage: Message; public unReadAmount: number; public conversationId: number; - public discriminator: string; + public discriminator: 'GroupConversation' | 'PrivateConversation'; public userId: string; public aesKey: string; public avatarURL: string; diff --git a/src/app/Views/conversations.html b/src/app/Views/conversations.html index 4e43df01..7208ae00 100644 --- a/src/app/Views/conversations.html +++ b/src/app/Views/conversations.html @@ -26,7 +26,12 @@ {{inf.latestMessage.sendTime | date:'shortTime'}}
- {{getLatestUserName(inf)}}{{inf.latestMessage.content}} + + + {{inf.discriminator === 'GroupConversation' ? getLatestUserName(inf) : ''}} + {{inf.latestMessage.content}}
From 0999f6c547fe9554e6d5222f44c06c80f327117b Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Thu, 19 Mar 2020 23:36:37 +0800 Subject: [PATCH 39/71] feat: check prev msg id to prevent losing messages. --- src/app/Models/NewMessageEvent.ts | 1 + src/app/Services/MessageService.ts | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/app/Models/NewMessageEvent.ts b/src/app/Models/NewMessageEvent.ts index 79c70e22..2e196828 100644 --- a/src/app/Models/NewMessageEvent.ts +++ b/src/app/Models/NewMessageEvent.ts @@ -3,6 +3,7 @@ import { Message } from './Message'; export class NewMessageEvent extends AiurEvent { public message: Message; + public previousMessageId: string; public aesKey: string; public muted: boolean; public mentioned: boolean; diff --git a/src/app/Services/MessageService.ts b/src/app/Services/MessageService.ts index 6536f3f1..92581b8a 100644 --- a/src/app/Services/MessageService.ts +++ b/src/app/Services/MessageService.ts @@ -101,11 +101,17 @@ export class MessageService { } if (this.conversation && this.conversation.id === evt.message.conversationId && this.localMessages.findIndex(t => t.id === evt.message.id) === -1) { - this.rawMessages.push(evt.message); - this.localMessages.push(this.modifyMessage(Object.assign({}, evt.message))); - this.reorderLocalMessages(); - this.updateAtLink(); - this.conversationApiService.GetMessage(this.conversation.id, null, 0).subscribe(); + if (evt.previousMessageId === this.rawMessages[this.rawMessages.length - 1].id || + evt.previousMessageId === '00000000-0000-0000-0000-000000000000') { + this.rawMessages.push(evt.message); + this.localMessages.push(this.modifyMessage(Object.assign({}, evt.message))); + this.reorderLocalMessages(); + this.updateAtLink(); + this.conversationApiService.GetMessage(this.conversation.id, null, 0).subscribe(); + this.saveMessage(); + } else { // lost some message. + this.getMessages(0, this.conversation.id, null, 15); + } if (this.belowWindowPercent <= 0.2) { setTimeout(() => { this.uploadService.scrollBottom(true); @@ -114,7 +120,6 @@ export class MessageService { if (!document.hasFocus()) { this.showNotification(evt); } - this.saveMessage(); } else { this.showNotification(evt); } From 3bcd3db69c86f53fd49bba514760787ed93142da Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Thu, 19 Mar 2020 23:41:34 +0800 Subject: [PATCH 40/71] Navigate to home when the user has already signed in --- src/app/Services/InitService.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/Services/InitService.ts b/src/app/Services/InitService.ts index 68ae00a3..67d54d0d 100644 --- a/src/app/Services/InitService.ts +++ b/src/app/Services/InitService.ts @@ -90,6 +90,9 @@ export class InitService { if (signInStatus.value === false) { this.router.navigate(['/signin'], {replaceUrl: true}); } else { + if (this.router.isActive('/signin', false)) { + this.router.navigate(['/home'], {replaceUrl: true}); + } this.authApiService.Me().subscribe(p => { if (p.code === 0) { this.cacheService.cachedData.me = p.value; From 16019818980357a61f060a84abdc2507815a252f Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Thu, 19 Mar 2020 23:54:23 +0800 Subject: [PATCH 41/71] Use server response to find last sent user --- src/app/Controllers/conversations.component.ts | 13 ------------- src/app/Views/conversations.html | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/app/Controllers/conversations.component.ts b/src/app/Controllers/conversations.component.ts index 64e584bf..57686697 100644 --- a/src/app/Controllers/conversations.component.ts +++ b/src/app/Controllers/conversations.component.ts @@ -68,17 +68,4 @@ export class ConversationsComponent implements OnInit, OnDestroy { public ngOnDestroy(): void { this.loadingImgURL = null; } - - public getLatestUserName(info: ContactInfo): string { - if (this.cacheService.cachedData.me && info.latestMessage.senderId === this.cacheService.cachedData.me.id) { - return this.cacheService.cachedData.me.nickName + ': '; - } - const groupDetail = this.cacheService.cachedData.conversationDetail[info.conversationId]; - if (groupDetail) { - const usr = groupDetail.users.find(t => t.userId === info.latestMessage.senderId); - return usr ? usr.user.nickName + ': ' : ''; - } - - return ''; - } } diff --git a/src/app/Views/conversations.html b/src/app/Views/conversations.html index 7208ae00..6df9fce1 100644 --- a/src/app/Views/conversations.html +++ b/src/app/Views/conversations.html @@ -30,7 +30,7 @@ *ngIf="cacheService.cachedData.me && inf.discriminator === 'PrivateConversation' && inf.latestMessage.senderId === cacheService.cachedData.me.id"> - {{inf.discriminator === 'GroupConversation' ? getLatestUserName(inf) : ''}} + {{inf.discriminator === 'GroupConversation' ? inf.latestMessage.sender.nickName : ''}} {{inf.latestMessage.content}}
From 5ae399b97b2ce9b7136637fedd2e94f32edcbbea Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Fri, 20 Mar 2020 11:45:52 +0800 Subject: [PATCH 42/71] better theme logo & autowarp --- src/app/Styles/menu.scss | 5 +++++ src/app/Views/theme.html | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/app/Styles/menu.scss b/src/app/Styles/menu.scss index 9d1d70b8..95d70c4f 100644 --- a/src/app/Styles/menu.scss +++ b/src/app/Styles/menu.scss @@ -155,6 +155,7 @@ a { .select-button-group { margin: 4px 10px 4px 10px; display: flex; + flex-wrap: wrap; } .select-button { @@ -199,4 +200,8 @@ a { display: inline-block; border: white solid 2px; margin-right: 4px; + + &.fas { + border: none; + } } diff --git a/src/app/Views/theme.html b/src/app/Views/theme.html index ecab3c0f..dad798bb 100644 --- a/src/app/Views/theme.html +++ b/src/app/Views/theme.html @@ -31,7 +31,7 @@
Accent color
- + System From 5bdf611682b725d333658ce000aa23bf4840bc2a Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Fri, 20 Mar 2020 11:58:02 +0800 Subject: [PATCH 43/71] better User Name in LatestMessage --- src/app/Styles/conversations.scss | 4 ++++ src/app/Views/conversations.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/Styles/conversations.scss b/src/app/Styles/conversations.scss index 1607857f..fae6df24 100644 --- a/src/app/Styles/conversations.scss +++ b/src/app/Styles/conversations.scss @@ -42,6 +42,10 @@ text-overflow: ellipsis; white-space: nowrap; width: 65%; + + b { + font-weight: 600; + } } .status-badge { diff --git a/src/app/Views/conversations.html b/src/app/Views/conversations.html index 6df9fce1..97f03fc4 100644 --- a/src/app/Views/conversations.html +++ b/src/app/Views/conversations.html @@ -30,7 +30,7 @@ *ngIf="cacheService.cachedData.me && inf.discriminator === 'PrivateConversation' && inf.latestMessage.senderId === cacheService.cachedData.me.id"> - {{inf.discriminator === 'GroupConversation' ? inf.latestMessage.sender.nickName : ''}} + {{inf.latestMessage.sender.nickName}}: {{inf.latestMessage.content}}
From bc5afc6bd815ac4be64682c3e189def9a18849ed Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Fri, 20 Mar 2020 12:16:48 +0800 Subject: [PATCH 44/71] Move events to a standalone namespace --- src/app/Models/{ => Events}/AiurEvent.ts | 0 src/app/Models/{ => Events}/DissolveEvent.ts | 0 src/app/Models/{ => Events}/EventType.ts | 0 .../{ => Events}/FriendAcceptedEvent.ts | 2 +- .../{ => Events}/NewFriendRequestEvent.ts | 2 +- src/app/Models/{ => Events}/NewMemberEvent.ts | 2 +- .../Models/{ => Events}/NewMessageEvent.ts | 2 +- .../Models/{ => Events}/SomeoneLeftEvent.ts | 2 +- .../Models/{ => Events}/TimerUpdatedEvent.ts | 0 .../Models/{ => Events}/WereDeletedEvent.ts | 2 +- src/app/Services/MessageService.ts | 20 +++++++++---------- 11 files changed, 16 insertions(+), 16 deletions(-) rename src/app/Models/{ => Events}/AiurEvent.ts (100%) rename src/app/Models/{ => Events}/DissolveEvent.ts (100%) rename src/app/Models/{ => Events}/EventType.ts (100%) rename src/app/Models/{ => Events}/FriendAcceptedEvent.ts (75%) rename src/app/Models/{ => Events}/NewFriendRequestEvent.ts (77%) rename src/app/Models/{ => Events}/NewMemberEvent.ts (79%) rename src/app/Models/{ => Events}/NewMessageEvent.ts (86%) rename src/app/Models/{ => Events}/SomeoneLeftEvent.ts (79%) rename src/app/Models/{ => Events}/TimerUpdatedEvent.ts (100%) rename src/app/Models/{ => Events}/WereDeletedEvent.ts (74%) diff --git a/src/app/Models/AiurEvent.ts b/src/app/Models/Events/AiurEvent.ts similarity index 100% rename from src/app/Models/AiurEvent.ts rename to src/app/Models/Events/AiurEvent.ts diff --git a/src/app/Models/DissolveEvent.ts b/src/app/Models/Events/DissolveEvent.ts similarity index 100% rename from src/app/Models/DissolveEvent.ts rename to src/app/Models/Events/DissolveEvent.ts diff --git a/src/app/Models/EventType.ts b/src/app/Models/Events/EventType.ts similarity index 100% rename from src/app/Models/EventType.ts rename to src/app/Models/Events/EventType.ts diff --git a/src/app/Models/FriendAcceptedEvent.ts b/src/app/Models/Events/FriendAcceptedEvent.ts similarity index 75% rename from src/app/Models/FriendAcceptedEvent.ts rename to src/app/Models/Events/FriendAcceptedEvent.ts index 5c45b0db..662c0e46 100644 --- a/src/app/Models/FriendAcceptedEvent.ts +++ b/src/app/Models/Events/FriendAcceptedEvent.ts @@ -1,5 +1,5 @@ import { AiurEvent } from './AiurEvent'; -import { KahlaUser } from './KahlaUser'; +import { KahlaUser } from '../KahlaUser'; export class FriendAcceptedEvent extends AiurEvent { public target: KahlaUser; diff --git a/src/app/Models/NewFriendRequestEvent.ts b/src/app/Models/Events/NewFriendRequestEvent.ts similarity index 77% rename from src/app/Models/NewFriendRequestEvent.ts rename to src/app/Models/Events/NewFriendRequestEvent.ts index 53016f06..e206163f 100644 --- a/src/app/Models/NewFriendRequestEvent.ts +++ b/src/app/Models/Events/NewFriendRequestEvent.ts @@ -1,5 +1,5 @@ import { AiurEvent } from './AiurEvent'; -import { Request } from './Request'; +import { Request } from '../Request'; export class NewFriendRequestEvent extends AiurEvent { public request: Request; diff --git a/src/app/Models/NewMemberEvent.ts b/src/app/Models/Events/NewMemberEvent.ts similarity index 79% rename from src/app/Models/NewMemberEvent.ts rename to src/app/Models/Events/NewMemberEvent.ts index 2e34709e..4525a5a1 100644 --- a/src/app/Models/NewMemberEvent.ts +++ b/src/app/Models/Events/NewMemberEvent.ts @@ -1,5 +1,5 @@ import { AiurEvent } from './AiurEvent'; -import { KahlaUser } from './KahlaUser'; +import { KahlaUser } from '../KahlaUser'; export class NewMemberEvent extends AiurEvent { public newMember: KahlaUser; diff --git a/src/app/Models/NewMessageEvent.ts b/src/app/Models/Events/NewMessageEvent.ts similarity index 86% rename from src/app/Models/NewMessageEvent.ts rename to src/app/Models/Events/NewMessageEvent.ts index 2e196828..7942a0e5 100644 --- a/src/app/Models/NewMessageEvent.ts +++ b/src/app/Models/Events/NewMessageEvent.ts @@ -1,5 +1,5 @@ import { AiurEvent } from './AiurEvent'; -import { Message } from './Message'; +import { Message } from '../Message'; export class NewMessageEvent extends AiurEvent { public message: Message; diff --git a/src/app/Models/SomeoneLeftEvent.ts b/src/app/Models/Events/SomeoneLeftEvent.ts similarity index 79% rename from src/app/Models/SomeoneLeftEvent.ts rename to src/app/Models/Events/SomeoneLeftEvent.ts index a2a83796..ef486751 100644 --- a/src/app/Models/SomeoneLeftEvent.ts +++ b/src/app/Models/Events/SomeoneLeftEvent.ts @@ -1,5 +1,5 @@ import { AiurEvent } from './AiurEvent'; -import { KahlaUser } from './KahlaUser'; +import { KahlaUser } from '../KahlaUser'; export class SomeoneLeftEvent extends AiurEvent { public leftUser: KahlaUser; diff --git a/src/app/Models/TimerUpdatedEvent.ts b/src/app/Models/Events/TimerUpdatedEvent.ts similarity index 100% rename from src/app/Models/TimerUpdatedEvent.ts rename to src/app/Models/Events/TimerUpdatedEvent.ts diff --git a/src/app/Models/WereDeletedEvent.ts b/src/app/Models/Events/WereDeletedEvent.ts similarity index 74% rename from src/app/Models/WereDeletedEvent.ts rename to src/app/Models/Events/WereDeletedEvent.ts index 777238bd..7e3bcc4e 100644 --- a/src/app/Models/WereDeletedEvent.ts +++ b/src/app/Models/Events/WereDeletedEvent.ts @@ -1,5 +1,5 @@ import { AiurEvent } from './AiurEvent'; -import { KahlaUser } from './KahlaUser'; +import { KahlaUser } from '../KahlaUser'; export class WereDeletedEvent extends AiurEvent { public trigger: KahlaUser; diff --git a/src/app/Services/MessageService.ts b/src/app/Services/MessageService.ts index 92581b8a..a78918e2 100644 --- a/src/app/Services/MessageService.ts +++ b/src/app/Services/MessageService.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; -import { EventType } from '../Models/EventType'; -import { AiurEvent } from '../Models/AiurEvent'; +import { EventType } from '../Models/Events/EventType'; +import { AiurEvent } from '../Models/Events/AiurEvent'; import Swal from 'sweetalert2'; -import { NewMessageEvent } from '../Models/NewMessageEvent'; +import { NewMessageEvent } from '../Models/Events/NewMessageEvent'; import { Conversation } from '../Models/Conversation'; import { Message } from '../Models/Message'; import { ConversationApiService } from './ConversationApiService'; @@ -15,17 +15,17 @@ import * as he from 'he'; import Autolinker from 'autolinker'; import { Values } from '../values'; import { ElectronService } from 'ngx-electron'; -import { TimerUpdatedEvent } from '../Models/TimerUpdatedEvent'; +import { TimerUpdatedEvent } from '../Models/Events/TimerUpdatedEvent'; import { TimerService } from './TimerService'; -import { WereDeletedEvent } from '../Models/WereDeletedEvent'; -import { NewFriendRequestEvent } from '../Models/NewFriendRequestEvent'; -import { FriendAcceptedEvent } from '../Models/FriendAcceptedEvent'; +import { WereDeletedEvent } from '../Models/Events/WereDeletedEvent'; +import { NewFriendRequestEvent } from '../Models/Events/NewFriendRequestEvent'; +import { FriendAcceptedEvent } from '../Models/Events/FriendAcceptedEvent'; import { Router } from '@angular/router'; import { UserGroupRelation } from '../Models/UserGroupRelation'; -import { SomeoneLeftEvent } from '../Models/SomeoneLeftEvent'; -import { NewMemberEvent } from '../Models/NewMemberEvent'; +import { SomeoneLeftEvent } from '../Models/Events/SomeoneLeftEvent'; +import { NewMemberEvent } from '../Models/Events/NewMemberEvent'; import { GroupConversation } from '../Models/GroupConversation'; -import { DissolveEvent } from '../Models/DissolveEvent'; +import { DissolveEvent } from '../Models/Events/DissolveEvent'; import { HomeService } from './HomeService'; import { GroupsApiService } from './GroupsApiService'; import { FriendsApiService } from './FriendsApiService'; From 2c40c3a6565c1885fa5053caa45722a337cbf2e4 Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Fri, 20 Mar 2020 13:49:39 +0800 Subject: [PATCH 45/71] Migrate to the new event system. --- src/app/Models/Events/EventType.ts | 7 +-- src/app/Models/Events/FriendAcceptedEvent.ts | 6 --- ...eDeletedEvent.ts => FriendDeletedEvent.ts} | 3 +- src/app/Models/Events/FriendsChangedEvent.ts | 9 ++++ src/app/Models/Events/GroupJoinedEvent.ts | 9 ++++ src/app/Models/Request.ts | 1 + src/app/Services/MessageService.ts | 50 ++++++++++++------- 7 files changed, 56 insertions(+), 29 deletions(-) delete mode 100644 src/app/Models/Events/FriendAcceptedEvent.ts rename src/app/Models/Events/{WereDeletedEvent.ts => FriendDeletedEvent.ts} (57%) create mode 100644 src/app/Models/Events/FriendsChangedEvent.ts create mode 100644 src/app/Models/Events/GroupJoinedEvent.ts diff --git a/src/app/Models/Events/EventType.ts b/src/app/Models/Events/EventType.ts index c93d08a1..5a6499cd 100644 --- a/src/app/Models/Events/EventType.ts +++ b/src/app/Models/Events/EventType.ts @@ -1,10 +1,11 @@ export enum EventType { NewMessage = 0, NewFriendRequest = 1, - WereDeletedEvent = 2, - FriendAcceptedEvent = 3, + FriendDeletedEvent = 2, + FriendsChangedEvent = 3, TimerUpdatedEvent = 4, NewMemberEvent = 5, - SomeoneLeftLevent = 6, + SomeoneLeftEvent = 6, DissolveEvent = 7, + GroupJoinedEvent = 8, } diff --git a/src/app/Models/Events/FriendAcceptedEvent.ts b/src/app/Models/Events/FriendAcceptedEvent.ts deleted file mode 100644 index 662c0e46..00000000 --- a/src/app/Models/Events/FriendAcceptedEvent.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { AiurEvent } from './AiurEvent'; -import { KahlaUser } from '../KahlaUser'; - -export class FriendAcceptedEvent extends AiurEvent { - public target: KahlaUser; -} diff --git a/src/app/Models/Events/WereDeletedEvent.ts b/src/app/Models/Events/FriendDeletedEvent.ts similarity index 57% rename from src/app/Models/Events/WereDeletedEvent.ts rename to src/app/Models/Events/FriendDeletedEvent.ts index 7e3bcc4e..92f17b74 100644 --- a/src/app/Models/Events/WereDeletedEvent.ts +++ b/src/app/Models/Events/FriendDeletedEvent.ts @@ -1,6 +1,7 @@ import { AiurEvent } from './AiurEvent'; import { KahlaUser } from '../KahlaUser'; -export class WereDeletedEvent extends AiurEvent { +export class FriendDeletedEvent extends AiurEvent { public trigger: KahlaUser; + public conversationId: number; } diff --git a/src/app/Models/Events/FriendsChangedEvent.ts b/src/app/Models/Events/FriendsChangedEvent.ts new file mode 100644 index 00000000..63b7c0d9 --- /dev/null +++ b/src/app/Models/Events/FriendsChangedEvent.ts @@ -0,0 +1,9 @@ +import { AiurEvent } from './AiurEvent'; +import { Request } from '../Request'; +import { Conversation } from '../Conversation'; + +export class FriendsChangedEvent extends AiurEvent { + public request: Request; + public result: boolean; + public createdConversation: Conversation; +} diff --git a/src/app/Models/Events/GroupJoinedEvent.ts b/src/app/Models/Events/GroupJoinedEvent.ts new file mode 100644 index 00000000..9c1d2fd1 --- /dev/null +++ b/src/app/Models/Events/GroupJoinedEvent.ts @@ -0,0 +1,9 @@ +import { AiurEvent } from './AiurEvent'; +import { Conversation } from '../Conversation'; +import { Message } from '../Message'; + +export class GroupJoinedEvent extends AiurEvent { + public createdConversation: Conversation; + public messageCount: number; + public latestMessage: Message; +} diff --git a/src/app/Models/Request.ts b/src/app/Models/Request.ts index b45970d7..bae73a2d 100644 --- a/src/app/Models/Request.ts +++ b/src/app/Models/Request.ts @@ -5,6 +5,7 @@ export class Request { public creatorId: string; public creator: KahlaUser; public targetId: string; + public target: KahlaUser; public createTime: Date; public completed: boolean; } diff --git a/src/app/Services/MessageService.ts b/src/app/Services/MessageService.ts index a78918e2..ecd105db 100644 --- a/src/app/Services/MessageService.ts +++ b/src/app/Services/MessageService.ts @@ -17,9 +17,9 @@ import { Values } from '../values'; import { ElectronService } from 'ngx-electron'; import { TimerUpdatedEvent } from '../Models/Events/TimerUpdatedEvent'; import { TimerService } from './TimerService'; -import { WereDeletedEvent } from '../Models/Events/WereDeletedEvent'; +import { FriendDeletedEvent } from '../Models/Events/FriendDeletedEvent'; import { NewFriendRequestEvent } from '../Models/Events/NewFriendRequestEvent'; -import { FriendAcceptedEvent } from '../Models/Events/FriendAcceptedEvent'; +import { FriendsChangedEvent } from '../Models/Events/FriendsChangedEvent'; import { Router } from '@angular/router'; import { UserGroupRelation } from '../Models/UserGroupRelation'; import { SomeoneLeftEvent } from '../Models/Events/SomeoneLeftEvent'; @@ -65,7 +65,8 @@ export class MessageService { private groupsApiService: GroupsApiService, private friendsApiService: FriendsApiService, private probeService: ProbeService, - ) { } + ) { + } public OnMessage(data: MessageEvent) { const ev = JSON.parse(data.data) as AiurEvent; @@ -126,31 +127,37 @@ export class MessageService { break; } case EventType.NewFriendRequest: { - if (fireAlert) { + if (fireAlert && (ev).request.creatorId !== this.cacheService.cachedData.me.id) { Swal.fire('Friend request', 'New friend request from ' + (ev).request.creator.nickName, 'info'); } this.cacheService.updateRequests(); break; } - case EventType.WereDeletedEvent: { - if (fireAlert) { - Swal.fire('Were deleted', 'You were deleted by ' + (ev).trigger.nickName, 'info'); + case EventType.FriendDeletedEvent: { + if (fireAlert && (ev).trigger.id !== this.cacheService.cachedData.me.id) { + Swal.fire('Were deleted', 'You were deleted by ' + (ev).trigger.nickName, 'info'); } this.cacheService.updateConversation(); this.cacheService.updateFriends(); break; } - case EventType.FriendAcceptedEvent: { - if (fireAlert) { - Swal.fire('Friend request accepted', 'You and ' + (ev).target.nickName + - ' are now friends!', 'success'); - } - this.cacheService.updateConversation(); - this.cacheService.updateFriends(); - if (this.router.isActive(`/user/${(ev as FriendAcceptedEvent).target.id}`, false)) { - this.friendsApiService.UserDetail((ev as FriendAcceptedEvent).target.id).subscribe(t => { - this.router.navigate(['/talking', t.conversationId]); - }); + case EventType.FriendsChangedEvent: { + const evt = ev; + this.cacheService.updateRequests(); + if (evt.result) { + if (fireAlert && evt.request.creatorId === this.cacheService.cachedData.me.id) { + Swal.fire('Friend request accepted', 'You and ' + evt.createdConversation.displayName + + ' are now friends!', 'success'); + } + this.cacheService.updateConversation(); + this.cacheService.updateFriends(); + if (this.router.isActive(`/user/${evt.request.targetId}`, false)) { + this.router.navigate(['/talking', evt.createdConversation.id]); + } + } else { + if (fireAlert && evt.request.creatorId === this.cacheService.cachedData.me.id) { + Swal.fire('Friend request rejected', `${evt.request.target.nickName} rejected your friend request.`, 'info'); + } } break; } @@ -176,7 +183,7 @@ export class MessageService { } break; } - case EventType.SomeoneLeftLevent: { + case EventType.SomeoneLeftEvent: { const evt = ev as SomeoneLeftEvent; const current = this.conversation && this.conversation.id === evt.conversationId && this.router.isActive('talking', false); if (evt.leftUser.id === this.cacheService.cachedData.me.id) { @@ -206,6 +213,11 @@ export class MessageService { this.cacheService.updateConversation(); break; } + case EventType.GroupJoinedEvent: { + this.cacheService.updateFriends(); + this.cacheService.updateConversation(); + break; + } default: break; } From ad0f2fbf2f9f1ce2363ef0650bbd002c71c03fc3 Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Mon, 23 Mar 2020 00:35:27 +0800 Subject: [PATCH 46/71] feat: allow forwarding a file in file history --- src/app/Controllers/file-history.component.ts | 8 +- src/app/Styles/file-list.scss | 95 ++++++++++++------- src/app/Views/file-history.html | 86 +++++++++-------- 3 files changed, 112 insertions(+), 77 deletions(-) diff --git a/src/app/Controllers/file-history.component.ts b/src/app/Controllers/file-history.component.ts index 2efc6e9a..3d7f509e 100644 --- a/src/app/Controllers/file-history.component.ts +++ b/src/app/Controllers/file-history.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { FileHistoryApiModel } from '../Models/ApiModels/FileHistoryApiModel'; import { switchMap } from 'rxjs/operators'; import { ConversationApiService } from '../Services/ConversationApiService'; @@ -22,6 +22,7 @@ export class FileHistoryComponent implements OnInit { private route: ActivatedRoute, private conversationApiService: ConversationApiService, public probeService: ProbeService, + public router: Router, ) { } @@ -58,4 +59,9 @@ export class FileHistoryComponent implements OnInit { }); return `${count} files. Total Size:${this.probeService.getFileSizeText(totalSize)}`; } + + public share(file: ProbeFile, dir: ProbeFolder) { + console.log(`[file]${this.files.rootPath}/${dir.folderName}/${file.fileName}|${file.fileName}|${this.probeService.getFileSizeText(file.fileSize)}`); + this.router.navigate(['share-target', {message: `[file]${this.files.siteName}/${this.files.rootPath}/${dir.folderName}/${file.fileName}|${file.fileName}|${this.probeService.getFileSizeText(file.fileSize)}`}]); + } } diff --git a/src/app/Styles/file-list.scss b/src/app/Styles/file-list.scss index fe17eb49..038f9843 100644 --- a/src/app/Styles/file-list.scss +++ b/src/app/Styles/file-list.scss @@ -6,53 +6,78 @@ display: grid; width: 250px; height: 60px; - padding: 4px 12px; - grid-template-columns: 60px 1fr; - grid-template-rows: 1fr 1fr; + grid-template-columns: 1fr 30px; + grid-template-rows: 1fr; margin: 6px; border: 1px solid var(--selectable-border-color); background: var(--selectable-bg); user-select: none; - transition: all 0.1s ease-in-out; - &:hover { - background: var(--selectable-hover-bg); - } + a { + padding: 4px 0 4px 12px; + transition: all 0.1s ease-in-out; + display: grid; + grid-template-columns: 60px 1fr; + grid-template-rows: 1fr 1fr; + overflow: hidden; - &:active { - background: var(--selectable-active-bg); - } + &:hover { + background: var(--default-foreground-20); + } - .icon { - grid-area: 1 / 1 / 3 / 2; - vertical-align: center; - align-self: center; - text-align: center; - font-size: 32px; - overflow: hidden; - justify-self: center; - max-height: 60px; - max-width: 60px; - color: var(--primary-color-depth3); - } + &:active { + background: var(--default-foreground-40); + } - .title, .detail { - text-overflow: ellipsis; - overflow: hidden; - align-self: center; - margin-left: 8px; + .icon { + grid-area: 1 / 1 / 3 / 2; + vertical-align: center; + align-self: center; + text-align: center; + font-size: 32px; + overflow: hidden; + justify-self: center; + max-height: 60px; + max-width: 60px; + color: var(--primary-color-depth3); + } + + .title, .detail { + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + align-self: center; + margin-left: 8px; + } + + .title { + grid-area: 1 / 2 / 2 / 3; + font-size: 15px; + color: var(--default-textcolor); + } + + .detail { + grid-area: 2 / 2 / 3 / 3; + font-size: 12px; + color: var(--minor-textcolor); + } } - .title { + .operate-button { grid-area: 1 / 2 / 2 / 3; - font-size: 15px; - color: var(--default-textcolor); - } + font-size: 20px; + display: flex; + justify-content: center; + transition: all 0.1s ease-in-out; + align-items: center; + + &:hover { + background: var(--default-foreground-20); + } - .detail { - grid-area: 2 / 2 / 3 / 3; - font-size: 12px; - color: var(--minor-textcolor); + &:active { + background: var(--default-foreground-40); + } } } } diff --git a/src/app/Views/file-history.html b/src/app/Views/file-history.html index 4b04d6ec..ec23a313 100644 --- a/src/app/Views/file-history.html +++ b/src/app/Views/file-history.html @@ -4,47 +4,51 @@
From 68403544b34561469b8cf950c2f6d2f5e78d3f51 Mon Sep 17 00:00:00 2001 From: xxyzz Date: Mon, 23 Mar 2020 12:35:32 +0000 Subject: [PATCH 47/71] replace user name color --- src/app/Services/MessageService.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/Services/MessageService.ts b/src/app/Services/MessageService.ts index ecd105db..b33644b0 100644 --- a/src/app/Services/MessageService.ts +++ b/src/app/Services/MessageService.ts @@ -47,8 +47,8 @@ export class MessageService { public maxImageWidth = 0; public videoHeight = 0; private userColors = new Map(); - private colors = ['aqua', 'aquamarine', 'bisque', 'blue', 'blueviolet', 'brown', 'burlywood', 'cadetblue', 'chocolate', - 'coral', 'cornflowerblue', 'darkcyan', 'darkgoldenrod']; + private colors = ['aqua', 'aquamarine', 'bisque', 'blue', 'blueviolet', 'brown', 'burlywood', 'chocolate', + 'coral', 'deepskyblue', 'darkturquoise', 'lightseagreen', 'indigo', 'lavenderblush', 'lawngreen', 'maroon']; public groupConversation = false; public sysNotifyText: string; public sysNotifyShown: boolean; From 4a55dd22d5ef5bea583d303c0044e96a714b967b Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Mon, 23 Mar 2020 23:22:14 +0800 Subject: [PATCH 48/71] remove debug code --- src/app/Controllers/file-history.component.ts | 6 ++++-- src/app/Styles/file-list.scss | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/Controllers/file-history.component.ts b/src/app/Controllers/file-history.component.ts index 3d7f509e..0f2d80e5 100644 --- a/src/app/Controllers/file-history.component.ts +++ b/src/app/Controllers/file-history.component.ts @@ -61,7 +61,9 @@ export class FileHistoryComponent implements OnInit { } public share(file: ProbeFile, dir: ProbeFolder) { - console.log(`[file]${this.files.rootPath}/${dir.folderName}/${file.fileName}|${file.fileName}|${this.probeService.getFileSizeText(file.fileSize)}`); - this.router.navigate(['share-target', {message: `[file]${this.files.siteName}/${this.files.rootPath}/${dir.folderName}/${file.fileName}|${file.fileName}|${this.probeService.getFileSizeText(file.fileSize)}`}]); + this.router.navigate(['share-target', { + message: `[file]${this.files.siteName}/${this.files.rootPath}/${ + dir.folderName}/${file.fileName}|${file.fileName}|${this.probeService.getFileSizeText(file.fileSize)}` + }]); } } diff --git a/src/app/Styles/file-list.scss b/src/app/Styles/file-list.scss index 038f9843..206f16ed 100644 --- a/src/app/Styles/file-list.scss +++ b/src/app/Styles/file-list.scss @@ -70,6 +70,7 @@ justify-content: center; transition: all 0.1s ease-in-out; align-items: center; + color: var(--primary-color-depth3); &:hover { background: var(--default-foreground-20); From a41c944e1187ea2c09b967278140203b1f2168dc Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Tue, 24 Mar 2020 13:53:00 +0800 Subject: [PATCH 49/71] feat: conn to new group management api which support hide the group in search list --- src/app/Controllers/manageGroup.component.ts | 24 +++++++++++--------- src/app/Models/GroupConversation.ts | 1 + src/app/Services/GroupsApiService.ts | 5 ++-- src/app/Styles/menu.scss | 2 +- src/app/Views/advanced-settings.html | 10 ++++---- src/app/Views/group.html | 2 +- src/app/Views/manageGroup.html | 12 +++++++++- 7 files changed, 35 insertions(+), 21 deletions(-) diff --git a/src/app/Controllers/manageGroup.component.ts b/src/app/Controllers/manageGroup.component.ts index 51d0507b..34e3715a 100644 --- a/src/app/Controllers/manageGroup.component.ts +++ b/src/app/Controllers/manageGroup.component.ts @@ -17,7 +17,8 @@ import { ProbeService } from '../Services/ProbeService'; templateUrl: '../Views/manageGroup.html', styleUrls: ['../Styles/menu.scss', '../Styles/userDetail.scss', - '../Styles/button.scss' + '../Styles/button.scss', + '../Styles/toggleButton.scss' ] }) export class ManageGroupComponent implements OnInit { @@ -135,17 +136,18 @@ export class ManageGroupComponent implements OnInit { } public saveInfo() { - this.groupsApiService.UpdateGroupInfo(this.conversation.groupName, this.conversation.groupImagePath, this.newGroupName) + this.groupsApiService.UpdateGroupInfo(this.conversation.groupName, this.conversation.listInSearchResult, + this.conversation.groupImagePath, this.newGroupName) .subscribe(res => { - if (res.code === 0) { - Swal.fire('Success', res.message, 'success'); - this.conversation.groupName = this.newGroupName; - } else if (res.code === -10 && (res as AiurCollection).items) { - Swal.fire('Error', (res as AiurCollection).items.join('
'), 'error'); - } else { - Swal.fire('Error', res.message, 'error'); - } - }); + if (res.code === 0) { + Swal.fire('Success', res.message, 'success'); + this.conversation.groupName = this.newGroupName; + } else if (res.code === -10 && (res as AiurCollection).items) { + Swal.fire('Error', (res as AiurCollection).items.join('
'), 'error'); + } else { + Swal.fire('Error', res.message, 'error'); + } + }); } public kickMember() { diff --git a/src/app/Models/GroupConversation.ts b/src/app/Models/GroupConversation.ts index 5659d921..ecd93151 100644 --- a/src/app/Models/GroupConversation.ts +++ b/src/app/Models/GroupConversation.ts @@ -5,4 +5,5 @@ export class GroupConversation extends Conversation { public groupImagePath: string; public hasPassword: boolean; public ownerId: string; + public listInSearchResult: boolean; } diff --git a/src/app/Services/GroupsApiService.ts b/src/app/Services/GroupsApiService.ts index 4cd78fc5..310ee34c 100644 --- a/src/app/Services/GroupsApiService.ts +++ b/src/app/Services/GroupsApiService.ts @@ -47,11 +47,12 @@ export class GroupsApiService { }); } - public UpdateGroupInfo(groupName: string, avatarPath?: string, newName?: string): Observable { + public UpdateGroupInfo(groupName: string, listInSearchResult: boolean, avatarPath?: string, newName?: string): Observable { return this.apiService.Post(GroupsApiService.serverPath + '/UpdateGroupInfo', { GroupName: groupName, AvatarPath: avatarPath, - NewName: newName + NewName: newName, + ListInSearchResult: listInSearchResult, }); } diff --git a/src/app/Styles/menu.scss b/src/app/Styles/menu.scss index 95d70c4f..5270ae0e 100644 --- a/src/app/Styles/menu.scss +++ b/src/app/Styles/menu.scss @@ -113,7 +113,7 @@ color: #d9534f !important; } - &.notification { + &.toggle-setting { grid-template-columns: 15% auto 15%; } } diff --git a/src/app/Views/advanced-settings.html b/src/app/Views/advanced-settings.html index f5e93c2c..f572c058 100644 --- a/src/app/Views/advanced-settings.html +++ b/src/app/Views/advanced-settings.html @@ -8,7 +8,7 @@
Language
-
@@ -23,7 +23,7 @@
Privacy
-
@@ -32,7 +32,7 @@
-
@@ -41,7 +41,7 @@
-
@@ -54,7 +54,7 @@
Notification
-
diff --git a/src/app/Views/group.html b/src/app/Views/group.html index 2307299d..108f21ee 100644 --- a/src/app/Views/group.html +++ b/src/app/Views/group.html @@ -33,7 +33,7 @@
File History
-
+
diff --git a/src/app/Views/manageGroup.html b/src/app/Views/manageGroup.html index 62494063..7b768937 100644 --- a/src/app/Views/manageGroup.html +++ b/src/app/Views/manageGroup.html @@ -17,6 +17,16 @@
+
+
+ +
+
List this group in the search result
+ + +
@@ -30,7 +40,7 @@
Kick member
- Security + Security & Privacy
From c12fcc512d4a4c2dfdde3ed67f9e8fd2d2dec42a Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Tue, 24 Mar 2020 13:56:02 +0800 Subject: [PATCH 50/71] correct header --- src/app/Views/manageGroup.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/Views/manageGroup.html b/src/app/Views/manageGroup.html index 7b768937..46db4931 100644 --- a/src/app/Views/manageGroup.html +++ b/src/app/Views/manageGroup.html @@ -40,7 +40,7 @@
Kick member
- Security & Privacy + Security
From 2b08173f71307724ebdb1a79f339a658dab95a5d Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Tue, 24 Mar 2020 14:14:07 +0800 Subject: [PATCH 51/71] fix lint err --- src/app/Services/GroupsApiService.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/Services/GroupsApiService.ts b/src/app/Services/GroupsApiService.ts index 310ee34c..6d301591 100644 --- a/src/app/Services/GroupsApiService.ts +++ b/src/app/Services/GroupsApiService.ts @@ -42,12 +42,13 @@ export class GroupsApiService { public TransferOwner(groupName: string, targetUserId: string): Observable { return this.apiService.Post(GroupsApiService.serverPath + '/TransferGroupOwner', { - groupName: groupName, + groupName: groupName, targetUserId: targetUserId }); } - public UpdateGroupInfo(groupName: string, listInSearchResult: boolean, avatarPath?: string, newName?: string): Observable { + public UpdateGroupInfo(groupName: string, listInSearchResult: boolean, + avatarPath?: string, newName?: string): Observable { return this.apiService.Post(GroupsApiService.serverPath + '/UpdateGroupInfo', { GroupName: groupName, AvatarPath: avatarPath, From 65a85a402cfc4e4917e713154711f7964c3f04b1 Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Thu, 26 Mar 2020 15:13:24 +0800 Subject: [PATCH 52/71] Sign in back be dark in dark theme. --- src/app/Styles/signin.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app/Styles/signin.scss b/src/app/Styles/signin.scss index 780e459e..bd419643 100644 --- a/src/app/Styles/signin.scss +++ b/src/app/Styles/signin.scss @@ -16,6 +16,11 @@ overflow-y: auto; text-align: center; } +@media (prefers-color-scheme: dark) { + .signin-back { + background-color: rgb(28, 30, 31)!important; + } +} .auth-page { margin: auto; From 682e45efebbfb306071594569834e2ccd7c42e50 Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Thu, 26 Mar 2020 16:28:36 +0800 Subject: [PATCH 53/71] dark color loading effects. --- src/index.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/index.html b/src/index.html index 7aab82dd..6837d136 100644 --- a/src/index.html +++ b/src/index.html @@ -64,6 +64,12 @@ background-color: #fff } + @media (prefers-color-scheme: dark) { + body { + background-color: rgb(28, 30, 31)!important; + } + } + h1 { color: #339bf9; font-weight: 400; From 25558c2a3919ff3b9fb1500b0e65e95ee4e6d352 Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Fri, 27 Mar 2020 14:16:33 +0800 Subject: [PATCH 54/71] Prefetch www.kahla.app. --- src/index.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 6837d136..4b0ff48b 100644 --- a/src/index.html +++ b/src/index.html @@ -8,8 +8,10 @@ - + + + From a15b82df8c19d4c06369e52c11dc2ad4214c0bb2 Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Fri, 27 Mar 2020 14:49:43 +0800 Subject: [PATCH 55/71] Change some sign in layout. --- src/app/Views/signin.html | 11 +++++------ src/index.js | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/app/Views/signin.html b/src/app/Views/signin.html index 4a44a68a..861d4928 100644 --- a/src/app/Views/signin.html +++ b/src/app/Views/signin.html @@ -6,6 +6,11 @@

Kahla

Select server

+ Server: {{this.apiService.serverConfig.serverName}} +

+ (Not an official server) +

Forgot password? - - Server: {{this.apiService.serverConfig.serverName}} -

- (Not an official server) -

diff --git a/src/index.js b/src/index.js index 2e783b29..804759e8 100644 --- a/src/index.js +++ b/src/index.js @@ -54,8 +54,8 @@ function createWindow() { event.preventDefault(); let oauth = new BrowserWindow( { - width: 800, - height: 600, + width: 410, + height: 730, icon: __dirname + '/assets/144x144.png', titleBarStyle: 'default', minWidth: 200, From 9d2bc921e75fc4d1a2a4ebf4eab5012956072f6c Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Sun, 29 Mar 2020 00:18:06 +0800 Subject: [PATCH 56/71] feat: try to support changing notification settings. --- .../Controllers/advanced-setting.component.ts | 12 ---- src/app/Controllers/devices.component.ts | 54 +++++++++++++++- src/app/Models/PushSubscriptionSetting.ts | 4 ++ src/app/Services/CacheService.ts | 7 ++- src/app/Services/DevicesApiService.ts | 8 ++- src/app/Services/InitService.ts | 63 ++++++++++++++----- src/app/Views/advanced-settings.html | 10 +-- src/app/Views/devices.html | 33 +++++++++- 8 files changed, 148 insertions(+), 43 deletions(-) create mode 100644 src/app/Models/PushSubscriptionSetting.ts diff --git a/src/app/Controllers/advanced-setting.component.ts b/src/app/Controllers/advanced-setting.component.ts index a3bb5d73..42fa4c85 100644 --- a/src/app/Controllers/advanced-setting.component.ts +++ b/src/app/Controllers/advanced-setting.component.ts @@ -61,18 +61,6 @@ export class AdvancedSettingComponent implements OnInit { }); } - public testPush(): void { - this.devicesApiService.PushTestMessage().subscribe(t => { - if (t.code === 0) { - Swal.fire( - 'Successfully sent!', - t.message, - 'info' - ); - } - }); - } - public todo(): void { Swal.fire('Under development', 'This features is still under development ^_^.', 'info'); } diff --git a/src/app/Controllers/devices.component.ts b/src/app/Controllers/devices.component.ts index 326eae40..513ccb91 100644 --- a/src/app/Controllers/devices.component.ts +++ b/src/app/Controllers/devices.component.ts @@ -2,19 +2,32 @@ import { Component, OnInit } from '@angular/core'; import { CacheService } from '../Services/CacheService'; import Swal from 'sweetalert2'; import { Device } from '../Models/Device'; +import { ElectronService } from 'ngx-electron'; +import { DevicesApiService } from '../Services/DevicesApiService'; +import { PushSubscriptionSetting } from '../Models/PushSubscriptionSetting'; +import { InitService } from '../Services/InitService'; @Component({ templateUrl: '../Views/devices.html', - styleUrls: ['../Styles/menu.scss'] + styleUrls: ['../Styles/menu.scss', + '../Styles/toggleButton.scss'] }) export class DevicesComponent implements OnInit { constructor( public cacheService: CacheService, + public electronService: ElectronService, + public devicesApiService: DevicesApiService, + public initService: InitService, ) { } + public webPushEnabled: boolean; + public ngOnInit(): void { - this.cacheService.updateDevice(); + this.cacheService.updateDevice(); + if (this.webpushSupported()) { + this.webPushEnabled = this.getWebPushStatus(); + } } public detail(device: Device): void { @@ -27,4 +40,41 @@ export class DevicesComponent implements OnInit { }); } } + + public webpushSupported(): boolean { + return !this.electronService.isElectronApp && 'Notification' in window && 'serviceWorker' in navigator; + } + + public testPush(): void { + this.devicesApiService.PushTestMessage().subscribe(t => { + if (t.code === 0) { + Swal.fire( + 'Successfully sent!', + t.message, + 'info' + ); + } + }); + } + + public getWebPushStatus(): boolean { + if (!localStorage.getItem('setting-pushSubscription')) { + return true; + } + const status: PushSubscriptionSetting = JSON.parse(localStorage.getItem('setting-pushSubscription')); + return status.enabled; + } + + public setWebPushStatus(value: boolean) { + const status: PushSubscriptionSetting = localStorage.getItem('setting-pushSubscription') ? + JSON.parse(localStorage.getItem('setting-pushSubscription')) : + { + enabled: value, + deviceId: 0 + }; + status.enabled = value; + localStorage.setItem('setting-pushSubscription', JSON.stringify(status)); + this.webPushEnabled = value; + this.initService.subscribeUser(); + } } diff --git a/src/app/Models/PushSubscriptionSetting.ts b/src/app/Models/PushSubscriptionSetting.ts new file mode 100644 index 00000000..0a4a1069 --- /dev/null +++ b/src/app/Models/PushSubscriptionSetting.ts @@ -0,0 +1,4 @@ +export class PushSubscriptionSetting { + public deviceId: number; + public enabled: boolean; +} diff --git a/src/app/Services/CacheService.ts b/src/app/Services/CacheService.ts index 16bf8966..01a77ddd 100644 --- a/src/app/Services/CacheService.ts +++ b/src/app/Services/CacheService.ts @@ -6,6 +6,7 @@ import { AES, enc } from 'crypto-js'; import { DevicesApiService } from './DevicesApiService'; import { ConversationApiService } from './ConversationApiService'; import { ProbeService } from './ProbeService'; +import { PushSubscriptionSetting } from '../Models/PushSubscriptionSetting'; @Injectable() export class CacheService { @@ -75,6 +76,10 @@ export class CacheService { public updateDevice(): void { this.devicesApiService.MyDevices().subscribe(response => { + let currentId = 0; + if (localStorage.getItem('setting-pushSubscription')) { + currentId = (JSON.parse(localStorage.getItem('setting-pushSubscription'))).deviceId; + } response.items.forEach(item => { if (item.name !== null && item.name.length >= 0) { const deviceName = []; @@ -93,7 +98,7 @@ export class CacheService { deviceName.push('Unknown OS'); } - if (item.id === Number(localStorage.getItem('deviceID'))) { + if (item.id === currentId) { deviceName[0] += '(Current device)'; } diff --git a/src/app/Services/DevicesApiService.ts b/src/app/Services/DevicesApiService.ts index d213cd53..190e6717 100644 --- a/src/app/Services/DevicesApiService.ts +++ b/src/app/Services/DevicesApiService.ts @@ -24,7 +24,7 @@ export class DevicesApiService { } public UpdateDevice(deviceID: number, userAgent: string, PushEndpoint: string, - PushP256DH: string, PushAuth: string): Observable> { + PushP256DH: string, PushAuth: string): Observable> { return this.apiService.Post(DevicesApiService.serverPath + '/UpdateDevice', { DeviceId: deviceID, Name: userAgent, @@ -34,6 +34,12 @@ export class DevicesApiService { }); } + public DropDevice(deviceId: number): Observable { + return this.apiService.Post(DevicesApiService.serverPath + '/DropDevice', { + id: deviceId + }); + } + public MyDevices(): Observable> { return this.apiService.Get(DevicesApiService.serverPath + '/MyDevices'); } diff --git a/src/app/Services/InitService.ts b/src/app/Services/InitService.ts index 67d54d0d..2570064e 100644 --- a/src/app/Services/InitService.ts +++ b/src/app/Services/InitService.ts @@ -12,6 +12,7 @@ import { ProbeService } from './ProbeService'; import { ServerConfig } from '../Models/ServerConfig'; import { ApiService } from './ApiService'; import { ServerListApiService } from './ServerListApiService'; +import { PushSubscriptionSetting } from '../Models/PushSubscriptionSetting'; @Injectable({ providedIn: 'root' @@ -195,39 +196,67 @@ export class InitService { }, this.timeoutNumber); } - private subscribeUser(): void { + public subscribeUser() { if ('Notification' in window && 'serviceWorker' in navigator && Notification.permission === 'granted') { const _this = this; - navigator.serviceWorker.ready.then(function (registration) { - return registration.pushManager.getSubscription().then(function (sub) { + navigator.serviceWorker.ready.then((registration => { + return registration.pushManager.getSubscription().then(sub => { if (sub === null) { return registration.pushManager.subscribe(_this.options) .then(function (pushSubscription) { - return _this.devicesApiService.AddDevice(navigator.userAgent, pushSubscription.endpoint, - pushSubscription.toJSON().keys.p256dh, pushSubscription.toJSON().keys.auth) - .subscribe(function (result) { - localStorage.setItem('deviceID', result.value.toString()); - }); + _this.bindDevice(pushSubscription); }); + } else { + _this.bindDevice(sub); } }); - }.bind(_this)); + })); + } + } + + public bindDevice(pushSubscription: PushSubscription, force: boolean = false) { + let data: PushSubscriptionSetting = JSON.parse(localStorage.getItem('setting-pushSubscription')); + console.log(data); + if (!data) { + data = { + enabled: true, + deviceId: 0 + }; + localStorage.setItem('setting-pushSubscription', JSON.stringify(data)); + } + if (!data.enabled && data.deviceId) { + this.devicesApiService.DropDevice(data.deviceId).subscribe(t => { + if (t.code === 0) { + data.deviceId = 0; + localStorage.setItem('setting-pushSubscription', JSON.stringify(data)); + } + }); + + } + if (data.deviceId) { + if (force) { + this.devicesApiService.UpdateDevice(data.deviceId, navigator.userAgent, pushSubscription.endpoint, + pushSubscription.toJSON().keys.p256dh, pushSubscription.toJSON().keys.auth).subscribe(); + } + } else { + this.devicesApiService.AddDevice(navigator.userAgent, pushSubscription.endpoint, + pushSubscription.toJSON().keys.p256dh, pushSubscription.toJSON().keys.auth).subscribe(t => { + data.deviceId = t.value; + localStorage.setItem('setting-pushSubscription', JSON.stringify(data)); + }); } } private updateSubscription(): void { if ('Notification' in window && 'serviceWorker' in navigator && Notification.permission === 'granted') { const _this = this; - navigator.serviceWorker.ready.then(function (registration) { - return navigator.serviceWorker.addEventListener('pushsubscriptionchange', function () { + navigator.serviceWorker.ready.then(registration => + navigator.serviceWorker.addEventListener('pushsubscriptionchange', () => { registration.pushManager.subscribe(_this.options) - .then(function (pushSubscription) { - return _this.devicesApiService.UpdateDevice(Number(localStorage.getItem('deviceID')), navigator.userAgent, - pushSubscription.endpoint, pushSubscription.toJSON().keys.p256dh, pushSubscription.toJSON().keys.auth) - .subscribe(); + .then(pushSubscription => { + _this.bindDevice(pushSubscription, true); }); - }); - }.bind(_this)); + })); } } diff --git a/src/app/Views/advanced-settings.html b/src/app/Views/advanced-settings.html index f572c058..e0016b39 100644 --- a/src/app/Views/advanced-settings.html +++ b/src/app/Views/advanced-settings.html @@ -66,15 +66,9 @@
- +
-
My Devices
-
-
-
- -
-
Send Test Notification
+
Desktop Notification Settings
Account diff --git a/src/app/Views/devices.html b/src/app/Views/devices.html index fe097383..042a2015 100644 --- a/src/app/Views/devices.html +++ b/src/app/Views/devices.html @@ -1,5 +1,34 @@ - -
+ +
Status & Settings
+ +
+
+
Enable WebPush notification
+ + +
+
+
+ +
+
Send Test Notification
+
+
This will send a WebPush notification to all your devices.
+ + +
+
+
Enable Desktop Notification
+ + +
+ + +
Sorry, but your platform doesn't support receiving notifications.
+ +
My devices (WebPush devices only)
+
Date: Sun, 29 Mar 2020 00:26:01 +0800 Subject: [PATCH 57/71] feat: support changing notify setting on electron --- src/app/Controllers/advanced-setting.component.ts | 2 -- src/app/Controllers/devices.component.ts | 8 ++++++++ src/app/Services/MessageService.ts | 5 ++++- src/app/Views/devices.html | 4 ++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/app/Controllers/advanced-setting.component.ts b/src/app/Controllers/advanced-setting.component.ts index 42fa4c85..c9c934be 100644 --- a/src/app/Controllers/advanced-setting.component.ts +++ b/src/app/Controllers/advanced-setting.component.ts @@ -2,7 +2,6 @@ import { Component, OnInit } from '@angular/core'; import { AuthApiService } from '../Services/AuthApiService'; import { KahlaUser } from '../Models/KahlaUser'; import Swal from 'sweetalert2'; -import { DevicesApiService } from '../Services/DevicesApiService'; import { CacheService } from '../Services/CacheService'; import { ProbeService } from '../Services/ProbeService'; import { Subscription } from 'rxjs'; @@ -21,7 +20,6 @@ export class AdvancedSettingComponent implements OnInit { constructor( private authApiService: AuthApiService, - private devicesApiService: DevicesApiService, private cacheService: CacheService, private probeService: ProbeService, ) { diff --git a/src/app/Controllers/devices.component.ts b/src/app/Controllers/devices.component.ts index 513ccb91..0d316946 100644 --- a/src/app/Controllers/devices.component.ts +++ b/src/app/Controllers/devices.component.ts @@ -77,4 +77,12 @@ export class DevicesComponent implements OnInit { this.webPushEnabled = value; this.initService.subscribeUser(); } + + public getElectronNotify(): boolean { + return localStorage.getItem('setting-electronNotify') === 'true'; + } + + public setElectronNotify(value: boolean) { + localStorage.setItem('setting-electronNotify', value ? 'true' : 'false'); + } } diff --git a/src/app/Services/MessageService.ts b/src/app/Services/MessageService.ts index b33644b0..78957221 100644 --- a/src/app/Services/MessageService.ts +++ b/src/app/Services/MessageService.ts @@ -351,7 +351,10 @@ export class MessageService { } private showNotification(event: NewMessageEvent): void { - if (!event.muted && event.message.sender.id !== this.cacheService.cachedData.me.id && this._electronService.isElectronApp) { + if (!event.muted && + event.message.sender.id !== this.cacheService.cachedData.me.id && + this._electronService.isElectronApp && + localStorage.getItem('setting-electronNotify') === 'true') { event.message.content = AES.decrypt(event.message.content, event.aesKey).toString(enc.Utf8); event.message.content = this.cacheService.modifyMessage(event.message.content); const notify = new Notification(event.message.sender.nickName, { diff --git a/src/app/Views/devices.html b/src/app/Views/devices.html index 042a2015..9d2164a3 100644 --- a/src/app/Views/devices.html +++ b/src/app/Views/devices.html @@ -16,10 +16,10 @@
This will send a WebPush notification to all your devices.
-
+
Enable Desktop Notification
- +
From 5edbe4be9795fff164670c14067d38be3e2e2750 Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Sun, 29 Mar 2020 01:06:20 +0800 Subject: [PATCH 58/71] Rename some items. --- src/app/Views/advanced-settings.html | 2 +- src/app/Views/devices.html | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/Views/advanced-settings.html b/src/app/Views/advanced-settings.html index e0016b39..374b3204 100644 --- a/src/app/Views/advanced-settings.html +++ b/src/app/Views/advanced-settings.html @@ -68,7 +68,7 @@
-
Desktop Notification Settings
+
Push Notification Settings
Account diff --git a/src/app/Views/devices.html b/src/app/Views/devices.html index 9d2164a3..4b7801d4 100644 --- a/src/app/Views/devices.html +++ b/src/app/Views/devices.html @@ -3,7 +3,7 @@
-
Enable WebPush notification
+
Enable push notification
@@ -13,12 +13,12 @@
Send Test Notification
-
This will send a WebPush notification to all your devices.
+
This will send a push notification to all your devices.
-
Enable Desktop Notification
+
Enable Push Notification
@@ -26,7 +26,7 @@
Sorry, but your platform doesn't support receiving notifications.
 -
My devices (WebPush devices only)
+
My web devices
From 429aa6789c214310bfaba43d0db4127a9f444a69 Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Sun, 29 Mar 2020 01:10:48 +0800 Subject: [PATCH 59/71] Allow testing notification on electron. --- src/app/Views/devices.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/app/Views/devices.html b/src/app/Views/devices.html index 4b7801d4..6054f7fd 100644 --- a/src/app/Views/devices.html +++ b/src/app/Views/devices.html @@ -7,22 +7,22 @@
-
-
- -
-
Send Test Notification
-
-
This will send a push notification to all your devices.
-
-
Enable Push Notification
+
+
Enable desktop notification
 +
+
+ +
+
Send Test Notification
+
+
This will send a push notification to all your devices.
Sorry, but your platform doesn't support receiving notifications.
 From 1d090a458ca48ecf611917fd9331d94ac0bac7e8 Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Sun, 29 Mar 2020 01:12:35 +0800 Subject: [PATCH 60/71] Fix lower case. --- src/app/Views/devices.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/Views/devices.html b/src/app/Views/devices.html index 6054f7fd..3f95dfcb 100644 --- a/src/app/Views/devices.html +++ b/src/app/Views/devices.html @@ -20,7 +20,7 @@
-
Send Test Notification
+
Send test notification
This will send a push notification to all your devices.
From de6c1d7c8b420ec00f3d04ad22f025982c67413d Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Sun, 29 Mar 2020 01:13:46 +0800 Subject: [PATCH 61/71] Label lower case. --- src/app/Views/advanced-settings.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/Views/advanced-settings.html b/src/app/Views/advanced-settings.html index 374b3204..7d62a7c1 100644 --- a/src/app/Views/advanced-settings.html +++ b/src/app/Views/advanced-settings.html @@ -60,7 +60,7 @@
-
Email Notification
+
Email notification
@@ -68,7 +68,7 @@
-
Push Notification Settings
+
Push notification settings
Account @@ -77,17 +77,17 @@
-
Change Password
+
Change password
-
Advanced Email Settings
+
Advanced email settings
-
Advanced Account Settings
+
Advanced account settings
 From 086b7b0dbac4e5f707ad898918cd9325ca4fedbb Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Sun, 29 Mar 2020 02:01:21 +0800 Subject: [PATCH 62/71] Use CDN to download files. --- src/app/values.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/values.ts b/src/app/values.ts index c298997b..828c7344 100644 --- a/src/app/values.ts +++ b/src/app/values.ts @@ -1,7 +1,6 @@ export class Values { - public static fileCompatAddress = 'https://{site}.aiur.site/'; - public static fileAddress = 'https://probe.aiursoft.com/Download/Open/'; - public static fileDownloadAddress = 'https://probe.aiursoft.com/Download/File/'; + public static fileCompatAddress = 'https://probe.cdn.aiursoft.com/{site}'; + public static fileDownloadAddress = 'https://probe.download.cdn.aiursoft.com/'; public static loadingImgURL = 'https://ui.cdn.aiursoft.com/images/loading.gif'; public static sourceCodeURL = 'https://github.com/AiursoftWeb/Kahla.App/commit/'; } From 5d18f22c928a7eab84c7f162f283ce5e1f3b7422 Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Sun, 29 Mar 2020 12:20:25 +0800 Subject: [PATCH 63/71] Make Electron Notification default as true --- src/app/Controllers/devices.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/Controllers/devices.component.ts b/src/app/Controllers/devices.component.ts index 0d316946..4a1e03e2 100644 --- a/src/app/Controllers/devices.component.ts +++ b/src/app/Controllers/devices.component.ts @@ -79,7 +79,7 @@ export class DevicesComponent implements OnInit { } public getElectronNotify(): boolean { - return localStorage.getItem('setting-electronNotify') === 'true'; + return localStorage.getItem('setting-electronNotify') !== 'false'; } public setElectronNotify(value: boolean) { From 64cc51d3bb6183ec7ad3dad55259a33b999ef6de Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Sun, 29 Mar 2020 12:29:02 +0800 Subject: [PATCH 64/71] remove debug code --- src/app/Services/InitService.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/Services/InitService.ts b/src/app/Services/InitService.ts index 2570064e..9bd4a322 100644 --- a/src/app/Services/InitService.ts +++ b/src/app/Services/InitService.ts @@ -216,7 +216,6 @@ export class InitService { public bindDevice(pushSubscription: PushSubscription, force: boolean = false) { let data: PushSubscriptionSetting = JSON.parse(localStorage.getItem('setting-pushSubscription')); - console.log(data); if (!data) { data = { enabled: true, From 764fe553a4a2f30adc10f0ffd50babc924ce0496 Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Sun, 29 Mar 2020 12:57:37 +0800 Subject: [PATCH 65/71] Fix wrong file path. --- src/app/values.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/values.ts b/src/app/values.ts index 828c7344..03b7cc78 100644 --- a/src/app/values.ts +++ b/src/app/values.ts @@ -1,5 +1,5 @@ export class Values { - public static fileCompatAddress = 'https://probe.cdn.aiursoft.com/{site}'; + public static fileCompatAddress = 'https://probe.cdn.aiursoft.com/{site}/'; public static fileDownloadAddress = 'https://probe.download.cdn.aiursoft.com/'; public static loadingImgURL = 'https://ui.cdn.aiursoft.com/images/loading.gif'; public static sourceCodeURL = 'https://github.com/AiursoftWeb/Kahla.App/commit/'; From 3878ae7c9d848009cff4d2228e4d364e5a9387ab Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Sun, 29 Mar 2020 13:29:15 +0800 Subject: [PATCH 66/71] Fix #831. --- src/app/Controllers/about.component.ts | 2 ++ src/app/Views/about.html | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/Controllers/about.component.ts b/src/app/Controllers/about.component.ts index 6e6fb8f2..125cf1e5 100644 --- a/src/app/Controllers/about.component.ts +++ b/src/app/Controllers/about.component.ts @@ -3,6 +3,7 @@ import { CheckService } from '../Services/CheckService'; import { Values } from '../values'; import { ApiService } from '../Services/ApiService'; import { ElectronService } from 'ngx-electron'; +import { environment } from '../../environments/environment'; @Component({ templateUrl: '../Views/about.html', @@ -14,6 +15,7 @@ import { ElectronService } from 'ngx-electron'; export class AboutComponent { public sourceCodeURL = Values.sourceCodeURL; + public website = environment.officialServerList; constructor( public checkService: CheckService, diff --git a/src/app/Views/about.html b/src/app/Views/about.html index 9b75012d..3a519589 100644 --- a/src/app/Views/about.html +++ b/src/app/Views/about.html @@ -41,7 +41,7 @@

Kahla {{checkService.version}}

Update history
- +
From 7f847b0e506a76126ef6b4d272ee681138d88c15 Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Sun, 29 Mar 2020 13:35:36 +0800 Subject: [PATCH 67/71] Simplify devices page. --- src/app/Views/devices.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/Views/devices.html b/src/app/Views/devices.html index 3f95dfcb..e2418ebb 100644 --- a/src/app/Views/devices.html +++ b/src/app/Views/devices.html @@ -3,14 +3,14 @@
-
Enable push notification
+
Enable web push notification
-
+
Enable desktop notification
@@ -22,7 +22,6 @@
Send test notification
-
This will send a push notification to all your devices.
Sorry, but your platform doesn't support receiving notifications.
 From c5fe235b411ce2af096bab0c56fec84067d50ada Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Sun, 29 Mar 2020 13:38:19 +0800 Subject: [PATCH 68/71] Correctly push electron nitification --- src/app/Services/MessageService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/Services/MessageService.ts b/src/app/Services/MessageService.ts index 78957221..9bab6c18 100644 --- a/src/app/Services/MessageService.ts +++ b/src/app/Services/MessageService.ts @@ -354,7 +354,7 @@ export class MessageService { if (!event.muted && event.message.sender.id !== this.cacheService.cachedData.me.id && this._electronService.isElectronApp && - localStorage.getItem('setting-electronNotify') === 'true') { + localStorage.getItem('setting-electronNotify') !== 'false') { event.message.content = AES.decrypt(event.message.content, event.aesKey).toString(enc.Utf8); event.message.content = this.cacheService.modifyMessage(event.message.content); const notify = new Notification(event.message.sender.nickName, { From ea5ea48032f514aec53f1fbdb8f87e74f7f99ec4 Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Sun, 29 Mar 2020 16:53:32 +0800 Subject: [PATCH 69/71] Fix electron may quit issue. --- src/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index 804759e8..4e77316e 100644 --- a/src/index.js +++ b/src/index.js @@ -36,8 +36,9 @@ function createWindow() { })); mainWindow.on('close', function (event) { - if (!app.isQuiting && app.showExitNotif) { + if (!app.isQuiting) { event.preventDefault(); + mainWindow.hide(); if (app.showExitNotif) { app.showExitNotif = false; new Notification({ @@ -45,7 +46,6 @@ function createWindow() { body: 'Kahla is running in the background. Press Ctrl + Alt + S to open.' }).show(); } - mainWindow.hide(); } }); From 6a99b791b618c25ea26515f44f4a63ecfa1a869e Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Tue, 31 Mar 2020 00:12:19 +0800 Subject: [PATCH 70/71] feat: support sign in to any server via electron --- src/app/Controllers/signin.component.ts | 8 +++ src/app/Views/signin.html | 14 ++-- src/index.js | 88 ++++++++++++++----------- 3 files changed, 63 insertions(+), 47 deletions(-) diff --git a/src/app/Controllers/signin.component.ts b/src/app/Controllers/signin.component.ts index cf050903..401b55f4 100644 --- a/src/app/Controllers/signin.component.ts +++ b/src/app/Controllers/signin.component.ts @@ -94,4 +94,12 @@ export class SignInComponent implements OnInit { this.serverAddr = this.apiService.serverConfig.domain.server; } } + + public goLogin(url: string) { + if (this._electronService.isElectronApp) { + this._electronService.ipcRenderer.send('oauth', url); + } else { + document.location.href = url; + } + } } diff --git a/src/app/Views/signin.html b/src/app/Views/signin.html index 861d4928..9204bb24 100644 --- a/src/app/Views/signin.html +++ b/src/app/Views/signin.html @@ -7,18 +7,18 @@

Select server

Server: {{this.apiService.serverConfig.serverName}} + (click)="changingServer = true">Server: {{this.apiService.serverConfig.serverName}}

(Not an official server)

- Forgot password?
diff --git a/src/index.js b/src/index.js index 804759e8..be08e97d 100644 --- a/src/index.js +++ b/src/index.js @@ -1,5 +1,5 @@ const electron = require('electron'); -const { Menu, Tray, Notification, shell, globalShortcut } = require('electron'); +const {Menu, Tray, Notification, shell, globalShortcut, ipcMain} = require('electron'); const app = electron.app; const BrowserWindow = electron.BrowserWindow; const path = require('path'); @@ -50,42 +50,43 @@ function createWindow() { }); mainWindow.webContents.on("new-window", (event, url) => { - if (url.match(/https:\/\/.*server\.kahla\.app\/Auth\/(Oauth|GoRegister)\/*/gi)) { - event.preventDefault(); - let oauth = new BrowserWindow( - { - width: 410, - height: 730, - icon: __dirname + '/assets/144x144.png', - titleBarStyle: 'default', - minWidth: 200, - minHeight: 300, - title: 'Please login via your aiursoft account.' - }); - oauth.loadURL(url); - oauth.webContents.on('will-redirect', (event_, url_) => { - - if (url_.match(/((staging|web)\.kahla\.app)|localhost/gi)) { - event_.preventDefault(); - oauth.close(); - oauth.destroy(); - mainWindow.loadURL(Url.format({ - pathname: path.join(__dirname, 'index.html'), - protocol: 'file:', - slashes: true - })); - } - }); - oauth.show(); - } else { - event.preventDefault(); - shell.openExternal(url); - } - }) + event.preventDefault(); + shell.openExternal(url); + }); } app.on('ready', createWindow); +ipcMain.on('oauth', (event, arg) => { + let nextExit = false; + let oauth = new BrowserWindow( + { + width: 410, + height: 730, + icon: __dirname + '/assets/144x144.png', + titleBarStyle: 'default', + minWidth: 200, + minHeight: 300, + title: 'Please login via your aiursoft account.' + }); + oauth.loadURL(arg); + oauth.webContents.on('will-redirect', (event_, url_) => { + if (nextExit) { + oauth.close(); + oauth.destroy(); + mainWindow.loadURL(Url.format({ + pathname: path.join(__dirname, 'index.html'), + protocol: 'file:', + slashes: true, + })); + } + if (url_.match(/.+\/Auth\/AuthResult.+/gi)) { + nextExit = true; + } + }); + oauth.show(); +}); + app.addListener('before-quit', () => { app.isQuiting = true; }); @@ -95,9 +96,9 @@ app.on('window-all-closed', function () { }); app.on('will-quit', () => { - globalShortcut.unregister('CommandOrControl+Alt+S') + globalShortcut.unregister('CommandOrControl+Alt+S'); globalShortcut.unregisterAll() -}) +}); app.setAppUserModelId('com.example.kahla'); @@ -131,17 +132,24 @@ app.on('ready', () => { } else { mainWindow.show(); } - }) + }); const contextMenu = Menu.buildFromTemplate([ { - label: 'Kahla', click: function () { mainWindow.show(); } + label: 'Kahla', click: function () { + mainWindow.show(); + } }, { - label: 'Toggle developer tools', click: function () { mainWindow.toggleDevTools() } + label: 'Toggle developer tools', click: function () { + mainWindow.toggleDevTools() + } }, - { type: 'separator' }, + {type: 'separator'}, { - label: 'Exit', click: function () { app.isQuiting = true; app.quit(); } + label: 'Exit', click: function () { + app.isQuiting = true; + app.quit(); + } } ]); Menu.setApplicationMenu(null); From 3fd9581cdf22932ab4e4aff587aaa62fd6ebb4cb Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Tue, 31 Mar 2020 16:11:34 +0800 Subject: [PATCH 71/71] not to add devices when the notification is disabled --- src/app/Services/InitService.ts | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/app/Services/InitService.ts b/src/app/Services/InitService.ts index 9bd4a322..8639b6cd 100644 --- a/src/app/Services/InitService.ts +++ b/src/app/Services/InitService.ts @@ -230,20 +230,22 @@ export class InitService { localStorage.setItem('setting-pushSubscription', JSON.stringify(data)); } }); - } - if (data.deviceId) { - if (force) { - this.devicesApiService.UpdateDevice(data.deviceId, navigator.userAgent, pushSubscription.endpoint, - pushSubscription.toJSON().keys.p256dh, pushSubscription.toJSON().keys.auth).subscribe(); + if (data.enabled) { + if (data.deviceId) { + if (force) { + this.devicesApiService.UpdateDevice(data.deviceId, navigator.userAgent, pushSubscription.endpoint, + pushSubscription.toJSON().keys.p256dh, pushSubscription.toJSON().keys.auth).subscribe(); + } + } else { + this.devicesApiService.AddDevice(navigator.userAgent, pushSubscription.endpoint, + pushSubscription.toJSON().keys.p256dh, pushSubscription.toJSON().keys.auth).subscribe(t => { + data.deviceId = t.value; + localStorage.setItem('setting-pushSubscription', JSON.stringify(data)); + }); } - } else { - this.devicesApiService.AddDevice(navigator.userAgent, pushSubscription.endpoint, - pushSubscription.toJSON().keys.p256dh, pushSubscription.toJSON().keys.auth).subscribe(t => { - data.deviceId = t.value; - localStorage.setItem('setting-pushSubscription', JSON.stringify(data)); - }); } + } private updateSubscription(): void {