From 316715ad81f07ee660018ec16cd212cd83cad621 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 8 Apr 2019 23:05:41 +0900
Subject: [PATCH] revert rename

---
 locales/ja-JP.yml                                  |  6 +++---
 .../app/common/views/deck/deck.column-core.vue     |  2 +-
 .../app/common/views/deck/deck.tl-column.vue       |  4 ++--
 src/client/app/common/views/deck/deck.tl.vue       |  6 +++---
 src/client/app/common/views/deck/deck.vue          |  6 +++---
 .../app/desktop/views/home/timeline.core.vue       |  6 +++---
 src/client/app/desktop/views/home/timeline.vue     |  6 +++---
 .../app/mobile/views/pages/home.timeline.vue       |  6 +++---
 src/client/app/mobile/views/pages/home.vue         | 10 +++++-----
 src/docs/stream.ja-JP.md                           |  2 +-
 .../{social-timeline.ts => hybrid-timeline.ts}     |  2 +-
 .../{social-timeline.ts => hybrid-timeline.ts}     |  2 +-
 src/server/api/stream/channels/index.ts            |  4 ++--
 test/streaming.ts                                  | 14 +++++++-------
 14 files changed, 38 insertions(+), 38 deletions(-)
 rename src/server/api/endpoints/notes/{social-timeline.ts => hybrid-timeline.ts} (98%)
 rename src/server/api/stream/channels/{social-timeline.ts => hybrid-timeline.ts} (97%)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index a36817688..927eefb5b 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1088,7 +1088,7 @@ desktop/views/components/taskmanager.vue:
 desktop/views/components/timeline.vue:
   home: "ホーム"
   local: "ローカル"
-  social: "ソーシャル"
+  hybrid: "ソーシャル"
   global: "グローバル"
   mentions: "あなた宛て"
   messages: "ダイレクト投稿"
@@ -1665,7 +1665,7 @@ mobile/views/pages/following.vue:
 mobile/views/pages/home.vue:
   home: "ホーム"
   local: "ローカル"
-  social: "ソーシャル"
+  hybrid: "ソーシャル"
   global: "グローバル"
   mentions: "あなた宛て"
   messages: "ダイレクト投稿"
@@ -1735,7 +1735,7 @@ deck:
   widgets: "ウィジェット"
   home: "ホーム"
   local: "ローカル"
-  social: "ソーシャル"
+  hybrid: "ソーシャル"
   hashtag: "ハッシュタグ"
   global: "グローバル"
   mentions: "あなた宛て"
diff --git a/src/client/app/common/views/deck/deck.column-core.vue b/src/client/app/common/views/deck/deck.column-core.vue
index e3f92dea1..974c58235 100644
--- a/src/client/app/common/views/deck/deck.column-core.vue
+++ b/src/client/app/common/views/deck/deck.column-core.vue
@@ -3,7 +3,7 @@
 <x-notifications-column v-else-if="column.type == 'notifications'" :column="column" :is-stacked="isStacked" v-on="$listeners"/>
 <x-tl-column v-else-if="column.type == 'home'" :column="column" :is-stacked="isStacked" v-on="$listeners"/>
 <x-tl-column v-else-if="column.type == 'local'" :column="column" :is-stacked="isStacked" v-on="$listeners"/>
-<x-tl-column v-else-if="column.type == 'social'" :column="column" :is-stacked="isStacked" v-on="$listeners"/>
+<x-tl-column v-else-if="column.type == 'hybrid'" :column="column" :is-stacked="isStacked" v-on="$listeners"/>
 <x-tl-column v-else-if="column.type == 'global'" :column="column" :is-stacked="isStacked" v-on="$listeners"/>
 <x-tl-column v-else-if="column.type == 'list'" :column="column" :is-stacked="isStacked" v-on="$listeners"/>
 <x-tl-column v-else-if="column.type == 'hashtag'" :column="column" :is-stacked="isStacked" v-on="$listeners"/>
diff --git a/src/client/app/common/views/deck/deck.tl-column.vue b/src/client/app/common/views/deck/deck.tl-column.vue
index f6a9ee528..5ab8ccb12 100644
--- a/src/client/app/common/views/deck/deck.tl-column.vue
+++ b/src/client/app/common/views/deck/deck.tl-column.vue
@@ -3,7 +3,7 @@
 	<template #header>
 		<fa v-if="column.type == 'home'" icon="home"/>
 		<fa v-if="column.type == 'local'" :icon="['far', 'comments']"/>
-		<fa v-if="column.type == 'social'" icon="share-alt"/>
+		<fa v-if="column.type == 'hybrid'" icon="share-alt"/>
 		<fa v-if="column.type == 'global'" icon="globe"/>
 		<fa v-if="column.type == 'list'" icon="list"/>
 		<fa v-if="column.type == 'hashtag'" icon="hashtag"/>
@@ -80,7 +80,7 @@ export default Vue.extend({
 			switch (this.column.type) {
 				case 'home': return this.$t('@deck.home');
 				case 'local': return this.$t('@deck.local');
-				case 'social': return this.$t('@deck.social');
+				case 'hybrid': return this.$t('@deck.hybrid');
 				case 'global': return this.$t('@deck.global');
 				case 'list': return this.column.list.name;
 				case 'hashtag': return this.$store.state.settings.tagTimelines.find(x => x.id == this.column.tagTlId).title;
diff --git a/src/client/app/common/views/deck/deck.tl.vue b/src/client/app/common/views/deck/deck.tl.vue
index 83fc149a0..9284f06ee 100644
--- a/src/client/app/common/views/deck/deck.tl.vue
+++ b/src/client/app/common/views/deck/deck.tl.vue
@@ -51,7 +51,7 @@ export default Vue.extend({
 			switch (this.src) {
 				case 'home': return this.$root.stream.useSharedConnection('homeTimeline');
 				case 'local': return this.$root.stream.useSharedConnection('localTimeline');
-				case 'social': return this.$root.stream.useSharedConnection('socialTimeline');
+				case 'hybrid': return this.$root.stream.useSharedConnection('hybridTimeline');
 				case 'global': return this.$root.stream.useSharedConnection('globalTimeline');
 			}
 		},
@@ -60,7 +60,7 @@ export default Vue.extend({
 			switch (this.src) {
 				case 'home': return 'notes/timeline';
 				case 'local': return 'notes/local-timeline';
-				case 'social': return 'notes/social-timeline';
+				case 'hybrid': return 'notes/hybrid-timeline';
 				case 'global': return 'notes/global-timeline';
 			}
 		},
@@ -107,7 +107,7 @@ export default Vue.extend({
 
 		this.$root.getMeta().then(meta => {
 			this.disabled = !this.$store.state.i.isModerator && !this.$store.state.i.isAdmin && (
-				meta.disableLocalTimeline && ['local', 'social'].includes(this.src) ||
+				meta.disableLocalTimeline && ['local', 'hybrid'].includes(this.src) ||
 				meta.disableGlobalTimeline && ['global'].includes(this.src));
 		});
 	},
diff --git a/src/client/app/common/views/deck/deck.vue b/src/client/app/common/views/deck/deck.vue
index a1bef8400..b46f2167a 100644
--- a/src/client/app/common/views/deck/deck.vue
+++ b/src/client/app/common/views/deck/deck.vue
@@ -145,11 +145,11 @@ export default Vue.extend({
 					}
 				}, {
 					icon: 'share-alt',
-					text: this.$t('@deck.social'),
+					text: this.$t('@deck.hybrid'),
 					action: () => {
 						this.$store.commit('device/addDeckColumn', {
 							id: uuid(),
-							type: 'social'
+							type: 'hybrid'
 						});
 					}
 				}, {
@@ -302,7 +302,7 @@ export default Vue.extend({
 
 		isTlColumn(id) {
 			const column = this.columns.find(c => c.id === id);
-			return ['home', 'local', 'social', 'global', 'list', 'hashtag', 'mentions', 'direct'].includes(column.type);
+			return ['home', 'local', 'hybrid', 'global', 'list', 'hashtag', 'mentions', 'direct'].includes(column.type);
 		}
 	}
 });
diff --git a/src/client/app/desktop/views/home/timeline.core.vue b/src/client/app/desktop/views/home/timeline.core.vue
index 934b1aa78..12806365d 100644
--- a/src/client/app/desktop/views/home/timeline.core.vue
+++ b/src/client/app/desktop/views/home/timeline.core.vue
@@ -77,9 +77,9 @@ export default Vue.extend({
 			this.endpoint = 'notes/local-timeline';
 			this.connection = this.$root.stream.useSharedConnection('localTimeline');
 			this.connection.on('note', prepend);
-		} else if (this.src == 'social') {
-			this.endpoint = 'notes/social-timeline';
-			this.connection = this.$root.stream.useSharedConnection('socialTimeline');
+		} else if (this.src == 'hybrid') {
+			this.endpoint = 'notes/hybrid-timeline';
+			this.connection = this.$root.stream.useSharedConnection('hybridTimeline');
 			this.connection.on('note', prepend);
 		} else if (this.src == 'global') {
 			this.endpoint = 'notes/global-timeline';
diff --git a/src/client/app/desktop/views/home/timeline.vue b/src/client/app/desktop/views/home/timeline.vue
index ccd55d1d7..f257f1fa9 100644
--- a/src/client/app/desktop/views/home/timeline.vue
+++ b/src/client/app/desktop/views/home/timeline.vue
@@ -6,7 +6,7 @@
 			<header class="zahtxcqi">
 				<span :data-active="src == 'home'" @click="src = 'home'"><fa icon="home"/> {{ $t('home') }}</span>
 				<span :data-active="src == 'local'" @click="src = 'local'" v-if="enableLocalTimeline"><fa :icon="['far', 'comments']"/> {{ $t('local') }}</span>
-				<span :data-active="src == 'social'" @click="src = 'social'" v-if="enableLocalTimeline"><fa icon="share-alt"/> {{ $t('social') }}</span>
+				<span :data-active="src == 'hybrid'" @click="src = 'hybrid'" v-if="enableLocalTimeline"><fa icon="share-alt"/> {{ $t('hybrid') }}</span>
 				<span :data-active="src == 'global'" @click="src = 'global'" v-if="enableGlobalTimeline"><fa icon="globe"/> {{ $t('global') }}</span>
 				<span :data-active="src == 'tag'" @click="src = 'tag'" v-if="tagTl"><fa icon="hashtag"/> {{ tagTl.title }}</span>
 				<span :data-active="src == 'list'" @click="src = 'list'" v-if="list"><fa icon="list"/> {{ list.name }}</span>
@@ -78,7 +78,7 @@ export default Vue.extend({
 			) && this.src === 'global') this.src = 'local';
 			if (!(
 				this.enableLocalTimeline = !meta.disableLocalTimeline || this.$store.state.i.isModerator || this.$store.state.i.isAdmin
-			) && ['local', 'social'].includes(this.src)) this.src = 'home';
+			) && ['local', 'hybrid'].includes(this.src)) this.src = 'home';
 		});
 
 		if (this.$store.state.device.tl) {
@@ -89,7 +89,7 @@ export default Vue.extend({
 				this.tagTl = this.$store.state.device.tl.arg;
 			}
 		} else if (this.$store.state.i.followingCount == 0) {
-			this.src = 'social';
+			this.src = 'hybrid';
 		}
 	},
 
diff --git a/src/client/app/mobile/views/pages/home.timeline.vue b/src/client/app/mobile/views/pages/home.timeline.vue
index 36aea1ffc..809158dd2 100644
--- a/src/client/app/mobile/views/pages/home.timeline.vue
+++ b/src/client/app/mobile/views/pages/home.timeline.vue
@@ -78,9 +78,9 @@ export default Vue.extend({
 			this.endpoint = 'notes/local-timeline';
 			this.connection = this.$root.stream.useSharedConnection('localTimeline');
 			this.connection.on('note', prepend);
-		} else if (this.src == 'social') {
-			this.endpoint = 'notes/social-timeline';
-			this.connection = this.$root.stream.useSharedConnection('socialTimeline');
+		} else if (this.src == 'hybrid') {
+			this.endpoint = 'notes/hybrid-timeline';
+			this.connection = this.$root.stream.useSharedConnection('hybridTimeline');
 			this.connection.on('note', prepend);
 		} else if (this.src == 'global') {
 			this.endpoint = 'notes/global-timeline';
diff --git a/src/client/app/mobile/views/pages/home.vue b/src/client/app/mobile/views/pages/home.vue
index 7e3944199..cf15670f3 100644
--- a/src/client/app/mobile/views/pages/home.vue
+++ b/src/client/app/mobile/views/pages/home.vue
@@ -5,7 +5,7 @@
 			<span :class="$style.title">
 				<span v-if="src == 'home'"><fa icon="home"/>{{ $t('home') }}</span>
 				<span v-if="src == 'local'"><fa :icon="['far', 'comments']"/>{{ $t('local') }}</span>
-				<span v-if="src == 'social'"><fa icon="share-alt"/>{{ $t('social') }}</span>
+				<span v-if="src == 'hybrid'"><fa icon="share-alt"/>{{ $t('hybrid') }}</span>
 				<span v-if="src == 'global'"><fa icon="globe"/>{{ $t('global') }}</span>
 				<span v-if="src == 'mentions'"><fa icon="at"/>{{ $t('mentions') }}</span>
 				<span v-if="src == 'messages'"><fa :icon="['far', 'envelope']"/>{{ $t('messages') }}</span>
@@ -32,7 +32,7 @@
 				<div>
 					<span :data-active="src == 'home'" @click="src = 'home'"><fa icon="home"/> {{ $t('home') }}</span>
 					<span :data-active="src == 'local'" @click="src = 'local'" v-if="enableLocalTimeline"><fa :icon="['far', 'comments']"/> {{ $t('local') }}</span>
-					<span :data-active="src == 'social'" @click="src = 'social'" v-if="enableLocalTimeline"><fa icon="share-alt"/> {{ $t('social') }}</span>
+					<span :data-active="src == 'hybrid'" @click="src = 'hybrid'" v-if="enableLocalTimeline"><fa icon="share-alt"/> {{ $t('hybrid') }}</span>
 					<span :data-active="src == 'global'" @click="src = 'global'" v-if="enableGlobalTimeline"><fa icon="globe"/> {{ $t('global') }}</span>
 					<div class="hr"></div>
 					<span :data-active="src == 'mentions'" @click="src = 'mentions'"><fa icon="at"/> {{ $t('mentions') }}<i class="badge" v-if="$store.state.i.hasUnreadMentions"><fa icon="circle"/></i></span>
@@ -50,7 +50,7 @@
 		<div class="tl">
 			<x-tl v-if="src == 'home'" ref="tl" key="home" src="home"/>
 			<x-tl v-if="src == 'local'" ref="tl" key="local" src="local"/>
-			<x-tl v-if="src == 'social'" ref="tl" key="social" src="social"/>
+			<x-tl v-if="src == 'hybrid'" ref="tl" key="hybrid" src="hybrid"/>
 			<x-tl v-if="src == 'global'" ref="tl" key="global" src="global"/>
 			<x-tl v-if="src == 'mentions'" ref="tl" key="mentions" src="mentions"/>
 			<x-tl v-if="src == 'messages'" ref="tl" key="messages" src="messages"/>
@@ -120,7 +120,7 @@ export default Vue.extend({
 			) && this.src === 'global') this.src = 'local';
 			if (!(
 				this.enableLocalTimeline = !meta.disableLocalTimeline || this.$store.state.i.isModerator || this.$store.state.i.isAdmin
-			) && ['local', 'social'].includes(this.src)) this.src = 'home';
+			) && ['local', 'hybrid'].includes(this.src)) this.src = 'home';
 		});
 
 		if (this.$store.state.device.tl) {
@@ -131,7 +131,7 @@ export default Vue.extend({
 				this.tagTl = this.$store.state.device.tl.arg;
 			}
 		} else if (this.$store.state.i.followingCount == 0) {
-			this.src = 'social';
+			this.src = 'hybrid';
 		}
 	},
 
diff --git a/src/docs/stream.ja-JP.md b/src/docs/stream.ja-JP.md
index 8a6bf6346..0e9afa733 100644
--- a/src/docs/stream.ja-JP.md
+++ b/src/docs/stream.ja-JP.md
@@ -339,7 +339,7 @@ Misskeyは投稿のキャプチャと呼ばれる仕組みを提供していま
 #### `note`
 ローカルタイムラインに新しい投稿が流れてきたときに発生するイベントです。
 
-## `socialTimeline`
+## `hybridTimeline`
 ソーシャルタイムラインの投稿情報が流れてきます。このチャンネルにパラメータはありません。
 
 ### 流れてくるイベント一覧
diff --git a/src/server/api/endpoints/notes/social-timeline.ts b/src/server/api/endpoints/notes/hybrid-timeline.ts
similarity index 98%
rename from src/server/api/endpoints/notes/social-timeline.ts
rename to src/server/api/endpoints/notes/hybrid-timeline.ts
index 10e215d6c..76f1682a9 100644
--- a/src/server/api/endpoints/notes/social-timeline.ts
+++ b/src/server/api/endpoints/notes/hybrid-timeline.ts
@@ -95,7 +95,7 @@ export const meta = {
 
 	errors: {
 		stlDisabled: {
-			message: 'Social timeline has been disabled.',
+			message: 'Hybrid timeline has been disabled.',
 			code: 'STL_DISABLED',
 			id: '620763f4-f621-4533-ab33-0577a1a3c342'
 		},
diff --git a/src/server/api/stream/channels/social-timeline.ts b/src/server/api/stream/channels/hybrid-timeline.ts
similarity index 97%
rename from src/server/api/stream/channels/social-timeline.ts
rename to src/server/api/stream/channels/hybrid-timeline.ts
index 1d76eed29..3f09dd839 100644
--- a/src/server/api/stream/channels/social-timeline.ts
+++ b/src/server/api/stream/channels/hybrid-timeline.ts
@@ -5,7 +5,7 @@ import fetchMeta from '../../../../misc/fetch-meta';
 import { Notes } from '../../../../models';
 
 export default class extends Channel {
-	public readonly chName = 'socialTimeline';
+	public readonly chName = 'hybridTimeline';
 	public static shouldShare = true;
 	public static requireCredential = true;
 
diff --git a/src/server/api/stream/channels/index.ts b/src/server/api/stream/channels/index.ts
index 199ab0a80..4527fb1e4 100644
--- a/src/server/api/stream/channels/index.ts
+++ b/src/server/api/stream/channels/index.ts
@@ -1,7 +1,7 @@
 import main from './main';
 import homeTimeline from './home-timeline';
 import localTimeline from './local-timeline';
-import socialTimeline from './social-timeline';
+import hybridTimeline from './hybrid-timeline';
 import globalTimeline from './global-timeline';
 import notesStats from './notes-stats';
 import serverStats from './server-stats';
@@ -20,7 +20,7 @@ export default {
 	main,
 	homeTimeline,
 	localTimeline,
-	socialTimeline,
+	hybridTimeline,
 	globalTimeline,
 	notesStats,
 	serverStats,
diff --git a/test/streaming.ts b/test/streaming.ts
index 74a5aaa0b..759472861 100644
--- a/test/streaming.ts
+++ b/test/streaming.ts
@@ -381,11 +381,11 @@ describe('Streaming', () => {
 		}));
 	});
 
-	describe('Social Timeline', () => {
+	describe('Hybrid Timeline', () => {
 		it('自分の投稿が流れる', () => new Promise(async done => {
 			const me = await signup();
 
-			const ws = await connectStream(me, 'socialTimeline', ({ type, body }) => {
+			const ws = await connectStream(me, 'hybridTimeline', ({ type, body }) => {
 				if (type == 'note') {
 					assert.deepStrictEqual(body.userId, me.id);
 					ws.close();
@@ -402,7 +402,7 @@ describe('Streaming', () => {
 			const alice = await signup({ username: 'alice' });
 			const bob = await signup({ username: 'bob' });
 
-			const ws = await connectStream(alice, 'socialTimeline', ({ type, body }) => {
+			const ws = await connectStream(alice, 'hybridTimeline', ({ type, body }) => {
 				if (type == 'note') {
 					assert.deepStrictEqual(body.userId, bob.id);
 					ws.close();
@@ -422,7 +422,7 @@ describe('Streaming', () => {
 			// Alice が Bob をフォロー
 			await follow(alice, bob);
 
-			const ws = await connectStream(alice, 'socialTimeline', ({ type, body }) => {
+			const ws = await connectStream(alice, 'hybridTimeline', ({ type, body }) => {
 				if (type == 'note') {
 					assert.deepStrictEqual(body.userId, bob.id);
 					ws.close();
@@ -441,7 +441,7 @@ describe('Streaming', () => {
 
 			let fired = false;
 
-			const ws = await connectStream(alice, 'socialTimeline', ({ type, body }) => {
+			const ws = await connectStream(alice, 'hybridTimeline', ({ type, body }) => {
 				if (type == 'note') {
 					fired = true;
 				}
@@ -467,7 +467,7 @@ describe('Streaming', () => {
 				userId: bob.id
 			}, alice);
 
-			const ws = await connectStream(alice, 'socialTimeline', ({ type, body }) => {
+			const ws = await connectStream(alice, 'hybridTimeline', ({ type, body }) => {
 				if (type == 'note') {
 					assert.deepStrictEqual(body.userId, bob.id);
 					assert.deepStrictEqual(body.text, 'foo');
@@ -490,7 +490,7 @@ describe('Streaming', () => {
 
 			let fired = false;
 
-			const ws = await connectStream(alice, 'socialTimeline', ({ type, body }) => {
+			const ws = await connectStream(alice, 'hybridTimeline', ({ type, body }) => {
 				if (type == 'note') {
 					fired = true;
 				}