starnakin/42_ft_transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sous une nuit étoilé, dans la capitale où les habitants font grèves en boucle, un jeune homme du nom d'Adrien, plein d'espoir espérant une douce nuit auprès de sa belle et tendre 'Princesse'. Acheta des capotes premier prix dans la pharmacie non loin de la gare. La suite au prochain commit...

Browse Source
This commit is contained in:
Xamora
2024-02-01 12:57:32 +01:00
parent 910a8861e5
commit 8c7c5a3637
14 changed files with 67 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
frontend/static/js/api/chat/notice.js
View File

@ -80,7 +80,7 @@ class Notice {
this.rewrite_invite();
}
else {
let sender = await this.client.profiles.getProfile(send.author_id);
let sender = await this.client.profiles.getProfileId(send.author_id);
create_popup(sender.username + " refuse your invitation");
}
@ -123,7 +123,7 @@ class Notice {
return;
this.data["invited"] = content;
let sender = await this.client.profiles.getProfile(send.author_id);
let sender = await this.client.profiles.getProfileId(send.author_id);
create_popup("Invitation received by " + sender.username);
@ -145,7 +145,7 @@ class Notice {
}
async receive_online_users(send) {
let content = send.content;
let content = send.online;
if (content !== undefined) {
if (this.data["online"].length > 0) {
@ -187,7 +187,7 @@ class Notice {
if (send.status == 400)
create_popup("Friend ask error");
else if (send.status == 409)
create_popup("Already asked friend or already friend");
create_popup("Already asked friend");
}
//if (!send.asked.includes(send.author_id) ||
@ -202,7 +202,7 @@ class Notice {
this.data["asker"] = send.asker;
if (send.author_id != my_id) {
let sender = await this.client.profiles.getProfile(send.author_id);
let sender = await this.client.profiles.getProfileId(send.author_id);
if (this.data["asker"].includes(send.author_id))
create_popup(sender.username + " ask you as friend");
if (this.rewrite_profile !== undefined)
@ -220,8 +220,6 @@ class Notice {
}
async receive_remove_friend(send) {
this.data["asked"] = send.asked;
this.data["asker"] = send.asker;
if (send.author_id == this.client.me.id) {
if (send.status == 400)
@ -233,6 +231,8 @@ class Notice {
if (this.rewrite_profile !== undefined)
await this.rewrite_profile();
this.receive_online_users(send);
}
async accept_friend(user_id) {
@ -246,7 +246,7 @@ class Notice {
async receive_accept_friend(send) {
this.data["asked"] = send.asked;
this.data["asker"] = send.asker;
let sender = await this.client.profiles.getProfile(send.author_id);
let sender = await this.client.profiles.getProfileId(send.author_id);
if (send.author_id == this.client.me.id) {
if (send.status == 400)
@ -262,6 +262,8 @@ class Notice {
if (this.rewrite_profile !== undefined)
await this.rewrite_profile();
this.receive_online_users(send);
}
async refuse_friend(user_id) {
@ -275,7 +277,7 @@ class Notice {
async receive_refuse_friend(send) {
this.data["asked"] = send.asked;
this.data["asker"] = send.asker;
let sender = await this.client.profiles.getProfile(send.author_id);
let sender = await this.client.profiles.getProfileId(send.author_id);
if (send.author_id == this.client.me.id) {
if (send.status == 400)

1
frontend/static/js/api/client.js
View File

@ -73,6 +73,7 @@ class Client
this.notice = new Notice(this);
this.lang = new LanguageManager;
}
/**

8
frontend/static/js/api/profile.js
View File

@ -5,7 +5,7 @@ class Profile
/**
* @param {Client} client
*/
constructor (client, username, id = undefined, avatar_url = undefined)
constructor (client, username=undefined, id=undefined, avatar_url=undefined)
{
/**
* @type {Client} client
@ -36,7 +36,11 @@ class Profile
async init()
{
let response = await this.client._get(`/api/profiles/${this.username}`);
let response;
if (this.username !== undefined)
response = await this.client._get(`/api/profiles/${this.username}`);
else
response = await this.client._get(`/api/profiles/id/${this.id}`);
if (response.status !== 200)
return response.status;

8
frontend/static/js/api/profiles.js
View File

@ -42,6 +42,14 @@ class Profiles
return profile;
}
async getProfileId(id)
{
let profile = new Profile(this.client, undefined, id);
if (await profile.init())
return null;
return profile;
}
/**
* Block a user
* @param {Number} user_id

2
frontend/static/js/views/Search.js
View File

@ -68,7 +68,7 @@ export default class extends AbstractView {
username.setAttribute('data-link', '');
username.id = `username${user.id}`
username.href = `/profiles/${user.username}`;
if (user.id == client.me.id)
if (logged && user.id == client.me.id)
username.style.color = "green";
else {
let online = client.notice.data["online"][user.id];