summaryrefslogtreecommitdiff
path: root/src/server/api
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-04-08 23:05:41 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-04-08 23:05:41 +0900
commit87d3a06dcd6a76120789c050dd6a0c7111bf7224 (patch)
treeec0035b3284c30459033e97fbdc986b5cb5cf430 /src/server/api
parentUpdate CHANGELOG.md (diff)
downloadsharkey-87d3a06dcd6a76120789c050dd6a0c7111bf7224.tar.gz
sharkey-87d3a06dcd6a76120789c050dd6a0c7111bf7224.tar.bz2
sharkey-87d3a06dcd6a76120789c050dd6a0c7111bf7224.zip
revert rename
Diffstat (limited to 'src/server/api')
-rw-r--r--src/server/api/endpoints/notes/hybrid-timeline.ts (renamed from src/server/api/endpoints/notes/social-timeline.ts)2
-rw-r--r--src/server/api/stream/channels/hybrid-timeline.ts (renamed from src/server/api/stream/channels/social-timeline.ts)2
-rw-r--r--src/server/api/stream/channels/index.ts4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/server/api/endpoints/notes/social-timeline.ts b/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
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,