laoxong/misskey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
syuilo 2018-08-19 21:07:18 +09:00
parent c9de5b65d4
commit bb925e5de3
23 changed files with 45 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/app/desktop/views/components/notes.vue
View File

@ -193,7 +193,7 @@ export default Vue.extend({
clearNotification() {
this.unreadCount = 0;
document.title = config.name;
document.title = (this as any).os.instanceName;
},
onVisibilitychange() {

3
src/client/app/desktop/views/pages/home-customize.vue
View File

@ -4,11 +4,10 @@
<script lang="ts">
import Vue from 'vue';
import * as config from '../../../config';
export default Vue.extend({
mounted() {
document.title = `${config.name} - %i18n:@title%`;
document.title = `${(this as any).os.instanceName} - %i18n:@title%`;
}
});
</script>

3
src/client/app/desktop/views/pages/home.vue
View File

@ -7,7 +7,6 @@
<script lang="ts">
import Vue from 'vue';
import Progress from '../../../common/scripts/loading';
import * as config from '../../../config';
export default Vue.extend({
props: {
@ -17,7 +16,7 @@ export default Vue.extend({
}
},
mounted() {
document.title = config.name;
document.title = (this as any).os.instanceName;
Progress.start();
},

3
src/client/app/desktop/views/pages/share.vue
View File

@ -12,12 +12,11 @@
<script lang="ts">
import Vue from 'vue';
import * as config from '../../../config';
export default Vue.extend({
data() {
return {
name: config.name,
name: (this as any).os.instanceName,
posted: false,
text: new URLSearchParams(location.search).get('text')
};

14
src/client/app/desktop/views/pages/welcome.vue
View File

@ -5,7 +5,7 @@
<template v-if="$store.state.device.darkmode">%fa:moon%</template>
<template v-else>%fa:R moon%</template>
</button>
<div class="body" :style="{ backgroundImage: `url('${ welcomeBgUrl }')` }">
<div class="body">
<div class="container">
<div class="info">
<span><b>{{ host }}</b></span>
@ -46,22 +46,26 @@
<script lang="ts">
import Vue from 'vue';
import { host, name, description, copyright, welcomeBgUrl } from '../../../config';
import { host, copyright } from '../../../config';
export default Vue.extend({
data() {
return {
stats: null,
copyright,
welcomeBgUrl,
host,
name,
description,
name: 'Misskey',
description: '',
pointerInterval: null,
tags: []
};
},
created() {
(this as any).os.getMeta().then(meta => {
this.name = meta.name;
this.description = meta.description;
});
(this as any).api('stats').then(stats => {
this.stats = stats;
});

4
src/client/app/mios.ts
View File

@ -70,6 +70,10 @@ export default class MiOS extends EventEmitter {
chachedAt: Date;
};
public get instanceName() {
return this.meta ? this.meta.data.name : 'Misskey';
}
private isMetaFetching = false;
public app: Vue;

3
src/client/app/mobile/views/components/notes.vue
View File

@ -38,7 +38,6 @@
<script lang="ts">
import Vue from 'vue';
import getNoteSummary from '../../../../../misc/get-note-summary';
import * as config from '../../../config';
const displayLimit = 30;
@ -190,7 +189,7 @@ export default Vue.extend({
clearNotification() {
this.unreadCount = 0;
document.title = config.name;
document.title = (this as any).os.instanceName;
},
onVisibilitychange() {

4
src/client/app/mobile/views/components/ui.header.vue
View File

@ -8,7 +8,7 @@
<button class="nav" @click="$parent.isDrawerOpening = true">%fa:bars%</button>
<template v-if="hasUnreadNotification || hasUnreadMessagingMessage || hasGameInvitation">%fa:circle%</template>
<h1>
<slot>config.name</slot>
<slot>{{ os.instanceName }}</slot>
</h1>
<slot name="func"></slot>
</div>
@ -20,13 +20,11 @@
<script lang="ts">
import Vue from 'vue';
import * as anime from 'animejs';
import * as config from '../../../config';
export default Vue.extend({
props: ['func'],
data() {
return {
config,
hasGameInvitation: false,
connection: null,
connectionId: null

9
src/client/app/mobile/views/pages/drive.vue
View File

@ -25,7 +25,6 @@
<script lang="ts">
import Vue from 'vue';
import Progress from '../../../common/scripts/loading';
import * as config from '../../../config';
export default Vue.extend({
data() {
@ -44,7 +43,7 @@ export default Vue.extend({
window.addEventListener('popstate', this.onPopState);
},
mounted() {
document.title = `${config.name} Drive`;
document.title = `${(this as any).os.instanceName} Drive`;
document.documentElement.style.background = '#fff';
},
beforeDestroy() {
@ -64,7 +63,7 @@ export default Vue.extend({
(this.$refs as any).browser.openContextMenu();
},
onMoveRoot(silent) {
const title = `${config.name} Drive`;
const title = `${(this as any).os.instanceName} Drive`;
if (!silent) {
// Rewrite URL
@ -77,7 +76,7 @@ export default Vue.extend({
this.folder = null;
},
onOpenFolder(folder, silent) {
const title = `${folder.name} | ${config.name} Drive`;
const title = `${folder.name} | ${(this as any).os.instanceName} Drive`;
if (!silent) {
// Rewrite URL
@ -90,7 +89,7 @@ export default Vue.extend({
this.folder = folder;
},
onOpenFile(file, silent) {
const title = `${file.name} | ${config.name} Drive`;
const title = `${file.name} | ${(this as any).os.instanceName} Drive`;
if (!silent) {
// Rewrite URL

3
src/client/app/mobile/views/pages/favorites.vue
View File

@ -14,7 +14,6 @@
<script lang="ts">
import Vue from 'vue';
import Progress from '../../../common/scripts/loading';
import * as config from '../../../config';
export default Vue.extend({
data() {
@ -29,7 +28,7 @@ export default Vue.extend({
this.fetch();
},
mounted() {
document.title = `${config.name} | %i18n:@notifications%`;
document.title = `${(this as any).os.instanceName} | %i18n:@notifications%`;
},
methods: {
fetch() {

3
src/client/app/mobile/views/pages/followers.vue
View File

@ -21,7 +21,6 @@ import Vue from 'vue';
import Progress from '../../../common/scripts/loading';
import parseAcct from '../../../../../misc/acct/parse';
import getUserName from '../../../../../misc/get-user-name';
import * as config from '../../../config';
export default Vue.extend({
data() {
@ -50,7 +49,7 @@ export default Vue.extend({
this.user = user;
this.fetching = false;
document.title = '%i18n:@followers-of%'.replace('{}', this.name) + ' | ' + config.name;
document.title = '%i18n:@followers-of%'.replace('{}', this.name) + ' | ' + (this as any).os.instanceName;
});
},
onLoaded() {

3
src/client/app/mobile/views/pages/following.vue
View File

@ -20,7 +20,6 @@
import Vue from 'vue';
import Progress from '../../../common/scripts/loading';
import parseAcct from '../../../../../misc/acct/parse';
import * as config from '../../../config';
export default Vue.extend({
data() {
@ -49,7 +48,7 @@ export default Vue.extend({
this.user = user;
this.fetching = false;
document.title = '%i18n:@followers-of%'.replace('{}', this.name) + ' | ' + config.name;
document.title = '%i18n:@followers-of%'.replace('{}', this.name) + ' | ' + (this as any).os.instanceName;
});
},
onLoaded() {

3
src/client/app/mobile/views/pages/games/reversi.vue
View File

@ -7,11 +7,10 @@
<script lang="ts">
import Vue from 'vue';
import * as config from '../../../../config';
export default Vue.extend({
mounted() {
document.title = `${config.name} %i18n:@reversi%`;
document.title = `${(this as any).os.instanceName} %i18n:@reversi%`;
document.documentElement.style.background = '#fff';
},
methods: {

3
src/client/app/mobile/views/pages/home.vue
View File

@ -49,7 +49,6 @@
import Vue from 'vue';
import Progress from '../../../common/scripts/loading';
import XTl from './home.timeline.vue';
import * as config from '../../../config';
export default Vue.extend({
components: {
@ -97,7 +96,7 @@ export default Vue.extend({
},
mounted() {
document.title = config.name;
document.title = (this as any).os.instanceName;
Progress.start();

3
src/client/app/mobile/views/pages/messaging-room.vue
View File

@ -11,7 +11,6 @@
<script lang="ts">
import Vue from 'vue';
import parseAcct from '../../../../../misc/acct/parse';
import * as config from '../../../config';
export default Vue.extend({
data() {
@ -48,7 +47,7 @@ export default Vue.extend({
this.user = user;
this.fetching = false;
document.title = `%i18n:@messaging%: ${Vue.filter('userName')(this.user)} | ${config.name}`;
document.title = `%i18n:@messaging%: ${Vue.filter('userName')(this.user)} | ${(this as any).os.instanceName}`;
});
}
}

3
src/client/app/mobile/views/pages/messaging.vue
View File

@ -8,11 +8,10 @@
<script lang="ts">
import Vue from 'vue';
import getAcct from '../../../../../misc/acct/render';
import * as config from '../../../config';
export default Vue.extend({
mounted() {
document.title = `${config.name} %i18n:@messaging%`;
document.title = `${(this as any).os.instanceName} %i18n:@messaging%`;
},
methods: {
navigate(user) {

3
src/client/app/mobile/views/pages/note.vue
View File

@ -16,7 +16,6 @@
<script lang="ts">
import Vue from 'vue';
import Progress from '../../../common/scripts/loading';
import * as config from '../../../config';
export default Vue.extend({
data() {
@ -32,7 +31,7 @@ export default Vue.extend({
this.fetch();
},
mounted() {
document.title = config.name;
document.title = (this as any).os.instanceName;
},
methods: {
fetch() {

3
src/client/app/mobile/views/pages/search.vue
View File

@ -12,7 +12,6 @@
<script lang="ts">
import Vue from 'vue';
import Progress from '../../../common/scripts/loading';
import * as config from '../../../config';
const limit = 20;
@ -35,7 +34,7 @@ export default Vue.extend({
}
},
mounted() {
document.title = `%i18n:@search%: ${this.q} | ${config.name}`;
document.title = `%i18n:@search%: ${this.q} | ${(this as any).os.instanceName}`;
this.fetch();
},

3
src/client/app/mobile/views/pages/share.vue
View File

@ -12,12 +12,11 @@
<script lang="ts">
import Vue from 'vue';
import * as config from '../../../config';
export default Vue.extend({
data() {
return {
name: config.name,
name: (this as any).os.instanceName,
posted: false,
text: new URLSearchParams(location.search).get('text')
};

3
src/client/app/mobile/views/pages/user.vue
View File

@ -67,7 +67,6 @@ import * as age from 's-age';
import parseAcct from '../../../../../misc/acct/parse';
import Progress from '../../../common/scripts/loading';
import XHome from './user/home.vue';
import * as config from '../../../config';
export default Vue.extend({
components: {
@ -107,7 +106,7 @@ export default Vue.extend({
this.fetching = false;
Progress.done();
document.title = Vue.filter('userName')(this.user) + ' | ' + config.name;
document.title = Vue.filter('userName')(this.user) + ' | ' + (this as any).os.instanceName;
});
}
}

11
src/client/app/mobile/views/pages/welcome.vue
View File

@ -30,7 +30,7 @@
<script lang="ts">
import Vue from 'vue';
import { apiUrl, copyright, host, name, description } from '../../../config';
import { apiUrl, copyright, host } from '../../../config';
export default Vue.extend({
data() {
@ -39,12 +39,17 @@ export default Vue.extend({
copyright,
stats: null,
host,
name,
description,
name: 'Misskey',
description: '',
tags: []
};
},
created() {
(this as any).os.getMeta().then(meta => {
this.name = meta.name;
this.description = meta.description;
});
(this as any).api('stats').then(stats => {
this.stats = stats;
});

3
src/client/app/mobile/views/pages/widgets.vue
View File

@ -53,7 +53,6 @@
import Vue from 'vue';
import * as XDraggable from 'vuedraggable';
import * as uuid from 'uuid';
import * as config from '../../../config';
export default Vue.extend({
components: {
@ -103,7 +102,7 @@ export default Vue.extend({
},
mounted() {
document.title = config.name;
document.title = (this as any).os.instanceName;
},
methods: {

4
src/server/api/endpoints/meta.ts
View File

@ -33,7 +33,7 @@ export default () => new Promise(async (res, rej) => {
},
broadcasts: meta.broadcasts,
disableRegistration: meta.disableRegistration,
recaptchaSitekey: config.recaptcha.site_key,
swPublickey: config.sw.public_key
recaptchaSitekey: config.recaptcha ? config.recaptcha.site_key : null,
swPublickey: config.sw ? config.sw.public_key : null
});
});