Revert "Release 2022.07.03-milkey-2.8 (#72)"

This reverts commit 35eafcb.

.github/workflows/dockerimage.yml

@@ -1,6 +1,6 @@
 name: Docker Image CI
 
-on: [push, pull_request, release]
+on: [push]
 
 jobs:
   build:

.github/workflows/nodejs.yml

@@ -1,5 +1,5 @@
 name: Node.js CI
-on: [push, pull_request, release]
+on: [push]
 
 jobs:
   build_and_test:

.node-version

@@ -1 +1 @@
-v16.20.2
+v16.19.1

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16.20.2-bullseye AS builder
+FROM node:16.19.1-bullseye AS builder
 
 ENV NODE_ENV=production
 WORKDIR /misskey
@@ -12,7 +12,7 @@ COPY . ./
 RUN yarn build
 
 
-FROM node:16.20.2-bullseye-slim AS runner
+FROM node:16.19.1-bullseye-slim AS runner
 
 WORKDIR /misskey
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "groundpolis-milkey",
-	"version": "2022.07.03-milkey-2.8",
+	"version": "2022.07.03-milkey-2.7",
 	"private": true,
 	"author": "Xeltica <[email protected]> , Minemu <[email protected]> , Azuki⪥ <[email protected]> , Remito <[email protected]> , atsu1125 <[email protected]>",
 	"contributors": [
@@ -54,7 +54,6 @@
 		"@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",
@@ -229,13 +228,13 @@
 		"sass": "1.49.9",
 		"sass-loader": "13.2.0",
 		"seedrandom": "3.0.5",
-		"sharp": "0.32.6",
+		"sharp": "0.31.1",
 		"speakeasy": "2.0.0",
 		"stringz": "2.1.0",
 		"style-loader": "3.3.1",
 		"summaly": "2.7.0",
 		"syslog-pro": "1.0.0",
-		"systeminformation": "5.21.7",
+		"systeminformation": "5.12.6",
 		"syuilo-password-strength": "0.0.1",
 		"terser-webpack-plugin": "4.2.3",
 		"textarea-caret": "3.1.0",

src/client/components/note-detailed.vue

@@ -395,7 +395,6 @@ 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);
 			}
 		},
@@ -405,11 +404,6 @@ 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);
 			}
 		},
@@ -421,7 +415,7 @@ export default defineComponent({
 		onStreamNoteUpdated(data) {
 			const { type, id, body } = data;
 
-			if ((id !== this.note.id) && (id !== this.appearNote.id)) return;
+			if (id !== this.appearNote.id) return;
 
 			switch (type) {
 				case 'reacted': {

src/client/components/note.vue

@@ -289,7 +289,7 @@ export default defineComponent({
 		},
 
 		canRenote(): boolean {
-			return ['public', 'home'].includes(this.appearNote.visibility) || (['followers', 'users'].includes(this.appearNote.visibility) && this.isMyNote);
+			return ['public', 'home'].includes(this.appearNote.visibility) || this.isMyNote;
 		},
 
 		reactionsCount(): number {
@@ -385,7 +385,6 @@ 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);
 			}
 		},
@@ -395,11 +394,6 @@ 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);
 			}
 		},
@@ -411,7 +405,7 @@ export default defineComponent({
 		onStreamNoteUpdated(data) {
 			const { type, id, body } = data;
 
-			if ((id !== this.note.id) && (id !== this.appearNote.id)) return;
+			if (id !== this.appearNote.id) return;
 
 			switch (type) {
 				case 'reacted': {

src/client/pages/instance/announcements.vue

@@ -20,15 +20,14 @@
 					</div>
 				</div>
 			</section>
-			<MkButton class="button" inline @click="more()"><Fa :icon="faEllipsisH"/> {{ $ts.more }}</MkButton>
 		</div>
 	</div>
 </div>
 </template>
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { faBroadcastTower, faPlus, faEllipsisH } from '@fortawesome/free-solid-svg-icons';
+import { faBroadcastTower, faPlus } from '@fortawesome/free-solid-svg-icons';
 import { faSave, faTrashAlt } from '@fortawesome/free-regular-svg-icons';
 import MkButton from '@/components/ui/button.vue';
 import MkInput from '@/components/ui/input.vue';
@@ -53,7 +52,7 @@ export default defineComponent({
 				},
 			},
 			announcements: [],
-			faBroadcastTower, faSave, faTrashAlt, faEllipsisH
+			faBroadcastTower, faSave, faTrashAlt
 		}
 	},
 
@@ -92,7 +91,6 @@ export default defineComponent({
 						type: 'success',
 						text: this.$ts.saved
 					});
-					this.refresh();
 				}).catch(e => {
 					os.dialog({
 						type: 'error',
@@ -112,20 +110,6 @@ export default defineComponent({
 					});
 				});
 			}
-		},
-
-		refresh() {
-			os.api('admin/announcements/list').then(announcements => {
-				this.announcements = announcements;
-			});
-		},
-
-		more() {
-			const announcements = this.announcements;
-
-			os.api('admin/announcements/list', { untilId: announcements.reduce((acc, announcement) => announcement.id != null ? announcement : acc).id }).then(announcements => {
-				this.announcements = this.announcements.concat(announcements);
-			});
 		}
 	}
 });

src/queue/index.ts

@@ -1,5 +1,5 @@
 import * as Queue from 'bull';
-import * as httpSignature from '@peertube/http-signature';
+import * as httpSignature from 'http-signature';
 
 import config from '../config';
 import { ILocalUser } from '../models/entities/user';

src/queue/processors/deliver.ts

@@ -69,20 +69,11 @@ export default async (job: Bull.Job) => {
 		if (res != null && res.hasOwnProperty('statusCode')) {
 			// 4xx
 			if (res.statusCode >= 400 && res.statusCode < 500) {
-				// 401,408,429がどうもpermanent errorじゃなさそう
-				if (res.statusCode === 401 || res.statusCode === 408 || res.statusCode === 429) {
-					throw `${res.statusCode} ${res.statusMessage}`;
-				}
 				// HTTPステータスコード4xxはクライアントエラーであり、それはつまり
 				// 何回再送しても成功することはないということなのでエラーにはしないでおく
 				return `${res.statusCode} ${res.statusMessage}`;
 			}
 
-			// ただし501は成功することはない
-			if (res.statusCode === 501) {
-				return `${res.statusCode} ${res.statusMessage}`;
-			}
-
 			// 5xx etc.
 			throw `${res.statusCode} ${res.statusMessage}`;
 		} else {

src/queue/processors/inbox.ts

@@ -1,5 +1,5 @@
 import * as Bull from 'bull';
-import * as httpSignature from '@peertube/http-signature';
+import * as httpSignature from 'http-signature';
 import perform from '../../remote/activitypub/perform';
 import Logger from '../../services/logger';
 import { registerOrFetchInstanceDoc } from '../../services/register-or-fetch-instance-doc';
@@ -13,7 +13,6 @@ import { InboxJobData } from '..';
 import DbResolver from '../../remote/activitypub/db-resolver';
 import { resolvePerson } from '../../remote/activitypub/models/person';
 import { LdSignature } from '../../remote/activitypub/misc/ld-signature';
-import { verifySignature } from '../../remote/activitypub/check-fetch.js';
 
 const logger = new Logger('inbox');
 
@@ -67,10 +66,6 @@ export default async (job: Bull.Job<InboxJobData>): Promise<string> => {
 	// HTTP-Signatureの検証
 	const httpSignatureValidated = httpSignature.verifySignature(signature, authUser.key.keyPem);
 
-	if (httpSignatureValidated) {
-		if (!verifySignature(signature, authUser.key)) return `skip: Invalid HTTP signature`;
-	}
-
 	// また、signatureのsignerは、activity.actorと一致する必要がある
 	if (!httpSignatureValidated || authUser.user.uri !== activity.actor) {
 		// 一致しなくても、でもLD-Signatureがありそうならそっちも見る

src/queue/types.ts

@@ -1,7 +1,7 @@
 import { DriveFile } from '../models/entities/drive-file';
 import { User } from '../models/entities/user';
 import { IActivity } from '../remote/activitypub/type';
-import * as httpSignature from '@peertube/http-signature';
+import * as httpSignature from 'http-signature';
 
 export type DeliverJobData = {
 	/** Actor */

src/remote/activitypub/audience.ts

@@ -80,7 +80,7 @@ function groupingAudience(ids: string[], actor: IRemoteUser) {
 function isPublic(id: string) {
 	return [
 		'https://www.w3.org/ns/activitystreams#Public',
-		'as:Public',
+		'as#Public',
 		'Public',
 	].includes(id);
 }

src/remote/activitypub/kernel/delete/index.ts

@@ -2,7 +2,6 @@ import deleteNote from './note';
 import { IRemoteUser } from '../../../../models/entities/user';
 import { IDelete, getApId, isTombstone, IObject, validPost, validActor } from '../../type';
 import { toSingle } from '../../../../prelude/array';
-import { deleteActor } from './actor';
 
 /**
  * 削除アクティビティを捌きます
@@ -42,7 +41,7 @@ export default async (actor: IRemoteUser, activity: IDelete): Promise<string> =>
 	if (validPost.includes(formarType)) {
 		return await deleteNote(actor, uri);
 	} else if (validActor.includes(formarType)) {
-		return await deleteActor(actor, uri);
+		return `Delete Actor is not implanted`;
 	} else {
 		return `Unknown type ${formarType}`;
 	}

src/remote/activitypub/renderer/undo.ts

@@ -1,12 +1,8 @@
 import config from '../../../config';
 import { ILocalUser, User } from '../../../models/entities/user';
 
-export default (object: any, user: ILocalUser | User) => {
-	if (object == null) return null;
-
-	return {
-		type: 'Undo',
-		actor: `${config.url}/users/${user.id}`,
-		object
-	};
-};
+export default (object: any, user: ILocalUser | User) => ({
+	type: 'Undo',
+	actor: `${config.url}/users/${user.id}`,
+	object
+});