summaryrefslogtreecommitdiff
path: root/src/client/pages
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2021-07-26 11:15:42 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2021-07-26 11:15:42 +0900
commit5e6e1e237a2de1c4a1db87f6df66bba380a9c2f0 (patch)
tree9f286de3c26ab68facbeb74f909fdc48b4256d5c /src/client/pages
parentMerge branch 'develop' (diff)
parent12.84.3 (diff)
downloadmisskey-5e6e1e237a2de1c4a1db87f6df66bba380a9c2f0.tar.gz
misskey-5e6e1e237a2de1c4a1db87f6df66bba380a9c2f0.tar.bz2
misskey-5e6e1e237a2de1c4a1db87f6df66bba380a9c2f0.zip
Merge branch 'develop'
Diffstat (limited to 'src/client/pages')
-rw-r--r--src/client/pages/instance/metrics.vue4
-rw-r--r--src/client/pages/instance/queue.vue4
-rw-r--r--src/client/pages/messaging/index.vue4
-rw-r--r--src/client/pages/messaging/messaging-room.vue6
-rw-r--r--src/client/pages/reversi/game.vue6
-rw-r--r--src/client/pages/reversi/index.vue4
6 files changed, 14 insertions, 14 deletions
diff --git a/src/client/pages/instance/metrics.vue b/src/client/pages/instance/metrics.vue
index 407cce9e7f..131af37c7f 100644
--- a/src/client/pages/instance/metrics.vue
+++ b/src/client/pages/instance/metrics.vue
@@ -90,7 +90,7 @@ export default defineComponent({
stats: null,
serverInfo: null,
connection: null,
- queueConnection: os.stream.useChannel('queueStats'),
+ queueConnection: markRaw(os.stream.useChannel('queueStats')),
memUsage: 0,
chartCpuMem: null,
chartNet: null,
@@ -121,7 +121,7 @@ export default defineComponent({
os.api('admin/server-info', {}).then(res => {
this.serverInfo = res;
- this.connection = os.stream.useChannel('serverStats');
+ this.connection = markRaw(os.stream.useChannel('serverStats'));
this.connection.on('stats', this.onStats);
this.connection.on('statsLog', this.onStatsLog);
this.connection.send('requestLog', {
diff --git a/src/client/pages/instance/queue.vue b/src/client/pages/instance/queue.vue
index 8f56fd74bf..e8ec0bc97d 100644
--- a/src/client/pages/instance/queue.vue
+++ b/src/client/pages/instance/queue.vue
@@ -11,7 +11,7 @@
</template>
<script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent, markRaw } from 'vue';
import MkButton from '@client/components/ui/button.vue';
import XQueue from './queue.chart.vue';
import FormBase from '@client/components/form/base.vue';
@@ -35,7 +35,7 @@ export default defineComponent({
title: this.$ts.jobQueue,
icon: 'fas fa-clipboard-list',
},
- connection: os.stream.useChannel('queueStats'),
+ connection: markRaw(os.stream.useChannel('queueStats')),
}
},
diff --git a/src/client/pages/messaging/index.vue b/src/client/pages/messaging/index.vue
index 87ca1890fd..b9c29492c6 100644
--- a/src/client/pages/messaging/index.vue
+++ b/src/client/pages/messaging/index.vue
@@ -37,7 +37,7 @@
</template>
<script lang="ts">
-import { defineAsyncComponent, defineComponent } from 'vue';
+import { defineAsyncComponent, defineComponent, markRaw } from 'vue';
import { getAcct } from '@/misc/acct';
import MkButton from '@client/components/ui/button.vue';
import { acct } from '../../filters/user';
@@ -63,7 +63,7 @@ export default defineComponent({
},
mounted() {
- this.connection = os.stream.useChannel('messagingIndex');
+ this.connection = markRaw(os.stream.useChannel('messagingIndex'));
this.connection.on('message', this.onMessage);
this.connection.on('read', this.onRead);
diff --git a/src/client/pages/messaging/messaging-room.vue b/src/client/pages/messaging/messaging-room.vue
index 6ec60566b6..396f5f56fd 100644
--- a/src/client/pages/messaging/messaging-room.vue
+++ b/src/client/pages/messaging/messaging-room.vue
@@ -36,7 +36,7 @@
</template>
<script lang="ts">
-import { computed, defineComponent } from 'vue';
+import { computed, defineComponent, markRaw } from 'vue';
import XList from '@client/components/date-separated-list.vue';
import XMessage from './messaging-room.message.vue';
import XForm from './messaging-room.form.vue';
@@ -141,10 +141,10 @@ const Component = defineComponent({
this.group = group;
}
- this.connection = os.stream.useChannel('messaging', {
+ this.connection = markRaw(os.stream.useChannel('messaging', {
otherparty: this.user ? this.user.id : undefined,
group: this.group ? this.group.id : undefined,
- });
+ }));
this.connection.on('message', this.onMessage);
this.connection.on('read', this.onRead);
diff --git a/src/client/pages/reversi/game.vue b/src/client/pages/reversi/game.vue
index dc4d11ca4a..ae10b45b5b 100644
--- a/src/client/pages/reversi/game.vue
+++ b/src/client/pages/reversi/game.vue
@@ -5,7 +5,7 @@
</template>
<script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent, markRaw } from 'vue';
import GameSetting from './game.setting.vue';
import GameBoard from './game.board.vue';
import * as os from '@client/os';
@@ -61,9 +61,9 @@ export default defineComponent({
if (this.connection) {
this.connection.dispose();
}
- this.connection = os.stream.useChannel('gamesReversiGame', {
+ this.connection = markRaw(os.stream.useChannel('gamesReversiGame', {
gameId: this.game.id
- });
+ }));
this.connection.on('started', this.onStarted);
});
},
diff --git a/src/client/pages/reversi/index.vue b/src/client/pages/reversi/index.vue
index dd329084a8..cedfd12089 100644
--- a/src/client/pages/reversi/index.vue
+++ b/src/client/pages/reversi/index.vue
@@ -60,7 +60,7 @@
</template>
<script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent, markRaw } from 'vue';
import * as os from '@client/os';
import MkButton from '@client/components/ui/button.vue';
import MkFolder from '@client/components/ui/folder.vue';
@@ -92,7 +92,7 @@ export default defineComponent({
mounted() {
if (this.$i) {
- this.connection = os.stream.useChannel('gamesReversi');
+ this.connection = markRaw(os.stream.useChannel('gamesReversi'));
this.connection.on('invited', this.onInvited);