summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-01-04 03:52:50 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-01-04 03:52:50 +0900
commitb4b6e9548d05a0313e9ed722a27edb54c9dda8e1 (patch)
treeb7dc73c14996d0f58abd107b5d1ff7fc44c298fa
parentMake instance logo customisable (#3829) (diff)
downloadmisskey-b4b6e9548d05a0313e9ed722a27edb54c9dda8e1.tar.gz
misskey-b4b6e9548d05a0313e9ed722a27edb54c9dda8e1.tar.bz2
misskey-b4b6e9548d05a0313e9ed722a27edb54c9dda8e1.zip
Rename
-rw-r--r--src/client/app/admin/views/instance.vue8
-rw-r--r--src/client/app/desktop/views/pages/welcome.vue2
-rw-r--r--src/misc/fetch-meta.ts2
-rw-r--r--src/models/meta.ts2
-rw-r--r--src/server/api/endpoints/admin/update-meta.ts8
-rw-r--r--src/server/api/endpoints/meta.ts2
6 files changed, 12 insertions, 12 deletions
diff --git a/src/client/app/admin/views/instance.vue b/src/client/app/admin/views/instance.vue
index 4e7d59b8eb..6fd92a779f 100644
--- a/src/client/app/admin/views/instance.vue
+++ b/src/client/app/admin/views/instance.vue
@@ -6,7 +6,7 @@
<ui-input :value="host" readonly>{{ $t('host') }}</ui-input>
<ui-input v-model="name">{{ $t('instance-name') }}</ui-input>
<ui-textarea v-model="description">{{ $t('instance-description') }}</ui-textarea>
- <ui-input v-model="logoUrl"><i slot="icon"><fa icon="link"/></i>{{ $t('logo-url') }}</ui-input>
+ <ui-input v-model="mascotImageUrl"><i slot="icon"><fa icon="link"/></i>{{ $t('logo-url') }}</ui-input>
<ui-input v-model="bannerUrl"><i slot="icon"><fa icon="link"/></i>{{ $t('banner-url') }}</ui-input>
<ui-input v-model="errorImageUrl"><i slot="icon"><fa icon="link"/></i>{{ $t('error-image-url') }}</ui-input>
<ui-input v-model="languages"><i slot="icon"><fa icon="language"/></i>{{ $t('languages') }}<span slot="desc">{{ $t('languages-desc') }}</span></ui-input>
@@ -150,7 +150,7 @@ export default Vue.extend({
maintainerEmail: null,
disableRegistration: false,
disableLocalTimeline: false,
- logoUrl: null,
+ mascotImageUrl: null,
bannerUrl: null,
errorImageUrl: null,
name: null,
@@ -198,7 +198,7 @@ export default Vue.extend({
this.maintainerEmail = meta.maintainer.email;
this.disableRegistration = meta.disableRegistration;
this.disableLocalTimeline = meta.disableLocalTimeline;
- this.logoUrl = meta.logoUrl;
+ this.mascotImageUrl = meta.mascotImageUrl;
this.bannerUrl = meta.bannerUrl;
this.errorImageUrl = meta.errorImageUrl;
this.name = meta.name;
@@ -256,7 +256,7 @@ export default Vue.extend({
maintainerEmail: this.maintainerEmail,
disableRegistration: this.disableRegistration,
disableLocalTimeline: this.disableLocalTimeline,
- logoUrl: this.logoUrl,
+ mascotImageUrl: this.mascotImageUrl,
bannerUrl: this.bannerUrl,
errorImageUrl: this.errorImageUrl,
name: this.name,
diff --git a/src/client/app/desktop/views/pages/welcome.vue b/src/client/app/desktop/views/pages/welcome.vue
index 0aa864546f..88a11eafa6 100644
--- a/src/client/app/desktop/views/pages/welcome.vue
+++ b/src/client/app/desktop/views/pages/welcome.vue
@@ -35,7 +35,7 @@
<span class="signin" @click="signin">{{ $t('signin') }}</span>
</p>
- <img :src="meta.logoUrl || '/assets/ai.png'" alt="" title="藍" class="char">
+ <img :src="meta.mascotImageUrl" alt="" title="藍" class="char">
</div>
</div>
diff --git a/src/misc/fetch-meta.ts b/src/misc/fetch-meta.ts
index 138646e881..e6488da395 100644
--- a/src/misc/fetch-meta.ts
+++ b/src/misc/fetch-meta.ts
@@ -19,7 +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,
- logoUrl: '/assets/ai.png',
+ 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 b68ec43f15..daa7964d6f 100644
--- a/src/models/meta.ts
+++ b/src/models/meta.ts
@@ -185,7 +185,7 @@ export type IMeta = {
disableRegistration?: boolean;
disableLocalTimeline?: boolean;
hidedTags?: string[];
- logoUrl?: string;
+ mascotImageUrl?: string;
bannerUrl?: string;
errorImageUrl?: string;
diff --git a/src/server/api/endpoints/admin/update-meta.ts b/src/server/api/endpoints/admin/update-meta.ts
index f841927922..cf117ebd71 100644
--- a/src/server/api/endpoints/admin/update-meta.ts
+++ b/src/server/api/endpoints/admin/update-meta.ts
@@ -39,10 +39,10 @@ export const meta = {
}
},
- logoUrl: {
+ mascotImageUrl: {
validator: $.str.optional.nullable,
desc: {
- 'ja-JP': 'インスタンスロゴ画像のURL'
+ 'ja-JP': 'インスタンスキャラクター画像のURL'
}
},
@@ -335,8 +335,8 @@ export default define(meta, (ps) => new Promise(async (res, rej) => {
set.hidedTags = ps.hidedTags;
}
- if (ps.logoUrl !== undefined) {
- set.logoUrl = ps.logoUrl;
+ if (ps.mascotImageUrl !== undefined) {
+ set.mascotImageUrl = ps.mascotImageUrl;
}
if (ps.bannerUrl !== undefined) {
diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts
index 641c7728ff..fa933513b7 100644
--- a/src/server/api/endpoints/meta.ts
+++ b/src/server/api/endpoints/meta.ts
@@ -65,7 +65,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
enableRecaptcha: instance.enableRecaptcha,
recaptchaSiteKey: instance.recaptchaSiteKey,
swPublickey: instance.swPublicKey,
- logoUrl: instance.logoUrl,
+ mascotImageUrl: instance.mascotImageUrl,
bannerUrl: instance.bannerUrl,
errorImageUrl: instance.errorImageUrl,
maxNoteTextLength: instance.maxNoteTextLength,