MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-11 10:53:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Request invites and friend requests

Browse Source
This commit is contained in:
Natsumi
2020-11-19 06:44:03 +13:00
committed by pypy
parent fd36751019
commit e0fb98d86c
2 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
html/src/vr.js
View File

@@ -678,6 +678,18 @@ import webApiService from './service/webapi.js';
map[feed.senderUsername] = feed.created_at;
}
}
else if (feed.type === 'requestInvite') {
if (!map[feed.senderUsername] ||
map[feed.senderUsername] < feed.created_at) {
map[feed.senderUsername] = feed.created_at;
}
}
else if (feed.type === 'friendRequest') {
if (!map[feed.senderUsername] ||
map[feed.senderUsername] < feed.created_at) {
map[feed.senderUsername] = feed.created_at;
}
}
});
// disable notification on busy
if (this.currentUserStatus === 'busy') {
@@ -710,6 +722,20 @@ import webApiService from './service/webapi.js';
notys.push(feed);
}
}
else if (feed.type === 'requestInvite') {
if (!map[feed.senderUsername] ||
map[feed.senderUsername] < feed.created_at) {
map[feed.senderUsername] = feed.created_at;
notys.push(feed);
}
}
else if (feed.type === 'friendRequest') {
if (!map[feed.senderUsername] ||
map[feed.senderUsername] < feed.created_at) {
map[feed.senderUsername] = feed.created_at;
notys.push(feed);
}
}
});
var bias = new Date(Date.now() - 60000).toJSON();
var theme = 'relax';
@@ -754,6 +780,20 @@ import webApiService from './service/webapi.js';
text: `<strong>${noty.senderUsername}</strong> has invited you to ${noty.details.worldName}`
}).show();
break;
case 'requestInvite':
new Noty({
type: 'alert',
theme: theme,
text: `<strong>${noty.senderUsername}</strong> has requested an invite`
}).show();
break;
case 'friendRequest':
new Noty({
type: 'alert',
theme: theme,
text: `<strong>${noty.senderUsername}</strong> has sent you a friend request`
}).show();
break;
}
}
});

20
html/src/vr.pug
View File

@@ -58,6 +58,16 @@ html
span.time {{ feed.created_at | formatDate('HH:MI') }}
| 📨 #[span.name(v-text="feed.senderUsername")]
| #[span(v-text="feed.details.worldName")]
div(v-else-if="feed.type === 'requestInvite'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }")
.detail
span.extra
span.time {{ feed.created_at | formatDate('HH:MI') }}
| 📩 #[span.name(v-text="feed.senderUsername")]
div(v-else-if="feed.type === 'friendRequest'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }")
.detail
span.extra
span.time {{ feed.created_at | formatDate('HH:MI') }}
| 💚 #[span.name(v-text="feed.senderUsername")]
template(v-else)
template(v-for="feed in feeds")
.x-friend-item(v-if="feed.type === 'GPS'" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }")
@@ -101,6 +111,16 @@ html
span.time {{ feed.created_at | formatDate('HH:MI') }}
| #[span.name(v-text="feed.senderUsername")] has invited you to
| #[span(v-text="feed.details.worldName")]
div(v-else-if="feed.type === 'requestInvite'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }")
.detail
span.extra
span.time {{ feed.created_at | formatDate('HH:MI') }}
| #[span.name(v-text="feed.senderUsername")] has requested an invite
div(v-else-if="feed.type === 'friendRequest'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }")
.detail
span.extra
span.time {{ feed.created_at | formatDate('HH:MI') }}
| #[span.name(v-text="feed.senderUsername")] has sent you a friend request
.x-container
div(style="display:flex;flex-direction:row")
template(v-if="devices.length")