diff --git a/src/docs/article.pug b/src/docs/article.pug
index 38494fec6c..48f501d406 100644
--- a/src/docs/article.pug
+++ b/src/docs/article.pug
@@ -6,4 +6,4 @@ block main
block footer
p
= i18n('docs.edit-this-page-on-github')
- a(href=src target="_blank")= i18n('docs.edit-this-page-on-github-link')
+ a(href=src rel="noopener" target="_blank")= i18n('docs.edit-this-page-on-github-link')
diff --git a/src/server/web/views/note.pug b/src/server/web/views/note.pug
index 983c731a04..0580e959f7 100644
--- a/src/server/web/views/note.pug
+++ b/src/server/web/views/note.pug
@@ -26,6 +26,9 @@ block meta
meta(name='twitter:card' content='summary')
// todo
+ if user.host
+ meta(name='robots' content='noindex')
+
if user.twitter
meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
diff --git a/src/server/web/views/user.pug b/src/server/web/views/user.pug
index bff98ba80f..9b257afb7b 100644
--- a/src/server/web/views/user.pug
+++ b/src/server/web/views/user.pug
@@ -24,6 +24,9 @@ block meta
meta(name='twitter:card' content='summary')
+ if user.host
+ meta(name='robots' content='noindex')
+
if profile.twitter
meta(name='twitter:creator' content=`@${profile.twitter.screenName}`)
--
cgit v1.2.3-freya
From b128b593c205df895d8d9d3c5763d87f7e7ebd71 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Tue, 14 May 2019 02:53:05 +0900
Subject: Fix: user menu (#4845) (#4920)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Fix: Firefoxで自分のメニューが開けないなど
* 自分のユーザーメニューにはミュートなどを表示しないようになど
---
.../app/common/views/components/user-menu.vue | 31 ++++++++++++----------
.../app/desktop/views/home/user/user.header.vue | 13 +--------
2 files changed, 18 insertions(+), 26 deletions(-)
(limited to 'src/client/app/common')
diff --git a/src/client/app/common/views/components/user-menu.vue b/src/client/app/common/views/components/user-menu.vue
index 0af0fdb7e4..7cbffa9f9a 100644
--- a/src/client/app/common/views/components/user-menu.vue
+++ b/src/client/app/common/views/components/user-menu.vue
@@ -7,7 +7,6 @@
diff --git a/src/client/app/common/views/components/signup.vue b/src/client/app/common/views/components/signup.vue
index 9b1df79771..bf8e5d25b8 100644
--- a/src/client/app/common/views/components/signup.vue
+++ b/src/client/app/common/views/components/signup.vue
@@ -37,8 +37,13 @@
{{ $t('password-not-matched') }}
+
+
+ {{ $t('tos') }}
+
+
-
{{ $t('create') }}
+
{{ $t('create') }}
@@ -64,7 +69,8 @@ export default Vue.extend({
usernameState: null,
passwordStrength: '',
passwordRetypeState: null,
- meta: null
+ meta: {},
+ ToSAgreement: false
}
},
diff --git a/src/models/entities/meta.ts b/src/models/entities/meta.ts
index 2c36b8333f..c3797a9ed6 100644
--- a/src/models/entities/meta.ts
+++ b/src/models/entities/meta.ts
@@ -268,4 +268,24 @@ export class Meta {
nullable: true
})
public discordClientSecret: string | null;
+
+ @Column('varchar', {
+ length: 512,
+ nullable: true
+ })
+ public ToSUrl: string | null;
+
+ @Column('varchar', {
+ length: 512,
+ default: 'https://github.com/syuilo/misskey',
+ nullable: false
+ })
+ public repositoryUrl: string;
+
+ @Column('varchar', {
+ length: 512,
+ default: 'https://github.com/syuilo/misskey/issues/new',
+ nullable: true
+ })
+ public feedbackUrl: string | null;
}
diff --git a/src/server/api/endpoints/admin/update-meta.ts b/src/server/api/endpoints/admin/update-meta.ts
index 8a2019fcc1..e34840e907 100644
--- a/src/server/api/endpoints/admin/update-meta.ts
+++ b/src/server/api/endpoints/admin/update-meta.ts
@@ -330,6 +330,27 @@ export const meta = {
'ja-JP': 'ServiceWorkerのVAPIDキーペアの秘密鍵'
}
},
+
+ ToSUrl: {
+ validator: $.optional.nullable.str,
+ desc: {
+ 'ja-JP': '利用規約のURL'
+ }
+ },
+
+ repositoryUrl: {
+ validator: $.optional.str,
+ desc: {
+ 'ja-JP': 'リポジトリのURL'
+ }
+ },
+
+ feedbackUrl: {
+ validator: $.optional.str,
+ desc: {
+ 'ja-JP': 'フィードバックのURL'
+ }
+ }
}
};
@@ -516,6 +537,18 @@ export default define(meta, async (ps) => {
set.swPrivateKey = ps.swPrivateKey;
}
+ if (ps.ToSUrl !== undefined) {
+ set.ToSUrl = ps.ToSUrl;
+ }
+
+ if (ps.repositoryUrl !== undefined) {
+ set.repositoryUrl = ps.repositoryUrl;
+ }
+
+ if (ps.feedbackUrl !== undefined) {
+ set.feedbackUrl = ps.feedbackUrl;
+ }
+
await getConnection().transaction(async transactionalEntityManager => {
const meta = await transactionalEntityManager.findOne(Meta, {
order: {
diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts
index 5667e7fbb4..e29edae266 100644
--- a/src/server/api/endpoints/meta.ts
+++ b/src/server/api/endpoints/meta.ts
@@ -106,6 +106,9 @@ export default define(meta, async (ps, me) => {
uri: config.url,
description: instance.description,
langs: instance.langs,
+ ToSUrl: instance.ToSUrl,
+ repositoryUrl: instance.repositoryUrl,
+ feedbackUrl: instance.feedbackUrl,
secure: config.https != null,
machine: os.hostname(),
diff --git a/src/server/nodeinfo.ts b/src/server/nodeinfo.ts
index d3ad90fab5..da1e4e7b5e 100644
--- a/src/server/nodeinfo.ts
+++ b/src/server/nodeinfo.ts
@@ -26,6 +26,9 @@ const nodeinfo2 = async () => {
maintainerName,
maintainerEmail,
langs,
+ ToSUrl,
+ repositoryUrl,
+ feedbackUrl,
announcements,
disableRegistration,
disableLocalTimeline,
@@ -77,6 +80,9 @@ const nodeinfo2 = async () => {
email: maintainerEmail
},
langs,
+ ToSUrl,
+ repositoryUrl,
+ feedbackUrl,
announcements,
disableRegistration,
disableLocalTimeline,
--
cgit v1.2.3-freya
From 5d42ee2359c1f9a0018fc3ae9c7b3f2f2c6fbccc Mon Sep 17 00:00:00 2001
From: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com>
Date: Tue, 14 May 2019 10:50:20 +0900
Subject: Fix tag cloud on Welcome page (#4922)
Resolve #4754
---
src/client/app/common/views/components/tag-cloud.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'src/client/app/common')
diff --git a/src/client/app/common/views/components/tag-cloud.vue b/src/client/app/common/views/components/tag-cloud.vue
index b5eef964b6..3fa5e3b9d4 100644
--- a/src/client/app/common/views/components/tag-cloud.vue
+++ b/src/client/app/common/views/components/tag-cloud.vue
@@ -4,7 +4,7 @@
{{ $t('empty') }}
@@ -43,7 +43,7 @@ export default Vue.extend({
},
methods: {
fetch() {
- this.$root.api('aggregation/hashtags').then(tags => {
+ this.$root.api('hashtags/trend').then(tags => {
this.tags = tags;
this.fetching = false;
});
--
cgit v1.2.3-freya