Skip to content
This repository has been archived by the owner on Mar 26, 2022. It is now read-only.

Commit

Permalink
Merge 1b0bac4 into 3042e5e
Browse files Browse the repository at this point in the history
  • Loading branch information
@Nacho888
Nacho888 committed Mar 24, 2019
2 parents 3042e5e + 1b0bac4 commit 0602af5
Show file tree
Hide file tree
Showing 3 changed files with 229 additions and 75 deletions.
12 changes: 5 additions & 7 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

152 changes: 117 additions & 35 deletions src/app/services/chat.service.ts
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import { Injectable } from '@angular/core';
import { Observable, of, BehaviorSubject, timer } from 'rxjs';
import { mergeMap } from 'rxjs/operators';
import {Injectable} from '@angular/core';
import {BehaviorSubject, Observable, of} from 'rxjs';

import { ChatMessage } from '../models/chat-message.model';
import { RdfService } from './rdf.service';
import { User } from '../models/user.model';
import { ToastrService } from 'ngx-toastr';
import {ChatMessage} from '../models/chat-message.model';
import {RdfService} from './rdf.service';
import {User} from '../models/user.model';
import {ToastrService} from 'ngx-toastr';

import * as fileClient from 'solid-file-client';
import { Message } from '@angular/compiler/src/i18n/i18n_ast';

@Injectable()
export class ChatService {
Expand All @@ -24,6 +22,12 @@ export class ChatService {

friends: Array<User> = new Array<User>();

/**
* First it will try to get the session and then to load the current user in session data.
* It will also load the user's friends.
* @param rdf Service to access and manage all the actions with SOLID.
* @param toastr To display error messages.
*/
constructor(private rdf: RdfService, private toastr: ToastrService) {
this.rdf.getSession();
this.loadUserData().then(response => {
Expand All @@ -35,35 +39,54 @@ export class ChatService {

// Observables

/**
* Returns current user in session as an Observable.
*/
getUser() {
return this.thisUser.asObservable();
}

/**
* Returns the other user (as an Observable) whose talking with the current user in session.
*/
getOtherUser() {
return of(this.otherUser);
}

/**
* Returns all the current user friends.
*/
getUsers(): Observable<User[]> {
return of(this.friends);
}

/**
* Checks is there's a conversation opened.
*/
isChatActive(): Observable<boolean> {
return this.isActive.asObservable();
}

/**
* Returns an observable of all the messages in a specific conversation.
*/
getMessages(): Observable<ChatMessage[]> {
return of(this.chatMessages);
}

// Loading methods

/**
* Waits for user to be in session, then finds its name, profile picture and webId to be used
* in the application.
*/
private async loadUserData() {
await this.rdf.getSession();
if (!this.rdf.session) {
return;
}
const webId = this.rdf.session.webId;
let user : User = new User(webId, '', '');
const user: User = new User(webId, '', '');
await this.rdf.getFieldAsStringFromProfile('fn').then(response => {
user.username = response;
});
Expand All @@ -74,6 +97,9 @@ export class ChatService {
this.thisUser.next(user);
}

/**
* Load current user's friends with their names and profile pictures sorted by username.
*/
private async loadFriends() {
await this.rdf.getSession();
if (!this.rdf.session) {
Expand All @@ -87,19 +113,27 @@ export class ChatService {
});
}

/**
* Load all messages from SOLID between the current user and the other user whose talking.
*/
private async loadMessages() {
console.log('Loading messages...');
if (!this.isActive) {
return;
}
await this.rdf.getSession();
this.chatMessages.length = 0;
this.loadMessagesFromTo(this.otherUser, this.thisUser.value);
this.loadMessagesFromTo(this.thisUser.value, this.otherUser);
await this.loadMessagesFromTo(this.otherUser, this.thisUser.value);
await this.loadMessagesFromTo(this.thisUser.value, this.otherUser);
}

/**
* Auxiliary method to load messages with all their details (date, text, sender) between user1 and user2.
* @param user1 First pair of the communication.
* @param user2 Second pair of the communication.
*/
private async loadMessagesFromTo(user1: User, user2: User) {
const messages = (await this.rdf.getElementsFromContainer(await this.getChatUrl(user1, user2)))
const messages = (await this.rdf.getElementsFromContainer(await this.getChatUrl(user1, user2)));
if (!messages) {
this.toastr.error('Please make sure the other user has clicked on your chat', 'Could not load messages');
this.isActive.next(false);
Expand All @@ -113,40 +147,53 @@ export class ChatService {
const text = this.rdf.getValueFromSchema('text', url);
const date = Date.parse(this.rdf.getValueFromSchema('dateSent', url));
const name = await this.rdf.getFriendData(sender, 'fn');
//console.log('Messages loaded: ' + messages);
// console.log('Messages loaded: ' + messages);
this.addMessage(new ChatMessage(name, text, date));
});
}

// Message methods

/**
* Gets the URL for the chat resource location
* @param user1 user who sends
* @param user2 user who recieves
* Gets the URL for the chat resource location.
* @param user1 User who sends.
* @param user2 User who receives.
*/
private async getChatUrl(user1: User, user2: User): Promise<String> {
await this.rdf.getSession();
const root = user1.webId.replace('/profile/card#me', '/private/dechat/chat_');
const name = user2.webId.split('/')[2].split('.')[0];
const finalUrl = root + name + '/';
// console.log(finalUrl);
return finalUrl;
// console.log(root + name + '/');
return root + name + '/';
}

private sortByDateDesc(m1: ChatMessage, m2: ChatMessage) {
return m1.timeSent > m2.timeSent ? 1 : m1.timeSent < m2.timeSent ? -1 : 0;
}
/**
* Auxiliary comparator method to sort messages by their date.
* @param m1 A message.
* @param m2 Another message.
*/
private sortByDateDesc = (m1: ChatMessage, m2: ChatMessage) => m1.timeSent > m2.timeSent ? 1 : m1.timeSent < m2.timeSent ? -1 : 0;

private sortUserByName(u1: User, u2: User) {
return u1.username.localeCompare(u2.username);
}
/**
* Auxiliary comparator method to sort users by their name.
* @param u1 An user.
* @param u2 Another user.
*/
private sortUserByName = (u1: User, u2: User) => u1.username.localeCompare(u2.username);

/**
* Method to add a message to the ones present in the system.
* @param message Message to be added.
*/
private addMessage(message: ChatMessage) {
this.chatMessages.push(message);
this.chatMessages.sort(this.sortByDateDesc);
}

/**
* Method to send a message to SOLID.
* @param msg Text of the message to be sent.
*/
async sendMessage(msg: string) {
if (msg !== '' && this.otherUser) {
const newMsg = new ChatMessage(this.thisUser.value.username, msg);
Expand All @@ -155,6 +202,10 @@ export class ChatService {
}
}

/**
* Method that declares the structure of the message in XML and sends it to SOLID.
* @param msg Instance of the message to be sent.
*/
private async postMessage(msg: ChatMessage) {
const message = `
@prefix : <#>.
Expand All @@ -169,12 +220,16 @@ export class ChatService {
`;
const path = await this.getChatUrl(this.thisUser.value, this.otherUser) + 'message.ttl';
fileClient.createFile(path).then((fileCreated: any) => {
fileClient.updateFile(fileCreated, message).then( success => {
console.log('Message has been sended succesfully');
}, (err: any) => console.log(err) );
fileClient.updateFile(fileCreated, message).then(success => {
console.log('Message has been sent successfully');
}, (err: any) => console.log(err));
});
}

/**
* Method invoked we switch to another conversation with a different user.
* @param user The new user we are talking to.
*/
async changeChat(user: User) {
this.isActive.next(true);
this.otherUser = user;
Expand All @@ -185,12 +240,20 @@ export class ChatService {

// Solid methods

/**
* Adds a friend to your SOLID profile given its webId.
* @param webId Of the user that we are adding.
*/
addFriend(webId: string) {
if (this.thisUser.value.webId !== webId) {
this.rdf.addFriend(webId);
}
}

/**
* Removes a friend to your SOLID profile given its webId and deletes all the stored conversations.
* @param webId Of the user that we are removing.
*/
removeFriend(webId: string) {
const name = webId.split('/')[2].split('.')[0];
if (this.thisUser.value.webId !== webId) {
Expand All @@ -201,41 +264,60 @@ export class ChatService {
}
}

/**
* Removes the conversation (its folder structure in the application) with a user
* given a path.
* @param path Of the folder to be deleted.
*/
private async removeFolderStructure(path: string) {
fileClient.deleteFolder(path).then((success: any) => {
console.log(`Removed folder ${path}.`);
}, (err: any) => console.log(err));
}

/**
* Method that evaluates if its possible to chat with another user (it has the correct folder
* structure) and if it's not possible it will create the appropriate folder structure and give
* the permissions.
*/
async checkFolderStructure() {
await this.rdf.getSession();
try {
this.getChatUrl(this.thisUser.value, this.otherUser).then(charUrl => {
fileClient.readFolder(charUrl).then((success: any) => {
console.log('Folder structure correct');
}, (err: any) => {
console.log('Attempting to create: ' + charUrl);
this.createFolderStructure(charUrl).then(res => {
console.log('Creating ACL file...');
this.grantAccessToFolder(charUrl, this.otherUser);
});
console.log('Attempting to create: ' + charUrl);
this.createFolderStructure(charUrl).then(res => {
console.log('Creating ACL file...');
this.grantAccessToFolder(charUrl, this.otherUser);
});
});
});
} catch (error) {
console.log(`Error creating folder structure/with permissions: ${error}`);
}
}

/**
* Auxiliary method to create a folder structure given its path.
* @param path To the folder to be created.
*/
private async createFolderStructure(path: String) {
await fileClient.createFolder(path).then((success: any) => {
console.log(`Created folder ${path}.`);
}, (err: string) => console.log('Could not create folder structure: ' + err));
}

/**
* Method that creates the ACL structure to grant VIEW permissions to a user to a folder.
* @param path To the folder whose permissions we are going to modify.
* @param user To grant permissions.
*/
private grantAccessToFolder(path: string | String, user: User) {
const webId = user.webId.replace('#me', '#');
const acl =
`@prefix : <#>.
`@prefix : <#>.
@prefix n0: <http://www.w3.org/ns/auth/acl#>.
@prefix ch: <./>.
@prefix c: </profile/card#>.
Expand All @@ -258,4 +340,4 @@ export class ChatService {
console.log('Folder permisions added');
}, (err: string) => console.log('Could not set folder permisions' + err));
}
}
}
Loading

0 comments on commit 0602af5

Please sign in to comment.