-
Notifications
You must be signed in to change notification settings - Fork 85
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #605 from AiursoftWeb/dev
Release 3.6.3
- Loading branch information
Showing
23 changed files
with
258 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| import { Component, OnInit } from '@angular/core'; | ||
| import { Router } from '@angular/router'; | ||
| import { Values } from '../values'; | ||
| import { MessageService } from '../Services/MessageService'; | ||
| import { CacheService } from '../Services/CacheService'; | ||
| import Swal, { SweetAlertResult } from 'sweetalert2'; | ||
| import { KahlaUser } from '../Models/KahlaUser'; | ||
| import { GroupsResult } from '../Models/GroupsResults'; | ||
| import { ConversationApiService } from '../Services/ConversationApiService'; | ||
| import { AES } from 'crypto-js'; | ||
| import { FriendsApiService } from '../Services/FriendsApiService'; | ||
| import { ShareService } from '../Services/ShareService'; | ||
|
|
||
| @Component({ | ||
| templateUrl: '../Views/share.html', | ||
| styleUrls: [ | ||
| '../Styles/menu.scss', | ||
| '../Styles/add-friend.scss', | ||
| '../Styles/friends.scss'] | ||
|
|
||
| }) | ||
| export class ShareComponent implements OnInit { | ||
| public loadingImgURL = Values.loadingImgURL; | ||
| public showUsers = true; | ||
| public message: string; | ||
| public inApp = false; | ||
|
|
||
| constructor( | ||
| private router: Router, | ||
| private messageService: MessageService, | ||
| public cacheService: CacheService, | ||
| private conversationApiService: ConversationApiService, | ||
| private friendsApiService: FriendsApiService, | ||
| private shareService: ShareService) { | ||
| } | ||
|
|
||
| public ngOnInit(): void { | ||
| if (this.shareService.share) { | ||
| this.shareService.share = false; | ||
| this.message = this.shareService.content; | ||
| this.inApp = true; | ||
| } else { | ||
| const parsedUrl = new URL(location.href); | ||
| const text = parsedUrl.searchParams.get('text'); | ||
| const url = parsedUrl.searchParams.get('url'); | ||
| this.message = `${text ? text : ''} ${url ? url : ''}`; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| public showUsersResults(selectUsers: boolean): void { | ||
| this.showUsers = selectUsers; | ||
| } | ||
|
|
||
| public share(user: KahlaUser | GroupsResult, group: boolean): void { | ||
| let conversationID = group ? (<GroupsResult>user).id : 0; | ||
| if (!group) { | ||
| this.friendsApiService.UserDetail((<KahlaUser>user).id) | ||
| .subscribe(result => { | ||
| if (result.code === 0) { | ||
| conversationID = result.conversationId; | ||
| } else { | ||
| return; | ||
| } | ||
| }); | ||
| } | ||
| const name = group ? (<GroupsResult>user).name : (<KahlaUser>user).nickName; | ||
| let dialog: Promise<SweetAlertResult>; | ||
| const isResource = this.message.startsWith('[img]') || this.message.startsWith('[video]') || this.message.startsWith('[file]'); | ||
| if (isResource) { | ||
| const msgType = this.message.startsWith('[img]') ? 'image' : (this.message.startsWith('[video]') ? 'video' : 'file'); | ||
| dialog = Swal.fire({ | ||
| title: `Share ${msgType}?`, | ||
| text: `Are you sure to send this ${msgType} to ${name}?`, | ||
| showCancelButton: true, | ||
| }); | ||
| } else { | ||
| dialog = Swal.fire({ | ||
| title: 'Share message to', | ||
| text: `Are you sure to send this message to ${name}?`, | ||
| input: 'textarea', | ||
| inputValue: this.message, | ||
| showCancelButton: true, | ||
| }); | ||
| } | ||
| dialog.then(input => { | ||
| const msg = isResource ? this.message : input.value; | ||
| if (!input.dismiss && msg) { | ||
| if (this.messageService.conversation && | ||
| this.messageService.conversation.id === conversationID) { | ||
| this.sendMessage(msg); | ||
| } else { | ||
| this.conversationApiService.ConversationDetail(conversationID) | ||
| .subscribe(result => { | ||
| this.messageService.conversation = result.value; | ||
| this.sendMessage(msg); | ||
| }); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| private sendMessage(content: string): void { | ||
| const encryptedMessage = AES.encrypt(content, this.messageService.conversation.aesKey).toString(); | ||
| const messageIDArry = this.messageService.getAtIDs(content); | ||
| this.conversationApiService.SendMessage(this.messageService.conversation.id, | ||
| encryptedMessage, messageIDArry.slice(1)) | ||
| .subscribe(result => { | ||
| if (result.code === 0) { | ||
| this.router.navigate(['/home'], {replaceUrl: true}); | ||
| Swal.fire( | ||
| 'Send success', | ||
| 'Your message was sent successfully.', | ||
| 'success'); | ||
| } else { | ||
| Swal.fire( | ||
| 'Send failed', | ||
| 'Something went wrong!', | ||
| 'error'); | ||
| } | ||
| }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.