From 38d0f2b9afa3786d392f37bd9cdc25dbb2904fe3 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki <nekomanma@pixiv.co.jp> Date: Mon, 2 Apr 2018 13:41:25 +0900 Subject: [PATCH] Introduce renderers directory --- src/client/app/common/scripts/compose-notification.ts | 4 ++-- src/client/app/desktop/views/components/notifications.vue | 2 +- src/client/app/desktop/views/pages/home.vue | 2 +- src/client/app/mobile/api/post.ts | 2 +- .../app/mobile/views/components/notification-preview.vue | 2 +- src/client/app/mobile/views/components/notification.vue | 2 +- src/client/app/mobile/views/components/post-card.vue | 2 +- src/client/app/mobile/views/pages/home.vue | 2 +- src/{ => renderers}/get-notification-summary.ts | 0 src/{ => renderers}/get-post-summary.ts | 0 src/{ => renderers}/get-reaction-emoji.ts | 0 src/{user/get-summary.ts => renderers/get-user-summary.ts} | 2 +- src/server/api/bot/core.ts | 6 +++--- src/server/api/bot/interfaces/line.ts | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) rename src/{ => renderers}/get-notification-summary.ts (100%) rename src/{ => renderers}/get-post-summary.ts (100%) rename src/{ => renderers}/get-reaction-emoji.ts (100%) rename src/{user/get-summary.ts => renderers/get-user-summary.ts} (93%) diff --git a/src/client/app/common/scripts/compose-notification.ts b/src/client/app/common/scripts/compose-notification.ts index 4030d61ac..ebc15952f 100644 --- a/src/client/app/common/scripts/compose-notification.ts +++ b/src/client/app/common/scripts/compose-notification.ts @@ -1,5 +1,5 @@ -import getPostSummary from '../../../../get-post-summary'; -import getReactionEmoji from '../../../../get-reaction-emoji'; +import getPostSummary from '../../../../renderers/get-post-summary'; +import getReactionEmoji from '../../../../renderers/get-reaction-emoji'; type Notification = { title: string; diff --git a/src/client/app/desktop/views/components/notifications.vue b/src/client/app/desktop/views/components/notifications.vue index 8c4102494..9bfe1560b 100644 --- a/src/client/app/desktop/views/components/notifications.vue +++ b/src/client/app/desktop/views/components/notifications.vue @@ -103,7 +103,7 @@ <script lang="ts"> import Vue from 'vue'; import getAcct from '../../../../../user/get-acct'; -import getPostSummary from '../../../../../get-post-summary'; +import getPostSummary from '../../../../../renderers/get-post-summary'; export default Vue.extend({ data() { diff --git a/src/client/app/desktop/views/pages/home.vue b/src/client/app/desktop/views/pages/home.vue index ad9e2bc9d..c209af4e4 100644 --- a/src/client/app/desktop/views/pages/home.vue +++ b/src/client/app/desktop/views/pages/home.vue @@ -7,7 +7,7 @@ <script lang="ts"> import Vue from 'vue'; import Progress from '../../../common/scripts/loading'; -import getPostSummary from '../../../../../get-post-summary'; +import getPostSummary from '../../../../../renderers/get-post-summary'; export default Vue.extend({ props: { diff --git a/src/client/app/mobile/api/post.ts b/src/client/app/mobile/api/post.ts index 6580cbf4b..98309ba8d 100644 --- a/src/client/app/mobile/api/post.ts +++ b/src/client/app/mobile/api/post.ts @@ -1,6 +1,6 @@ import PostForm from '../views/components/post-form.vue'; //import RepostForm from '../views/components/repost-form.vue'; -import getPostSummary from '../../../../get-post-summary'; +import getPostSummary from '../../../../renderers/get-post-summary'; export default (os) => (opts) => { const o = opts || {}; diff --git a/src/client/app/mobile/views/components/notification-preview.vue b/src/client/app/mobile/views/components/notification-preview.vue index e7e1f75a8..77abd3c0e 100644 --- a/src/client/app/mobile/views/components/notification-preview.vue +++ b/src/client/app/mobile/views/components/notification-preview.vue @@ -59,7 +59,7 @@ <script lang="ts"> import Vue from 'vue'; -import getPostSummary from '../../../../../get-post-summary'; +import getPostSummary from '../../../../../renderers/get-post-summary'; export default Vue.extend({ props: ['notification'], diff --git a/src/client/app/mobile/views/components/notification.vue b/src/client/app/mobile/views/components/notification.vue index d92b01944..d3e313756 100644 --- a/src/client/app/mobile/views/components/notification.vue +++ b/src/client/app/mobile/views/components/notification.vue @@ -78,7 +78,7 @@ <script lang="ts"> import Vue from 'vue'; -import getPostSummary from '../../../../../get-post-summary'; +import getPostSummary from '../../../../../renderers/get-post-summary'; import getAcct from '../../../../../user/get-acct'; export default Vue.extend({ diff --git a/src/client/app/mobile/views/components/post-card.vue b/src/client/app/mobile/views/components/post-card.vue index 893e4c307..de42a01f7 100644 --- a/src/client/app/mobile/views/components/post-card.vue +++ b/src/client/app/mobile/views/components/post-card.vue @@ -14,7 +14,7 @@ <script lang="ts"> import Vue from 'vue'; -import summary from '../../../../../get-post-summary'; +import summary from '../../../../../renderers/get-post-summary'; import getAcct from '../../../../../user/get-acct'; export default Vue.extend({ diff --git a/src/client/app/mobile/views/pages/home.vue b/src/client/app/mobile/views/pages/home.vue index b2edf5956..6fb1c6d4f 100644 --- a/src/client/app/mobile/views/pages/home.vue +++ b/src/client/app/mobile/views/pages/home.vue @@ -64,7 +64,7 @@ import Vue from 'vue'; import * as XDraggable from 'vuedraggable'; import * as uuid from 'uuid'; import Progress from '../../../common/scripts/loading'; -import getPostSummary from '../../../../../get-post-summary'; +import getPostSummary from '../../../../../renderers/get-post-summary'; export default Vue.extend({ components: { diff --git a/src/get-notification-summary.ts b/src/renderers/get-notification-summary.ts similarity index 100% rename from src/get-notification-summary.ts rename to src/renderers/get-notification-summary.ts diff --git a/src/get-post-summary.ts b/src/renderers/get-post-summary.ts similarity index 100% rename from src/get-post-summary.ts rename to src/renderers/get-post-summary.ts diff --git a/src/get-reaction-emoji.ts b/src/renderers/get-reaction-emoji.ts similarity index 100% rename from src/get-reaction-emoji.ts rename to src/renderers/get-reaction-emoji.ts diff --git a/src/user/get-summary.ts b/src/renderers/get-user-summary.ts similarity index 93% rename from src/user/get-summary.ts rename to src/renderers/get-user-summary.ts index 822081702..2a9e8a5d0 100644 --- a/src/user/get-summary.ts +++ b/src/renderers/get-user-summary.ts @@ -1,5 +1,5 @@ import { IUser, isLocalUser } from '../models/user'; -import getAcct from './get-acct'; +import getAcct from '../user/get-acct'; /** * ユーザーを表す文字列を取得します。 diff --git a/src/server/api/bot/core.ts b/src/server/api/bot/core.ts index 3beec33d1..7f9409660 100644 --- a/src/server/api/bot/core.ts +++ b/src/server/api/bot/core.ts @@ -3,10 +3,10 @@ import * as bcrypt from 'bcryptjs'; import User, { IUser, init as initUser, ILocalUser } from '../../../models/user'; -import getPostSummary from '../../../get-post-summary'; -import getUserSummary from '../../../user/get-summary'; +import getPostSummary from '../../../renderers/get-post-summary'; +import getUserSummary from '../../../renderers/get-user-summary'; import parseAcct from '../../../user/parse-acct'; -import getNotificationSummary from '../../../get-notification-summary'; +import getNotificationSummary from '../../../renderers/get-notification-summary'; const hmm = [ '?', diff --git a/src/server/api/bot/interfaces/line.ts b/src/server/api/bot/interfaces/line.ts index 27248c9b9..17841a9f0 100644 --- a/src/server/api/bot/interfaces/line.ts +++ b/src/server/api/bot/interfaces/line.ts @@ -9,7 +9,7 @@ import _redis from '../../../../db/redis'; import prominence = require('prominence'); import getAcct from '../../../../user/get-acct'; import parseAcct from '../../../../user/parse-acct'; -import getPostSummary from '../../../../get-post-summary'; +import getPostSummary from '../../../../renderers/get-post-summary'; const redis = prominence(_redis);