未ログオンページでのキャッシュの強化 (#4572)

* GET APIでstring Arrayをサポート

* 未ログイントップのキャッシュ

* users/get-frequently-replied-users

* user

* note

* explore

* featured

* search

Author: mei23

src/client/app/common/views/deck/deck.hashtag-tl.vue

@@ -30,7 +30,7 @@ export default Vue.extend({
 		return {
 			connection: null,
 			date: null as Date | null,
-			makePromise: (cursor: string) => this.$root.api('notes/search_by_tag', {
+			makePromise: (cursor: string) => this.$root.api('notes/search-by-tag', {
 				limit: fetchLimit + 1,
 				untilId: (!this.date && cursor) ? cursor : undefined,
 				untilDate: this.date ? this.date.getTime() : undefined,

src/client/app/common/views/deck/deck.user-column.home.vue

@@ -89,7 +89,7 @@ export default Vue.extend({
 			makePromise: null,
 			date: null as Date | null,
 			faCalendarAlt,
-			makeFrequentlyRepliedUsersPromise: () => this.$root.api('users/get_frequently_replied_users', {
+			makeFrequentlyRepliedUsersPromise: () => this.$root.api('users/get-frequently-replied-users', {
 				userId: this.user.id,
 				limit: 5,
 			}).then(res => res.map(x => x.user)),

src/client/app/common/views/pages/explore.vue

@@ -246,14 +246,14 @@ export default Vue.extend({
 			sort: '+attachedLocalUsers',
 			attachedToLocalUserOnly: true,
 			limit: 30
-		}).then(tags => {
+		}, false, true).then(tags => {
 			this.tagsLocal = tags;
 		});
 		this.$root.api('hashtags/list', {
 			sort: '+attachedRemoteUsers',
 			attachedToRemoteUserOnly: true,
 			limit: 30
-		}).then(tags => {
+		}, false, true).then(tags => {
 			this.tagsRemote = tags;
 		});
 		this.$root.api('stats', {}, false, true).then(stats => {

src/client/app/desktop/views/components/note-detail.vue

@@ -147,7 +147,7 @@ export default Vue.extend({
 			this.$root.api('notes/children', {
 				noteId: this.appearNote.id,
 				limit: 30
-			}).then(replies => {
+			}, false, !this.$store.getters.isSignedIn).then(replies => {
 				this.replies = replies;
 			});
 		}

src/client/app/desktop/views/home/featured.vue

@@ -79,7 +79,7 @@ export default Vue.extend({
 				fileType: this.mediaOnly ? ['image/jpeg', 'image/png', 'image/apng', 'image/gif', 'image/webp', 'image/avif', 'video/mp4', 'video/webm'] : undefined,
 				excludeNsfw: this.filter === 'excludeNsfw',
 				excludeSfw: this.filter === 'excludeSfw',
-			}, false, false).then((notes: any[]) => {
+			}, false, !this.$store.getters.isSignedIn).then((notes: any[]) => {
 				this.notes = notes;
 				this.fetching = false;
 

src/client/app/desktop/views/home/note.vue

@@ -35,7 +35,7 @@ export default Vue.extend({
 
 			this.$root.api('notes/show', {
 				noteId: this.$route.params.note
-			}).then(note => {
+			}, false, !this.$store.getters.isSignedIn).then(note => {
 				if (this.$store.state.i || !note.user.host) this.note = note;
 			}).catch((e: any) => {
 				this.$root.dialog({

src/client/app/desktop/views/home/search.vue

@@ -32,7 +32,7 @@ export default Vue.extend({
 					limit: limit + 1,
 					offset: cursor ? cursor : undefined,
 					query: this.q
-				}).then(notes => {
+				}, false, !this.$store.getters.isSignedIn).then(notes => {
 					if (notes.length == limit + 1) {
 						notes.pop();
 						return {

src/client/app/desktop/views/home/tag.vue

@@ -19,11 +19,11 @@ export default Vue.extend({
 	data() {
 		return {
 			connection: null,
-			makePromise: cursor => this.$root.api('notes/search_by_tag', {
+			makePromise: cursor => this.$root.api('notes/search-by-tag', {
 				limit: limit + 1,
 				offset: cursor ? cursor : undefined,
 				tag: this.$route.params.tag
-			}).then(notes => {
+			}, false, !this.$store.getters.isSignedIn).then(notes => {
 				if (notes.length == limit + 1) {
 					notes.pop();
 					return {

src/client/app/desktop/views/home/timeline.core.vue

@@ -59,7 +59,7 @@ export default Vue.extend({
 		};
 
 		if (this.src == 'tag') {
-			this.endpoint = 'notes/search_by_tag';
+			this.endpoint = 'notes/search-by-tag';
 			this.query = {
 				query: this.tagTl.query
 			};

src/client/app/desktop/views/home/user/index.vue

@@ -45,7 +45,8 @@ export default Vue.extend({
 			if (!this.$route.params.user) return;
 			this.fetching = true;
 			Progress.start();
-			this.$root.api('users/show', parseAcct(this.$route.params.user)).then(user => {
+			const { username, host } = parseAcct(this.$route.params.user);
+			this.$root.api('users/show', { username, host: host ?? undefined }, false, !this.$store.getters.isSignedIn).then(user => {
 				if (this.$store.state.i || !user.host) this.user = user;
 				this.fetching = false;
 				Progress.done();

src/client/app/desktop/views/home/user/user.home.vue

@@ -47,9 +47,9 @@ export default Vue.extend({
 	},
 	data() {
 		return {
-			makeFrequentlyRepliedUsersPromise: () => this.$root.api('users/get_frequently_replied_users', {
+			makeFrequentlyRepliedUsersPromise: () => this.$root.api('users/get-frequently-replied-users', {
 				userId: this.user.id
-			}).then(res => res.map(x => x.user)),
+			}, false, !this.$store.getters.isSignedIn).then(res => res.map(x => x.user)),
 		};
 	},
 	methods: {

src/client/app/desktop/views/home/user/user.photos.vue

@@ -42,7 +42,7 @@ export default Vue.extend({
 			fileType: image,
 			excludeNsfw: !this.$store.state.device.alwaysShowNsfw,
 			limit: 9,
-		}).then(notes => {
+		}, false, !this.$store.getters.isSignedIn).then(notes => {
 			for (const note of notes) {
 				for (const file of note.files) {
 					file._note = note;

src/client/app/desktop/views/home/user/user.timeline.vue

@@ -52,7 +52,7 @@ export default Vue.extend({
 				withFiles: this.mode == 'with-media',
 				untilId: (!this.date && cursor) ? cursor : undefined,
 				untilDate: this.date ? this.date.getTime() : undefined,
-			}).then((notes: ThinPackedNote[]) => {
+			}, false, !this.$store.getters.isSignedIn).then((notes: ThinPackedNote[]) => {
 				this.date = null;
 				if (notes.length == fetchLimit + 1) {
 					notes.pop();

src/client/app/desktop/views/pages/welcome.vue

@@ -192,7 +192,7 @@ export default Vue.extend({
 			fileType: image,
 			limit: 6,
 			excludeNsfw: true,
-		}, false, false).then((notes: any[]) => {
+		}, false, true).then((notes: any[]) => {
 			const files = concat(notes.map((n: any): any[] => n.files));
 			this.photos = files.filter(f => image.includes(f.type)).slice(0, 6);
 		});

src/client/app/mobile/views/components/note-detail.vue

@@ -156,7 +156,7 @@ export default Vue.extend({
 			this.$root.api('notes/children', {
 				noteId: this.appearNote.id,
 				limit: 30
-			}).then(replies => {
+			}, false, !this.$store.getters.isSignedIn).then(replies => {
 				this.replies = replies;
 			});
 		},

src/client/app/mobile/views/components/user-timeline.vue

@@ -25,7 +25,7 @@ export default Vue.extend({
 				limit: fetchLimit + 1,
 				withFiles: this.withMedia,
 				untilId: cursor ? cursor : undefined,
-			}).then(notes => {
+			}, false, !this.$store.getters.isSignedIn).then(notes => {
 				if (notes.length == fetchLimit + 1) {
 					notes.pop();
 					return {

src/client/app/mobile/views/pages/featured.vue

@@ -84,7 +84,7 @@ export default Vue.extend({
 				fileType: this.mediaOnly ? ['image/jpeg', 'image/png', 'image/apng', 'image/gif', 'image/webp', 'image/avif', 'video/mp4', 'video/webm'] : undefined,
 				excludeNsfw: this.filter === 'excludeNsfw',
 				excludeSfw: this.filter === 'excludeSfw',
-			}, false, false).then((notes: any) => {
+			}, false, !this.$store.getters.isSignedIn).then((notes: any) => {
 				notes.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
 				this.notes = notes;
 				this.fetching = false;

src/client/app/mobile/views/pages/home.timeline.vue

@@ -60,7 +60,7 @@ export default Vue.extend({
 		};
 
 		if (this.src == 'tag') {
-			this.endpoint = 'notes/search_by_tag';
+			this.endpoint = 'notes/search-by-tag';
 			this.query = {
 				query: this.tagTl.query
 			};

src/client/app/mobile/views/pages/note.vue

@@ -42,7 +42,7 @@ export default Vue.extend({
 
 			this.$root.api('notes/show', {
 				noteId: this.$route.params.note
-			}).then(note => {
+			}, false, !this.$store.getters.isSignedIn).then(note => {
 				this.note = note;
 			}).catch((e: any) => {
 				this.$root.dialog({

src/client/app/mobile/views/pages/search.vue

@@ -30,7 +30,7 @@ export default Vue.extend({
 				limit: limit + 1,
 				offset: cursor ? cursor : undefined,
 				query: this.q
-			}).then(notes => {
+			}, false, !this.$store.getters.isSignedIn).then(notes => {
 				if (notes.length == limit + 1) {
 					notes.pop();
 					return {

src/client/app/mobile/views/pages/tag.vue

@@ -32,11 +32,11 @@ export default Vue.extend({
 	data() {
 		return {
 			connection: null,
-			makePromise: cursor => this.$root.api('notes/search_by_tag', {
+			makePromise: cursor => this.$root.api('notes/search-by-tag', {
 				limit: limit + 1,
 				offset: cursor ? cursor : undefined,
 				tag: this.$route.params.tag
-			}).then(notes => {
+			}, false, !this.$store.getters.isSignedIn).then(notes => {
 				if (notes.length == limit + 1) {
 					notes.pop();
 					return {

src/client/app/mobile/views/pages/user/home.notes.vue

@@ -23,7 +23,7 @@ export default Vue.extend({
 	mounted() {
 		this.$root.api('users/notes', {
 			userId: this.user.id,
-		}).then(notes => {
+		}, false, !this.$store.getters.isSignedIn).then(notes => {
 			this.notes = notes;
 			this.fetching = false;
 		});

src/client/app/mobile/views/pages/user/home.photos.vue

@@ -33,7 +33,7 @@ export default Vue.extend({
 			fileType: image,
 			excludeNsfw: !this.$store.state.device.alwaysShowNsfw,
 			limit: 9,
-		}).then(notes => {
+		}, false, !this.$store.getters.isSignedIn).then(notes => {
 			for (const note of notes) {
 				for (const media of note.files) {
 					if (this.images.length < 9) {

src/client/app/mobile/views/pages/user/home.vue

@@ -42,9 +42,9 @@ export default Vue.extend({
 	props: ['user'],
 	data() {
 		return {
-			makeFrequentlyRepliedUsersPromise: () => this.$root.api('users/get_frequently_replied_users', {
+			makeFrequentlyRepliedUsersPromise: () => this.$root.api('users/get-frequently-replied-users', {
 				userId: this.user.id
-			}).then(res => res.map(x => x.user)),
+			}, false, !this.$store.getters.isSignedIn).then(res => res.map(x => x.user)), 
 		};
 	}
 });

src/client/app/mobile/views/pages/user/index.vue

@@ -141,7 +141,9 @@ export default Vue.extend({
 		fetch() {
 			Progress.start();
 
-			this.$root.api('users/show', parseAcct(this.$route.params.user)).then(user => {
+			const { username, host } = parseAcct(this.$route.params.user);
+
+			this.$root.api('users/show', { username, host: host ?? undefined }, false, !this.$store.getters.isSignedIn).then(user => {
 				if (this.$store.state.i || !user.host) this.user = user;
 				this.fetching = false;
 

src/client/app/mobile/views/pages/welcome.vue

@@ -86,7 +86,7 @@ export default Vue.extend({
 			fileType: image,
 			limit: 6,
 			excludeNsfw: true,
-		}, false, false).then((notes: any[]) => {
+		}, false, true).then((notes: any[]) => {
 			const files = concat(notes.map((n: any): any[] => n.files));
 			this.photos = files.filter(f => image.includes(f.type)).slice(0, 6);
 		});

src/server/api/call.ts

@@ -105,6 +105,8 @@ export default async (endpoint: string, user: IUser | null | undefined, app: IAp
 						reason: `cannot cast to ${param.validator.name}`,
 					})
 				}
+			} else if (param.validator.name === 'Array' && typeof data[k] === 'string') {
+				data[k] = (data[k] as string).split(',');
 			}
 		}
 	}

src/server/api/endpoints/hashtags/list.ts

@@ -6,6 +6,8 @@ export const meta = {
 	tags: ['hashtags'],
 
 	requireCredential: false,
+	allowGet: true,
+	cacheSec: 600,
 
 	params: {
 		limit: {

src/server/api/endpoints/notes/children.ts

@@ -14,6 +14,8 @@ export const meta = {
 	tags: ['notes'],
 
 	requireCredential: false,
+	allowGet: true,
+	cacheSec: 60,
 
 	params: {
 		noteId: {

src/server/api/endpoints/notes/featured.ts

@@ -16,6 +16,7 @@ export const meta = {
 	requireCredential: false,
 
 	allowGet: true,
+	cacheSec: 600,
 
 	params: {
 		minScore: {

src/server/api/endpoints/notes/search-by-tag.ts

@@ -16,6 +16,10 @@ export const meta = {
 
 	tags: ['notes', 'hashtags'],
 
+	requireCredential: false,
+	allowGet: true,
+	cacheSec: 60,
+
 	params: {
 		tag: {
 			validator: $.optional.str,

src/server/api/endpoints/notes/search.ts

@@ -24,6 +24,8 @@ export const meta = {
 	tags: ['notes'],
 
 	requireCredential: false,
+	allowGet: true,
+	cacheSec: 60,
 
 	params: {
 		query: {

src/server/api/endpoints/notes/show.ts

@@ -16,6 +16,8 @@ export const meta = {
 	tags: ['notes'],
 
 	requireCredential: false,
+	allowGet: true,
+	cacheSec: 60,
 
 	params: {
 		noteId: {

src/server/api/endpoints/stats.ts

@@ -7,6 +7,7 @@ export const meta = {
 	requireCredential: false,
 
 	allowGet: true,
+	cacheSec: 600,
 	canDenyPost: true,
 
 	desc: {

src/server/api/endpoints/users/get-frequently-replied-users.ts

@@ -12,6 +12,8 @@ export const meta = {
 	tags: ['users'],
 
 	requireCredential: false,
+	allowGet: true,
+	cacheSec: 3600 * 24,
 
 	params: {
 		userId: {

src/server/api/endpoints/users/notes.ts

@@ -13,6 +13,10 @@ export const meta = {
 
 	tags: ['users', 'notes'],
 
+	requireCredential: false,
+	allowGet: true,
+	cacheSec: 60,
+
 	params: {
 		userId: {
 			validator: $.type(ID),

src/server/api/endpoints/users/show.ts

@@ -16,6 +16,8 @@ export const meta = {
 	tags: ['users'],
 
 	requireCredential: false,
+	allowGet: true,
+	cacheSec: 60,
 
 	params: {
 		userId: {

src/server/web/index.ts

@@ -82,7 +82,8 @@ router.get('/assets/*', async ctx => {
 // Apple touch icon
 router.get('/apple-touch-icon.png', async ctx => {
 	await send(ctx as any, '/assets/apple-touch-icon.png', {
-		root: client
+		root: client,
+		maxage: ms('7 days'),
 	});
 });