{{ $t('home') }}
{{ $t('local') }}
-
{{ $t('social') }}
+
{{ $t('hybrid') }}
{{ $t('global') }}
{{ $t('mentions') }}
@@ -50,7 +50,7 @@
-
+
@@ -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 8a6bf63464..0e9afa7332 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 10e215d6c4..76f1682a95 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 1d76eed297..3f09dd8398 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 199ab0a809..4527fb1e46 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 74a5aaa0b4..7594728618 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;
}