@@ -171,9 +174,16 @@ export default Vue.extend({
diff --git a/src/client/app/mobile/views/components/friends-maker.vue b/src/client/app/mobile/views/components/friends-maker.vue
deleted file mode 100644
index 21bb8dec1..000000000
--- a/src/client/app/mobile/views/components/friends-maker.vue
+++ /dev/null
@@ -1,130 +0,0 @@
-
-
-
{{ $t('title') }}:
-
-
-
-
{{ $t('empty') }}
-
{{ $t('fetching') }}
-
{{ $t('refresh') }}
-
-
-
+
+
+
{{ $t('@.empty-timeline-info.follow-users-to-make-your-timeline') }}
+
{{ $t('@.empty-timeline-info.explore') }}
+
@@ -18,7 +23,7 @@ const fetchLimit = 10;
export default Vue.extend({
i18n: i18n('mobile/views/pages/home.timeline.vue'),
-
+
props: {
src: {
type: String,
@@ -172,3 +177,14 @@ export default Vue.extend({
}
});
+
+
From efd0368e568b39ca31d75bc3962e2627681bff13 Mon Sep 17 00:00:00 2001
From: syuilo
Date: Mon, 18 Feb 2019 04:52:40 +0900
Subject: [PATCH 129/256] Resolve #4305
---
package.json | 1 -
src/client/app/boot.js | 4 ++--
src/client/app/common/scripts/check-for-update.ts | 4 ++--
src/client/app/common/views/widgets/version.vue | 2 +-
src/client/app/config.ts | 2 --
src/client/app/desktop/views/components/settings.vue | 2 +-
src/client/app/init.ts | 2 +-
src/client/app/mios.ts | 2 +-
src/client/app/mobile/views/pages/settings.vue | 2 +-
src/server/api/endpoints/meta.ts | 3 ---
webpack.config.ts | 3 +--
11 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/package.json b/package.json
index 6514cc605..d876274c7 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,6 @@
"name": "misskey",
"author": "syuilo ",
"version": "10.87.1",
- "clientVersion": "2.0.14358",
"codename": "nighthike",
"repository": {
"type": "git",
diff --git a/src/client/app/boot.js b/src/client/app/boot.js
index 28ba1be09..f93cb407e 100644
--- a/src/client/app/boot.js
+++ b/src/client/app/boot.js
@@ -138,8 +138,8 @@
const meta = await res.json();
// Compare versions
- if (meta.clientVersion != ver) {
- localStorage.setItem('v', meta.clientVersion);
+ if (meta.version != ver) {
+ localStorage.setItem('v', meta.version);
alert(
'Misskeyの新しいバージョンがあります。ページを再度読み込みします。' +
diff --git a/src/client/app/common/scripts/check-for-update.ts b/src/client/app/common/scripts/check-for-update.ts
index 20da83a0c..d48791576 100644
--- a/src/client/app/common/scripts/check-for-update.ts
+++ b/src/client/app/common/scripts/check-for-update.ts
@@ -1,8 +1,8 @@
-import { clientVersion as current } from '../../config';
+import { version as current } from '../../config';
export default async function($root: any, force = false, silent = false) {
const meta = await $root.getMeta(force);
- const newer = meta.clientVersion;
+ const newer = meta.version;
if (newer != current) {
localStorage.setItem('should-refresh', 'true');
diff --git a/src/client/app/common/views/widgets/version.vue b/src/client/app/common/views/widgets/version.vue
index 470eb1a84..e8f6c08f3 100644
--- a/src/client/app/common/views/widgets/version.vue
+++ b/src/client/app/common/views/widgets/version.vue
@@ -3,7 +3,7 @@
diff --git a/src/client/app/desktop/views/deck/deck.tl.vue b/src/client/app/desktop/views/deck/deck.tl.vue
index 16f268f2c..263c2a082 100644
--- a/src/client/app/desktop/views/deck/deck.tl.vue
+++ b/src/client/app/desktop/views/deck/deck.tl.vue
@@ -6,7 +6,7 @@
{{ $t('disabled-timeline.description') }}
-
-
+
+
+
- {{ $t('not-available') }}
- {{ $t('not-found', { q }) }}
-
-
@@ -22,27 +19,40 @@ export default Vue.extend({
i18n: i18n('desktop/views/pages/search.vue'),
data() {
return {
- fetching: true,
- moreFetching: false,
- existMore: false,
- offset: 0,
- empty: false,
- notAvailable: false
+ makePromise: cursor => this.$root.api('notes/search', {
+ limit: limit + 1,
+ offset: cursor ? cursor : undefined,
+ query: this.q
+ }).then(notes => {
+ if (notes.length == limit + 1) {
+ notes.pop();
+ return {
+ notes: notes,
+ cursor: cursor ? cursor + limit : limit
+ };
+ } else {
+ return {
+ notes: notes,
+ cursor: null
+ };
+ }
+ })
};
},
- watch: {
- $route: 'fetch'
- },
computed: {
q(): string {
return this.$route.query.q;
}
},
+ watch: {
+ $route() {
+ this.$refs.timeline.reload();
+ }
+ },
mounted() {
document.addEventListener('keydown', this.onDocumentKeydown);
window.addEventListener('scroll', this.onScroll, { passive: true });
-
- this.fetch();
+ Progress.start();
},
beforeDestroy() {
document.removeEventListener('keydown', this.onDocumentKeydown);
@@ -56,75 +66,23 @@ export default Vue.extend({
}
}
},
- fetch() {
- this.fetching = true;
- Progress.start();
-
- (this.$refs.timeline as any).init(() => new Promise((res, rej) => {
- this.$root.api('notes/search', {
- limit: limit + 1,
- offset: this.offset,
- query: this.q
- }).then(notes => {
- if (notes.length == 0) this.empty = true;
- if (notes.length == limit + 1) {
- notes.pop();
- this.existMore = true;
- }
- res(notes);
- this.fetching = false;
- Progress.done();
- }, (e: string) => {
- this.fetching = false;
- Progress.done();
- if (e === 'searching not available') this.notAvailable = true;
- });
- }));
+ inited() {
+ Progress.done();
},
- more() {
- this.offset += limit;
-
- const promise = this.$root.api('notes/search', {
- limit: limit + 1,
- offset: this.offset,
- query: this.q
- });
-
- promise.then(notes => {
- if (notes.length == limit + 1) {
- notes.pop();
- } else {
- this.existMore = false;
- }
- for (const n of notes) {
- (this.$refs.timeline as any).append(n);
- }
- this.moreFetching = false;
- });
-
- return promise;
- }
}
});
diff --git a/src/client/app/desktop/views/home/tag.vue b/src/client/app/desktop/views/home/tag.vue
index 182c8f351..2f9854c07 100644
--- a/src/client/app/desktop/views/home/tag.vue
+++ b/src/client/app/desktop/views/home/tag.vue
@@ -1,7 +1,10 @@
-
{{ $t('no-posts-found', { q: $route.params.tag }) }}
-
+
+
+ {{ $route.params.tag }}
+
+
@@ -16,21 +19,35 @@ export default Vue.extend({
i18n: i18n('desktop/views/pages/tag.vue'),
data() {
return {
- fetching: true,
- moreFetching: false,
- existMore: false,
- offset: 0,
- empty: false
+ makePromise: cursor => this.$root.api('notes/search_by_tag', {
+ limit: limit + 1,
+ offset: cursor ? cursor : undefined,
+ tag: this.$route.params.tag
+ }).then(notes => {
+ if (notes.length == limit + 1) {
+ notes.pop();
+ return {
+ notes: notes,
+ cursor: cursor ? cursor + limit : limit
+ };
+ } else {
+ return {
+ notes: notes,
+ cursor: null
+ };
+ }
+ })
};
},
watch: {
- $route: 'fetch'
+ $route() {
+ this.$refs.timeline.reload();
+ }
},
mounted() {
document.addEventListener('keydown', this.onDocumentKeydown);
window.addEventListener('scroll', this.onScroll, { passive: true });
-
- this.fetch();
+ Progress.start();
},
beforeDestroy() {
document.removeEventListener('keydown', this.onDocumentKeydown);
@@ -44,73 +61,23 @@ export default Vue.extend({
}
}
},
- fetch() {
- this.fetching = true;
- Progress.start();
-
- (this.$refs.timeline as any).init(() => new Promise((res, rej) => {
- this.$root.api('notes/search_by_tag', {
- limit: limit + 1,
- offset: this.offset,
- tag: this.$route.params.tag
- }).then(notes => {
- if (notes.length == 0) this.empty = true;
- if (notes.length == limit + 1) {
- notes.pop();
- this.existMore = true;
- }
- res(notes);
- this.fetching = false;
- Progress.done();
- }, rej);
- }));
+ inited() {
+ Progress.done();
},
- more() {
- this.offset += limit;
-
- const promise = this.$root.api('notes/search_by_tag', {
- limit: limit + 1,
- offset: this.offset,
- tag: this.$route.params.tag
- });
-
- promise.then(notes => {
- if (notes.length == limit + 1) {
- notes.pop();
- } else {
- this.existMore = false;
- }
- for (const n of notes) {
- (this.$refs.timeline as any).append(n);
- }
- this.moreFetching = false;
- });
-
- return promise;
- }
}
});
-
diff --git a/src/client/app/desktop/views/home/timeline.core.vue b/src/client/app/desktop/views/home/timeline.core.vue
index 704ca48ae..efffc0b4d 100644
--- a/src/client/app/desktop/views/home/timeline.core.vue
+++ b/src/client/app/desktop/views/home/timeline.core.vue
@@ -5,8 +5,11 @@
{{ $t('@.empty-timeline-info.explore') }}
+
+
+
+
+
{{ $t('empty') }}
@@ -21,6 +24,7 @@ const fetchLimit = 10;
export default Vue.extend({
i18n: i18n('desktop/views/components/timeline.core.vue'),
+
props: {
src: {
type: String,
@@ -33,9 +37,6 @@ export default Vue.extend({
data() {
return {
- fetching: true,
- moreFetching: false,
- existMore: false,
connection: null,
date: null,
baseQuery: {
@@ -44,21 +45,18 @@ export default Vue.extend({
includeLocalRenotes: this.$store.state.settings.showLocalRenotes
},
query: {},
- endpoint: null
+ endpoint: null,
+ makePromise: null
};
},
computed: {
alone(): boolean {
return this.$store.state.i.followingCount == 0;
- },
-
- canFetchMore(): boolean {
- return !this.moreFetching && !this.fetching && this.existMore;
}
},
- mounted() {
+ created() {
const prepend = note => {
(this.$refs.timeline as any).prepend(note);
};
@@ -109,7 +107,25 @@ export default Vue.extend({
this.connection.on('mention', onNote);
}
- this.fetch();
+ this.makePromise = cursor => this.$root.api(this.endpoint, {
+ limit: fetchLimit + 1,
+ untilDate: cursor ? undefined : (this.date ? this.date.getTime() : undefined),
+ untilId: cursor ? cursor : undefined,
+ ...this.baseQuery, ...this.query
+ }).then(notes => {
+ if (notes.length == fetchLimit + 1) {
+ notes.pop();
+ return {
+ notes: notes,
+ cursor: notes[notes.length - 1].id
+ };
+ } else {
+ return {
+ notes: notes,
+ cursor: null
+ };
+ }
+ });
},
beforeDestroy() {
@@ -117,57 +133,8 @@ export default Vue.extend({
},
methods: {
- fetch() {
- this.fetching = true;
-
- (this.$refs.timeline as any).init(() => new Promise((res, rej) => {
- this.$root.api(this.endpoint, Object.assign({
- limit: fetchLimit + 1,
- untilDate: this.date ? this.date.getTime() : undefined
- }, this.baseQuery, this.query)).then(notes => {
- if (notes.length == fetchLimit + 1) {
- notes.pop();
- this.existMore = true;
- }
- res(notes);
- this.fetching = false;
- this.$emit('loaded');
- }, rej);
- }));
- },
-
- more() {
- if (!this.canFetchMore) return;
-
- this.moreFetching = true;
-
- const promise = this.$root.api(this.endpoint, Object.assign({
- limit: fetchLimit + 1,
- untilId: (this.$refs.timeline as any).tail().id
- }, this.baseQuery, this.query));
-
- promise.then(notes => {
- if (notes.length == fetchLimit + 1) {
- notes.pop();
- } else {
- this.existMore = false;
- }
- for (const n of notes) {
- (this.$refs.timeline as any).append(n);
- }
- this.moreFetching = false;
- });
-
- return promise;
- },
-
focus() {
(this.$refs.timeline as any).focus();
- },
-
- warp(date) {
- this.date = date;
- this.fetch();
}
}
});
@@ -186,20 +153,3 @@ export default Vue.extend({
margin 0 0 8px 0
-
-
diff --git a/src/client/app/desktop/views/home/timeline.vue b/src/client/app/desktop/views/home/timeline.vue
index 2f42b9723..573cc95a9 100644
--- a/src/client/app/desktop/views/home/timeline.vue
+++ b/src/client/app/desktop/views/home/timeline.vue
@@ -1,29 +1,23 @@
-
+
-
- {{ $t('home') }}
- {{ $t('local') }}
- {{ $t('hybrid') }}
- {{ $t('global') }}
- {{ tagTl.title }}
- {{ list.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ {{ $t('home') }}
+ {{ $t('local') }}
+ {{ $t('hybrid') }}
+ {{ $t('global') }}
+ {{ tagTl.title }}
+ {{ list.title }}
+
+
+
+
+
+
+
+
@@ -51,6 +45,16 @@ export default Vue.extend({
};
},
+ computed: {
+ options(): any {
+ return {
+ ...(this.src == 'list' ? { list: this.list } : { src: this.src }),
+ ...(this.src == 'tag' ? { tagTl: this.tagTl } : {}),
+ key: this.src == 'list' ? this.list.id : this.src
+ }
+ }
+ },
+
watch: {
src() {
this.saveSrc();
@@ -186,88 +190,82 @@ export default Vue.extend({
diff --git a/src/client/app/desktop/views/home/user/user.home.vue b/src/client/app/desktop/views/home/user/user.home.vue
index 3a999b573..65aa5e1c8 100644
--- a/src/client/app/desktop/views/home/user/user.home.vue
+++ b/src/client/app/desktop/views/home/user/user.home.vue
@@ -10,7 +10,7 @@
-
- {{ $t('default') }}
- {{ $t('with-replies') }}
- {{ $t('with-media') }}
- {{ $t('my-posts') }}
-
-
+
+
+
+ {{ $t('default') }}
+ {{ $t('with-replies') }}
+ {{ $t('with-media') }}
+ {{ $t('my-posts') }}
+
{{ $t('empty') }}
-
+
+
-
+
@@ -10,8 +10,6 @@
-
-
@@ -23,8 +21,8 @@
-
-
+
{{ $t('empty') }}
@@ -36,9 +36,6 @@ export default Vue.extend({
data() {
return {
- fetching: true,
- moreFetching: false,
- existMore: false,
streamManager: null,
connection: null,
unreadCount: 0,
@@ -49,21 +46,18 @@ export default Vue.extend({
includeLocalRenotes: this.$store.state.settings.showLocalRenotes
},
query: {},
- endpoint: null
+ endpoint: null,
+ makePromise: null
};
},
computed: {
alone(): boolean {
return this.$store.state.i.followingCount == 0;
- },
-
- canFetchMore(): boolean {
- return !this.moreFetching && !this.fetching && this.existMore;
}
},
- mounted() {
+ created() {
const prepend = note => {
(this.$refs.timeline as any).prepend(note);
};
@@ -114,7 +108,25 @@ export default Vue.extend({
this.connection.on('mention', onNote);
}
- this.fetch();
+ this.makePromise = cursor => this.$root.api(this.endpoint, {
+ limit: fetchLimit + 1,
+ untilDate: cursor ? undefined : (this.date ? this.date.getTime() : undefined),
+ untilId: cursor ? cursor : undefined,
+ ...this.baseQuery, ...this.query
+ }).then(notes => {
+ if (notes.length == fetchLimit + 1) {
+ notes.pop();
+ return {
+ notes: notes,
+ cursor: notes[notes.length - 1].id
+ };
+ } else {
+ return {
+ notes: notes,
+ cursor: null
+ };
+ }
+ });
},
beforeDestroy() {
@@ -122,57 +134,13 @@ export default Vue.extend({
},
methods: {
- fetch() {
- this.fetching = true;
-
- (this.$refs.timeline as any).init(() => new Promise((res, rej) => {
- this.$root.api(this.endpoint, Object.assign({
- limit: fetchLimit + 1,
- untilDate: this.date ? this.date.getTime() : undefined
- }, this.baseQuery, this.query)).then(notes => {
- if (notes.length == fetchLimit + 1) {
- notes.pop();
- this.existMore = true;
- }
- res(notes);
- this.fetching = false;
- this.$emit('loaded');
- }, rej);
- }));
- },
-
- more() {
- if (!this.canFetchMore) return;
-
- this.moreFetching = true;
-
- const promise = this.$root.api(this.endpoint, Object.assign({
- limit: fetchLimit + 1,
- untilId: (this.$refs.timeline as any).tail().id
- }, this.baseQuery, this.query));
-
- promise.then(notes => {
- if (notes.length == fetchLimit + 1) {
- notes.pop();
- } else {
- this.existMore = false;
- }
- for (const n of notes) {
- (this.$refs.timeline as any).append(n);
- }
- this.moreFetching = false;
- });
-
- return promise;
- },
-
focus() {
(this.$refs.timeline as any).focus();
},
warp(date) {
this.date = date;
- this.fetch();
+ (this.$refs.timeline as any).reload();
}
}
});
diff --git a/src/client/app/mobile/views/pages/home.vue b/src/client/app/mobile/views/pages/home.vue
index a663c1da9..7f6a1b823 100644
--- a/src/client/app/mobile/views/pages/home.vue
+++ b/src/client/app/mobile/views/pages/home.vue
@@ -233,17 +233,6 @@ main
font-size 10px
color var(--notificationIndicator)
- > .tl
- max-width 680px
- margin 0 auto
- padding 8px
-
- @media (min-width 500px)
- padding 16px
-
- @media (min-width 600px)
- padding 32px
-
diff --git a/src/client/app/mobile/views/pages/received-follow-requests.vue b/src/client/app/mobile/views/pages/received-follow-requests.vue
index 1b8323e83..df0cf109c 100644
--- a/src/client/app/mobile/views/pages/received-follow-requests.vue
+++ b/src/client/app/mobile/views/pages/received-follow-requests.vue
@@ -57,17 +57,6 @@ export default Vue.extend({
diff --git a/src/client/app/mobile/views/pages/settings.vue b/src/client/app/mobile/views/pages/settings.vue
index f26b9af6f..17f0c2f14 100644
--- a/src/client/app/mobile/views/pages/settings.vue
+++ b/src/client/app/mobile/views/pages/settings.vue
@@ -383,9 +383,6 @@ export default Vue.extend({
diff --git a/src/client/app/mobile/views/pages/user-lists.vue b/src/client/app/mobile/views/pages/user-lists.vue
index dc9d47de3..530357576 100644
--- a/src/client/app/mobile/views/pages/user-lists.vue
+++ b/src/client/app/mobile/views/pages/user-lists.vue
@@ -53,20 +53,3 @@ export default Vue.extend({
}
});
-
-
diff --git a/src/client/app/mobile/views/pages/user/home.vue b/src/client/app/mobile/views/pages/user/home.vue
index 98b4f4447..f9b7e7f90 100644
--- a/src/client/app/mobile/views/pages/user/home.vue
+++ b/src/client/app/mobile/views/pages/user/home.vue
@@ -57,7 +57,6 @@ export default Vue.extend({
From 54d40420ada996e844eed231117619928e130fce Mon Sep 17 00:00:00 2001
From: syuilo
Date: Mon, 18 Feb 2019 09:48:00 +0900
Subject: [PATCH 131/256] Use v-slot instead of slot
---
src/client/app/admin/views/abuse.vue | 2 +-
src/client/app/admin/views/announcements.vue | 2 +-
src/client/app/admin/views/drive.vue | 8 +--
src/client/app/admin/views/emoji.vue | 12 ++--
src/client/app/admin/views/federation.vue | 8 +--
src/client/app/admin/views/hashtags.vue | 2 +-
src/client/app/admin/views/instance.vue | 58 +++++++++----------
src/client/app/admin/views/moderators.vue | 4 +-
src/client/app/admin/views/queue.vue | 2 +-
src/client/app/admin/views/users.vue | 10 ++--
.../common/views/components/api-settings.vue | 4 +-
.../app/common/views/components/dialog.vue | 2 +-
.../views/components/drive-settings.vue | 2 +-
.../views/components/integration-settings.vue | 2 +-
.../views/components/language-settings.vue | 2 +-
.../views/components/mute-and-block.vue | 4 +-
.../components/notification-settings.vue | 4 +-
.../views/components/profile-editor.vue | 26 ++++-----
.../app/common/views/components/signin.vue | 8 +--
.../app/common/views/components/signup.vue | 34 +++++------
.../app/common/views/components/theme.vue | 6 +-
.../views/components/user-list-editor.vue | 4 +-
.../app/common/views/components/user-list.vue | 2 +-
src/client/app/common/views/pages/explore.vue | 2 +-
.../app/common/views/widgets/hashtags.vue | 2 +-
src/client/app/common/views/widgets/memo.vue | 2 +-
.../app/common/views/widgets/photo-stream.vue | 2 +-
.../common/views/widgets/posts-monitor.vue | 4 +-
src/client/app/common/views/widgets/rss.vue | 4 +-
.../app/common/views/widgets/server.vue | 4 +-
.../app/desktop/views/components/activity.vue | 4 +-
.../choose-file-from-drive-window.vue | 10 ++--
.../choose-folder-from-drive-window.vue | 4 +-
.../desktop/views/components/crop-window.vue | 2 +-
.../desktop/views/components/drive-window.vue | 2 +-
.../desktop/views/components/game-window.vue | 6 +-
.../components/messaging-room-window.vue | 6 +-
.../views/components/messaging-window.vue | 2 +-
.../views/components/post-form-window.vue | 16 ++---
.../views/components/progress-dialog.vue | 2 +-
.../received-follow-requests-window.vue | 2 +-
.../views/components/renote-form-window.vue | 2 +-
.../views/components/settings-window.vue | 2 +-
.../app/desktop/views/components/settings.vue | 40 ++++++-------
.../views/components/user-list-timeline.vue | 2 +-
.../views/components/user-list-window.vue | 2 +-
.../views/components/user-lists-window.vue | 2 +-
.../app/desktop/views/deck/deck.column.vue | 2 +-
.../desktop/views/deck/deck.direct-column.vue | 2 +-
.../views/deck/deck.explore-column.vue | 4 +-
.../views/deck/deck.favorites-column.vue | 4 +-
.../views/deck/deck.featured-column.vue | 4 +-
.../views/deck/deck.hashtag-column.vue | 4 +-
.../views/deck/deck.mentions-column.vue | 2 +-
.../desktop/views/deck/deck.note-column.vue | 4 +-
.../views/deck/deck.notifications-column.vue | 2 +-
.../desktop/views/deck/deck.search-column.vue | 4 +-
.../app/desktop/views/deck/deck.tl-column.vue | 4 +-
.../views/deck/deck.user-column.home.vue | 8 +--
.../desktop/views/deck/deck.user-column.vue | 4 +-
.../views/deck/deck.widgets-column.vue | 2 +-
src/client/app/desktop/views/home/search.vue | 8 ++-
src/client/app/desktop/views/home/tag.vue | 8 ++-
.../app/desktop/views/home/timeline.core.vue | 6 +-
.../app/desktop/views/home/user/user.home.vue | 2 +-
.../desktop/views/home/user/user.photos.vue | 2 +-
.../desktop/views/home/user/user.timeline.vue | 16 ++---
.../app/desktop/views/widgets/messaging.vue | 4 +-
.../desktop/views/widgets/notifications.vue | 4 +-
.../app/desktop/views/widgets/polls.vue | 12 ++--
.../app/desktop/views/widgets/post-form.vue | 2 +-
.../app/desktop/views/widgets/trends.vue | 4 +-
.../app/desktop/views/widgets/users.vue | 12 ++--
src/client/app/mobile/views/components/ui.vue | 2 +-
.../mobile/views/components/user-timeline.vue | 4 +-
src/client/app/mobile/views/pages/drive.vue | 6 +-
src/client/app/mobile/views/pages/explore.vue | 2 +-
.../app/mobile/views/pages/favorites.vue | 2 +-
.../app/mobile/views/pages/featured.vue | 2 +-
.../app/mobile/views/pages/games/reversi.vue | 2 +-
.../app/mobile/views/pages/home.timeline.vue | 4 +-
src/client/app/mobile/views/pages/home.vue | 36 ++++++------
.../app/mobile/views/pages/messaging-room.vue | 4 +-
.../app/mobile/views/pages/messaging.vue | 2 +-
src/client/app/mobile/views/pages/note.vue | 2 +-
.../app/mobile/views/pages/notifications.vue | 4 +-
.../views/pages/received-follow-requests.vue | 2 +-
src/client/app/mobile/views/pages/search.vue | 2 +-
.../app/mobile/views/pages/settings.vue | 14 ++---
src/client/app/mobile/views/pages/tag.vue | 2 +-
.../app/mobile/views/pages/user-list.vue | 2 +-
.../app/mobile/views/pages/user-lists.vue | 4 +-
.../app/mobile/views/pages/user/index.vue | 2 +-
src/client/app/mobile/views/pages/widgets.vue | 4 +-
.../app/mobile/views/widgets/activity.vue | 2 +-
src/client/app/test/views/index.vue | 4 +-
96 files changed, 291 insertions(+), 283 deletions(-)
diff --git a/src/client/app/admin/views/abuse.vue b/src/client/app/admin/views/abuse.vue
index 11be43eeb..141e0376c 100644
--- a/src/client/app/admin/views/abuse.vue
+++ b/src/client/app/admin/views/abuse.vue
@@ -1,7 +1,7 @@
- {{ $t('title') }}
+ {{ $t('title') }}
diff --git a/src/client/app/admin/views/announcements.vue b/src/client/app/admin/views/announcements.vue
index f50239e09..4f2f85306 100644
--- a/src/client/app/admin/views/announcements.vue
+++ b/src/client/app/admin/views/announcements.vue
@@ -1,7 +1,7 @@
- {{ $t('announcements') }}
+ {{ $t('announcements') }}
{{ $t('title') }}
diff --git a/src/client/app/admin/views/drive.vue b/src/client/app/admin/views/drive.vue
index f973465ea..fe265637d 100644
--- a/src/client/app/admin/views/drive.vue
+++ b/src/client/app/admin/views/drive.vue
@@ -1,7 +1,7 @@
- {{ $t('operation') }}
+ {{ $t('operation') }}
{{ $t('fileid-or-url') }}
@@ -17,18 +17,18 @@
- {{ $t('@.drive') }}
+ {{ $t('@.drive') }}
- {{ $t('sort.title') }}
+ {{ $t('sort.title') }}
- {{ $t('origin.title') }}
+ {{ $t('origin.title') }}
diff --git a/src/client/app/admin/views/emoji.vue b/src/client/app/admin/views/emoji.vue
index 1a623f424..ae272b4df 100644
--- a/src/client/app/admin/views/emoji.vue
+++ b/src/client/app/admin/views/emoji.vue
@@ -1,20 +1,20 @@
- {{ $t('add-emoji.title') }}
+ {{ $t('add-emoji.title') }}
{{ $t('add-emoji.name') }}
- {{ $t('add-emoji.name-desc') }}
+ {{ $t('add-emoji.name-desc') }}
{{ $t('add-emoji.aliases') }}
- {{ $t('add-emoji.aliases-desc') }}
+ {{ $t('add-emoji.aliases-desc') }}
-
+
{{ $t('add-emoji.url') }}
{{ $t('add-emoji.info') }}
@@ -23,7 +23,7 @@
- {{ $t('emojis.title') }}
+ {{ $t('emojis.title') }}
![]()
@@ -38,7 +38,7 @@
-
+
{{ $t('add-emoji.url') }}
diff --git a/src/client/app/admin/views/federation.vue b/src/client/app/admin/views/federation.vue
index 365ffdeae..c5f3d4e0e 100644
--- a/src/client/app/admin/views/federation.vue
+++ b/src/client/app/admin/views/federation.vue
@@ -1,7 +1,7 @@
- {{ $t('federation') }}
+ {{ $t('federation') }}
{{ $t('host') }}
@@ -74,11 +74,11 @@
- {{ $t('instances') }}
+ {{ $t('instances') }}
- {{ $t('sort') }}
+ {{ $t('sort') }}
@@ -97,7 +97,7 @@
- {{ $t('state') }}
+ {{ $t('state') }}
diff --git a/src/client/app/admin/views/hashtags.vue b/src/client/app/admin/views/hashtags.vue
index dc9f0b015..67b1ccde7 100644
--- a/src/client/app/admin/views/hashtags.vue
+++ b/src/client/app/admin/views/hashtags.vue
@@ -1,7 +1,7 @@
- {{ $t('hided-tags') }}
+ {{ $t('hided-tags') }}
{{ $t('save') }}
diff --git a/src/client/app/admin/views/instance.vue b/src/client/app/admin/views/instance.vue
index bf30913b2..014b1743a 100644
--- a/src/client/app/admin/views/instance.vue
+++ b/src/client/app/admin/views/instance.vue
@@ -1,20 +1,20 @@
- {{ $t('instance') }}
+ {{ $t('instance') }}
{{ $t('host') }}
{{ $t('instance-name') }}
{{ $t('instance-description') }}
- {{ $t('logo-url') }}
- {{ $t('banner-url') }}
- {{ $t('error-image-url') }}
- {{ $t('languages') }}{{ $t('languages-desc') }}
+ {{ $t('logo-url') }}
+ {{ $t('banner-url') }}
+ {{ $t('error-image-url') }}
+ {{ $t('languages') }}{{ $t('languages-desc') }}
{{ $t('maintainer-config') }}
{{ $t('maintainer-name') }}
- {{ $t('maintainer-email') }}
+ {{ $t('maintainer-email') }}
{{ $t('max-note-text-length') }}
@@ -27,28 +27,28 @@
- {{ $t('cache-remote-files') }}{{ $t('cache-remote-files-desc') }}
- {{ $t('local-drive-capacity-mb') }}MB{{ $t('mb') }}
- {{ $t('remote-drive-capacity-mb') }}MB{{ $t('mb') }}
+ {{ $t('cache-remote-files') }}{{ $t('cache-remote-files-desc') }}
+ {{ $t('local-drive-capacity-mb') }}MB{{ $t('mb') }}
+ {{ $t('remote-drive-capacity-mb') }}MB{{ $t('mb') }}
{{ $t('recaptcha-config') }}
{{ $t('enable-recaptcha') }}
{{ $t('recaptcha-info') }}
- {{ $t('recaptcha-site-key') }}
- {{ $t('recaptcha-secret-key') }}
+ {{ $t('recaptcha-site-key') }}
+ {{ $t('recaptcha-secret-key') }}
{{ $t('proxy-account-config') }}
{{ $t('proxy-account-info') }}
- @{{ $t('proxy-account-username') }}{{ $t('proxy-account-username-desc') }}
+ @{{ $t('proxy-account-username') }}{{ $t('proxy-account-username-desc') }}
{{ $t('proxy-account-warn') }}
- {{ $t('enable-email') }}{{ $t('email-config-info') }}
+ {{ $t('enable-email') }}{{ $t('email-config-info') }}
{{ $t('email') }}
{{ $t('smtp-host') }}
@@ -58,15 +58,15 @@
{{ $t('smtp-user') }}
{{ $t('smtp-pass') }}
- {{ $t('smtp-secure') }}{{ $t('smtp-secure-info') }}
+ {{ $t('smtp-secure') }}{{ $t('smtp-secure-info') }}
{{ $t('serviceworker-config') }}
- {{ $t('enable-serviceworker') }}{{ $t('serviceworker-info') }}
+ {{ $t('enable-serviceworker') }}{{ $t('serviceworker-info') }}
{{ $t('vapid-info') }}
npm i web-push -g
web-push generate-vapid-keys
- {{ $t('vapid-publickey') }}
- {{ $t('vapid-privatekey') }}
+ {{ $t('vapid-publickey') }}
+ {{ $t('vapid-privatekey') }}
@@ -76,8 +76,8 @@
{{ $t('user-recommendation-config') }}
{{ $t('enable-external-user-recommendation') }}
- {{ $t('external-user-recommendation-engine') }}{{ $t('external-user-recommendation-engine-desc') }}
- {{ $t('external-user-recommendation-timeout') }}ms{{ $t('external-user-recommendation-timeout-desc') }}
+ {{ $t('external-user-recommendation-engine') }}{{ $t('external-user-recommendation-engine-desc') }}
+ {{ $t('external-user-recommendation-timeout') }}ms{{ $t('external-user-recommendation-timeout-desc') }}
{{ $t('save') }}
@@ -85,7 +85,7 @@
- {{ $t('invite') }}
+ {{ $t('invite') }}
{{ $t('invite') }}
Code: {{ inviteCode }}
@@ -93,12 +93,12 @@
- {{ $t('twitter-integration-config') }}
+ {{ $t('twitter-integration-config') }}
{{ $t('enable-twitter-integration') }}
- {{ $t('twitter-integration-consumer-key') }}
- {{ $t('twitter-integration-consumer-secret') }}
+ {{ $t('twitter-integration-consumer-key') }}
+ {{ $t('twitter-integration-consumer-secret') }}
{{ $t('twitter-integration-info', { url: `${url}/api/tw/cb` }) }}
{{ $t('save') }}
@@ -106,12 +106,12 @@
- {{ $t('github-integration-config') }}
+ {{ $t('github-integration-config') }}
{{ $t('enable-github-integration') }}
- {{ $t('github-integration-client-id') }}
- {{ $t('github-integration-client-secret') }}
+ {{ $t('github-integration-client-id') }}
+ {{ $t('github-integration-client-secret') }}
{{ $t('github-integration-info', { url: `${url}/api/gh/cb` }) }}
{{ $t('save') }}
@@ -119,12 +119,12 @@
- {{ $t('discord-integration-config') }}
+ {{ $t('discord-integration-config') }}
{{ $t('enable-discord-integration') }}
- {{ $t('discord-integration-client-id') }}
- {{ $t('discord-integration-client-secret') }}
+ {{ $t('discord-integration-client-id') }}
+ {{ $t('discord-integration-client-secret') }}
{{ $t('discord-integration-info', { url: `${url}/api/dc/cb` }) }}
{{ $t('save') }}
diff --git a/src/client/app/admin/views/moderators.vue b/src/client/app/admin/views/moderators.vue
index 89a7c75e2..0e5af1d41 100644
--- a/src/client/app/admin/views/moderators.vue
+++ b/src/client/app/admin/views/moderators.vue
@@ -1,10 +1,10 @@
- {{ $t('add-moderator.title') }}
+ {{ $t('add-moderator.title') }}
- @
+ @
{{ $t('add-moderator.add') }}
diff --git a/src/client/app/admin/views/queue.vue b/src/client/app/admin/views/queue.vue
index e26b86e3e..f75c73d7a 100644
--- a/src/client/app/admin/views/queue.vue
+++ b/src/client/app/admin/views/queue.vue
@@ -1,7 +1,7 @@
- {{ $t('operation') }}
+ {{ $t('operation') }}
{{ $t('remove-all-jobs') }}
diff --git a/src/client/app/admin/views/users.vue b/src/client/app/admin/views/users.vue
index db9f521bc..46399ef69 100644
--- a/src/client/app/admin/views/users.vue
+++ b/src/client/app/admin/views/users.vue
@@ -1,7 +1,7 @@
- {{ $t('operation') }}
+ {{ $t('operation') }}
{{ $t('username-or-userid') }}
@@ -32,18 +32,18 @@
- {{ $t('users.title') }}
+ {{ $t('users.title') }}
- {{ $t('users.sort.title') }}
+ {{ $t('users.sort.title') }}
- {{ $t('users.state.title') }}
+ {{ $t('users.state.title') }}
@@ -52,7 +52,7 @@
- {{ $t('users.origin.title') }}
+ {{ $t('users.origin.title') }}
diff --git a/src/client/app/common/views/components/api-settings.vue b/src/client/app/common/views/components/api-settings.vue
index e96eb28d9..c0361726a 100644
--- a/src/client/app/common/views/components/api-settings.vue
+++ b/src/client/app/common/views/components/api-settings.vue
@@ -1,6 +1,6 @@
- API
+ API
@@ -19,7 +19,7 @@
{{ $t('console.parameter') }} (JSON or JSON5)
- {{ $t('console.credential-info') }}
+ {{ $t('console.credential-info') }}
{{ $t('console.sending') }}
diff --git a/src/client/app/common/views/components/dialog.vue b/src/client/app/common/views/components/dialog.vue
index 9eb9151a0..95b7265f7 100644
--- a/src/client/app/common/views/components/dialog.vue
+++ b/src/client/app/common/views/components/dialog.vue
@@ -6,7 +6,7 @@
- @
+ @
diff --git a/src/client/app/common/views/components/drive-settings.vue b/src/client/app/common/views/components/drive-settings.vue
index 89a23686b..72129f8e5 100644
--- a/src/client/app/common/views/components/drive-settings.vue
+++ b/src/client/app/common/views/components/drive-settings.vue
@@ -1,6 +1,6 @@
- {{ $t('@.drive') }}
+ {{ $t('@.drive') }}
diff --git a/src/client/app/common/views/components/integration-settings.vue b/src/client/app/common/views/components/integration-settings.vue
index a9b17779b..2036645e0 100644
--- a/src/client/app/common/views/components/integration-settings.vue
+++ b/src/client/app/common/views/components/integration-settings.vue
@@ -1,6 +1,6 @@
- {{ $t('title') }}
+ {{ $t('title') }}
diff --git a/src/client/app/common/views/components/language-settings.vue b/src/client/app/common/views/components/language-settings.vue
index aa3f29051..6ab18abca 100644
--- a/src/client/app/common/views/components/language-settings.vue
+++ b/src/client/app/common/views/components/language-settings.vue
@@ -1,6 +1,6 @@
- {{ $t('title') }}
+ {{ $t('title') }}
diff --git a/src/client/app/common/views/components/mute-and-block.vue b/src/client/app/common/views/components/mute-and-block.vue
index 97e992ace..fcdbcf264 100644
--- a/src/client/app/common/views/components/mute-and-block.vue
+++ b/src/client/app/common/views/components/mute-and-block.vue
@@ -1,6 +1,6 @@
- {{ $t('mute-and-block') }}
+ {{ $t('mute-and-block') }}
@@ -25,7 +25,7 @@
- {{ $t('muted-words') }}{{ $t('muted-words-description') }}
+ {{ $t('muted-words') }}{{ $t('muted-words-description') }}
{{ $t('save') }}
diff --git a/src/client/app/common/views/components/notification-settings.vue b/src/client/app/common/views/components/notification-settings.vue
index 68e3e7b3a..e1e112819 100644
--- a/src/client/app/common/views/components/notification-settings.vue
+++ b/src/client/app/common/views/components/notification-settings.vue
@@ -1,9 +1,9 @@
- {{ $t('title') }}
+ {{ $t('title') }}
- {{ $t('auto-watch') }}{{ $t('auto-watch-desc') }}
+ {{ $t('auto-watch') }}{{ $t('auto-watch-desc') }}
{{ $t('mark-as-read-all-notifications') }}
diff --git a/src/client/app/common/views/components/profile-editor.vue b/src/client/app/common/views/components/profile-editor.vue
index 2c9dc5445..66e568619 100644
--- a/src/client/app/common/views/components/profile-editor.vue
+++ b/src/client/app/common/views/components/profile-editor.vue
@@ -1,6 +1,6 @@
- {{ $t('title') }}
+ {{ $t('title') }}