-
+
{{ note._datetext }}
{{ _notes[i + 1]._datetext }}
diff --git a/src/client/app/mobile/views/components/post-form.vue b/src/client/app/mobile/views/components/post-form.vue
index 00d0eebd6a..47af21c2a5 100644
--- a/src/client/app/mobile/views/components/post-form.vue
+++ b/src/client/app/mobile/views/components/post-form.vue
@@ -187,11 +187,11 @@ export default Vue.extend({
const mention = x.host ? `@${x.username}@${toASCII(x.host)}` : `@${x.username}`;
// 自分は除外
- if (this.$store.state.i.username == x.username && x.host == null) return;
- if (this.$store.state.i.username == x.username && x.host == host) return;
+ if (this.$store.state.i.username == x.username && x.host == null) continue;
+ if (this.$store.state.i.username == x.username && x.host == host) continue;
// 重複は除外
- if (this.text.indexOf(`${mention} `) != -1) return;
+ if (this.text.indexOf(`${mention} `) != -1) continue;
this.text += `${mention} `;
}
@@ -211,6 +211,12 @@ export default Vue.extend({
});
}
+ // keep cw when reply
+ if (this.reply && this.reply.cw != null) {
+ this.useCw = true;
+ this.cw = this.reply.cw;
+ }
+
this.focus();
this.$nextTick(() => {
diff --git a/src/misc/fetch-meta.ts b/src/misc/fetch-meta.ts
index a49e4dbe78..e6488da395 100644
--- a/src/misc/fetch-meta.ts
+++ b/src/misc/fetch-meta.ts
@@ -19,6 +19,7 @@ const defaultMeta: any = {
enableExternalUserRecommendation: false,
externalUserRecommendationEngine: 'https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}',
externalUserRecommendationTimeout: 300000,
+ mascotImageUrl: '/assets/ai.png',
errorImageUrl: 'https://ai.misskey.xyz/aiart/yubitun.png',
enableServiceWorker: false
};
diff --git a/src/models/meta.ts b/src/models/meta.ts
index fd07438a81..daa7964d6f 100644
--- a/src/models/meta.ts
+++ b/src/models/meta.ts
@@ -185,6 +185,7 @@ export type IMeta = {
disableRegistration?: boolean;
disableLocalTimeline?: boolean;
hidedTags?: string[];
+ mascotImageUrl?: string;
bannerUrl?: string;
errorImageUrl?: string;
diff --git a/src/models/note.ts b/src/models/note.ts
index f334970750..f2fb39051b 100644
--- a/src/models/note.ts
+++ b/src/models/note.ts
@@ -372,7 +372,14 @@ export const pack = async (
//#endregion
if (_note.user.isCat && _note.text) {
- _note.text = _note.text.replace(/な/g, 'にゃ').replace(/ナ/g, 'ニャ').replace(/ﾅ/g, 'ﾆｬ');
+ _note.text = (_note.text
+ // ja-JP
+ .replace(/な/g, 'にゃ').replace(/ナ/g, 'ニャ').replace(/ﾅ/g, 'ﾆｬ')
+ // ko-KR
+ .replace(/[나-낳]/g, (match: string) => String.fromCharCode(
+ match.codePointAt(0) + '냐'.charCodeAt(0) - '나'.charCodeAt(0)
+ ))
+ );
}
if (!opts.skipHide) {
diff --git a/src/server/activitypub.ts b/src/server/activitypub.ts
index 42d90ab91f..9adc3dd943 100644
--- a/src/server/activitypub.ts
+++ b/src/server/activitypub.ts
@@ -83,7 +83,7 @@ router.get('/notes/:note', async (ctx, next) => {
}
ctx.body = pack(await renderNote(note, false));
- ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
+ ctx.set('Cache-Control', 'public, max-age=180');
setResponseType(ctx);
});
@@ -162,7 +162,9 @@ async function userInfo(ctx: Router.IRouterContext, user: IUser) {
setResponseType(ctx);
}
-router.get('/users/:user', async ctx => {
+router.get('/users/:user', async (ctx, next) => {
+ if (!isActivityPubReq(ctx)) return await next();
+
if (!ObjectID.isValid(ctx.params.user)) {
ctx.status = 404;
return;
diff --git a/src/server/api/endpoints/admin/update-meta.ts b/src/server/api/endpoints/admin/update-meta.ts
index 6ceb2a98dc..cf117ebd71 100644
--- a/src/server/api/endpoints/admin/update-meta.ts
+++ b/src/server/api/endpoints/admin/update-meta.ts
@@ -39,6 +39,13 @@ export const meta = {
}
},
+ mascotImageUrl: {
+ validator: $.str.optional.nullable,
+ desc: {
+ 'ja-JP': 'インスタンスキャラクター画像のURL'
+ }
+ },
+
bannerUrl: {
validator: $.str.optional.nullable,
desc: {
@@ -328,6 +335,10 @@ export default define(meta, (ps) => new Promise(async (res, rej) => {
set.hidedTags = ps.hidedTags;
}
+ if (ps.mascotImageUrl !== undefined) {
+ set.mascotImageUrl = ps.mascotImageUrl;
+ }
+
if (ps.bannerUrl !== undefined) {
set.bannerUrl = ps.bannerUrl;
}
diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts
index d406f59dc9..fa933513b7 100644
--- a/src/server/api/endpoints/meta.ts
+++ b/src/server/api/endpoints/meta.ts
@@ -65,6 +65,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
enableRecaptcha: instance.enableRecaptcha,
recaptchaSiteKey: instance.recaptchaSiteKey,
swPublickey: instance.swPublicKey,
+ mascotImageUrl: instance.mascotImageUrl,
bannerUrl: instance.bannerUrl,
errorImageUrl: instance.errorImageUrl,
maxNoteTextLength: instance.maxNoteTextLength,
diff --git a/src/server/api/endpoints/notes/reactions/create.ts b/src/server/api/endpoints/notes/reactions/create.ts
index c9f70d9658..6c90898250 100644
--- a/src/server/api/endpoints/notes/reactions/create.ts
+++ b/src/server/api/endpoints/notes/reactions/create.ts
@@ -45,7 +45,7 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
}
if (note.deletedAt != null) {
- return rej('this not is already deleted');
+ return rej('this note is already deleted');
}
try {
diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index 998fd2adf2..59b8390ab5 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -148,6 +148,27 @@ router.get('/@:user', async (ctx, next) => {
}
});
+router.get('/users/:user', async ctx => {
+ if (!ObjectID.isValid(ctx.params.user)) {
+ ctx.status = 404;
+ return;
+ }
+
+ const userId = new ObjectID(ctx.params.user);
+
+ const user = await User.findOne({
+ _id: userId,
+ host: null
+ });
+
+ if (user === null) {
+ ctx.status = 404;
+ return;
+ }
+
+ ctx.redirect(`/@${user.username}${ user.host == null ? '' : '@' + user.host}`);
+});
+
// Note
router.get('/notes/:note', async ctx => {
if (ObjectID.isValid(ctx.params.note)) {
@@ -159,7 +180,12 @@ router.get('/notes/:note', async ctx => {
note: _note,
summary: getNoteSummary(_note)
});
- ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
+
+ if (['public', 'home'].includes(note.visibility)) {
+ ctx.set('Cache-Control', 'public, max-age=180');
+ } else {
+ ctx.set('Cache-Control', 'private, max-age=0, must-revalidate');
+ }
return;
}