diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 14fb28b8c9..15d5516399 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -1,6 +1,6 @@ name: Docker Image CI -on: [push] +on: [push, pull_request, release] jobs: build: diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 3a33d1742e..fb2a51a736 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -1,5 +1,5 @@ name: Node.js CI -on: [push] +on: [push, pull_request, release] jobs: build_and_test: diff --git a/.node-version b/.node-version index e329619ca2..2ab3d4be55 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -v16.19.1 +v16.20.2 diff --git a/Dockerfile b/Dockerfile index 140f97ce2d..8dc0c76ba1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16.19.1-bullseye AS builder +FROM node:16.20.2-bullseye AS builder ENV NODE_ENV=production WORKDIR /misskey @@ -12,7 +12,7 @@ COPY . ./ RUN yarn build -FROM node:16.19.1-bullseye-slim AS runner +FROM node:16.20.2-bullseye-slim AS runner WORKDIR /misskey diff --git a/package.json b/package.json index 7094d3da1b..0631e6468f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "groundpolis-milkey", - "version": "2022.07.03-milkey-2.7", + "version": "2022.07.03-milkey-2.8", "private": true, "author": "Xeltica , Minemu , Azuki⪥ , Remito , atsu1125 ", "contributors": [ @@ -54,6 +54,7 @@ "@koa/cors": "3.1.0", "@koa/multer": "3.0.0", "@koa/router": "9.0.1", + "@peertube/http-signature": "1.7.0", "@sentry/browser": "7.5.1", "@sentry/tracing": "5.29.2", "@sinonjs/fake-timers": "10.0.0", @@ -228,13 +229,13 @@ "sass": "1.49.9", "sass-loader": "13.2.0", "seedrandom": "3.0.5", - "sharp": "0.31.1", + "sharp": "0.32.6", "speakeasy": "2.0.0", "stringz": "2.1.0", "style-loader": "3.3.1", "summaly": "2.7.0", "syslog-pro": "1.0.0", - "systeminformation": "5.12.6", + "systeminformation": "5.21.7", "syuilo-password-strength": "0.0.1", "terser-webpack-plugin": "4.2.3", "textarea-caret": "3.1.0", diff --git a/src/client/components/note-detailed.vue b/src/client/components/note-detailed.vue index 44fcc23e8b..05585eebdf 100644 --- a/src/client/components/note-detailed.vue +++ b/src/client/components/note-detailed.vue @@ -395,6 +395,7 @@ export default defineComponent({ capture(withHandler = false) { if (this.$i) { this.connection.send(document.body.contains(this.$el) ? 'sn' : 's', { id: this.appearNote.id }); + if (this.note.id !== this.appearNote.id) this.connection.send('s', { id: this.note.id }); if (withHandler) this.connection.on('noteUpdated', this.onStreamNoteUpdated); } }, @@ -404,6 +405,11 @@ export default defineComponent({ this.connection.send('un', { id: this.appearNote.id }); + if (this.note.id !== this.appearNote.id) { + this.connection.send('un', { + id: this.note.id, + }); + } if (withHandler) this.connection.off('noteUpdated', this.onStreamNoteUpdated); } }, @@ -415,7 +421,7 @@ export default defineComponent({ onStreamNoteUpdated(data) { const { type, id, body } = data; - if (id !== this.appearNote.id) return; + if ((id !== this.note.id) && (id !== this.appearNote.id)) return; switch (type) { case 'reacted': { diff --git a/src/client/components/note.vue b/src/client/components/note.vue index 73f8238303..69958907d1 100644 --- a/src/client/components/note.vue +++ b/src/client/components/note.vue @@ -289,7 +289,7 @@ export default defineComponent({ }, canRenote(): boolean { - return ['public', 'home'].includes(this.appearNote.visibility) || this.isMyNote; + return ['public', 'home'].includes(this.appearNote.visibility) || (['followers', 'users'].includes(this.appearNote.visibility) && this.isMyNote); }, reactionsCount(): number { @@ -385,6 +385,7 @@ export default defineComponent({ capture(withHandler = false) { if (this.$i) { this.connection.send(document.body.contains(this.$el) ? 'sn' : 's', { id: this.appearNote.id }); + if (this.note.id !== this.appearNote.id) this.connection.send('s', { id: this.note.id }); if (withHandler) this.connection.on('noteUpdated', this.onStreamNoteUpdated); } }, @@ -394,6 +395,11 @@ export default defineComponent({ this.connection.send('un', { id: this.appearNote.id }); + if (this.note.id !== this.appearNote.id) { + this.connection.send('un', { + id: this.note.id, + }); + } if (withHandler) this.connection.off('noteUpdated', this.onStreamNoteUpdated); } }, @@ -405,7 +411,7 @@ export default defineComponent({ onStreamNoteUpdated(data) { const { type, id, body } = data; - if (id !== this.appearNote.id) return; + if ((id !== this.note.id) && (id !== this.appearNote.id)) return; switch (type) { case 'reacted': { diff --git a/src/client/pages/instance/announcements.vue b/src/client/pages/instance/announcements.vue index ce0633740d..b3d8ef24f3 100644 --- a/src/client/pages/instance/announcements.vue +++ b/src/client/pages/instance/announcements.vue @@ -20,6 +20,7 @@ + {{ $ts.more }} @@ -27,7 +28,7 @@