Global timeline

locales/en-US.yml

@@ -32,6 +32,7 @@ instance: "Instance"
 settings: "Settings"
 profile: "Profile"
 timeline: "Timeline"
+globalTimeline: "Global"
 noAccountDescription: "This user has not written a profile description"
 login: "Login"
 loginWaiting: "Logging in"

locales/ja-JP.yml

@@ -34,6 +34,7 @@ instance: "インスタンス"
 settings: "設定"
 profile: "プロフィール"
 timeline: "タイムライン"
+globalTimeline: "グローバル"
 noAccountDescription: "自己紹介はありません"
 login: "ログイン"
 loginWaiting: "ログイン中"

src/client/app.ui.vue

@@ -47,7 +47,8 @@
 	</transition>
 	<div class="buttons">
 		<button v-if="$store.getters.isSignedIn" class="button nav _button" @click="() => { navOpen = !navOpen; notificationsOpen = false; }" ref="navButton"><fa :icon="navOpen ? faTimes : faBars"/><i v-if="$store.state.i.hasUnreadSpecifiedNotes || $store.state.i.pendingReceivedFollowRequestsCount"><fa :icon="faCircle"/></i></button>
-		<button v-if="$store.getters.isSignedIn" class="button home _button" :disabled="$route.path === '/'" @click="$router.push('/')"><fa :icon="faHome"/></button>
+		<button v-if="$store.getters.isSignedIn && $route.path !== '/'" class="button home _button" @click="$router.push('/')"><fa :icon="faHome"/></button>
+		<button v-if="$store.getters.isSignedIn && $route.path === '/'" class="button home _button" @click="$router.push('/global')"><fa :icon="faGlobe"/></button>
 		<button v-if="$store.getters.isSignedIn" class="button notifications _button" @click="notificationsOpen = !notificationsOpen" ref="notificationsButton"><fa :icon="notificationsOpen ? faTimes : faBell"/><i v-if="$store.state.i.hasUnreadNotification"><fa :icon="faCircle"/></i></button>
 		<button v-if="$store.getters.isSignedIn" class="button post _buttonPrimary" @click="post()"><fa :icon="faPencilAlt"/></button>
 	</div>

src/client/pages/index.global.timeline.vue

@@ -0,0 +1,46 @@
+<template>
+<x-notes ref="timeline" :pagination="pagination" @before="$emit('before')" @after="e => $emit('after', e)"/>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import XNotes from '../components/notes.vue';
+
+export default Vue.extend({
+	components: {
+		XNotes
+	},
+
+	data() {
+		return {
+			connection: null,
+			pagination: null,
+		};
+	},
+
+	created() {
+		this.$once('hook:beforeDestroy', () => {
+			this.connection.dispose();
+		});
+
+		const prepend = note => {
+			(this.$refs.timeline as any).prepend(note);
+		};
+
+		const onChangeFollowing = () => {
+			this.fetch();
+		};
+
+		this.connection = this.$root.stream.useSharedConnection('globalTimeline');
+		this.connection.on('note', prepend);
+		this.connection.on('follow', onChangeFollowing);
+		this.connection.on('unfollow', onChangeFollowing);
+
+		this.pagination = {
+			endpoint: 'notes/global-timeline',
+			limit: 10,
+			params: {}
+		};
+	}
+});
+</script>

src/client/pages/index.global.vue

@@ -0,0 +1,30 @@
+<template>
+<div class="dp-global">
+	<x-global-timeline @before="before()" @after="after()"/>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import Progress from '../scripts/loading';
+import XGlobalTimeline from './index.global.timeline.vue';
+
+export default Vue.extend({
+	metaInfo() {
+		return {
+			title: this.$t('globalTimeline')
+		};
+	},
+	components: {
+		XGlobalTimeline
+	},
+	methods: {
+		before() {
+			Progress.start();
+		},
+		after() {
+			Progress.done();
+		}
+	}
+});
+</script>

src/client/pages/index.vue

@@ -5,10 +5,12 @@
 <script lang="ts">
 import Vue from 'vue';
 import Home from './index.home.vue';
+import Global from './index.global.vue';
 
 export default Vue.extend({
 	components: {
 		Home,
+		Global,
 		Welcome: () => import('./index.welcome.vue').then(m => m.default),
 	}
 });

src/client/router.ts

@@ -8,6 +8,7 @@ export const router = new VueRouter({
 	mode: 'history',
 	routes: [
 		{ path: '/', name: 'index', component: DpIndex },
+		{ path: '/global', name: 'global', component: () => import('./pages/index.global.vue').then(m => m.default) },
 		{ path: '/@:user', name: 'user', component: () => import('./pages/user/index.vue').then(m => m.default), children: [
 			{ path: 'following', name: 'userFollowing', component: () => import('./pages/user/follow-list.vue').then(m => m.default), props: { type: 'following' } },
 			{ path: 'followers', name: 'userFollowers', component: () => import('./pages/user/follow-list.vue').then(m => m.default), props: { type: 'followers' } },

src/server/api/endpoints/notes/global-timeline.ts

@@ -0,0 +1,74 @@
+import $ from 'cafy';
+import { ID } from '../../../../misc/cafy-id';
+import define from '../../define';
+import { makePaginationQuery } from '../../common/make-pagination-query';
+import { Notes } from '../../../../models';
+import { generateMuteQuery } from '../../common/generate-mute-query';
+
+export const meta = {
+	desc: {
+		'ja-JP': 'グローバルタイムラインを取得します。'
+	},
+
+	tags: ['notes'],
+
+	params: {
+		withFiles: {
+			validator: $.optional.bool,
+			desc: {
+				'ja-JP': 'ファイルが添付された投稿に限定するか否か'
+			}
+		},
+
+		limit: {
+			validator: $.optional.num.range(1, 100),
+			default: 10
+		},
+
+		sinceId: {
+			validator: $.optional.type(ID),
+		},
+
+		untilId: {
+			validator: $.optional.type(ID),
+		},
+
+		sinceDate: {
+			validator: $.optional.num
+		},
+
+		untilDate: {
+			validator: $.optional.num
+		},
+	},
+
+	res: {
+		type: 'array' as const,
+		optional: false as const, nullable: false as const,
+		items: {
+			type: 'object' as const,
+			optional: false as const, nullable: false as const,
+			ref: 'Note',
+		}
+	},
+};
+
+export default define(meta, async (ps, user) => {
+	//#region Construct query
+	const query = makePaginationQuery(Notes.createQueryBuilder('note'),
+			ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
+		.andWhere('note.visibility = \'public\'')
+		.andWhere('note.replyId IS NULL')
+		.leftJoinAndSelect('note.user', 'user');
+
+	if (user) generateMuteQuery(query, user);
+
+	if (ps.withFiles) {
+		query.andWhere('note.fileIds != \'{}\'');
+	}
+	//#endregion
+
+	const timeline = await query.take(ps.limit!).getMany();
+
+	return await Notes.packMany(timeline, user);
+});

src/server/api/stream/channels/global-timeline.ts

@@ -0,0 +1,51 @@
+import autobind from 'autobind-decorator';
+import shouldMuteThisNote from '../../../../misc/should-mute-this-note';
+import Channel from '../channel';
+import { Notes } from '../../../../models';
+import { PackedNote } from '../../../../models/repositories/note';
+
+export default class extends Channel {
+	public readonly chName = 'globalTimeline';
+	public static shouldShare = true;
+	public static requireCredential = false;
+
+	@autobind
+	public async init(params: any) {
+		// Subscribe events
+		this.subscriber.on('notesStream', this.onNote);
+	}
+
+	@autobind
+	private async onNote(note: PackedNote) {
+		if (note.visibility !== 'public') return;
+
+		// リプライなら再pack
+		if (note.replyId != null) {
+			note.reply = await Notes.pack(note.replyId, this.user, {
+				detail: true
+			});
+		}
+		// Renoteなら再pack
+		if (note.renoteId != null) {
+			note.renote = await Notes.pack(note.renoteId, this.user, {
+				detail: true
+			});
+		}
+
+		// 返信は除外
+		if (note.reply) {
+			return;
+		}
+
+		// 流れてきたNoteがミュートしているユーザーが関わるものだったら無視する
+		if (shouldMuteThisNote(note, this.muting)) return;
+
+		this.send('note', note);
+	}
+
+	@autobind
+	public dispose() {
+		// Unsubscribe events
+		this.subscriber.off('notesStream', this.onNote);
+	}
+}

src/server/api/stream/channels/index.ts

@@ -1,5 +1,6 @@
 import main from './main';
 import homeTimeline from './home-timeline';
+import globalTimeline from './global-timeline';
 import queueStats from './queue-stats';
 import serverStats from './server-stats';
 import userList from './user-list';
@@ -11,6 +12,7 @@ import admin from './admin';
 export default {
 	main,
 	homeTimeline,
+	globalTimeline,
 	queueStats,
 	serverStats,
 	userList,