diff --git a/LogWatcher.cs b/LogWatcher.cs index 2d29e9a4..044b9ad3 100644 --- a/LogWatcher.cs +++ b/LogWatcher.cs @@ -193,6 +193,7 @@ namespace VRCX if (ParseLogOnPlayerJoinedOrLeft(fileInfo, logContext, line, offset) == true || ParseLogLocation(fileInfo, logContext, line, offset) == true || ParseLogPortalSpawn(fileInfo, logContext, line, offset) == true || + ParseLogNotification(fileInfo, logContext, line, offset) == true || ParseLogJoinBlocked(fileInfo, logContext, line, offset) == true || ParseLogAvatarPedestalChange(fileInfo, logContext, line, offset) == true || ParseLogVideoPlay(fileInfo, logContext, line, offset) == true || @@ -204,8 +205,7 @@ namespace VRCX continue; } - if (ParseLogNotification(fileInfo, logContext, line, 34) == true || - ParseLogShaderKeywordsLimit(fileInfo, logContext, line, 34) == true || + if (ParseLogShaderKeywordsLimit(fileInfo, logContext, line, 34) == true || ParseLogSDK2VideoPlay(fileInfo, logContext, line, 34) == true) { continue; @@ -546,7 +546,7 @@ namespace VRCX private bool ParseLogNotification(FileInfo fileInfo, LogContext logContext, string line, int offset) { - // 2021.01.03 05:48:58 Log - Received Notification: < Notification from username:pypy, sender user id:usr_4f76a584-9d4b-46f6-8209-8305eb683661 to of type: friendRequest, id: not_3a8f66eb-613c-4351-bee3-9980e6b5652c, created at: 01/14/2021 15:38:40 UTC, details: {{}}, type:friendRequest, m seen:False, message: ""> received at 01/02/2021 16:48:58 UTC + // 2021.01.03 05:48:58 Log - [API] Received Notification: < Notification from username:pypy, sender user id:usr_4f76a584-9d4b-46f6-8209-8305eb683661 to of type: friendRequest, id: not_3a8f66eb-613c-4351-bee3-9980e6b5652c, created at: 01/14/2021 15:38:40 UTC, details: {{}}, type:friendRequest, m seen:False, message: ""> received at 01/02/2021 16:48:58 UTC if (string.Compare(line, offset, "Received Notification: <", 0, 24, StringComparison.Ordinal) != 0) { diff --git a/html/src/app.js b/html/src/app.js index 84cc5e3d..18a28d63 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -6178,6 +6178,11 @@ speechSynthesis.getVoices(); value: [], filterFn: (row, filter) => filter.value.some((v) => v === row.type) }, + { + prop: 'type', + value: true, + filterFn: (row, filter) => row.type !== 'Notification' + }, { prop: 'data', value: '' diff --git a/html/src/index.pug b/html/src/index.pug index 0f5c1a64..f89b86f8 100644 --- a/html/src/index.pug +++ b/html/src/index.pug @@ -174,7 +174,7 @@ html template(#tool) div(style="margin:0 0 10px;display:flex;align-items:center") el-select(v-model="gameLogTable.filters[0].value" multiple clearable collapse-tags style="flex:1" placeholder="Filter") - el-option(v-once v-for="type in ['Location', 'OnPlayerJoined', 'OnPlayerLeft', 'Notification', 'PortalSpawn', 'Event', 'VideoPlay']" :key="type" :label="type" :value="type") + el-option(v-once v-for="type in ['Location', 'OnPlayerJoined', 'OnPlayerLeft', 'PortalSpawn', 'Event', 'VideoPlay']" :key="type" :label="type" :value="type") el-input(v-model="gameLogTable.filters[1].value" placeholder="Search" style="flex:none;width:150px;margin:0 10px") el-button(type="default" @click="resetGameLog()" icon="el-icon-refresh" circle style="flex:none") el-table-column(label="Date" prop="created_at" sortable="custom" width="90")