MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-19 06:43:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

VRDancing Discord RPC

Browse Source
This commit is contained in:
Natsumi
2021-12-02 23:26:27 +13:00
parent 3ab5e6a4f9
commit 694a81c444
2 changed files with 88 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
html/src/app.js
View File

@@ -7977,6 +7977,8 @@ speechSynthesis.getVoices();
var type = gameLog.data.substr(0, gameLog.data.indexOf(' '));
if (type === 'VideoPlay(PyPyDance)') {
this.addGameLogPyPyDance(gameLog, location);
} else if (type === 'VideoPlay(VRDancing)') {
this.addGameLogVRDancing(gameLog, location);
}
return;
case 'photon-event':
@@ -8718,11 +8720,7 @@ speechSynthesis.getVoices();
data.EventType === 'UdonSyncRunProgramAsRPC' &&
data.Data[0] === 'Beep'
) {
var L = API.parseLocation(this.lastLocation.location);
if (
L.worldId !==
'wrld_f20326da-f1ac-45fc-a062-609723b097b1'
) {
if (!this.isDanceWorld(this.lastLocation.location)) {
return;
}
var text = 'Beep';
@@ -9026,12 +9024,8 @@ speechSynthesis.getVoices();
if (typeof gameLog.videoPos !== 'undefined') {
videoPos = gameLog.videoPos;
}
var L = API.parseLocation(location);
if (
L.worldId !== 'wrld_f20326da-f1ac-45fc-a062-609723b097b1' ||
gameLog.videoId === 'YouTube'
) {
// skip PyPyDance videos
if (!this.isDanceWorld(location) || gameLog.videoId === 'YouTube') {
// skip PyPyDance and VRDancing videos
try {
var url = new URL(videoUrl);
var id1 = url.pathname;
@@ -9095,18 +9089,9 @@ speechSynthesis.getVoices();
text2 = text2.substr(text2.indexOf(':') + 2);
}
var videoName = text2.slice(0, -1);
var userId = '';
if (displayName === 'Random') {
displayName = '';
}
if (displayName) {
for (var ref of API.cachedUsers.values()) {
if (ref.displayName === displayName) {
userId = ref.id;
break;
}
}
}
if (videoUrl === this.nowPlaying.url) {
var entry = {
created_at: gameLog.dt,
@@ -9117,6 +9102,74 @@ speechSynthesis.getVoices();
this.setNowPlaying(entry);
return;
}
var userId = '';
if (displayName) {
for (var ref of API.cachedUsers.values()) {
if (ref.displayName === displayName) {
userId = ref.id;
break;
}
}
}
if (videoId === 'YouTube') {
var entry = {
dt: gameLog.dt,
videoUrl,
displayName,
videoPos,
videoId
};
this.addGameLogVideo(entry, location, userId);
} else {
var entry = {
created_at: gameLog.dt,
type: 'VideoPlay',
videoUrl,
videoId,
videoName,
videoLength,
location,
displayName,
userId,
videoPos
};
this.setNowPlaying(entry);
}
};
$app.methods.addGameLogVRDancing = function (gameLog, location) {
var data =
/VideoPlay\(VRDancing\) "(.+?)",([\d.]+),([\d.]+),([\d.]+),"(.+?)","(.+?)"/g.exec(
gameLog.data
);
var videoUrl = data[1];
var videoPos = Number(data[2]);
var videoLength = Number(data[3]);
var videoId = Number(data[4]);
var displayName = data[5];
var videoName = data[6];
if (videoId === -1) {
videoId = 'YouTube';
}
if (videoUrl === this.nowPlaying.url) {
var entry = {
created_at: gameLog.dt,
videoUrl,
videoLength,
videoPos
};
this.setNowPlaying(entry);
return;
}
var userId = '';
if (displayName) {
for (var ref of API.cachedUsers.values()) {
if (ref.displayName === displayName) {
userId = ref.id;
break;
}
}
}
if (videoId === 'YouTube') {
var entry = {
dt: gameLog.dt,
@@ -9409,11 +9462,7 @@ speechSynthesis.getVoices();
buttonText = '';
buttonUrl = '';
}
if (
(!hidePrivate &&
L.worldId === 'wrld_f20326da-f1ac-45fc-a062-609723b097b1') ||
L.worldId === 'wrld_42377cf1-c54f-45ed-8996-5875b0573a83'
) {
if (!hidePrivate && this.isDanceWorld(L.tag)) {
// dance world rpc
if (L.worldId === 'wrld_f20326da-f1ac-45fc-a062-609723b097b1') {
appId = '784094509008551956';
@@ -11215,17 +11264,24 @@ speechSynthesis.getVoices();
AppApi.ExecuteVrOverlayFunction('configUpdate', json);
};
$app.methods.isDanceWorld = function (location) {
var danceWorlds = [
'wrld_f20326da-f1ac-45fc-a062-609723b097b1',
'wrld_42377cf1-c54f-45ed-8996-5875b0573a83'
];
var L = API.parseLocation(location);
if (danceWorlds.includes(L.worldId)) {
return true;
}
return false;
};
$app.methods.updateVRLastLocation = function () {
var progressPie = false;
if (this.progressPie) {
progressPie = true;
if (this.progressPieFilter) {
var L = API.parseLocation(this.lastLocation.location);
var danceWorlds = [
'wrld_f20326da-f1ac-45fc-a062-609723b097b1',
'wrld_42377cf1-c54f-45ed-8996-5875b0573a83'
];
if (!danceWorlds.includes(L.worldId)) {
if (!this.isDanceWorld(this.lastLocation.location)) {
progressPie = false;
}
}

2
html/src/index.pug
View File

@@ -1543,7 +1543,7 @@ html
span \#{{ room.$location.instanceName }} {{ room.$location.accessType }}
span.famfamfam-flags(v-if="room.$location.region === 'eu'" class="europeanunion" style="display:inline-block;margin-left:5px")
span.famfamfam-flags(v-else-if="room.$location.region === 'jp'" class="jp" style="display:inline-block;margin-left:5px")
span.flag-icon-use(v-else-if="currentInstanceLocation.region === 'use'" style="display:inline-block;margin-left:5px")
span.flag-icon-use(v-else-if="room.$location.region === 'use'" style="display:inline-block;margin-left:5px")
span.flag-icon-usw(v-else style="display:inline-block;margin-left:5px")
el-tooltip(placement="top" content="Invite yourself" :disabled="hideTooltips")
invite-yourself(:location="room.$location.tag" style="margin-left:5px")