10.58.1

* Update Dockerfile

* Update Dockerfile

.gitignore

@@ -17,3 +17,4 @@ api-docs.json
 /mongo
 /elasticsearch
 *.code-workspace
+yarn.lock

Dockerfile

@@ -8,18 +8,20 @@ WORKDIR /misskey
 
 FROM base AS builder
 
+RUN unlink /usr/bin/free
 RUN apk add --no-cache \
-    gcc \
-    g++ \
-    libc-dev \
-    python \
     autoconf \
     automake \
     file \
+    g++ \
+    gcc \
+    libc-dev \
+    libtool \
     make \
     nasm \
     pkgconfig \
-    libtool \
+    procps \
+    python \
     zlib-dev
 RUN npm i -g node-gyp
 

locales/ja-JP.yml

@@ -1092,17 +1092,17 @@ admin/views/instance.vue:
   recaptcha-site-key: "reCAPTCHA site key"
   recaptcha-secret-key: "reCAPTCHA secret key"
   twitter-integration-config: "Twitter連携の設定"
-  twitter-integration-info: "コールバックURLは /api/tw/cb に設定します。"
+  twitter-integration-info: "コールバックURLは {url} に設定します。"
   enable-twitter-integration: "Twitter連携を有効にする"
   twitter-integration-consumer-key: "Consumer key"
   twitter-integration-consumer-secret: "Consumer secret"
   github-integration-config: "GitHub連携の設定"
-  github-integration-info: "コールバックURLは /api/gh/cb に設定します。"
+  github-integration-info: "コールバックURLは {url} に設定します。"
   enable-github-integration: "GitHub連携を有効にする"
   github-integration-client-id: "Client ID"
   github-integration-client-secret: "Client Secret"
   discord-integration-config: "Discord連携の設定"
-  discord-integration-info: "コールバックURLは /api/dc/cb に設定します。"
+  discord-integration-info: "コールバックURLは {url} に設定します。"
   enable-discord-integration: "Discord連携を有効にする"
   discord-integration-client-id: "Client ID"
   discord-integration-client-secret: "Client Secret"

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "10.58.0",
-	"clientVersion": "2.0.12104",
+	"version": "10.58.1",
+	"clientVersion": "2.0.12110",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,

src/client/app/admin/views/instance.vue

@@ -69,7 +69,7 @@
 		<div slot="title"><fa :icon="['fab', 'twitter']"/> {{ $t('twitter-integration-config') }}</div>
 		<section>
 			<ui-switch v-model="enableTwitterIntegration">{{ $t('enable-twitter-integration') }}</ui-switch>
-			<ui-info>{{ $t('twitter-integration-info') }}</ui-info>
+			<ui-info>{{ $t('twitter-integration-info', { url: `${url}/api/tw/cb` }) }}</ui-info>
 			<ui-input v-model="twitterConsumerKey" :disabled="!enableTwitterIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('twitter-integration-consumer-key') }}</ui-input>
 			<ui-input v-model="twitterConsumerSecret" :disabled="!enableTwitterIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('twitter-integration-consumer-secret') }}</ui-input>
 			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
@@ -80,7 +80,7 @@
 		<div slot="title"><fa :icon="['fab', 'github']"/> {{ $t('github-integration-config') }}</div>
 		<section>
 			<ui-switch v-model="enableGithubIntegration">{{ $t('enable-github-integration') }}</ui-switch>
-			<ui-info>{{ $t('github-integration-info') }}</ui-info>
+			<ui-info>{{ $t('github-integration-info', { url: `${url}/api/gh/cb` }) }}</ui-info>
 			<ui-input v-model="githubClientId" :disabled="!enableGithubIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('github-integration-client-id') }}</ui-input>
 			<ui-input v-model="githubClientSecret" :disabled="!enableGithubIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('github-integration-client-secret') }}</ui-input>
 			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
@@ -91,7 +91,7 @@
 		<div slot="title"><fa :icon="['fab', 'discord']"/> {{ $t('discord-integration-config') }}</div>
 		<section>
 			<ui-switch v-model="enableDiscordIntegration">{{ $t('enable-discord-integration') }}</ui-switch>
-			<ui-info>{{ $t('discord-integration-info') }}</ui-info>
+			<ui-info>{{ $t('discord-integration-info', { url: `${url}/api/dc/cb` }) }}</ui-info>
 			<ui-input v-model="discordClientId" :disabled="!enableDiscordIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('discord-integration-client-id') }}</ui-input>
 			<ui-input v-model="discordClientSecret" :disabled="!enableDiscordIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('discord-integration-client-secret') }}</ui-input>
 			<ui-button @click="updateMeta">{{ $t('save') }}</ui-button>
@@ -103,7 +103,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../i18n';
-import { host } from '../../config';
+import { url, host } from '../../config';
 import { toUnicode } from 'punycode';
 import { faHeadset, faShieldAlt, faGhost, faUserPlus } from '@fortawesome/free-solid-svg-icons';
 
@@ -112,6 +112,7 @@ export default Vue.extend({
 
 	data() {
 		return {
+			url,
 			host: toUnicode(host),
 			maintainerName: null,
 			maintainerEmail: null,

src/server/api/index.ts

@@ -19,6 +19,12 @@ app.use(cors({
 	origin: '*'
 }));
 
+// No caching
+app.use(async (ctx, next) => {
+	ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
+	await next();
+});
+
 app.use(bodyParser({
 	// リクエストが multipart/form-data でない限りはJSONだと見なす
 	detectJSON: ctx => !ctx.is('multipart/form-data')

src/server/index.ts

@@ -59,6 +59,11 @@ const router = new Router();
 router.use(activityPub.routes());
 router.use(webFinger.routes());
 
+// Return 404 for other .well-known
+router.all('/.well-known/*', async ctx => {
+	ctx.status = 404;
+});
+
 // Register router
 app.use(router.routes());