mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-05-07 06:56:04 +02:00
v2019.10.31.1
This commit is contained in:
+42
-22
@@ -3471,7 +3471,7 @@ if (window.CefSharp) {
|
|||||||
VRCX,
|
VRCX,
|
||||||
nextRefresh: 0,
|
nextRefresh: 0,
|
||||||
isGameRunning: false,
|
isGameRunning: false,
|
||||||
appVersion: '2019.10.31',
|
appVersion: '2019.10.31.1',
|
||||||
latestAppVersion: '',
|
latestAppVersion: '',
|
||||||
ossDialog: false
|
ossDialog: false
|
||||||
},
|
},
|
||||||
@@ -5179,6 +5179,7 @@ if (window.CefSharp) {
|
|||||||
var user = API.user[id];
|
var user = API.user[id];
|
||||||
if (user) {
|
if (user) {
|
||||||
ctx.displayName = user.displayName;
|
ctx.displayName = user.displayName;
|
||||||
|
ctx.trustLevel = user.trustLevel_;
|
||||||
}
|
}
|
||||||
this.friendLog[id] = ctx;
|
this.friendLog[id] = ctx;
|
||||||
});
|
});
|
||||||
@@ -5191,12 +5192,14 @@ if (window.CefSharp) {
|
|||||||
if (!this.friendLog[id]) {
|
if (!this.friendLog[id]) {
|
||||||
var ctx = {
|
var ctx = {
|
||||||
id,
|
id,
|
||||||
displayName: null
|
displayName: null,
|
||||||
|
trustLevel: null
|
||||||
};
|
};
|
||||||
this.$set(this.friendLog, id, ctx);
|
this.$set(this.friendLog, id, ctx);
|
||||||
var ref = API.user[id];
|
var ref = API.user[id];
|
||||||
if (ref) {
|
if (ref) {
|
||||||
ctx.displayName = ref.displayName;
|
ctx.displayName = ref.displayName;
|
||||||
|
ctx.trustLevel = ref.trustLevel_;
|
||||||
this.friendLogTable.data.push({
|
this.friendLogTable.data.push({
|
||||||
created_at: new Date().toJSON(),
|
created_at: new Date().toJSON(),
|
||||||
type: 'Friend',
|
type: 'Friend',
|
||||||
@@ -5239,27 +5242,44 @@ if (window.CefSharp) {
|
|||||||
|
|
||||||
$app.methods.updateFriendship = function (ref) {
|
$app.methods.updateFriendship = function (ref) {
|
||||||
var ctx = this.friendLog[ref.id];
|
var ctx = this.friendLog[ref.id];
|
||||||
if (ctx &&
|
if (ctx) {
|
||||||
ctx.displayName !== ref.displayName) {
|
if (ctx.displayName !== ref.displayName) {
|
||||||
if (ctx.displayName) {
|
if (ctx.displayName) {
|
||||||
this.friendLogTable.data.push({
|
this.friendLogTable.data.push({
|
||||||
created_at: new Date().toJSON(),
|
created_at: new Date().toJSON(),
|
||||||
type: 'DisplayName',
|
type: 'DisplayName',
|
||||||
userId: ref.id,
|
userId: ref.id,
|
||||||
displayName: ref.displayName,
|
displayName: ref.displayName,
|
||||||
previousDisplayName: ctx.displayName
|
previousDisplayName: ctx.displayName
|
||||||
});
|
});
|
||||||
} else if (ctx.displayName === null) {
|
} else if (ctx.displayName === null) {
|
||||||
this.friendLogTable.data.push({
|
this.friendLogTable.data.push({
|
||||||
created_at: new Date().toJSON(),
|
created_at: new Date().toJSON(),
|
||||||
type: 'Friend',
|
type: 'Friend',
|
||||||
userId: ref.id,
|
userId: ref.id,
|
||||||
displayName: ref.displayName
|
displayName: ref.displayName
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
ctx.displayName = ref.displayName;
|
||||||
|
this.saveFriendLog();
|
||||||
|
this.notifyMenu('friendLog');
|
||||||
|
}
|
||||||
|
if (ref.trustLevel_ &&
|
||||||
|
ctx.trustLevel !== ref.trustLevel_) {
|
||||||
|
if (ctx.trustLevel) {
|
||||||
|
this.friendLogTable.data.push({
|
||||||
|
created_at: new Date().toJSON(),
|
||||||
|
type: 'TrustLevel',
|
||||||
|
userId: ref.id,
|
||||||
|
displayName: ref.displayName,
|
||||||
|
trustLevel: ref.trustLevel_,
|
||||||
|
previousTrustLevel: ctx.trustLevel
|
||||||
|
});
|
||||||
|
}
|
||||||
|
ctx.trustLevel = ref.trustLevel_;
|
||||||
|
this.saveFriendLog();
|
||||||
|
this.notifyMenu('friendLog');
|
||||||
}
|
}
|
||||||
ctx.displayName = ref.displayName;
|
|
||||||
this.saveFriendLog();
|
|
||||||
this.notifyMenu('friendLog');
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
+6
-3
@@ -410,7 +410,7 @@
|
|||||||
<template #tool>
|
<template #tool>
|
||||||
<div style="margin:0 0 10px;display:flex;align-items:center">
|
<div style="margin:0 0 10px;display:flex;align-items:center">
|
||||||
<el-select v-model="friendLogTable.filters[0].value" multiple clearable collapse-tags style="flex:1" placeholder="Filter">
|
<el-select v-model="friendLogTable.filters[0].value" multiple clearable collapse-tags style="flex:1" placeholder="Filter">
|
||||||
<el-option v-once v-for="type in ['Friend', 'Unfriend', 'FriendRequest', 'CancelFriendRequest', 'DisplayName']" :key="type" :label="type" :value="type"></el-option>
|
<el-option v-once v-for="type in ['Friend', 'Unfriend', 'FriendRequest', 'CancelFriendRequest', 'DisplayName', 'TrustLevel']" :key="type" :label="type" :value="type"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
<el-input v-model="friendLogTable.filters[1].value" placeholder="Search" style="flex:none;width:150px;margin-left:10px"></el-input>
|
<el-input v-model="friendLogTable.filters[1].value" placeholder="Search" style="flex:none;width:150px;margin-left:10px"></el-input>
|
||||||
</div>
|
</div>
|
||||||
@@ -430,6 +430,9 @@
|
|||||||
<template v-once #default="scope">
|
<template v-once #default="scope">
|
||||||
<span v-if="scope.row.type === 'DisplayName'">{{ scope.row.previousDisplayName }} <i class="el-icon-right"></i> </span>
|
<span v-if="scope.row.type === 'DisplayName'">{{ scope.row.previousDisplayName }} <i class="el-icon-right"></i> </span>
|
||||||
<span v-text="scope.row.displayName || scope.row.userId" @click="showUserDialog(scope.row.userId)" class="x-link"></span>
|
<span v-text="scope.row.displayName || scope.row.userId" @click="showUserDialog(scope.row.userId)" class="x-link"></span>
|
||||||
|
<template v-if="scope.row.type === 'TrustLevel'">
|
||||||
|
<br/><span>({{ scope.row.previousTrustLevel }} <i class="el-icon-right"></i> {{ scope.row.trustLevel }})</span>
|
||||||
|
</template>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="Action" width="80" align="right">
|
<el-table-column label="Action" width="80" align="right">
|
||||||
@@ -1732,8 +1735,8 @@ SOFTWARE.
|
|||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.10/vue.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.10/vue.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue-lazyload/1.3.3/vue-lazyload.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue-lazyload/1.3.3/vue-lazyload.js"></script>
|
||||||
<script src="https://unpkg.com/vue-data-tables@3.4.4/dist/data-tables.min.js"></script>
|
<script src="https://unpkg.com/vue-data-tables@3.4.4/dist/data-tables.min.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.12.0/index.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.11.1/index.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.12.0/locale/en.min.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.11.1/locale/en.min.js"></script>
|
||||||
<script>
|
<script>
|
||||||
(() => {
|
(() => {
|
||||||
var link = document.createElement('link');
|
var link = document.createElement('link');
|
||||||
|
|||||||
+2
-2
@@ -127,8 +127,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/noty/3.2.0-beta/noty.min.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/noty/3.2.0-beta/noty.min.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.10/vue.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.10/vue.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.12.0/index.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.11.1/index.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.12.0/locale/en.min.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.11.1/locale/en.min.js"></script>
|
||||||
<script>
|
<script>
|
||||||
(() => {
|
(() => {
|
||||||
var link = document.createElement('link');
|
var link = document.createElement('link');
|
||||||
|
|||||||
Reference in New Issue
Block a user