From 3eef84583dec612ece0d57a87eae13c2563262d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Sat, 10 Aug 2019 08:23:41 +0900 Subject: [PATCH 1/3] Use `~` instead of `..` in resolving paths --- src/argv.ts | 2 +- src/boot/index.ts | 4 +- src/boot/master.ts | 16 ++-- src/boot/worker.ts | 2 +- src/config/load.ts | 2 +- src/daemons/janitor.ts | 2 +- src/daemons/notes-stats-child.ts | 4 +- src/daemons/queue-stats.ts | 2 +- src/db/elasticsearch.ts | 2 +- src/db/logger.ts | 2 +- src/db/postgre.ts | 94 +++++++++---------- src/db/redis.ts | 2 +- src/games/reversi/core.ts | 2 +- src/index.ts | 2 +- src/mfm/language.ts | 6 +- src/mfm/normalize.ts | 6 +- src/mfm/prelude.ts | 4 +- src/mfm/toHtml.ts | 6 +- src/misc/convert-host.ts | 2 +- src/misc/detect-mine.ts | 2 +- src/misc/donwload-url.ts | 4 +- src/misc/download-text-file.ts | 2 +- src/misc/extract-emojis.ts | 6 +- src/misc/extract-hashtags.ts | 6 +- src/misc/extract-mentions.ts | 4 +- src/misc/fetch-meta.ts | 2 +- src/misc/fetch-proxy-account.ts | 6 +- src/misc/gen-id.ts | 2 +- src/misc/get-user-name.ts | 2 +- src/misc/is-quote.ts | 2 +- src/misc/reaction-lib.ts | 2 +- src/misc/show-machine-info.ts | 2 +- src/models/entities/abuse-user-report.ts | 2 +- src/models/entities/access-token.ts | 2 +- src/models/entities/app.ts | 2 +- src/models/entities/attestation-challenge.ts | 2 +- src/models/entities/auth-session.ts | 2 +- src/models/entities/blocking.ts | 2 +- src/models/entities/drive-file.ts | 2 +- src/models/entities/drive-folder.ts | 2 +- src/models/entities/emoji.ts | 2 +- src/models/entities/follow-request.ts | 2 +- src/models/entities/following.ts | 2 +- src/models/entities/games/reversi/game.ts | 4 +- src/models/entities/games/reversi/matching.ts | 4 +- src/models/entities/hashtag.ts | 2 +- src/models/entities/instance.ts | 2 +- src/models/entities/log.ts | 2 +- src/models/entities/messaging-message.ts | 2 +- src/models/entities/moderation-log.ts | 2 +- src/models/entities/muting.ts | 2 +- src/models/entities/note-favorite.ts | 2 +- src/models/entities/note-reaction.ts | 2 +- src/models/entities/note-unread.ts | 2 +- src/models/entities/note-watching.ts | 2 +- src/models/entities/note.ts | 2 +- src/models/entities/notification.ts | 2 +- src/models/entities/page-like.ts | 2 +- src/models/entities/page.ts | 2 +- src/models/entities/poll-vote.ts | 2 +- src/models/entities/poll.ts | 2 +- src/models/entities/registration-tickets.ts | 2 +- src/models/entities/signin.ts | 2 +- src/models/entities/sw-subscription.ts | 2 +- src/models/entities/user-group-invite.ts | 2 +- src/models/entities/user-group-joining.ts | 2 +- src/models/entities/user-group.ts | 2 +- src/models/entities/user-keypair.ts | 2 +- src/models/entities/user-list-joining.ts | 2 +- src/models/entities/user-list.ts | 2 +- src/models/entities/user-note-pinings.ts | 2 +- src/models/entities/user-profile.ts | 2 +- src/models/entities/user-publickey.ts | 2 +- src/models/entities/user-security-key.ts | 2 +- src/models/entities/user.ts | 2 +- src/models/repositories/abuse-user-report.ts | 8 +- src/models/repositories/app.ts | 8 +- src/models/repositories/auth-session.ts | 8 +- src/models/repositories/blocking.ts | 10 +- src/models/repositories/drive-file.ts | 14 +-- src/models/repositories/drive-folder.ts | 10 +- src/models/repositories/follow-request.ts | 6 +- src/models/repositories/following.ts | 10 +- src/models/repositories/games/reversi/game.ts | 6 +- .../repositories/games/reversi/matching.ts | 8 +- src/models/repositories/hashtag.ts | 4 +- src/models/repositories/messaging-message.ts | 8 +- src/models/repositories/moderation-logs.ts | 8 +- src/models/repositories/muting.ts | 10 +- src/models/repositories/note-favorite.ts | 6 +- src/models/repositories/note-reaction.ts | 8 +- src/models/repositories/note.ts | 16 ++-- src/models/repositories/notification.ts | 10 +- src/models/repositories/page-like.ts | 6 +- src/models/repositories/page.ts | 14 +-- src/models/repositories/signin.ts | 2 +- src/models/repositories/user-group-invite.ts | 6 +- src/models/repositories/user-group.ts | 8 +- src/models/repositories/user-list.ts | 8 +- src/models/repositories/user.ts | 12 +-- src/queue/index.ts | 8 +- src/queue/logger.ts | 2 +- src/queue/processors/db/delete-drive-files.ts | 6 +- src/queue/processors/db/export-blocking.ts | 8 +- src/queue/processors/db/export-following.ts | 8 +- src/queue/processors/db/export-mute.ts | 8 +- src/queue/processors/db/export-notes.ts | 12 +-- src/queue/processors/db/export-user-lists.ts | 8 +- src/queue/processors/db/import-following.ts | 14 +-- src/queue/processors/db/import-user-lists.ts | 16 ++-- src/queue/processors/deliver.ts | 10 +- src/queue/processors/inbox.ts | 26 ++--- .../object-storage/clean-remote-files.ts | 6 +- .../processors/object-storage/delete-file.ts | 2 +- .../activitypub/kernel/accept/follow.ts | 10 +- src/remote/activitypub/kernel/accept/index.ts | 8 +- src/remote/activitypub/kernel/add/index.ts | 8 +- .../activitypub/kernel/announce/index.ts | 8 +- .../activitypub/kernel/announce/note.ts | 18 ++-- src/remote/activitypub/kernel/block/index.ts | 12 +-- src/remote/activitypub/kernel/create/index.ts | 8 +- src/remote/activitypub/kernel/create/note.ts | 6 +- src/remote/activitypub/kernel/delete/index.ts | 8 +- src/remote/activitypub/kernel/delete/note.ts | 8 +- src/remote/activitypub/kernel/follow.ts | 10 +- src/remote/activitypub/kernel/index.ts | 6 +- src/remote/activitypub/kernel/like.ts | 10 +- .../activitypub/kernel/reject/follow.ts | 10 +- src/remote/activitypub/kernel/reject/index.ts | 8 +- src/remote/activitypub/kernel/remove/index.ts | 8 +- src/remote/activitypub/kernel/undo/block.ts | 12 +-- src/remote/activitypub/kernel/undo/follow.ts | 12 +-- src/remote/activitypub/kernel/undo/index.ts | 8 +- src/remote/activitypub/kernel/undo/like.ts | 8 +- src/remote/activitypub/kernel/update/index.ts | 8 +- src/remote/activitypub/logger.ts | 2 +- src/remote/activitypub/misc/get-note-html.ts | 6 +- src/remote/activitypub/models/image.ts | 16 ++-- src/remote/activitypub/models/note.ts | 36 +++---- src/remote/activitypub/models/person.ts | 42 ++++----- src/remote/activitypub/models/question.ts | 12 +-- src/remote/activitypub/perform.ts | 2 +- src/remote/activitypub/renderer/accept.ts | 4 +- src/remote/activitypub/renderer/add.ts | 4 +- src/remote/activitypub/renderer/announce.ts | 4 +- src/remote/activitypub/renderer/block.ts | 4 +- src/remote/activitypub/renderer/create.ts | 4 +- src/remote/activitypub/renderer/delete.ts | 4 +- src/remote/activitypub/renderer/document.ts | 4 +- src/remote/activitypub/renderer/emoji.ts | 4 +- .../activitypub/renderer/follow-user.ts | 8 +- src/remote/activitypub/renderer/follow.ts | 6 +- src/remote/activitypub/renderer/hashtag.ts | 2 +- src/remote/activitypub/renderer/image.ts | 4 +- src/remote/activitypub/renderer/index.ts | 2 +- src/remote/activitypub/renderer/key.ts | 6 +- src/remote/activitypub/renderer/like.ts | 6 +- src/remote/activitypub/renderer/mention.ts | 6 +- src/remote/activitypub/renderer/note.ts | 16 ++-- src/remote/activitypub/renderer/person.ts | 14 +-- src/remote/activitypub/renderer/question.ts | 8 +- src/remote/activitypub/renderer/reject.ts | 4 +- src/remote/activitypub/renderer/remove.ts | 4 +- src/remote/activitypub/renderer/undo.ts | 4 +- src/remote/activitypub/renderer/update.ts | 4 +- src/remote/activitypub/renderer/vote.ts | 10 +- src/remote/activitypub/request.ts | 14 +-- src/remote/activitypub/resolver.ts | 2 +- src/remote/logger.ts | 2 +- src/remote/resolve-user.ts | 8 +- src/remote/webfinger.ts | 4 +- src/server/activitypub.ts | 20 ++-- src/server/activitypub/featured.ts | 14 +-- src/server/activitypub/followers.ts | 18 ++-- src/server/activitypub/following.ts | 20 ++-- src/server/activitypub/outbox.ts | 30 +++--- src/server/api/2fa.ts | 2 +- src/server/api/authenticate.ts | 6 +- src/server/api/call.ts | 4 +- src/server/api/common/generate-block-query.ts | 4 +- src/server/api/common/generate-mute-query.ts | 4 +- .../api/common/generate-visibility-query.ts | 4 +- src/server/api/common/getters.ts | 8 +- .../api/common/read-messaging-message.ts | 16 ++-- src/server/api/common/read-notification.ts | 8 +- src/server/api/common/signin.ts | 10 +- src/server/api/define.ts | 6 +- src/server/api/endpoints.ts | 2 +- .../api/endpoints/admin/abuse-user-reports.ts | 8 +- .../admin/delete-all-files-of-a-user.ts | 8 +- src/server/api/endpoints/admin/delete-logs.ts | 4 +- .../admin/drive/clean-remote-files.ts | 4 +- .../api/endpoints/admin/drive/cleanup.ts | 6 +- src/server/api/endpoints/admin/drive/files.ts | 6 +- .../api/endpoints/admin/drive/show-file.ts | 8 +- src/server/api/endpoints/admin/emoji/add.ts | 10 +- src/server/api/endpoints/admin/emoji/list.ts | 6 +- .../api/endpoints/admin/emoji/remove.ts | 8 +- .../api/endpoints/admin/emoji/update.ts | 8 +- .../admin/federation/delete-all-files.ts | 6 +- .../admin/federation/remove-all-following.ts | 8 +- .../admin/federation/update-instance.ts | 6 +- .../api/endpoints/admin/get-table-stats.ts | 2 +- src/server/api/endpoints/admin/invite.ts | 6 +- src/server/api/endpoints/admin/logs.ts | 4 +- .../api/endpoints/admin/moderators/add.ts | 6 +- .../api/endpoints/admin/moderators/remove.ts | 6 +- src/server/api/endpoints/admin/queue/clear.ts | 6 +- src/server/api/endpoints/admin/queue/jobs.ts | 4 +- src/server/api/endpoints/admin/queue/stats.ts | 4 +- .../admin/remove-abuse-user-report.ts | 6 +- .../api/endpoints/admin/reset-password.ts | 6 +- src/server/api/endpoints/admin/send-email.ts | 4 +- .../endpoints/admin/show-moderation-logs.ts | 8 +- src/server/api/endpoints/admin/show-user.ts | 6 +- src/server/api/endpoints/admin/show-users.ts | 4 +- .../api/endpoints/admin/silence-user.ts | 8 +- .../api/endpoints/admin/suspend-user.ts | 14 +-- .../api/endpoints/admin/unsilence-user.ts | 8 +- .../api/endpoints/admin/unsuspend-user.ts | 10 +- src/server/api/endpoints/admin/update-meta.ts | 6 +- .../api/endpoints/admin/update-remote-user.ts | 8 +- src/server/api/endpoints/admin/vacuum.ts | 4 +- src/server/api/endpoints/ap/show.ts | 24 ++--- src/server/api/endpoints/app/create.ts | 8 +- src/server/api/endpoints/app/show.ts | 8 +- src/server/api/endpoints/auth/accept.ts | 10 +- .../api/endpoints/auth/session/generate.ts | 10 +- src/server/api/endpoints/auth/session/show.ts | 6 +- .../api/endpoints/auth/session/userkey.ts | 8 +- src/server/api/endpoints/blocking/create.ts | 12 +-- src/server/api/endpoints/blocking/delete.ts | 12 +-- src/server/api/endpoints/blocking/list.ts | 8 +- .../api/endpoints/charts/active-users.ts | 6 +- src/server/api/endpoints/charts/drive.ts | 6 +- src/server/api/endpoints/charts/federation.ts | 6 +- src/server/api/endpoints/charts/hashtag.ts | 6 +- src/server/api/endpoints/charts/instance.ts | 6 +- src/server/api/endpoints/charts/network.ts | 6 +- src/server/api/endpoints/charts/notes.ts | 6 +- src/server/api/endpoints/charts/user/drive.ts | 8 +- .../api/endpoints/charts/user/following.ts | 8 +- src/server/api/endpoints/charts/user/notes.ts | 8 +- .../api/endpoints/charts/user/reactions.ts | 8 +- src/server/api/endpoints/charts/users.ts | 6 +- src/server/api/endpoints/drive.ts | 6 +- src/server/api/endpoints/drive/files.ts | 8 +- .../endpoints/drive/files/attached-notes.ts | 8 +- .../endpoints/drive/files/check-existence.ts | 4 +- .../api/endpoints/drive/files/create.ts | 12 +-- .../api/endpoints/drive/files/delete.ts | 12 +-- .../api/endpoints/drive/files/find-by-hash.ts | 4 +- src/server/api/endpoints/drive/files/find.ts | 6 +- src/server/api/endpoints/drive/files/show.ts | 10 +- .../api/endpoints/drive/files/update.ts | 10 +- .../endpoints/drive/files/upload-from-url.ts | 8 +- src/server/api/endpoints/drive/folders.ts | 8 +- .../api/endpoints/drive/folders/create.ts | 12 +-- .../api/endpoints/drive/folders/delete.ts | 10 +- .../api/endpoints/drive/folders/find.ts | 6 +- .../api/endpoints/drive/folders/show.ts | 8 +- .../api/endpoints/drive/folders/update.ts | 10 +- src/server/api/endpoints/drive/stream.ts | 8 +- src/server/api/endpoints/endpoint.ts | 4 +- src/server/api/endpoints/endpoints.ts | 4 +- .../api/endpoints/federation/instances.ts | 6 +- .../api/endpoints/federation/show-instance.ts | 6 +- src/server/api/endpoints/following/create.ts | 12 +-- src/server/api/endpoints/following/delete.ts | 12 +-- .../endpoints/following/requests/accept.ts | 10 +- .../endpoints/following/requests/cancel.ts | 12 +-- .../api/endpoints/following/requests/list.ts | 4 +- .../endpoints/following/requests/reject.ts | 10 +- .../api/endpoints/games/reversi/games.ts | 8 +- .../api/endpoints/games/reversi/games/show.ts | 10 +- .../games/reversi/games/surrender.ts | 10 +- .../endpoints/games/reversi/invitations.ts | 4 +- .../api/endpoints/games/reversi/match.ts | 20 ++-- .../endpoints/games/reversi/match/cancel.ts | 4 +- src/server/api/endpoints/hashtags/list.ts | 4 +- src/server/api/endpoints/hashtags/search.ts | 4 +- src/server/api/endpoints/hashtags/show.ts | 6 +- src/server/api/endpoints/hashtags/trend.ts | 8 +- src/server/api/endpoints/hashtags/users.ts | 4 +- src/server/api/endpoints/i.ts | 4 +- src/server/api/endpoints/i/2fa/done.ts | 6 +- src/server/api/endpoints/i/2fa/key-done.ts | 12 +-- .../api/endpoints/i/2fa/password-less.ts | 4 +- .../api/endpoints/i/2fa/register-key.ts | 10 +- src/server/api/endpoints/i/2fa/register.ts | 8 +- src/server/api/endpoints/i/2fa/remove-key.ts | 8 +- src/server/api/endpoints/i/2fa/unregister.ts | 6 +- src/server/api/endpoints/i/authorized-apps.ts | 4 +- src/server/api/endpoints/i/change-password.ts | 6 +- src/server/api/endpoints/i/delete-account.ts | 8 +- src/server/api/endpoints/i/export-blocking.ts | 4 +- .../api/endpoints/i/export-following.ts | 4 +- src/server/api/endpoints/i/export-mute.ts | 4 +- src/server/api/endpoints/i/export-notes.ts | 4 +- .../api/endpoints/i/export-user-lists.ts | 4 +- src/server/api/endpoints/i/favorites.ts | 8 +- .../api/endpoints/i/import-following.ts | 10 +- .../api/endpoints/i/import-user-lists.ts | 10 +- src/server/api/endpoints/i/notifications.ts | 10 +- src/server/api/endpoints/i/page-likes.ts | 8 +- src/server/api/endpoints/i/pages.ts | 8 +- src/server/api/endpoints/i/pin.ts | 10 +- .../i/read-all-messaging-messages.ts | 6 +- .../api/endpoints/i/read-all-unread-notes.ts | 6 +- .../api/endpoints/i/regenerate-token.ts | 10 +- src/server/api/endpoints/i/signin-history.ts | 8 +- src/server/api/endpoints/i/unpin.ts | 10 +- .../api/endpoints/i/update-client-setting.ts | 8 +- src/server/api/endpoints/i/update-email.ts | 14 +-- src/server/api/endpoints/i/update.ts | 28 +++--- .../api/endpoints/i/user-group-invites.ts | 8 +- src/server/api/endpoints/messaging/history.ts | 6 +- .../api/endpoints/messaging/messages.ts | 14 +-- .../endpoints/messaging/messages/create.ts | 24 ++--- .../endpoints/messaging/messages/delete.ts | 10 +- .../api/endpoints/messaging/messages/read.ts | 10 +- src/server/api/endpoints/meta.ts | 12 +-- src/server/api/endpoints/mute/create.ts | 14 +-- src/server/api/endpoints/mute/delete.ts | 10 +- src/server/api/endpoints/mute/list.ts | 8 +- src/server/api/endpoints/my/apps.ts | 4 +- src/server/api/endpoints/notes.ts | 8 +- src/server/api/endpoints/notes/children.ts | 12 +-- .../api/endpoints/notes/conversation.ts | 12 +-- src/server/api/endpoints/notes/create.ts | 18 ++-- src/server/api/endpoints/notes/delete.ts | 14 +-- .../api/endpoints/notes/favorites/create.ts | 12 +-- .../api/endpoints/notes/favorites/delete.ts | 10 +- src/server/api/endpoints/notes/featured.ts | 6 +- .../api/endpoints/notes/global-timeline.ts | 16 ++-- .../api/endpoints/notes/hybrid-timeline.ts | 18 ++-- .../api/endpoints/notes/local-timeline.ts | 18 ++-- src/server/api/endpoints/notes/mentions.ts | 14 +-- .../endpoints/notes/polls/recommendation.ts | 4 +- src/server/api/endpoints/notes/polls/vote.ts | 30 +++--- src/server/api/endpoints/notes/reactions.ts | 10 +- .../api/endpoints/notes/reactions/create.ts | 10 +- .../api/endpoints/notes/reactions/delete.ts | 10 +- src/server/api/endpoints/notes/renotes.ts | 16 ++-- src/server/api/endpoints/notes/replies.ts | 12 +-- .../api/endpoints/notes/search-by-tag.ts | 12 +-- src/server/api/endpoints/notes/search.ts | 12 +-- src/server/api/endpoints/notes/show.ts | 10 +- src/server/api/endpoints/notes/state.ts | 6 +- src/server/api/endpoints/notes/timeline.ts | 14 +-- src/server/api/endpoints/notes/unrenote.ts | 12 +-- .../api/endpoints/notes/user-list-timeline.ts | 14 +-- .../api/endpoints/notes/watching/create.ts | 10 +- .../api/endpoints/notes/watching/delete.ts | 10 +- .../notifications/mark-all-as-read.ts | 6 +- src/server/api/endpoints/page-push.ts | 10 +- src/server/api/endpoints/pages/create.ts | 12 +-- src/server/api/endpoints/pages/delete.ts | 8 +- src/server/api/endpoints/pages/like.ts | 10 +- src/server/api/endpoints/pages/show.ts | 10 +- src/server/api/endpoints/pages/unlike.ts | 8 +- src/server/api/endpoints/pages/update.ts | 8 +- src/server/api/endpoints/pinned-users.ts | 10 +- src/server/api/endpoints/stats.ts | 6 +- src/server/api/endpoints/sw/register.ts | 8 +- .../api/endpoints/username/available.ts | 4 +- src/server/api/endpoints/users.ts | 6 +- src/server/api/endpoints/users/followers.ts | 12 +-- src/server/api/endpoints/users/following.ts | 12 +-- .../users/get-frequently-replied-users.ts | 12 +-- .../api/endpoints/users/groups/create.ts | 10 +- .../api/endpoints/users/groups/delete.ts | 8 +- .../users/groups/invitations/accept.ts | 12 +-- .../users/groups/invitations/reject.ts | 8 +- .../api/endpoints/users/groups/invite.ts | 14 +-- .../api/endpoints/users/groups/joined.ts | 4 +- .../api/endpoints/users/groups/owned.ts | 4 +- src/server/api/endpoints/users/groups/pull.ts | 10 +- src/server/api/endpoints/users/groups/show.ts | 8 +- .../api/endpoints/users/groups/transfer.ts | 10 +- .../api/endpoints/users/groups/update.ts | 8 +- .../api/endpoints/users/lists/create.ts | 8 +- .../api/endpoints/users/lists/delete.ts | 8 +- src/server/api/endpoints/users/lists/list.ts | 4 +- src/server/api/endpoints/users/lists/pull.ts | 12 +-- src/server/api/endpoints/users/lists/push.ts | 12 +-- src/server/api/endpoints/users/lists/show.ts | 8 +- .../api/endpoints/users/lists/update.ts | 8 +- src/server/api/endpoints/users/notes.ts | 16 ++-- .../api/endpoints/users/recommendation.ts | 8 +- src/server/api/endpoints/users/relation.ts | 6 +- .../api/endpoints/users/report-abuse.ts | 14 +-- src/server/api/endpoints/users/search.ts | 6 +- src/server/api/endpoints/users/show.ts | 12 +-- src/server/api/index.ts | 2 +- src/server/api/limiter.ts | 8 +- src/server/api/logger.ts | 2 +- src/server/api/openapi/description.ts | 10 +- src/server/api/openapi/gen-spec.ts | 4 +- src/server/api/openapi/schemas.ts | 34 +++---- src/server/api/private/signin.ts | 14 +-- src/server/api/private/signup.ts | 22 ++--- src/server/api/service/discord.ts | 16 ++-- src/server/api/service/github.ts | 16 ++-- src/server/api/service/twitter.ts | 16 ++-- src/server/api/stream/channels/admin.ts | 2 +- src/server/api/stream/channels/ap-log.ts | 2 +- src/server/api/stream/channels/drive.ts | 2 +- .../api/stream/channels/games/reversi-game.ts | 12 +-- .../api/stream/channels/games/reversi.ts | 6 +- .../api/stream/channels/global-timeline.ts | 10 +- src/server/api/stream/channels/hashtag.ts | 8 +- .../api/stream/channels/home-timeline.ts | 8 +- .../api/stream/channels/hybrid-timeline.ts | 12 +-- .../api/stream/channels/local-timeline.ts | 12 +-- src/server/api/stream/channels/main.ts | 4 +- .../api/stream/channels/messaging-index.ts | 2 +- src/server/api/stream/channels/messaging.ts | 6 +- src/server/api/stream/channels/notes-stats.ts | 2 +- src/server/api/stream/channels/queue-stats.ts | 2 +- .../api/stream/channels/server-stats.ts | 2 +- src/server/api/stream/channels/user-list.ts | 10 +- src/server/api/stream/index.ts | 12 +-- src/server/api/streaming.ts | 2 +- src/server/file/send-drive-file.ts | 6 +- src/server/index.ts | 16 ++-- src/server/nodeinfo.ts | 10 +- src/server/proxy/proxy-media.ts | 8 +- src/server/web/docs.ts | 8 +- src/server/web/feed.ts | 8 +- src/server/web/index.ts | 18 ++-- src/server/web/manifest.ts | 4 +- src/server/web/url-preview.ts | 8 +- src/server/well-known.ts | 12 +-- src/services/blocking/create.ts | 22 ++--- src/services/blocking/delete.ts | 14 +-- .../chart/charts/classes/active-users.ts | 10 +- src/services/chart/charts/classes/drive.ts | 10 +- .../chart/charts/classes/federation.ts | 8 +- src/services/chart/charts/classes/hashtag.ts | 10 +- src/services/chart/charts/classes/instance.ts | 14 +-- src/services/chart/charts/classes/network.ts | 6 +- src/services/chart/charts/classes/notes.ts | 10 +- .../chart/charts/classes/per-user-drive.ts | 10 +- .../charts/classes/per-user-following.ts | 10 +- .../chart/charts/classes/per-user-notes.ts | 12 +-- .../charts/classes/per-user-reactions.ts | 12 +-- .../chart/charts/classes/test-grouped.ts | 6 +- .../chart/charts/classes/test-unique.ts | 6 +- src/services/chart/charts/classes/test.ts | 6 +- src/services/chart/charts/classes/users.ts | 10 +- src/services/chart/core.ts | 8 +- src/services/create-notification.ts | 10 +- src/services/drive/add-file.ts | 20 ++-- src/services/drive/delete-file.ts | 10 +- src/services/drive/internal-storage.ts | 2 +- src/services/drive/logger.ts | 2 +- src/services/drive/s3.ts | 4 +- src/services/drive/upload-from-url.ts | 12 +-- src/services/following/create.ts | 32 +++---- src/services/following/delete.ts | 20 ++-- src/services/following/requests/accept-all.ts | 6 +- src/services/following/requests/accept.ts | 16 ++-- src/services/following/requests/cancel.ts | 16 ++-- src/services/following/requests/create.ts | 16 ++-- src/services/following/requests/reject.ts | 14 +-- src/services/i/pin.ts | 22 ++--- src/services/i/update.ts | 12 +-- src/services/insert-moderation-log.ts | 6 +- src/services/logger.ts | 6 +- src/services/note/create.ts | 54 +++++------ src/services/note/delete.ts | 22 ++--- src/services/note/polls/update.ts | 12 +-- src/services/note/polls/vote.ts | 14 +-- src/services/note/reaction/create.ts | 32 +++---- src/services/note/reaction/delete.ts | 18 ++-- src/services/note/read.ts | 8 +- src/services/note/unread.ts | 10 +- src/services/note/unwatch.ts | 6 +- src/services/note/watch.ts | 10 +- src/services/push-notification.ts | 6 +- .../register-or-fetch-instance-doc.ts | 8 +- src/services/send-email.ts | 2 +- src/services/stream.ts | 12 +-- src/services/suspend-user.ts | 12 +-- src/services/unsuspend-user.ts | 14 +-- src/services/update-hashtag.ts | 8 +- src/services/user-list/push.ts | 20 ++-- src/tools/accept-migration.ts | 2 +- src/tools/add-emoji.ts | 4 +- src/tools/refresh-question.ts | 2 +- src/tools/resync-remote-user.ts | 4 +- src/tools/show-signin-history.ts | 2 +- tsconfig.json | 5 + webpack.config.ts | 1 + 495 files changed, 2080 insertions(+), 2074 deletions(-) diff --git a/src/argv.ts b/src/argv.ts index 562852d17..8e602e346 100644 --- a/src/argv.ts +++ b/src/argv.ts @@ -1,5 +1,5 @@ import * as program from 'commander'; -import * as pkg from '../package.json'; +import * as pkg from '~/package.json'; program .version(pkg.version) diff --git a/src/boot/index.ts b/src/boot/index.ts index 2c86d8ed8..5b4a1b07b 100644 --- a/src/boot/index.ts +++ b/src/boot/index.ts @@ -2,8 +2,8 @@ import * as cluster from 'cluster'; import chalk from 'chalk'; import Xev from 'xev'; -import Logger from '../services/logger'; -import { program } from '../argv'; +import Logger from '~/services/logger'; +import { program } from '~/argv'; // for typeorm import 'reflect-metadata'; diff --git a/src/boot/master.ts b/src/boot/master.ts index b698548d4..dd2192253 100644 --- a/src/boot/master.ts +++ b/src/boot/master.ts @@ -4,14 +4,14 @@ import chalk from 'chalk'; import * as portscanner from 'portscanner'; import * as isRoot from 'is-root'; -import Logger from '../services/logger'; -import loadConfig from '../config/load'; -import { Config } from '../config/types'; -import { lessThan } from '../prelude/array'; -import * as pkg from '../../package.json'; -import { program } from '../argv'; -import { showMachineInfo } from '../misc/show-machine-info'; -import { initDb } from '../db/postgre'; +import Logger from '~/services/logger'; +import loadConfig from '~/config/load'; +import { Config } from '~/config/types'; +import { lessThan } from '~/prelude/array'; +import * as pkg from '~/package.json'; +import { program } from '~/argv'; +import { showMachineInfo } from '~/misc/show-machine-info'; +import { initDb } from '~/db/postgre'; const logger = new Logger('core', 'cyan'); const bootLogger = logger.createSubLogger('boot', 'magenta', false); diff --git a/src/boot/worker.ts b/src/boot/worker.ts index 362fa3f26..a702fff95 100644 --- a/src/boot/worker.ts +++ b/src/boot/worker.ts @@ -1,5 +1,5 @@ import * as cluster from 'cluster'; -import { initDb } from '../db/postgre'; +import { initDb } from '~/db/postgre'; /** * Init worker process diff --git a/src/config/load.ts b/src/config/load.ts index aeed54d74..0e4c7d8cd 100644 --- a/src/config/load.ts +++ b/src/config/load.ts @@ -5,7 +5,7 @@ import * as fs from 'fs'; import * as yaml from 'js-yaml'; import { Source, Mixin } from './types'; -import * as pkg from '../../package.json'; +import * as pkg from '~/package.json'; /** * Path of configuration directory diff --git a/src/daemons/janitor.ts b/src/daemons/janitor.ts index 462ebf915..eb43e5042 100644 --- a/src/daemons/janitor.ts +++ b/src/daemons/janitor.ts @@ -1,5 +1,5 @@ const interval = 30 * 60 * 1000; -import { AttestationChallenges } from '../models'; +import { AttestationChallenges } from '~/models'; import { LessThan } from 'typeorm'; /** diff --git a/src/daemons/notes-stats-child.ts b/src/daemons/notes-stats-child.ts index b60f5badf..e2e9cf2a5 100644 --- a/src/daemons/notes-stats-child.ts +++ b/src/daemons/notes-stats-child.ts @@ -1,6 +1,6 @@ import { MoreThanOrEqual, getRepository } from 'typeorm'; -import { Note } from '../models/entities/note'; -import { initDb } from '../db/postgre'; +import { Note } from '~/models/entities/note'; +import { initDb } from '~/db/postgre'; const interval = 5000; diff --git a/src/daemons/queue-stats.ts b/src/daemons/queue-stats.ts index e560354c7..a1e72a6ee 100644 --- a/src/daemons/queue-stats.ts +++ b/src/daemons/queue-stats.ts @@ -1,6 +1,6 @@ import * as Deque from 'double-ended-queue'; import Xev from 'xev'; -import { deliverQueue, inboxQueue, dbQueue, objectStorageQueue } from '../queue'; +import { deliverQueue, inboxQueue, dbQueue, objectStorageQueue } from '~/queue'; const ev = new Xev(); diff --git a/src/db/elasticsearch.ts b/src/db/elasticsearch.ts index b34ebe605..d594c445c 100644 --- a/src/db/elasticsearch.ts +++ b/src/db/elasticsearch.ts @@ -1,5 +1,5 @@ import * as elasticsearch from '@elastic/elasticsearch'; -import config from '../config'; +import config from '~/config'; const index = { settings: { diff --git a/src/db/logger.ts b/src/db/logger.ts index 1f702c18e..9e74f2a4b 100644 --- a/src/db/logger.ts +++ b/src/db/logger.ts @@ -1,3 +1,3 @@ -import Logger from '../services/logger'; +import Logger from '~/services/logger'; export const dbLogger = new Logger('db'); diff --git a/src/db/postgre.ts b/src/db/postgre.ts index 00476b877..4eceacb57 100644 --- a/src/db/postgre.ts +++ b/src/db/postgre.ts @@ -1,54 +1,54 @@ import { createConnection, Logger, getConnection } from 'typeorm'; -import config from '../config'; -import { entities as charts } from '../services/chart/entities'; +import config from '~/config'; +import { entities as charts } from '~/services/chart/entities'; import { dbLogger } from './logger'; import * as highlight from 'cli-highlight'; -import { Log } from '../models/entities/log'; -import { User } from '../models/entities/user'; -import { DriveFile } from '../models/entities/drive-file'; -import { DriveFolder } from '../models/entities/drive-folder'; -import { AccessToken } from '../models/entities/access-token'; -import { App } from '../models/entities/app'; -import { PollVote } from '../models/entities/poll-vote'; -import { Note } from '../models/entities/note'; -import { NoteReaction } from '../models/entities/note-reaction'; -import { NoteWatching } from '../models/entities/note-watching'; -import { NoteUnread } from '../models/entities/note-unread'; -import { Notification } from '../models/entities/notification'; -import { Meta } from '../models/entities/meta'; -import { Following } from '../models/entities/following'; -import { Instance } from '../models/entities/instance'; -import { Muting } from '../models/entities/muting'; -import { SwSubscription } from '../models/entities/sw-subscription'; -import { Blocking } from '../models/entities/blocking'; -import { UserList } from '../models/entities/user-list'; -import { UserListJoining } from '../models/entities/user-list-joining'; -import { UserGroup } from '../models/entities/user-group'; -import { UserGroupJoining } from '../models/entities/user-group-joining'; -import { UserGroupInvite } from '../models/entities/user-group-invite'; -import { Hashtag } from '../models/entities/hashtag'; -import { NoteFavorite } from '../models/entities/note-favorite'; -import { AbuseUserReport } from '../models/entities/abuse-user-report'; -import { RegistrationTicket } from '../models/entities/registration-tickets'; -import { MessagingMessage } from '../models/entities/messaging-message'; -import { Signin } from '../models/entities/signin'; -import { AuthSession } from '../models/entities/auth-session'; -import { FollowRequest } from '../models/entities/follow-request'; -import { Emoji } from '../models/entities/emoji'; -import { ReversiGame } from '../models/entities/games/reversi/game'; -import { ReversiMatching } from '../models/entities/games/reversi/matching'; -import { UserNotePining } from '../models/entities/user-note-pinings'; -import { Poll } from '../models/entities/poll'; -import { UserKeypair } from '../models/entities/user-keypair'; -import { UserPublickey } from '../models/entities/user-publickey'; -import { UserProfile } from '../models/entities/user-profile'; -import { UserSecurityKey } from '../models/entities/user-security-key'; -import { AttestationChallenge } from '../models/entities/attestation-challenge'; -import { Page } from '../models/entities/page'; -import { PageLike } from '../models/entities/page-like'; -import { ModerationLog } from '../models/entities/moderation-log'; -import { UsedUsername } from '../models/entities/used-username'; +import { Log } from '~/models/entities/log'; +import { User } from '~/models/entities/user'; +import { DriveFile } from '~/models/entities/drive-file'; +import { DriveFolder } from '~/models/entities/drive-folder'; +import { AccessToken } from '~/models/entities/access-token'; +import { App } from '~/models/entities/app'; +import { PollVote } from '~/models/entities/poll-vote'; +import { Note } from '~/models/entities/note'; +import { NoteReaction } from '~/models/entities/note-reaction'; +import { NoteWatching } from '~/models/entities/note-watching'; +import { NoteUnread } from '~/models/entities/note-unread'; +import { Notification } from '~/models/entities/notification'; +import { Meta } from '~/models/entities/meta'; +import { Following } from '~/models/entities/following'; +import { Instance } from '~/models/entities/instance'; +import { Muting } from '~/models/entities/muting'; +import { SwSubscription } from '~/models/entities/sw-subscription'; +import { Blocking } from '~/models/entities/blocking'; +import { UserList } from '~/models/entities/user-list'; +import { UserListJoining } from '~/models/entities/user-list-joining'; +import { UserGroup } from '~/models/entities/user-group'; +import { UserGroupJoining } from '~/models/entities/user-group-joining'; +import { UserGroupInvite } from '~/models/entities/user-group-invite'; +import { Hashtag } from '~/models/entities/hashtag'; +import { NoteFavorite } from '~/models/entities/note-favorite'; +import { AbuseUserReport } from '~/models/entities/abuse-user-report'; +import { RegistrationTicket } from '~/models/entities/registration-tickets'; +import { MessagingMessage } from '~/models/entities/messaging-message'; +import { Signin } from '~/models/entities/signin'; +import { AuthSession } from '~/models/entities/auth-session'; +import { FollowRequest } from '~/models/entities/follow-request'; +import { Emoji } from '~/models/entities/emoji'; +import { ReversiGame } from '~/models/entities/games/reversi/game'; +import { ReversiMatching } from '~/models/entities/games/reversi/matching'; +import { UserNotePining } from '~/models/entities/user-note-pinings'; +import { Poll } from '~/models/entities/poll'; +import { UserKeypair } from '~/models/entities/user-keypair'; +import { UserPublickey } from '~/models/entities/user-publickey'; +import { UserProfile } from '~/models/entities/user-profile'; +import { UserSecurityKey } from '~/models/entities/user-security-key'; +import { AttestationChallenge } from '~/models/entities/attestation-challenge'; +import { Page } from '~/models/entities/page'; +import { PageLike } from '~/models/entities/page-like'; +import { ModerationLog } from '~/models/entities/moderation-log'; +import { UsedUsername } from '~/models/entities/used-username'; const sqlLogger = dbLogger.createSubLogger('sql', 'white', false); diff --git a/src/db/redis.ts b/src/db/redis.ts index 41d030149..a2c7efde4 100644 --- a/src/db/redis.ts +++ b/src/db/redis.ts @@ -1,5 +1,5 @@ import * as redis from 'redis'; -import config from '../config'; +import config from '~/config'; export default redis.createClient( config.redis.port, diff --git a/src/games/reversi/core.ts b/src/games/reversi/core.ts index 09d23e2b7..5d195cbf5 100644 --- a/src/games/reversi/core.ts +++ b/src/games/reversi/core.ts @@ -1,4 +1,4 @@ -import { count, concat } from '../../prelude/array'; +import { count, concat } from '~/prelude/array'; // MISSKEY REVERSI ENGINE diff --git a/src/index.ts b/src/index.ts index c4a1088c2..d6e100479 100644 --- a/src/index.ts +++ b/src/index.ts @@ -6,7 +6,7 @@ Error.stackTraceLimit = Infinity; require('events').EventEmitter.defaultMaxListeners = 128; -import boot from './boot'; +import boot from '~/boot'; export default function() { return boot(); diff --git a/src/mfm/language.ts b/src/mfm/language.ts index 5d5e35fbf..9b07ab656 100644 --- a/src/mfm/language.ts +++ b/src/mfm/language.ts @@ -1,9 +1,9 @@ import * as P from 'parsimmon'; import { createLeaf, createTree, urlRegex } from './prelude'; -import { takeWhile, cumulativeSum } from '../prelude/array'; -import parseAcct from '../misc/acct/parse'; +import { takeWhile, cumulativeSum } from '~/prelude/array'; +import parseAcct from '~/misc/acct/parse'; import { toUnicode } from 'punycode'; -import { emojiRegex } from '../misc/emoji-regex'; +import { emojiRegex } from '~/misc/emoji-regex'; export function removeOrphanedBrackets(s: string): string { const openBrackets = ['(', '「', '[']; diff --git a/src/mfm/normalize.ts b/src/mfm/normalize.ts index 1a2b5bdcd..e8fc7ba3d 100644 --- a/src/mfm/normalize.ts +++ b/src/mfm/normalize.ts @@ -1,7 +1,7 @@ -import * as A from '../prelude/array'; -import * as S from '../prelude/string'; +import * as A from '~/prelude/array'; +import * as S from '~/prelude/string'; import { MfmForest, MfmTree } from './prelude'; -import { createTree, createLeaf } from '../prelude/tree'; +import { createTree, createLeaf } from '~/prelude/tree'; function isEmptyTextTree(t: MfmTree): boolean { return t.node.type == 'text' && t.node.props.text === ''; diff --git a/src/mfm/prelude.ts b/src/mfm/prelude.ts index e18625bc7..a9621a612 100644 --- a/src/mfm/prelude.ts +++ b/src/mfm/prelude.ts @@ -1,5 +1,5 @@ -import { Tree } from '../prelude/tree'; -import * as T from '../prelude/tree'; +import { Tree } from '~/prelude/tree'; +import * as T from '~/prelude/tree'; type Node = { type: T, props: P }; diff --git a/src/mfm/toHtml.ts b/src/mfm/toHtml.ts index 58976fc2c..479e0759b 100644 --- a/src/mfm/toHtml.ts +++ b/src/mfm/toHtml.ts @@ -1,8 +1,8 @@ import { JSDOM } from 'jsdom'; -import config from '../config'; -import { intersperse } from '../prelude/array'; +import config from '~/config'; +import { intersperse } from '~/prelude/array'; import { MfmForest, MfmTree } from './prelude'; -import { IMentionedRemoteUsers } from '../models/entities/note'; +import { IMentionedRemoteUsers } from '~/models/entities/note'; export function toHtml(tokens: MfmForest | null, mentionedRemoteUsers: IMentionedRemoteUsers = []) { if (tokens == null) { diff --git a/src/misc/convert-host.ts b/src/misc/convert-host.ts index ad52e1258..c0a15fe6e 100644 --- a/src/misc/convert-host.ts +++ b/src/misc/convert-host.ts @@ -1,4 +1,4 @@ -import config from '../config'; +import config from '~/config'; import { toASCII } from 'punycode'; export function getFullApAccount(username: string, host: string | null) { diff --git a/src/misc/detect-mine.ts b/src/misc/detect-mine.ts index b22873369..e8a1d1503 100644 --- a/src/misc/detect-mine.ts +++ b/src/misc/detect-mine.ts @@ -1,6 +1,6 @@ import * as fs from 'fs'; import fileType = require('file-type'); -import checkSvg from '../misc/check-svg'; +import checkSvg from '~/misc/check-svg'; export async function detectMine(path: string) { return new Promise<[string, string | null]>((res, rej) => { diff --git a/src/misc/donwload-url.ts b/src/misc/donwload-url.ts index 564edbd3b..e05fc2012 100644 --- a/src/misc/donwload-url.ts +++ b/src/misc/donwload-url.ts @@ -1,8 +1,8 @@ import * as fs from 'fs'; import * as request from 'request'; -import config from '../config'; +import config from '~/config'; import chalk from 'chalk'; -import Logger from '../services/logger'; +import Logger from '~/services/logger'; export async function downloadUrl(url: string, path: string) { const logger = new Logger('download'); diff --git a/src/misc/download-text-file.ts b/src/misc/download-text-file.ts index f73286e9b..d8eea6149 100644 --- a/src/misc/download-text-file.ts +++ b/src/misc/download-text-file.ts @@ -1,6 +1,6 @@ import * as fs from 'fs'; import * as util from 'util'; -import Logger from '../services/logger'; +import Logger from '~/services/logger'; import { createTemp } from './create-temp'; import { downloadUrl } from './donwload-url'; diff --git a/src/misc/extract-emojis.ts b/src/misc/extract-emojis.ts index 2c57e9a8a..e00c61034 100644 --- a/src/misc/extract-emojis.ts +++ b/src/misc/extract-emojis.ts @@ -1,6 +1,6 @@ -import { EmojiNode, MfmForest } from '../mfm/prelude'; -import { preorderF } from '../prelude/tree'; -import { unique } from '../prelude/array'; +import { EmojiNode, MfmForest } from '~/mfm/prelude'; +import { preorderF } from '~/prelude/tree'; +import { unique } from '~/prelude/array'; export default function(mfmForest: MfmForest): string[] { const emojiNodes = preorderF(mfmForest).filter(x => x.type === 'emoji') as EmojiNode[]; diff --git a/src/misc/extract-hashtags.ts b/src/misc/extract-hashtags.ts index 36b2296a7..af2b1e140 100644 --- a/src/misc/extract-hashtags.ts +++ b/src/misc/extract-hashtags.ts @@ -1,6 +1,6 @@ -import { HashtagNode, MfmForest } from '../mfm/prelude'; -import { preorderF } from '../prelude/tree'; -import { unique } from '../prelude/array'; +import { HashtagNode, MfmForest } from '~/mfm/prelude'; +import { preorderF } from '~/prelude/tree'; +import { unique } from '~/prelude/array'; export default function(mfmForest: MfmForest): string[] { const hashtagNodes = preorderF(mfmForest).filter(x => x.type === 'hashtag') as HashtagNode[]; diff --git a/src/misc/extract-mentions.ts b/src/misc/extract-mentions.ts index 72330d31e..a783fb37f 100644 --- a/src/misc/extract-mentions.ts +++ b/src/misc/extract-mentions.ts @@ -1,7 +1,7 @@ // test is located in test/extract-mentions -import { MentionNode, MfmForest } from '../mfm/prelude'; -import { preorderF } from '../prelude/tree'; +import { MentionNode, MfmForest } from '~/mfm/prelude'; +import { preorderF } from '~/prelude/tree'; export default function(mfmForest: MfmForest): MentionNode['props'][] { // TODO: 重複を削除 diff --git a/src/misc/fetch-meta.ts b/src/misc/fetch-meta.ts index db82adb2a..291b16881 100644 --- a/src/misc/fetch-meta.ts +++ b/src/misc/fetch-meta.ts @@ -1,4 +1,4 @@ -import { Meta } from '../models/entities/meta'; +import { Meta } from '~/models/entities/meta'; import { getConnection } from 'typeorm'; let cache: Meta; diff --git a/src/misc/fetch-proxy-account.ts b/src/misc/fetch-proxy-account.ts index 075873091..c27dfeb53 100644 --- a/src/misc/fetch-proxy-account.ts +++ b/src/misc/fetch-proxy-account.ts @@ -1,7 +1,7 @@ import { fetchMeta } from './fetch-meta'; -import { ILocalUser } from '../models/entities/user'; -import { Users } from '../models'; -import { ensure } from '../prelude/ensure'; +import { ILocalUser } from '~/models/entities/user'; +import { Users } from '~/models'; +import { ensure } from '~/prelude/ensure'; export async function fetchProxyAccount(): Promise { const meta = await fetchMeta(); diff --git a/src/misc/gen-id.ts b/src/misc/gen-id.ts index 7779e2db1..e05a8136d 100644 --- a/src/misc/gen-id.ts +++ b/src/misc/gen-id.ts @@ -3,7 +3,7 @@ import { genAid } from './id/aid'; import { genMeid } from './id/meid'; import { genMeidg } from './id/meidg'; import { genObjectId } from './id/object-id'; -import config from '../config'; +import config from '~/config'; const metohd = config.id.toLowerCase(); diff --git a/src/misc/get-user-name.ts b/src/misc/get-user-name.ts index b6b45118b..f0d912f05 100644 --- a/src/misc/get-user-name.ts +++ b/src/misc/get-user-name.ts @@ -1,4 +1,4 @@ -import { User } from '../models/entities/user'; +import { User } from '~/models/entities/user'; export default function(user: User): string { return user.name || user.username; diff --git a/src/misc/is-quote.ts b/src/misc/is-quote.ts index 0a2a72f4a..24d55a406 100644 --- a/src/misc/is-quote.ts +++ b/src/misc/is-quote.ts @@ -1,4 +1,4 @@ -import { Note } from '../models/entities/note'; +import { Note } from '~/models/entities/note'; export default function(note: Note): boolean { return note.renoteId != null && (note.text != null || note.hasPoll || (note.fileIds != null && note.fileIds.length > 0)); diff --git a/src/misc/reaction-lib.ts b/src/misc/reaction-lib.ts index ced90ce78..f9a230bb9 100644 --- a/src/misc/reaction-lib.ts +++ b/src/misc/reaction-lib.ts @@ -1,6 +1,6 @@ import { emojiRegex } from './emoji-regex'; import { fetchMeta } from './fetch-meta'; -import { Emojis } from '../models'; +import { Emojis } from '~/models'; const basic10: Record = { '👍': 'like', diff --git a/src/misc/show-machine-info.ts b/src/misc/show-machine-info.ts index 2aae019be..7296dbbc5 100644 --- a/src/misc/show-machine-info.ts +++ b/src/misc/show-machine-info.ts @@ -1,6 +1,6 @@ import * as os from 'os'; import * as sysUtils from 'systeminformation'; -import Logger from '../services/logger'; +import Logger from '~/services/logger'; export async function showMachineInfo(parentLogger: Logger) { const logger = parentLogger.createSubLogger('machine'); diff --git a/src/models/entities/abuse-user-report.ts b/src/models/entities/abuse-user-report.ts index 43ab56023..7c6e1707b 100644 --- a/src/models/entities/abuse-user-report.ts +++ b/src/models/entities/abuse-user-report.ts @@ -1,6 +1,6 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; import { User } from './user'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() @Index(['userId', 'reporterId'], { unique: true }) diff --git a/src/models/entities/access-token.ts b/src/models/entities/access-token.ts index 137bf1444..05c58dfd2 100644 --- a/src/models/entities/access-token.ts +++ b/src/models/entities/access-token.ts @@ -1,7 +1,7 @@ import { Entity, PrimaryColumn, Index, Column, ManyToOne, JoinColumn } from 'typeorm'; import { User } from './user'; import { App } from './app'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() export class AccessToken { diff --git a/src/models/entities/app.ts b/src/models/entities/app.ts index ea8754631..ec425bd8d 100644 --- a/src/models/entities/app.ts +++ b/src/models/entities/app.ts @@ -1,6 +1,6 @@ import { Entity, PrimaryColumn, Column, Index, ManyToOne } from 'typeorm'; import { User } from './user'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() export class App { diff --git a/src/models/entities/attestation-challenge.ts b/src/models/entities/attestation-challenge.ts index 942747c02..b14b65e75 100644 --- a/src/models/entities/attestation-challenge.ts +++ b/src/models/entities/attestation-challenge.ts @@ -1,6 +1,6 @@ import { PrimaryColumn, Entity, JoinColumn, Column, ManyToOne, Index } from 'typeorm'; import { User } from './user'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() export class AttestationChallenge { diff --git a/src/models/entities/auth-session.ts b/src/models/entities/auth-session.ts index 4eec27e3f..b009167ba 100644 --- a/src/models/entities/auth-session.ts +++ b/src/models/entities/auth-session.ts @@ -1,7 +1,7 @@ import { Entity, PrimaryColumn, Index, Column, ManyToOne, JoinColumn } from 'typeorm'; import { User } from './user'; import { App } from './app'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() export class AuthSession { diff --git a/src/models/entities/blocking.ts b/src/models/entities/blocking.ts index 48487cb08..b28cd8b8e 100644 --- a/src/models/entities/blocking.ts +++ b/src/models/entities/blocking.ts @@ -1,6 +1,6 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; import { User } from './user'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() @Index(['blockerId', 'blockeeId'], { unique: true }) diff --git a/src/models/entities/drive-file.ts b/src/models/entities/drive-file.ts index 319bdc82c..364222aaa 100644 --- a/src/models/entities/drive-file.ts +++ b/src/models/entities/drive-file.ts @@ -1,7 +1,7 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; import { User } from './user'; import { DriveFolder } from './drive-folder'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() export class DriveFile { diff --git a/src/models/entities/drive-folder.ts b/src/models/entities/drive-folder.ts index a80d07585..6aa08f27d 100644 --- a/src/models/entities/drive-folder.ts +++ b/src/models/entities/drive-folder.ts @@ -1,6 +1,6 @@ import { JoinColumn, ManyToOne, Entity, PrimaryColumn, Index, Column } from 'typeorm'; import { User } from './user'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() export class DriveFolder { diff --git a/src/models/entities/emoji.ts b/src/models/entities/emoji.ts index 020636a7f..a1c0e900f 100644 --- a/src/models/entities/emoji.ts +++ b/src/models/entities/emoji.ts @@ -1,5 +1,5 @@ import { PrimaryColumn, Entity, Index, Column } from 'typeorm'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() @Index(['name', 'host'], { unique: true }) diff --git a/src/models/entities/follow-request.ts b/src/models/entities/follow-request.ts index 22ec26396..dfd492260 100644 --- a/src/models/entities/follow-request.ts +++ b/src/models/entities/follow-request.ts @@ -1,6 +1,6 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; import { User } from './user'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() @Index(['followerId', 'followeeId'], { unique: true }) diff --git a/src/models/entities/following.ts b/src/models/entities/following.ts index ee3286a1a..89a4f2813 100644 --- a/src/models/entities/following.ts +++ b/src/models/entities/following.ts @@ -1,6 +1,6 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; import { User } from './user'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() @Index(['followerId', 'followeeId'], { unique: true }) diff --git a/src/models/entities/games/reversi/game.ts b/src/models/entities/games/reversi/game.ts index 9deacaf5c..d37ddc9ea 100644 --- a/src/models/entities/games/reversi/game.ts +++ b/src/models/entities/games/reversi/game.ts @@ -1,6 +1,6 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; -import { User } from '../../user'; -import { id } from '../../../id'; +import { User } from '~/models/entities/user'; +import { id } from '~/models/id'; @Entity() export class ReversiGame { diff --git a/src/models/entities/games/reversi/matching.ts b/src/models/entities/games/reversi/matching.ts index 477a29316..f84c7459c 100644 --- a/src/models/entities/games/reversi/matching.ts +++ b/src/models/entities/games/reversi/matching.ts @@ -1,6 +1,6 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; -import { User } from '../../user'; -import { id } from '../../../id'; +import { User } from '~/models/entities/user'; +import { id } from '~/models/id'; @Entity() export class ReversiMatching { diff --git a/src/models/entities/hashtag.ts b/src/models/entities/hashtag.ts index 842cdaa56..e468742f3 100644 --- a/src/models/entities/hashtag.ts +++ b/src/models/entities/hashtag.ts @@ -1,6 +1,6 @@ import { Entity, PrimaryColumn, Index, Column } from 'typeorm'; import { User } from './user'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() export class Hashtag { diff --git a/src/models/entities/instance.ts b/src/models/entities/instance.ts index 52c5215f1..2cb51fa9e 100644 --- a/src/models/entities/instance.ts +++ b/src/models/entities/instance.ts @@ -1,5 +1,5 @@ import { Entity, PrimaryColumn, Index, Column } from 'typeorm'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() export class Instance { diff --git a/src/models/entities/log.ts b/src/models/entities/log.ts index 182a9fbed..851628f04 100644 --- a/src/models/entities/log.ts +++ b/src/models/entities/log.ts @@ -1,5 +1,5 @@ import { Entity, PrimaryColumn, Index, Column } from 'typeorm'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() export class Log { diff --git a/src/models/entities/messaging-message.ts b/src/models/entities/messaging-message.ts index c18897a37..4576235c6 100644 --- a/src/models/entities/messaging-message.ts +++ b/src/models/entities/messaging-message.ts @@ -1,7 +1,7 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; import { User } from './user'; import { DriveFile } from './drive-file'; -import { id } from '../id'; +import { id } from '~/models/id'; import { UserGroup } from './user-group'; @Entity() diff --git a/src/models/entities/moderation-log.ts b/src/models/entities/moderation-log.ts index 33d3d683a..4373dfe9c 100644 --- a/src/models/entities/moderation-log.ts +++ b/src/models/entities/moderation-log.ts @@ -1,6 +1,6 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; import { User } from './user'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() export class ModerationLog { diff --git a/src/models/entities/muting.ts b/src/models/entities/muting.ts index 0084213bc..02f3c1d92 100644 --- a/src/models/entities/muting.ts +++ b/src/models/entities/muting.ts @@ -1,6 +1,6 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; import { User } from './user'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() @Index(['muterId', 'muteeId'], { unique: true }) diff --git a/src/models/entities/note-favorite.ts b/src/models/entities/note-favorite.ts index 0713c3ae5..c9a6da877 100644 --- a/src/models/entities/note-favorite.ts +++ b/src/models/entities/note-favorite.ts @@ -1,7 +1,7 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; import { Note } from './note'; import { User } from './user'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() @Index(['userId', 'noteId'], { unique: true }) diff --git a/src/models/entities/note-reaction.ts b/src/models/entities/note-reaction.ts index a958e8957..d08433164 100644 --- a/src/models/entities/note-reaction.ts +++ b/src/models/entities/note-reaction.ts @@ -1,7 +1,7 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; import { User } from './user'; import { Note } from './note'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() @Index(['userId', 'noteId'], { unique: true }) diff --git a/src/models/entities/note-unread.ts b/src/models/entities/note-unread.ts index 2d1872825..c5bd29649 100644 --- a/src/models/entities/note-unread.ts +++ b/src/models/entities/note-unread.ts @@ -1,7 +1,7 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; import { User } from './user'; import { Note } from './note'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() @Index(['userId', 'noteId'], { unique: true }) diff --git a/src/models/entities/note-watching.ts b/src/models/entities/note-watching.ts index 741a1c0c8..a356901a0 100644 --- a/src/models/entities/note-watching.ts +++ b/src/models/entities/note-watching.ts @@ -1,7 +1,7 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; import { User } from './user'; import { Note } from './note'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() @Index(['userId', 'noteId'], { unique: true }) diff --git a/src/models/entities/note.ts b/src/models/entities/note.ts index 33a6d2bc2..9ae5ca802 100644 --- a/src/models/entities/note.ts +++ b/src/models/entities/note.ts @@ -2,7 +2,7 @@ import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typ import { User } from './user'; import { App } from './app'; import { DriveFile } from './drive-file'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() export class Note { diff --git a/src/models/entities/notification.ts b/src/models/entities/notification.ts index 627a57bec..03a7f1b23 100644 --- a/src/models/entities/notification.ts +++ b/src/models/entities/notification.ts @@ -1,6 +1,6 @@ import { Entity, Index, JoinColumn, ManyToOne, Column, PrimaryColumn } from 'typeorm'; import { User } from './user'; -import { id } from '../id'; +import { id } from '~/models/id'; import { Note } from './note'; @Entity() diff --git a/src/models/entities/page-like.ts b/src/models/entities/page-like.ts index ca84ece8f..d78d2a37e 100644 --- a/src/models/entities/page-like.ts +++ b/src/models/entities/page-like.ts @@ -1,6 +1,6 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; import { User } from './user'; -import { id } from '../id'; +import { id } from '~/models/id'; import { Page } from './page'; @Entity() diff --git a/src/models/entities/page.ts b/src/models/entities/page.ts index 2163f9997..1db3f8489 100644 --- a/src/models/entities/page.ts +++ b/src/models/entities/page.ts @@ -1,6 +1,6 @@ import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm'; import { User } from './user'; -import { id } from '../id'; +import { id } from '~/models/id'; import { DriveFile } from './drive-file'; @Entity() diff --git a/src/models/entities/poll-vote.ts b/src/models/entities/poll-vote.ts index 709376f90..d3f81369a 100644 --- a/src/models/entities/poll-vote.ts +++ b/src/models/entities/poll-vote.ts @@ -1,7 +1,7 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; import { User } from './user'; import { Note } from './note'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() @Index(['userId', 'noteId', 'choice'], { unique: true }) diff --git a/src/models/entities/poll.ts b/src/models/entities/poll.ts index 6bb67163a..18d575c9c 100644 --- a/src/models/entities/poll.ts +++ b/src/models/entities/poll.ts @@ -1,5 +1,5 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, OneToOne } from 'typeorm'; -import { id } from '../id'; +import { id } from '~/models/id'; import { Note } from './note'; import { User } from './user'; diff --git a/src/models/entities/registration-tickets.ts b/src/models/entities/registration-tickets.ts index d962f78a7..40c59b7cf 100644 --- a/src/models/entities/registration-tickets.ts +++ b/src/models/entities/registration-tickets.ts @@ -1,5 +1,5 @@ import { PrimaryColumn, Entity, Index, Column } from 'typeorm'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() export class RegistrationTicket { diff --git a/src/models/entities/signin.ts b/src/models/entities/signin.ts index 7e047084b..b5c18c2c9 100644 --- a/src/models/entities/signin.ts +++ b/src/models/entities/signin.ts @@ -1,6 +1,6 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; import { User } from './user'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() export class Signin { diff --git a/src/models/entities/sw-subscription.ts b/src/models/entities/sw-subscription.ts index 7c3f6f0a6..51b13376c 100644 --- a/src/models/entities/sw-subscription.ts +++ b/src/models/entities/sw-subscription.ts @@ -1,6 +1,6 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; import { User } from './user'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() export class SwSubscription { diff --git a/src/models/entities/user-group-invite.ts b/src/models/entities/user-group-invite.ts index 2adf2c024..9b5c55e10 100644 --- a/src/models/entities/user-group-invite.ts +++ b/src/models/entities/user-group-invite.ts @@ -1,7 +1,7 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; import { User } from './user'; import { UserGroup } from './user-group'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() @Index(['userId', 'userGroupId'], { unique: true }) diff --git a/src/models/entities/user-group-joining.ts b/src/models/entities/user-group-joining.ts index e09c3230f..ec2b020b0 100644 --- a/src/models/entities/user-group-joining.ts +++ b/src/models/entities/user-group-joining.ts @@ -1,7 +1,7 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; import { User } from './user'; import { UserGroup } from './user-group'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() @Index(['userId', 'userGroupId'], { unique: true }) diff --git a/src/models/entities/user-group.ts b/src/models/entities/user-group.ts index f4bac0322..15fa33bc6 100644 --- a/src/models/entities/user-group.ts +++ b/src/models/entities/user-group.ts @@ -1,6 +1,6 @@ import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm'; import { User } from './user'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() export class UserGroup { diff --git a/src/models/entities/user-keypair.ts b/src/models/entities/user-keypair.ts index 603321d75..15a6685ff 100644 --- a/src/models/entities/user-keypair.ts +++ b/src/models/entities/user-keypair.ts @@ -1,6 +1,6 @@ import { PrimaryColumn, Entity, JoinColumn, Column, OneToOne } from 'typeorm'; import { User } from './user'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() export class UserKeypair { diff --git a/src/models/entities/user-list-joining.ts b/src/models/entities/user-list-joining.ts index bb7dc40b9..d267b36fb 100644 --- a/src/models/entities/user-list-joining.ts +++ b/src/models/entities/user-list-joining.ts @@ -1,7 +1,7 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; import { User } from './user'; import { UserList } from './user-list'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() @Index(['userId', 'userListId'], { unique: true }) diff --git a/src/models/entities/user-list.ts b/src/models/entities/user-list.ts index 35a83ef8c..2407d48d3 100644 --- a/src/models/entities/user-list.ts +++ b/src/models/entities/user-list.ts @@ -1,6 +1,6 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; import { User } from './user'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() export class UserList { diff --git a/src/models/entities/user-note-pinings.ts b/src/models/entities/user-note-pinings.ts index 04a6f8f64..ed6ceebb8 100644 --- a/src/models/entities/user-note-pinings.ts +++ b/src/models/entities/user-note-pinings.ts @@ -1,7 +1,7 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm'; import { Note } from './note'; import { User } from './user'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() @Index(['userId', 'noteId'], { unique: true }) diff --git a/src/models/entities/user-profile.ts b/src/models/entities/user-profile.ts index 61e80049c..55c2ffb63 100644 --- a/src/models/entities/user-profile.ts +++ b/src/models/entities/user-profile.ts @@ -1,5 +1,5 @@ import { Entity, Column, Index, OneToOne, JoinColumn, PrimaryColumn } from 'typeorm'; -import { id } from '../id'; +import { id } from '~/models/id'; import { User } from './user'; import { Page } from './page'; diff --git a/src/models/entities/user-publickey.ts b/src/models/entities/user-publickey.ts index 21edc3e9e..c677b84c2 100644 --- a/src/models/entities/user-publickey.ts +++ b/src/models/entities/user-publickey.ts @@ -1,6 +1,6 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, OneToOne } from 'typeorm'; import { User } from './user'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() export class UserPublickey { diff --git a/src/models/entities/user-security-key.ts b/src/models/entities/user-security-key.ts index d54c728e5..bca6550c5 100644 --- a/src/models/entities/user-security-key.ts +++ b/src/models/entities/user-security-key.ts @@ -1,6 +1,6 @@ import { PrimaryColumn, Entity, JoinColumn, Column, ManyToOne, Index } from 'typeorm'; import { User } from './user'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() export class UserSecurityKey { diff --git a/src/models/entities/user.ts b/src/models/entities/user.ts index d3086f43f..fc18c59f9 100644 --- a/src/models/entities/user.ts +++ b/src/models/entities/user.ts @@ -1,6 +1,6 @@ import { Entity, Column, Index, OneToOne, JoinColumn, PrimaryColumn } from 'typeorm'; import { DriveFile } from './drive-file'; -import { id } from '../id'; +import { id } from '~/models/id'; @Entity() @Index(['usernameLower', 'host'], { unique: true }) diff --git a/src/models/repositories/abuse-user-report.ts b/src/models/repositories/abuse-user-report.ts index bff64c770..40c31b299 100644 --- a/src/models/repositories/abuse-user-report.ts +++ b/src/models/repositories/abuse-user-report.ts @@ -1,8 +1,8 @@ import { EntityRepository, Repository } from 'typeorm'; -import { Users } from '..'; -import { AbuseUserReport } from '../entities/abuse-user-report'; -import { ensure } from '../../prelude/ensure'; -import { awaitAll } from '../../prelude/await-all'; +import { Users } from '~/models'; +import { AbuseUserReport } from '~/models/entities/abuse-user-report'; +import { ensure } from '~/prelude/ensure'; +import { awaitAll } from '~/prelude/await-all'; @EntityRepository(AbuseUserReport) export class AbuseUserReportRepository extends Repository { diff --git a/src/models/repositories/app.ts b/src/models/repositories/app.ts index 45d8d16c5..5ecc30ad0 100644 --- a/src/models/repositories/app.ts +++ b/src/models/repositories/app.ts @@ -1,8 +1,8 @@ import { EntityRepository, Repository } from 'typeorm'; -import { App } from '../entities/app'; -import { AccessTokens } from '..'; -import { ensure } from '../../prelude/ensure'; -import { SchemaType } from '../../misc/schema'; +import { App } from '~/models/entities/app'; +import { AccessTokens } from '~/models'; +import { ensure } from '~/prelude/ensure'; +import { SchemaType } from '~/misc/schema'; export type PackedApp = SchemaType; diff --git a/src/models/repositories/auth-session.ts b/src/models/repositories/auth-session.ts index a6a4d46de..867ae4739 100644 --- a/src/models/repositories/auth-session.ts +++ b/src/models/repositories/auth-session.ts @@ -1,8 +1,8 @@ import { EntityRepository, Repository } from 'typeorm'; -import { Apps } from '..'; -import { AuthSession } from '../entities/auth-session'; -import { ensure } from '../../prelude/ensure'; -import { awaitAll } from '../../prelude/await-all'; +import { Apps } from '~/models'; +import { AuthSession } from '~/models/entities/auth-session'; +import { ensure } from '~/prelude/ensure'; +import { awaitAll } from '~/prelude/await-all'; @EntityRepository(AuthSession) export class AuthSessionRepository extends Repository { diff --git a/src/models/repositories/blocking.ts b/src/models/repositories/blocking.ts index 9ebe6bbf5..8f7463c1a 100644 --- a/src/models/repositories/blocking.ts +++ b/src/models/repositories/blocking.ts @@ -1,9 +1,9 @@ import { EntityRepository, Repository } from 'typeorm'; -import { Users } from '..'; -import { Blocking } from '../entities/blocking'; -import { ensure } from '../../prelude/ensure'; -import { awaitAll } from '../../prelude/await-all'; -import { SchemaType } from '../../misc/schema'; +import { Users } from '~/models'; +import { Blocking } from '~/models/entities/blocking'; +import { ensure } from '~/prelude/ensure'; +import { awaitAll } from '~/prelude/await-all'; +import { SchemaType } from '~/misc/schema'; export type PackedBlocking = SchemaType; diff --git a/src/models/repositories/drive-file.ts b/src/models/repositories/drive-file.ts index 702f195e9..7c453f359 100644 --- a/src/models/repositories/drive-file.ts +++ b/src/models/repositories/drive-file.ts @@ -1,11 +1,11 @@ import { EntityRepository, Repository } from 'typeorm'; -import { DriveFile } from '../entities/drive-file'; -import { Users, DriveFolders } from '..'; -import { User } from '../entities/user'; -import { toPuny } from '../../misc/convert-host'; -import { ensure } from '../../prelude/ensure'; -import { awaitAll } from '../../prelude/await-all'; -import { SchemaType } from '../../misc/schema'; +import { DriveFile } from '~/models/entities/drive-file'; +import { Users, DriveFolders } from '~/models'; +import { User } from '~/models/entities/user'; +import { toPuny } from '~/misc/convert-host'; +import { ensure } from '~/prelude/ensure'; +import { awaitAll } from '~/prelude/await-all'; +import { SchemaType } from '~/misc/schema'; export type PackedDriveFile = SchemaType; diff --git a/src/models/repositories/drive-folder.ts b/src/models/repositories/drive-folder.ts index dee424ccc..80a9589cb 100644 --- a/src/models/repositories/drive-folder.ts +++ b/src/models/repositories/drive-folder.ts @@ -1,9 +1,9 @@ import { EntityRepository, Repository } from 'typeorm'; -import { DriveFolders, DriveFiles } from '..'; -import { DriveFolder } from '../entities/drive-folder'; -import { ensure } from '../../prelude/ensure'; -import { awaitAll } from '../../prelude/await-all'; -import { SchemaType } from '../../misc/schema'; +import { DriveFolders, DriveFiles } from '~/models'; +import { DriveFolder } from '~/models/entities/drive-folder'; +import { ensure } from '~/prelude/ensure'; +import { awaitAll } from '~/prelude/await-all'; +import { SchemaType } from '~/misc/schema'; export type PackedDriveFolder = SchemaType; diff --git a/src/models/repositories/follow-request.ts b/src/models/repositories/follow-request.ts index 451ed8e2d..84feb0912 100644 --- a/src/models/repositories/follow-request.ts +++ b/src/models/repositories/follow-request.ts @@ -1,7 +1,7 @@ import { EntityRepository, Repository } from 'typeorm'; -import { FollowRequest } from '../entities/follow-request'; -import { Users } from '..'; -import { ensure } from '../../prelude/ensure'; +import { FollowRequest } from '~/models/entities/follow-request'; +import { Users } from '~/models'; +import { ensure } from '~/prelude/ensure'; @EntityRepository(FollowRequest) export class FollowRequestRepository extends Repository { diff --git a/src/models/repositories/following.ts b/src/models/repositories/following.ts index 58728a338..849a664fb 100644 --- a/src/models/repositories/following.ts +++ b/src/models/repositories/following.ts @@ -1,9 +1,9 @@ import { EntityRepository, Repository } from 'typeorm'; -import { Users } from '..'; -import { Following } from '../entities/following'; -import { ensure } from '../../prelude/ensure'; -import { awaitAll } from '../../prelude/await-all'; -import { SchemaType } from '../../misc/schema'; +import { Users } from '~/models'; +import { Following } from '~/models/entities/following'; +import { ensure } from '~/prelude/ensure'; +import { awaitAll } from '~/prelude/await-all'; +import { SchemaType } from '~/misc/schema'; type LocalFollowerFollowing = Following & { followerHost: null; diff --git a/src/models/repositories/games/reversi/game.ts b/src/models/repositories/games/reversi/game.ts index c380f5251..0adbf58de 100644 --- a/src/models/repositories/games/reversi/game.ts +++ b/src/models/repositories/games/reversi/game.ts @@ -1,7 +1,7 @@ import { EntityRepository, Repository } from 'typeorm'; -import { Users } from '../../..'; -import { ReversiGame } from '../../../entities/games/reversi/game'; -import { ensure } from '../../../../prelude/ensure'; +import { Users } from '~/models'; +import { ReversiGame } from '~/models/entities/games/reversi/game'; +import { ensure } from '~/prelude/ensure'; @EntityRepository(ReversiGame) export class ReversiGameRepository extends Repository { diff --git a/src/models/repositories/games/reversi/matching.ts b/src/models/repositories/games/reversi/matching.ts index 86c920445..4a356e368 100644 --- a/src/models/repositories/games/reversi/matching.ts +++ b/src/models/repositories/games/reversi/matching.ts @@ -1,8 +1,8 @@ import { EntityRepository, Repository } from 'typeorm'; -import { ReversiMatching } from '../../../entities/games/reversi/matching'; -import { Users } from '../../..'; -import { ensure } from '../../../../prelude/ensure'; -import { awaitAll } from '../../../../prelude/await-all'; +import { ReversiMatching } from '~/models/entities/games/reversi/matching'; +import { Users } from '~/models'; +import { ensure } from '~/prelude/ensure'; +import { awaitAll } from '~/prelude/await-all'; @EntityRepository(ReversiMatching) export class ReversiMatchingRepository extends Repository { diff --git a/src/models/repositories/hashtag.ts b/src/models/repositories/hashtag.ts index fb54a12e1..31669d160 100644 --- a/src/models/repositories/hashtag.ts +++ b/src/models/repositories/hashtag.ts @@ -1,6 +1,6 @@ import { EntityRepository, Repository } from 'typeorm'; -import { Hashtag } from '../entities/hashtag'; -import { SchemaType } from '../../misc/schema'; +import { Hashtag } from '~/models/entities/hashtag'; +import { SchemaType } from '~/misc/schema'; export type PackedHashtag = SchemaType; diff --git a/src/models/repositories/messaging-message.ts b/src/models/repositories/messaging-message.ts index d70e95bc1..8dec1757d 100644 --- a/src/models/repositories/messaging-message.ts +++ b/src/models/repositories/messaging-message.ts @@ -1,8 +1,8 @@ import { EntityRepository, Repository } from 'typeorm'; -import { MessagingMessage } from '../entities/messaging-message'; -import { Users, DriveFiles, UserGroups } from '..'; -import { ensure } from '../../prelude/ensure'; -import { SchemaType } from '../../misc/schema'; +import { MessagingMessage } from '~/models/entities/messaging-message'; +import { Users, DriveFiles, UserGroups } from '~/models'; +import { ensure } from '~/prelude/ensure'; +import { SchemaType } from '~/misc/schema'; export type PackedMessagingMessage = SchemaType; diff --git a/src/models/repositories/moderation-logs.ts b/src/models/repositories/moderation-logs.ts index d6e04795b..c97370a68 100644 --- a/src/models/repositories/moderation-logs.ts +++ b/src/models/repositories/moderation-logs.ts @@ -1,8 +1,8 @@ import { EntityRepository, Repository } from 'typeorm'; -import { Users } from '..'; -import { ModerationLog } from '../entities/moderation-log'; -import { ensure } from '../../prelude/ensure'; -import { awaitAll } from '../../prelude/await-all'; +import { Users } from '~/models'; +import { ModerationLog } from '~/models/entities/moderation-log'; +import { ensure } from '~/prelude/ensure'; +import { awaitAll } from '~/prelude/await-all'; @EntityRepository(ModerationLog) export class ModerationLogRepository extends Repository { diff --git a/src/models/repositories/muting.ts b/src/models/repositories/muting.ts index 763e04bb3..e3caa719d 100644 --- a/src/models/repositories/muting.ts +++ b/src/models/repositories/muting.ts @@ -1,9 +1,9 @@ import { EntityRepository, Repository } from 'typeorm'; -import { Users } from '..'; -import { Muting } from '../entities/muting'; -import { ensure } from '../../prelude/ensure'; -import { awaitAll } from '../../prelude/await-all'; -import { SchemaType } from '../../misc/schema'; +import { Users } from '~/models'; +import { Muting } from '~/models/entities/muting'; +import { ensure } from '~/prelude/ensure'; +import { awaitAll } from '~/prelude/await-all'; +import { SchemaType } from '~/misc/schema'; export type PackedMuting = SchemaType; diff --git a/src/models/repositories/note-favorite.ts b/src/models/repositories/note-favorite.ts index 37cfbc002..2704b8b6e 100644 --- a/src/models/repositories/note-favorite.ts +++ b/src/models/repositories/note-favorite.ts @@ -1,7 +1,7 @@ import { EntityRepository, Repository } from 'typeorm'; -import { NoteFavorite } from '../entities/note-favorite'; -import { Notes } from '..'; -import { ensure } from '../../prelude/ensure'; +import { NoteFavorite } from '~/models/entities/note-favorite'; +import { Notes } from '~/models'; +import { ensure } from '~/prelude/ensure'; @EntityRepository(NoteFavorite) export class NoteFavoriteRepository extends Repository { diff --git a/src/models/repositories/note-reaction.ts b/src/models/repositories/note-reaction.ts index 79b4989a2..bee663a8b 100644 --- a/src/models/repositories/note-reaction.ts +++ b/src/models/repositories/note-reaction.ts @@ -1,8 +1,8 @@ import { EntityRepository, Repository } from 'typeorm'; -import { NoteReaction } from '../entities/note-reaction'; -import { Users } from '..'; -import { ensure } from '../../prelude/ensure'; -import { SchemaType } from '../../misc/schema'; +import { NoteReaction } from '~/models/entities/note-reaction'; +import { Users } from '~/models'; +import { ensure } from '~/prelude/ensure'; +import { SchemaType } from '~/misc/schema'; export type PackedNoteReaction = SchemaType; diff --git a/src/models/repositories/note.ts b/src/models/repositories/note.ts index 03a50fece..9f0dbc860 100644 --- a/src/models/repositories/note.ts +++ b/src/models/repositories/note.ts @@ -1,12 +1,12 @@ import { EntityRepository, Repository, In } from 'typeorm'; -import { Note } from '../entities/note'; -import { User } from '../entities/user'; -import { unique, concat } from '../../prelude/array'; -import { nyaize } from '../../misc/nyaize'; -import { Emojis, Users, Apps, PollVotes, DriveFiles, NoteReactions, Followings, Polls } from '..'; -import { ensure } from '../../prelude/ensure'; -import { SchemaType } from '../../misc/schema'; -import { awaitAll } from '../../prelude/await-all'; +import { Note } from '~/models/entities/note'; +import { User } from '~/models/entities/user'; +import { unique, concat } from '~/prelude/array'; +import { nyaize } from '~/misc/nyaize'; +import { Emojis, Users, Apps, PollVotes, DriveFiles, NoteReactions, Followings, Polls } from '~/models'; +import { ensure } from '~/prelude/ensure'; +import { SchemaType } from '~/misc/schema'; +import { awaitAll } from '~/prelude/await-all'; export type PackedNote = SchemaType; diff --git a/src/models/repositories/notification.ts b/src/models/repositories/notification.ts index 96293d4a6..d360919d6 100644 --- a/src/models/repositories/notification.ts +++ b/src/models/repositories/notification.ts @@ -1,9 +1,9 @@ import { EntityRepository, Repository } from 'typeorm'; -import { Users, Notes } from '..'; -import { Notification } from '../entities/notification'; -import { ensure } from '../../prelude/ensure'; -import { awaitAll } from '../../prelude/await-all'; -import { SchemaType } from '../../misc/schema'; +import { Users, Notes } from '~/models'; +import { Notification } from '~/models/entities/notification'; +import { ensure } from '~/prelude/ensure'; +import { awaitAll } from '~/prelude/await-all'; +import { SchemaType } from '~/misc/schema'; export type PackedNotification = SchemaType; diff --git a/src/models/repositories/page-like.ts b/src/models/repositories/page-like.ts index 3e7e803fd..26d6ec3cd 100644 --- a/src/models/repositories/page-like.ts +++ b/src/models/repositories/page-like.ts @@ -1,7 +1,7 @@ import { EntityRepository, Repository } from 'typeorm'; -import { PageLike } from '../entities/page-like'; -import { Pages } from '..'; -import { ensure } from '../../prelude/ensure'; +import { PageLike } from '~/models/entities/page-like'; +import { Pages } from '~/models'; +import { ensure } from '~/prelude/ensure'; @EntityRepository(PageLike) export class PageLikeRepository extends Repository { diff --git a/src/models/repositories/page.ts b/src/models/repositories/page.ts index 1335ada73..47a230014 100644 --- a/src/models/repositories/page.ts +++ b/src/models/repositories/page.ts @@ -1,11 +1,11 @@ import { EntityRepository, Repository } from 'typeorm'; -import { Page } from '../entities/page'; -import { SchemaType } from '../../misc/schema'; -import { Users, DriveFiles, PageLikes } from '..'; -import { awaitAll } from '../../prelude/await-all'; -import { DriveFile } from '../entities/drive-file'; -import { User } from '../entities/user'; -import { ensure } from '../../prelude/ensure'; +import { Page } from '~/models/entities/page'; +import { SchemaType } from '~/misc/schema'; +import { Users, DriveFiles, PageLikes } from '~/models'; +import { awaitAll } from '~/prelude/await-all'; +import { DriveFile } from '~/models/entities/drive-file'; +import { User } from '~/models/entities/user'; +import { ensure } from '~/prelude/ensure'; export type PackedPage = SchemaType; diff --git a/src/models/repositories/signin.ts b/src/models/repositories/signin.ts index f5b90c0e9..a1461d55e 100644 --- a/src/models/repositories/signin.ts +++ b/src/models/repositories/signin.ts @@ -1,5 +1,5 @@ import { EntityRepository, Repository } from 'typeorm'; -import { Signin } from '../entities/signin'; +import { Signin } from '~/models/entities/signin'; @EntityRepository(Signin) export class SigninRepository extends Repository { diff --git a/src/models/repositories/user-group-invite.ts b/src/models/repositories/user-group-invite.ts index 1d4c2aa15..f675fbc4b 100644 --- a/src/models/repositories/user-group-invite.ts +++ b/src/models/repositories/user-group-invite.ts @@ -1,7 +1,7 @@ import { EntityRepository, Repository } from 'typeorm'; -import { UserGroupInvite } from '../entities/user-group-invite'; -import { UserGroups } from '..'; -import { ensure } from '../../prelude/ensure'; +import { UserGroupInvite } from '~/models/entities/user-group-invite'; +import { UserGroups } from '~/models'; +import { ensure } from '~/prelude/ensure'; @EntityRepository(UserGroupInvite) export class UserGroupInviteRepository extends Repository { diff --git a/src/models/repositories/user-group.ts b/src/models/repositories/user-group.ts index 5ff75047c..bbd92b66b 100644 --- a/src/models/repositories/user-group.ts +++ b/src/models/repositories/user-group.ts @@ -1,8 +1,8 @@ import { EntityRepository, Repository } from 'typeorm'; -import { UserGroup } from '../entities/user-group'; -import { ensure } from '../../prelude/ensure'; -import { UserGroupJoinings } from '..'; -import { SchemaType } from '../../misc/schema'; +import { UserGroup } from '~/models/entities/user-group'; +import { ensure } from '~/prelude/ensure'; +import { UserGroupJoinings } from '~/models'; +import { SchemaType } from '~/misc/schema'; export type PackedUserGroup = SchemaType; diff --git a/src/models/repositories/user-list.ts b/src/models/repositories/user-list.ts index 8842118be..c45e2bf04 100644 --- a/src/models/repositories/user-list.ts +++ b/src/models/repositories/user-list.ts @@ -1,8 +1,8 @@ import { EntityRepository, Repository } from 'typeorm'; -import { UserList } from '../entities/user-list'; -import { ensure } from '../../prelude/ensure'; -import { UserListJoinings } from '..'; -import { SchemaType } from '../../misc/schema'; +import { UserList } from '~/models/entities/user-list'; +import { ensure } from '~/prelude/ensure'; +import { UserListJoinings } from '~/models'; +import { SchemaType } from '~/misc/schema'; export type PackedUserList = SchemaType; diff --git a/src/models/repositories/user.ts b/src/models/repositories/user.ts index a5fad9647..2128f3230 100644 --- a/src/models/repositories/user.ts +++ b/src/models/repositories/user.ts @@ -1,11 +1,11 @@ import $ from 'cafy'; import { EntityRepository, Repository, In } from 'typeorm'; -import { User, ILocalUser, IRemoteUser } from '../entities/user'; -import { Emojis, Notes, NoteUnreads, FollowRequests, Notifications, MessagingMessages, UserNotePinings, Followings, Blockings, Mutings, UserProfiles, UserSecurityKeys, UserGroupJoinings, Pages } from '..'; -import { ensure } from '../../prelude/ensure'; -import config from '../../config'; -import { SchemaType } from '../../misc/schema'; -import { awaitAll } from '../../prelude/await-all'; +import { User, ILocalUser, IRemoteUser } from '~/models/entities/user'; +import { Emojis, Notes, NoteUnreads, FollowRequests, Notifications, MessagingMessages, UserNotePinings, Followings, Blockings, Mutings, UserProfiles, UserSecurityKeys, UserGroupJoinings, Pages } from '~/models'; +import { ensure } from '~/prelude/ensure'; +import config from '~/config'; +import { SchemaType } from '~/misc/schema'; +import { awaitAll } from '~/prelude/await-all'; export type PackedUser = SchemaType; diff --git a/src/queue/index.ts b/src/queue/index.ts index a7e9b9814..5ab17ee1e 100644 --- a/src/queue/index.ts +++ b/src/queue/index.ts @@ -1,16 +1,16 @@ import * as Queue from 'bull'; import * as httpSignature from 'http-signature'; -import config from '../config'; -import { ILocalUser } from '../models/entities/user'; -import { program } from '../argv'; +import config from '~/config'; +import { ILocalUser } from '~/models/entities/user'; +import { program } from '~/argv'; import processDeliver from './processors/deliver'; import processInbox from './processors/inbox'; import processDb from './processors/db'; import procesObjectStorage from './processors/object-storage'; import { queueLogger } from './logger'; -import { DriveFile } from '../models/entities/drive-file'; +import { DriveFile } from '~/models/entities/drive-file'; function initializeQueue(name: string) { return new Queue(name, { diff --git a/src/queue/logger.ts b/src/queue/logger.ts index d6d077468..6df4e6564 100644 --- a/src/queue/logger.ts +++ b/src/queue/logger.ts @@ -1,3 +1,3 @@ -import Logger from '../services/logger'; +import Logger from '~/services/logger'; export const queueLogger = new Logger('queue', 'orange'); diff --git a/src/queue/processors/db/delete-drive-files.ts b/src/queue/processors/db/delete-drive-files.ts index a2fd9050a..b95ce1487 100644 --- a/src/queue/processors/db/delete-drive-files.ts +++ b/src/queue/processors/db/delete-drive-files.ts @@ -1,8 +1,8 @@ import * as Bull from 'bull'; -import { queueLogger } from '../../logger'; -import { deleteFileSync } from '../../../services/drive/delete-file'; -import { Users, DriveFiles } from '../../../models'; +import { queueLogger } from '~/queue/logger'; +import { deleteFileSync } from '~/services/drive/delete-file'; +import { Users, DriveFiles } from '~/models'; import { MoreThan } from 'typeorm'; const logger = queueLogger.createSubLogger('delete-drive-files'); diff --git a/src/queue/processors/db/export-blocking.ts b/src/queue/processors/db/export-blocking.ts index 0504ab8c3..88884f9c3 100644 --- a/src/queue/processors/db/export-blocking.ts +++ b/src/queue/processors/db/export-blocking.ts @@ -2,11 +2,11 @@ import * as Bull from 'bull'; import * as tmp from 'tmp'; import * as fs from 'fs'; -import { queueLogger } from '../../logger'; -import addFile from '../../../services/drive/add-file'; +import { queueLogger } from '~/queue/logger'; +import addFile from '~/services/drive/add-file'; import dateFormat = require('dateformat'); -import { getFullApAccount } from '../../../misc/convert-host'; -import { Users, Blockings } from '../../../models'; +import { getFullApAccount } from '~/misc/convert-host'; +import { Users, Blockings } from '~/models'; import { MoreThan } from 'typeorm'; const logger = queueLogger.createSubLogger('export-blocking'); diff --git a/src/queue/processors/db/export-following.ts b/src/queue/processors/db/export-following.ts index 996ef6310..f84e009d0 100644 --- a/src/queue/processors/db/export-following.ts +++ b/src/queue/processors/db/export-following.ts @@ -2,11 +2,11 @@ import * as Bull from 'bull'; import * as tmp from 'tmp'; import * as fs from 'fs'; -import { queueLogger } from '../../logger'; -import addFile from '../../../services/drive/add-file'; +import { queueLogger } from '~/queue/logger'; +import addFile from '~/services/drive/add-file'; import dateFormat = require('dateformat'); -import { getFullApAccount } from '../../../misc/convert-host'; -import { Users, Followings } from '../../../models'; +import { getFullApAccount } from '~/misc/convert-host'; +import { Users, Followings } from '~/models'; import { MoreThan } from 'typeorm'; const logger = queueLogger.createSubLogger('export-following'); diff --git a/src/queue/processors/db/export-mute.ts b/src/queue/processors/db/export-mute.ts index 553155322..9e0daa06b 100644 --- a/src/queue/processors/db/export-mute.ts +++ b/src/queue/processors/db/export-mute.ts @@ -2,11 +2,11 @@ import * as Bull from 'bull'; import * as tmp from 'tmp'; import * as fs from 'fs'; -import { queueLogger } from '../../logger'; -import addFile from '../../../services/drive/add-file'; +import { queueLogger } from '~/queue/logger'; +import addFile from '~/services/drive/add-file'; import dateFormat = require('dateformat'); -import { getFullApAccount } from '../../../misc/convert-host'; -import { Users, Mutings } from '../../../models'; +import { getFullApAccount } from '~/misc/convert-host'; +import { Users, Mutings } from '~/models'; import { MoreThan } from 'typeorm'; const logger = queueLogger.createSubLogger('export-mute'); diff --git a/src/queue/processors/db/export-notes.ts b/src/queue/processors/db/export-notes.ts index 94a4302e0..365e8087b 100644 --- a/src/queue/processors/db/export-notes.ts +++ b/src/queue/processors/db/export-notes.ts @@ -2,14 +2,14 @@ import * as Bull from 'bull'; import * as tmp from 'tmp'; import * as fs from 'fs'; -import { queueLogger } from '../../logger'; -import addFile from '../../../services/drive/add-file'; +import { queueLogger } from '~/queue/logger'; +import addFile from '~/services/drive/add-file'; import dateFormat = require('dateformat'); -import { Users, Notes, Polls } from '../../../models'; +import { Users, Notes, Polls } from '~/models'; import { MoreThan } from 'typeorm'; -import { Note } from '../../../models/entities/note'; -import { Poll } from '../../../models/entities/poll'; -import { ensure } from '../../../prelude/ensure'; +import { Note } from '~/models/entities/note'; +import { Poll } from '~/models/entities/poll'; +import { ensure } from '~/prelude/ensure'; const logger = queueLogger.createSubLogger('export-notes'); diff --git a/src/queue/processors/db/export-user-lists.ts b/src/queue/processors/db/export-user-lists.ts index 447cdaa17..7852eda9e 100644 --- a/src/queue/processors/db/export-user-lists.ts +++ b/src/queue/processors/db/export-user-lists.ts @@ -2,11 +2,11 @@ import * as Bull from 'bull'; import * as tmp from 'tmp'; import * as fs from 'fs'; -import { queueLogger } from '../../logger'; -import addFile from '../../../services/drive/add-file'; +import { queueLogger } from '~/queue/logger'; +import addFile from '~/services/drive/add-file'; import dateFormat = require('dateformat'); -import { getFullApAccount } from '../../../misc/convert-host'; -import { Users, UserLists, UserListJoinings } from '../../../models'; +import { getFullApAccount } from '~/misc/convert-host'; +import { Users, UserLists, UserListJoinings } from '~/models'; import { In } from 'typeorm'; const logger = queueLogger.createSubLogger('export-user-lists'); diff --git a/src/queue/processors/db/import-following.ts b/src/queue/processors/db/import-following.ts index ff4ff6b6a..4a6a98af3 100644 --- a/src/queue/processors/db/import-following.ts +++ b/src/queue/processors/db/import-following.ts @@ -1,12 +1,12 @@ import * as Bull from 'bull'; -import { queueLogger } from '../../logger'; -import follow from '../../../services/following/create'; -import parseAcct from '../../../misc/acct/parse'; -import { resolveUser } from '../../../remote/resolve-user'; -import { downloadTextFile } from '../../../misc/download-text-file'; -import { isSelfHost, toPuny } from '../../../misc/convert-host'; -import { Users, DriveFiles } from '../../../models'; +import { queueLogger } from '~/queue/logger'; +import follow from '~/services/following/create'; +import parseAcct from '~/misc/acct/parse'; +import { resolveUser } from '~/remote/resolve-user'; +import { downloadTextFile } from '~/misc/download-text-file'; +import { isSelfHost, toPuny } from '~/misc/convert-host'; +import { Users, DriveFiles } from '~/models'; const logger = queueLogger.createSubLogger('import-following'); diff --git a/src/queue/processors/db/import-user-lists.ts b/src/queue/processors/db/import-user-lists.ts index 1e852be94..46b6d3b65 100644 --- a/src/queue/processors/db/import-user-lists.ts +++ b/src/queue/processors/db/import-user-lists.ts @@ -1,13 +1,13 @@ import * as Bull from 'bull'; -import { queueLogger } from '../../logger'; -import parseAcct from '../../../misc/acct/parse'; -import { resolveUser } from '../../../remote/resolve-user'; -import { pushUserToUserList } from '../../../services/user-list/push'; -import { downloadTextFile } from '../../../misc/download-text-file'; -import { isSelfHost, toPuny } from '../../../misc/convert-host'; -import { DriveFiles, Users, UserLists, UserListJoinings } from '../../../models'; -import { genId } from '../../../misc/gen-id'; +import { queueLogger } from '~/queue/logger'; +import parseAcct from '~/misc/acct/parse'; +import { resolveUser } from '~/remote/resolve-user'; +import { pushUserToUserList } from '~/services/user-list/push'; +import { downloadTextFile } from '~/misc/download-text-file'; +import { isSelfHost, toPuny } from '~/misc/convert-host'; +import { DriveFiles, Users, UserLists, UserListJoinings } from '~/models'; +import { genId } from '~/misc/gen-id'; const logger = queueLogger.createSubLogger('import-user-lists'); diff --git a/src/queue/processors/deliver.ts b/src/queue/processors/deliver.ts index 8837c80d8..edc476101 100644 --- a/src/queue/processors/deliver.ts +++ b/src/queue/processors/deliver.ts @@ -1,9 +1,9 @@ import * as Bull from 'bull'; -import request from '../../remote/activitypub/request'; -import { registerOrFetchInstanceDoc } from '../../services/register-or-fetch-instance-doc'; -import Logger from '../../services/logger'; -import { Instances } from '../../models'; -import { instanceChart } from '../../services/chart'; +import request from '~/remote/activitypub/request'; +import { registerOrFetchInstanceDoc } from '~/services/register-or-fetch-instance-doc'; +import Logger from '~/services/logger'; +import { Instances } from '~/models'; +import { instanceChart } from '~/services/chart'; const logger = new Logger('deliver'); diff --git a/src/queue/processors/inbox.ts b/src/queue/processors/inbox.ts index e71181ee7..d54183f92 100644 --- a/src/queue/processors/inbox.ts +++ b/src/queue/processors/inbox.ts @@ -1,18 +1,18 @@ import * as Bull from 'bull'; import * as httpSignature from 'http-signature'; -import { IRemoteUser } from '../../models/entities/user'; -import perform from '../../remote/activitypub/perform'; -import { resolvePerson, updatePerson } from '../../remote/activitypub/models/person'; -import { publishApLogStream } from '../../services/stream'; -import Logger from '../../services/logger'; -import { registerOrFetchInstanceDoc } from '../../services/register-or-fetch-instance-doc'; -import { Instances, Users, UserPublickeys } from '../../models'; -import { instanceChart } from '../../services/chart'; -import { UserPublickey } from '../../models/entities/user-publickey'; -import { fetchMeta } from '../../misc/fetch-meta'; -import { toPuny } from '../../misc/convert-host'; -import { validActor } from '../../remote/activitypub/type'; -import { ensure } from '../../prelude/ensure'; +import { IRemoteUser } from '~/models/entities/user'; +import perform from '~/remote/activitypub/perform'; +import { resolvePerson, updatePerson } from '~/remote/activitypub/models/person'; +import { publishApLogStream } from '~/services/stream'; +import Logger from '~/services/logger'; +import { registerOrFetchInstanceDoc } from '~/services/register-or-fetch-instance-doc'; +import { Instances, Users, UserPublickeys } from '~/models'; +import { instanceChart } from '~/services/chart'; +import { UserPublickey } from '~/models/entities/user-publickey'; +import { fetchMeta } from '~/misc/fetch-meta'; +import { toPuny } from '~/misc/convert-host'; +import { validActor } from '~/remote/activitypub/type'; +import { ensure } from '~/prelude/ensure'; const logger = new Logger('inbox'); diff --git a/src/queue/processors/object-storage/clean-remote-files.ts b/src/queue/processors/object-storage/clean-remote-files.ts index 7b34892e1..4dcba9cdc 100644 --- a/src/queue/processors/object-storage/clean-remote-files.ts +++ b/src/queue/processors/object-storage/clean-remote-files.ts @@ -1,8 +1,8 @@ import * as Bull from 'bull'; -import { queueLogger } from '../../logger'; -import { deleteFileSync } from '../../../services/drive/delete-file'; -import { DriveFiles } from '../../../models'; +import { queueLogger } from '~/queue/logger'; +import { deleteFileSync } from '~/services/drive/delete-file'; +import { DriveFiles } from '~/models'; import { MoreThan, Not, IsNull } from 'typeorm'; const logger = queueLogger.createSubLogger('clean-remote-files'); diff --git a/src/queue/processors/object-storage/delete-file.ts b/src/queue/processors/object-storage/delete-file.ts index f899df7d2..f60dd4345 100644 --- a/src/queue/processors/object-storage/delete-file.ts +++ b/src/queue/processors/object-storage/delete-file.ts @@ -1,5 +1,5 @@ import * as Bull from 'bull'; -import { deleteObjectStorageFile } from '../../../services/drive/delete-file'; +import { deleteObjectStorageFile } from '~/services/drive/delete-file'; export default async (job: Bull.Job) => { const key: string = job.data.key; diff --git a/src/remote/activitypub/kernel/accept/follow.ts b/src/remote/activitypub/kernel/accept/follow.ts index 377b8dac4..c153f0a70 100644 --- a/src/remote/activitypub/kernel/accept/follow.ts +++ b/src/remote/activitypub/kernel/accept/follow.ts @@ -1,8 +1,8 @@ -import { IRemoteUser } from '../../../../models/entities/user'; -import config from '../../../../config'; -import accept from '../../../../services/following/requests/accept'; -import { IFollow } from '../../type'; -import { Users } from '../../../../models'; +import { IRemoteUser } from '~/models/entities/user'; +import config from '~/config'; +import accept from '~/services/following/requests/accept'; +import { IFollow } from '~/remote/activitypub/type'; +import { Users } from '~/models'; export default async (actor: IRemoteUser, activity: IFollow): Promise => { const id = typeof activity.actor == 'string' ? activity.actor : activity.actor.id; diff --git a/src/remote/activitypub/kernel/accept/index.ts b/src/remote/activitypub/kernel/accept/index.ts index 5a27ce1d4..6ee356d42 100644 --- a/src/remote/activitypub/kernel/accept/index.ts +++ b/src/remote/activitypub/kernel/accept/index.ts @@ -1,8 +1,8 @@ -import Resolver from '../../resolver'; -import { IRemoteUser } from '../../../../models/entities/user'; +import Resolver from '~/remote/activitypub/resolver'; +import { IRemoteUser } from '~/models/entities/user'; import acceptFollow from './follow'; -import { IAccept, IFollow } from '../../type'; -import { apLogger } from '../../logger'; +import { IAccept, IFollow } from '~/remote/activitypub/type'; +import { apLogger } from '~/remote/activitypub/logger'; const logger = apLogger; diff --git a/src/remote/activitypub/kernel/add/index.ts b/src/remote/activitypub/kernel/add/index.ts index a5b268741..7c5a6e69b 100644 --- a/src/remote/activitypub/kernel/add/index.ts +++ b/src/remote/activitypub/kernel/add/index.ts @@ -1,7 +1,7 @@ -import { IRemoteUser } from '../../../../models/entities/user'; -import { IAdd } from '../../type'; -import { resolveNote } from '../../models/note'; -import { addPinned } from '../../../../services/i/pin'; +import { IRemoteUser } from '~/models/entities/user'; +import { IAdd } from '~/remote/activitypub/type'; +import { resolveNote } from '~/remote/activitypub/models/note'; +import { addPinned } from '~/services/i/pin'; export default async (actor: IRemoteUser, activity: IAdd): Promise => { if ('actor' in activity && actor.uri !== activity.actor) { diff --git a/src/remote/activitypub/kernel/announce/index.ts b/src/remote/activitypub/kernel/announce/index.ts index 68fce52e1..fcb8d361b 100644 --- a/src/remote/activitypub/kernel/announce/index.ts +++ b/src/remote/activitypub/kernel/announce/index.ts @@ -1,8 +1,8 @@ -import Resolver from '../../resolver'; -import { IRemoteUser } from '../../../../models/entities/user'; +import Resolver from '~/remote/activitypub/resolver'; +import { IRemoteUser } from '~/models/entities/user'; import announceNote from './note'; -import { IAnnounce, INote, validPost, getApId } from '../../type'; -import { apLogger } from '../../logger'; +import { IAnnounce, INote, validPost, getApId } from '~/remote/activitypub/type'; +import { apLogger } from '~/remote/activitypub/logger'; const logger = apLogger; diff --git a/src/remote/activitypub/kernel/announce/note.ts b/src/remote/activitypub/kernel/announce/note.ts index 2a07f50c8..3d1e86bd9 100644 --- a/src/remote/activitypub/kernel/announce/note.ts +++ b/src/remote/activitypub/kernel/announce/note.ts @@ -1,12 +1,12 @@ -import Resolver from '../../resolver'; -import post from '../../../../services/note/create'; -import { IRemoteUser, User } from '../../../../models/entities/user'; -import { IAnnounce, INote, getApId, getApIds } from '../../type'; -import { fetchNote, resolveNote } from '../../models/note'; -import { resolvePerson } from '../../models/person'; -import { apLogger } from '../../logger'; -import { extractDbHost } from '../../../../misc/convert-host'; -import { fetchMeta } from '../../../../misc/fetch-meta'; +import Resolver from '~/remote/activitypub/resolver'; +import post from '~/services/note/create'; +import { IRemoteUser, User } from '~/models/entities/user'; +import { IAnnounce, INote, getApId, getApIds } from '~/remote/activitypub/type'; +import { fetchNote, resolveNote } from '~/remote/activitypub/models/note'; +import { resolvePerson } from '~/remote/activitypub/models/person'; +import { apLogger } from '~/remote/activitypub/logger'; +import { extractDbHost } from '~/misc/convert-host'; +import { fetchMeta } from '~/misc/fetch-meta'; const logger = apLogger; diff --git a/src/remote/activitypub/kernel/block/index.ts b/src/remote/activitypub/kernel/block/index.ts index 5c247326c..26846b057 100644 --- a/src/remote/activitypub/kernel/block/index.ts +++ b/src/remote/activitypub/kernel/block/index.ts @@ -1,9 +1,9 @@ -import config from '../../../../config'; -import { IBlock } from '../../type'; -import block from '../../../../services/blocking/create'; -import { apLogger } from '../../logger'; -import { Users } from '../../../../models'; -import { IRemoteUser } from '../../../../models/entities/user'; +import config from '~/config'; +import { IBlock } from '~/remote/activitypub/type'; +import block from '~/services/blocking/create'; +import { apLogger } from '~/remote/activitypub/logger'; +import { Users } from '~/models'; +import { IRemoteUser } from '~/models/entities/user'; const logger = apLogger; diff --git a/src/remote/activitypub/kernel/create/index.ts b/src/remote/activitypub/kernel/create/index.ts index a6fa2336f..0fdffb2e4 100644 --- a/src/remote/activitypub/kernel/create/index.ts +++ b/src/remote/activitypub/kernel/create/index.ts @@ -1,8 +1,8 @@ -import Resolver from '../../resolver'; -import { IRemoteUser } from '../../../../models/entities/user'; +import Resolver from '~/remote/activitypub/resolver'; +import { IRemoteUser } from '~/models/entities/user'; import createNote from './note'; -import { ICreate, getApId, validPost } from '../../type'; -import { apLogger } from '../../logger'; +import { ICreate, getApId, validPost } from '~/remote/activitypub/type'; +import { apLogger } from '~/remote/activitypub/logger'; const logger = apLogger; diff --git a/src/remote/activitypub/kernel/create/note.ts b/src/remote/activitypub/kernel/create/note.ts index 70e61bdf1..0f9d13e5f 100644 --- a/src/remote/activitypub/kernel/create/note.ts +++ b/src/remote/activitypub/kernel/create/note.ts @@ -1,6 +1,6 @@ -import Resolver from '../../resolver'; -import { IRemoteUser } from '../../../../models/entities/user'; -import { createNote, fetchNote } from '../../models/note'; +import Resolver from '~/remote/activitypub/resolver'; +import { IRemoteUser } from '~/models/entities/user'; +import { createNote, fetchNote } from '~/remote/activitypub/models/note'; /** * 投稿作成アクティビティを捌きます diff --git a/src/remote/activitypub/kernel/delete/index.ts b/src/remote/activitypub/kernel/delete/index.ts index be7779e02..7a567e165 100644 --- a/src/remote/activitypub/kernel/delete/index.ts +++ b/src/remote/activitypub/kernel/delete/index.ts @@ -1,8 +1,8 @@ -import Resolver from '../../resolver'; +import Resolver from '~/remote/activitypub/resolver'; import deleteNote from './note'; -import { IRemoteUser } from '../../../../models/entities/user'; -import { IDelete, getApId, validPost } from '../../type'; -import { apLogger } from '../../logger'; +import { IRemoteUser } from '~/models/entities/user'; +import { IDelete, getApId, validPost } from '~/remote/activitypub/type'; +import { apLogger } from '~/remote/activitypub/logger'; /** * 削除アクティビティを捌きます diff --git a/src/remote/activitypub/kernel/delete/note.ts b/src/remote/activitypub/kernel/delete/note.ts index b146e68a0..40aee0d66 100644 --- a/src/remote/activitypub/kernel/delete/note.ts +++ b/src/remote/activitypub/kernel/delete/note.ts @@ -1,7 +1,7 @@ -import { IRemoteUser } from '../../../../models/entities/user'; -import deleteNode from '../../../../services/note/delete'; -import { apLogger } from '../../logger'; -import { Notes } from '../../../../models'; +import { IRemoteUser } from '~/models/entities/user'; +import deleteNode from '~/services/note/delete'; +import { apLogger } from '~/remote/activitypub/logger'; +import { Notes } from '~/models'; const logger = apLogger; diff --git a/src/remote/activitypub/kernel/follow.ts b/src/remote/activitypub/kernel/follow.ts index c255067bf..85b92ee28 100644 --- a/src/remote/activitypub/kernel/follow.ts +++ b/src/remote/activitypub/kernel/follow.ts @@ -1,8 +1,8 @@ -import { IRemoteUser } from '../../../models/entities/user'; -import config from '../../../config'; -import follow from '../../../services/following/create'; -import { IFollow } from '../type'; -import { Users } from '../../../models'; +import { IRemoteUser } from '~/models/entities/user'; +import config from '~/config'; +import follow from '~/services/following/create'; +import { IFollow } from '~/remote/activitypub/type'; +import { Users } from '~/models'; export default async (actor: IRemoteUser, activity: IFollow): Promise => { const id = typeof activity.object == 'string' ? activity.object : activity.object.id; diff --git a/src/remote/activitypub/kernel/index.ts b/src/remote/activitypub/kernel/index.ts index a0646bdd6..ab06e93e8 100644 --- a/src/remote/activitypub/kernel/index.ts +++ b/src/remote/activitypub/kernel/index.ts @@ -1,5 +1,5 @@ -import { Object } from '../type'; -import { IRemoteUser } from '../../../models/entities/user'; +import { Object } from '~/remote/activitypub/type'; +import { IRemoteUser } from '~/models/entities/user'; import create from './create'; import performDeleteActivity from './delete'; import performUpdateActivity from './update'; @@ -12,7 +12,7 @@ import reject from './reject'; import add from './add'; import remove from './remove'; import block from './block'; -import { apLogger } from '../logger'; +import { apLogger } from '~/remote/activitypub/logger'; const self = async (actor: IRemoteUser, activity: Object): Promise => { if (actor.isSuspended) return; diff --git a/src/remote/activitypub/kernel/like.ts b/src/remote/activitypub/kernel/like.ts index 23b4aedd1..eabc06678 100644 --- a/src/remote/activitypub/kernel/like.ts +++ b/src/remote/activitypub/kernel/like.ts @@ -1,8 +1,8 @@ -import { IRemoteUser } from '../../../models/entities/user'; -import { ILike } from '../type'; -import create from '../../../services/note/reaction/create'; -import { Notes } from '../../../models'; -import { apLogger } from '../logger'; +import { IRemoteUser } from '~/models/entities/user'; +import { ILike } from '~/remote/activitypub/type'; +import create from '~/services/note/reaction/create'; +import { Notes } from '~/models'; +import { apLogger } from '~/remote/activitypub/logger'; export default async (actor: IRemoteUser, activity: ILike) => { const id = typeof activity.object == 'string' ? activity.object : activity.object.id; diff --git a/src/remote/activitypub/kernel/reject/follow.ts b/src/remote/activitypub/kernel/reject/follow.ts index d8b5a4b9b..73f5044aa 100644 --- a/src/remote/activitypub/kernel/reject/follow.ts +++ b/src/remote/activitypub/kernel/reject/follow.ts @@ -1,8 +1,8 @@ -import { IRemoteUser } from '../../../../models/entities/user'; -import config from '../../../../config'; -import reject from '../../../../services/following/requests/reject'; -import { IFollow } from '../../type'; -import { Users } from '../../../../models'; +import { IRemoteUser } from '~/models/entities/user'; +import config from '~/config'; +import reject from '~/services/following/requests/reject'; +import { IFollow } from '~/remote/activitypub/type'; +import { Users } from '~/models'; export default async (actor: IRemoteUser, activity: IFollow): Promise => { const id = typeof activity.actor == 'string' ? activity.actor : activity.actor.id; diff --git a/src/remote/activitypub/kernel/reject/index.ts b/src/remote/activitypub/kernel/reject/index.ts index 8ece5cf17..24bcfa282 100644 --- a/src/remote/activitypub/kernel/reject/index.ts +++ b/src/remote/activitypub/kernel/reject/index.ts @@ -1,8 +1,8 @@ -import Resolver from '../../resolver'; -import { IRemoteUser } from '../../../../models/entities/user'; +import Resolver from '~/remote/activitypub/resolver'; +import { IRemoteUser } from '~/models/entities/user'; import rejectFollow from './follow'; -import { IReject, IFollow } from '../../type'; -import { apLogger } from '../../logger'; +import { IReject, IFollow } from '~/remote/activitypub/type'; +import { apLogger } from '~/remote/activitypub/logger'; const logger = apLogger; diff --git a/src/remote/activitypub/kernel/remove/index.ts b/src/remote/activitypub/kernel/remove/index.ts index 32b8d6647..9a18ab16d 100644 --- a/src/remote/activitypub/kernel/remove/index.ts +++ b/src/remote/activitypub/kernel/remove/index.ts @@ -1,7 +1,7 @@ -import { IRemoteUser } from '../../../../models/entities/user'; -import { IRemove } from '../../type'; -import { resolveNote } from '../../models/note'; -import { removePinned } from '../../../../services/i/pin'; +import { IRemoteUser } from '~/models/entities/user'; +import { IRemove } from '~/remote/activitypub/type'; +import { resolveNote } from '~/remote/activitypub/models/note'; +import { removePinned } from '~/services/i/pin'; export default async (actor: IRemoteUser, activity: IRemove): Promise => { if ('actor' in activity && actor.uri !== activity.actor) { diff --git a/src/remote/activitypub/kernel/undo/block.ts b/src/remote/activitypub/kernel/undo/block.ts index 8ef70a9be..8aa85b2ec 100644 --- a/src/remote/activitypub/kernel/undo/block.ts +++ b/src/remote/activitypub/kernel/undo/block.ts @@ -1,9 +1,9 @@ -import config from '../../../../config'; -import { IBlock } from '../../type'; -import unblock from '../../../../services/blocking/delete'; -import { apLogger } from '../../logger'; -import { IRemoteUser } from '../../../../models/entities/user'; -import { Users } from '../../../../models'; +import config from '~/config'; +import { IBlock } from '~/remote/activitypub/type'; +import unblock from '~/services/blocking/delete'; +import { apLogger } from '~/remote/activitypub/logger'; +import { IRemoteUser } from '~/models/entities/user'; +import { Users } from '~/models'; const logger = apLogger; diff --git a/src/remote/activitypub/kernel/undo/follow.ts b/src/remote/activitypub/kernel/undo/follow.ts index d75f05564..84064fe7a 100644 --- a/src/remote/activitypub/kernel/undo/follow.ts +++ b/src/remote/activitypub/kernel/undo/follow.ts @@ -1,9 +1,9 @@ -import config from '../../../../config'; -import unfollow from '../../../../services/following/delete'; -import cancelRequest from '../../../../services/following/requests/cancel'; -import { IFollow } from '../../type'; -import { IRemoteUser } from '../../../../models/entities/user'; -import { Users, FollowRequests, Followings } from '../../../../models'; +import config from '~/config'; +import unfollow from '~/services/following/delete'; +import cancelRequest from '~/services/following/requests/cancel'; +import { IFollow } from '~/remote/activitypub/type'; +import { IRemoteUser } from '~/models/entities/user'; +import { Users, FollowRequests, Followings } from '~/models'; export default async (actor: IRemoteUser, activity: IFollow): Promise => { const id = typeof activity.object == 'string' ? activity.object : activity.object.id; diff --git a/src/remote/activitypub/kernel/undo/index.ts b/src/remote/activitypub/kernel/undo/index.ts index 5f2e58c3b..bd2888e0d 100644 --- a/src/remote/activitypub/kernel/undo/index.ts +++ b/src/remote/activitypub/kernel/undo/index.ts @@ -1,10 +1,10 @@ -import { IRemoteUser } from '../../../../models/entities/user'; -import { IUndo, IFollow, IBlock, ILike } from '../../type'; +import { IRemoteUser } from '~/models/entities/user'; +import { IUndo, IFollow, IBlock, ILike } from '~/remote/activitypub/type'; import unfollow from './follow'; import unblock from './block'; import undoLike from './like'; -import Resolver from '../../resolver'; -import { apLogger } from '../../logger'; +import Resolver from '~/remote/activitypub/resolver'; +import { apLogger } from '~/remote/activitypub/logger'; const logger = apLogger; diff --git a/src/remote/activitypub/kernel/undo/like.ts b/src/remote/activitypub/kernel/undo/like.ts index 2678828a9..da2908241 100644 --- a/src/remote/activitypub/kernel/undo/like.ts +++ b/src/remote/activitypub/kernel/undo/like.ts @@ -1,7 +1,7 @@ -import { IRemoteUser } from '../../../../models/entities/user'; -import { ILike } from '../../type'; -import deleteReaction from '../../../../services/note/reaction/delete'; -import { Notes } from '../../../../models'; +import { IRemoteUser } from '~/models/entities/user'; +import { ILike } from '~/remote/activitypub/type'; +import deleteReaction from '~/services/note/reaction/delete'; +import { Notes } from '~/models'; /** * Process Undo.Like activity diff --git a/src/remote/activitypub/kernel/update/index.ts b/src/remote/activitypub/kernel/update/index.ts index b8dff7339..270a6e3d0 100644 --- a/src/remote/activitypub/kernel/update/index.ts +++ b/src/remote/activitypub/kernel/update/index.ts @@ -1,7 +1,7 @@ -import { IRemoteUser } from '../../../../models/entities/user'; -import { IUpdate, IObject } from '../../type'; -import { apLogger } from '../../logger'; -import { updateQuestion } from '../../models/question'; +import { IRemoteUser } from '~/models/entities/user'; +import { IUpdate, IObject } from '~/remote/activitypub/type'; +import { apLogger } from '~/remote/activitypub/logger'; +import { updateQuestion } from '~/remote/activitypub/models/question'; /** * Updateアクティビティを捌きます diff --git a/src/remote/activitypub/logger.ts b/src/remote/activitypub/logger.ts index e13add01d..8b70860b9 100644 --- a/src/remote/activitypub/logger.ts +++ b/src/remote/activitypub/logger.ts @@ -1,3 +1,3 @@ -import { remoteLogger } from '../logger'; +import { remoteLogger } from '~/remote/logger'; export const apLogger = remoteLogger.createSubLogger('ap', 'magenta'); diff --git a/src/remote/activitypub/misc/get-note-html.ts b/src/remote/activitypub/misc/get-note-html.ts index dba915fee..57f20c5e4 100644 --- a/src/remote/activitypub/misc/get-note-html.ts +++ b/src/remote/activitypub/misc/get-note-html.ts @@ -1,6 +1,6 @@ -import { Note } from '../../../models/entities/note'; -import { toHtml } from '../../../mfm/toHtml'; -import { parse } from '../../../mfm/parse'; +import { Note } from '~/models/entities/note'; +import { toHtml } from '~/mfm/toHtml'; +import { parse } from '~/mfm/parse'; export default function(note: Note) { let html = toHtml(parse(note.text), JSON.parse(note.mentionedRemoteUsers)); diff --git a/src/remote/activitypub/models/image.ts b/src/remote/activitypub/models/image.ts index 84a1040b2..2dcaa1010 100644 --- a/src/remote/activitypub/models/image.ts +++ b/src/remote/activitypub/models/image.ts @@ -1,11 +1,11 @@ -import uploadFromUrl from '../../../services/drive/upload-from-url'; -import { IRemoteUser } from '../../../models/entities/user'; -import Resolver from '../resolver'; -import { fetchMeta } from '../../../misc/fetch-meta'; -import { apLogger } from '../logger'; -import { DriveFile } from '../../../models/entities/drive-file'; -import { DriveFiles } from '../../../models'; -import { ensure } from '../../../prelude/ensure'; +import uploadFromUrl from '~/services/drive/upload-from-url'; +import { IRemoteUser } from '~/models/entities/user'; +import Resolver from '~/remote/activitypub/resolver'; +import { fetchMeta } from '~/misc/fetch-meta'; +import { apLogger } from '~/remote/activitypub/logger'; +import { DriveFile } from '~/models/entities/drive-file'; +import { DriveFiles } from '~/models'; +import { ensure } from '~/prelude/ensure'; const logger = apLogger; diff --git a/src/remote/activitypub/models/note.ts b/src/remote/activitypub/models/note.ts index 9afbb3915..4bc84bda0 100644 --- a/src/remote/activitypub/models/note.ts +++ b/src/remote/activitypub/models/note.ts @@ -1,27 +1,27 @@ import * as promiseLimit from 'promise-limit'; -import config from '../../../config'; -import Resolver from '../resolver'; -import post from '../../../services/note/create'; +import config from '~/config'; +import Resolver from '~/remote/activitypub/resolver'; +import post from '~/services/note/create'; import { resolvePerson, updatePerson } from './person'; import { resolveImage } from './image'; -import { IRemoteUser, User } from '../../../models/entities/user'; -import { fromHtml } from '../../../mfm/fromHtml'; +import { IRemoteUser, User } from '~/models/entities/user'; +import { fromHtml } from '~/mfm/fromHtml'; import { ITag, extractHashtags } from './tag'; -import { unique, concat, difference } from '../../../prelude/array'; +import { unique, concat, difference } from '~/prelude/array'; import { extractPollFromQuestion } from './question'; -import vote from '../../../services/note/polls/vote'; -import { apLogger } from '../logger'; -import { DriveFile } from '../../../models/entities/drive-file'; -import { deliverQuestionUpdate } from '../../../services/note/polls/update'; -import { extractDbHost, toPuny } from '../../../misc/convert-host'; -import { Notes, Emojis, Polls } from '../../../models'; -import { Note } from '../../../models/entities/note'; -import { IObject, INote, getApIds, getOneApId, getApId, validPost } from '../type'; -import { Emoji } from '../../../models/entities/emoji'; -import { genId } from '../../../misc/gen-id'; -import { fetchMeta } from '../../../misc/fetch-meta'; -import { ensure } from '../../../prelude/ensure'; +import vote from '~/services/note/polls/vote'; +import { apLogger } from '~/remote/activitypub/logger'; +import { DriveFile } from '~/models/entities/drive-file'; +import { deliverQuestionUpdate } from '~/services/note/polls/update'; +import { extractDbHost, toPuny } from '~/misc/convert-host'; +import { Notes, Emojis, Polls } from '~/models'; +import { Note } from '~/models/entities/note'; +import { IObject, INote, getApIds, getOneApId, getApId, validPost } from '~/remote/activitypub/type'; +import { Emoji } from '~/models/entities/emoji'; +import { genId } from '~/misc/gen-id'; +import { fetchMeta } from '~/misc/fetch-meta'; +import { ensure } from '~/prelude/ensure'; const logger = apLogger; diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts index bfcad100f..d82e95e69 100644 --- a/src/remote/activitypub/models/person.ts +++ b/src/remote/activitypub/models/person.ts @@ -1,31 +1,31 @@ import * as promiseLimit from 'promise-limit'; -import config from '../../../config'; -import Resolver from '../resolver'; +import config from '~/config'; +import Resolver from '~/remote/activitypub/resolver'; import { resolveImage } from './image'; -import { isCollectionOrOrderedCollection, isCollection, IPerson } from '../type'; -import { DriveFile } from '../../../models/entities/drive-file'; -import { fromHtml } from '../../../mfm/fromHtml'; +import { isCollectionOrOrderedCollection, isCollection, IPerson } from '~/remote/activitypub/type'; +import { DriveFile } from '~/models/entities/drive-file'; +import { fromHtml } from '~/mfm/fromHtml'; import { resolveNote, extractEmojis } from './note'; -import { registerOrFetchInstanceDoc } from '../../../services/register-or-fetch-instance-doc'; +import { registerOrFetchInstanceDoc } from '~/services/register-or-fetch-instance-doc'; import { ITag, extractHashtags } from './tag'; import { IIdentifier } from './identifier'; -import { apLogger } from '../logger'; -import { Note } from '../../../models/entities/note'; -import { updateHashtag } from '../../../services/update-hashtag'; -import { Users, UserNotePinings, Instances, DriveFiles, Followings, UserProfiles, UserPublickeys } from '../../../models'; -import { User, IRemoteUser } from '../../../models/entities/user'; -import { Emoji } from '../../../models/entities/emoji'; -import { UserNotePining } from '../../../models/entities/user-note-pinings'; -import { genId } from '../../../misc/gen-id'; -import { instanceChart, usersChart } from '../../../services/chart'; -import { UserPublickey } from '../../../models/entities/user-publickey'; -import { isDuplicateKeyValueError } from '../../../misc/is-duplicate-key-value-error'; -import { toPuny } from '../../../misc/convert-host'; -import { UserProfile } from '../../../models/entities/user-profile'; -import { validActor } from '../../../remote/activitypub/type'; +import { apLogger } from '~/remote/activitypub/logger'; +import { Note } from '~/models/entities/note'; +import { updateHashtag } from '~/services/update-hashtag'; +import { Users, UserNotePinings, Instances, DriveFiles, Followings, UserProfiles, UserPublickeys } from '~/models'; +import { User, IRemoteUser } from '~/models/entities/user'; +import { Emoji } from '~/models/entities/emoji'; +import { UserNotePining } from '~/models/entities/user-note-pinings'; +import { genId } from '~/misc/gen-id'; +import { instanceChart, usersChart } from '~/services/chart'; +import { UserPublickey } from '~/models/entities/user-publickey'; +import { isDuplicateKeyValueError } from '~/misc/is-duplicate-key-value-error'; +import { toPuny } from '~/misc/convert-host'; +import { UserProfile } from '~/models/entities/user-profile'; +import { validActor } from '~/remote/activitypub/type'; import { getConnection } from 'typeorm'; -import { ensure } from '../../../prelude/ensure'; +import { ensure } from '~/prelude/ensure'; const logger = apLogger; /** diff --git a/src/remote/activitypub/models/question.ts b/src/remote/activitypub/models/question.ts index 5c889db43..edbfefb77 100644 --- a/src/remote/activitypub/models/question.ts +++ b/src/remote/activitypub/models/question.ts @@ -1,9 +1,9 @@ -import config from '../../../config'; -import Resolver from '../resolver'; -import { IObject, IQuestion, isQuestion, } from '../type'; -import { apLogger } from '../logger'; -import { Notes, Polls } from '../../../models'; -import { IPoll } from '../../../models/entities/poll'; +import config from '~/config'; +import Resolver from '~/remote/activitypub/resolver'; +import { IObject, IQuestion, isQuestion } from '~/remote/activitypub/type'; +import { apLogger } from '~/remote/activitypub/logger'; +import { Notes, Polls } from '~/models'; +import { IPoll } from '~/models/entities/poll'; export async function extractPollFromQuestion(source: string | IObject, resolver?: Resolver): Promise { if (resolver == null) resolver = new Resolver(); diff --git a/src/remote/activitypub/perform.ts b/src/remote/activitypub/perform.ts index 425adaec9..aae14fdcc 100644 --- a/src/remote/activitypub/perform.ts +++ b/src/remote/activitypub/perform.ts @@ -1,5 +1,5 @@ import { Object } from './type'; -import { IRemoteUser } from '../../models/entities/user'; +import { IRemoteUser } from '~/models/entities/user'; import kernel from './kernel'; export default async (actor: IRemoteUser, activity: Object): Promise => { diff --git a/src/remote/activitypub/renderer/accept.ts b/src/remote/activitypub/renderer/accept.ts index 21b462907..8d494cfd1 100644 --- a/src/remote/activitypub/renderer/accept.ts +++ b/src/remote/activitypub/renderer/accept.ts @@ -1,5 +1,5 @@ -import config from '../../../config'; -import { ILocalUser } from '../../../models/entities/user'; +import config from '~/config'; +import { ILocalUser } from '~/models/entities/user'; export default (object: any, user: ILocalUser) => ({ type: 'Accept', diff --git a/src/remote/activitypub/renderer/add.ts b/src/remote/activitypub/renderer/add.ts index 46f937f61..c57098e4b 100644 --- a/src/remote/activitypub/renderer/add.ts +++ b/src/remote/activitypub/renderer/add.ts @@ -1,5 +1,5 @@ -import config from '../../../config'; -import { ILocalUser } from '../../../models/entities/user'; +import config from '~/config'; +import { ILocalUser } from '~/models/entities/user'; export default (user: ILocalUser, target: any, object: any) => ({ type: 'Add', diff --git a/src/remote/activitypub/renderer/announce.ts b/src/remote/activitypub/renderer/announce.ts index 11e7be449..2dd156925 100644 --- a/src/remote/activitypub/renderer/announce.ts +++ b/src/remote/activitypub/renderer/announce.ts @@ -1,5 +1,5 @@ -import config from '../../../config'; -import { Note } from '../../../models/entities/note'; +import config from '~/config'; +import { Note } from '~/models/entities/note'; export default (object: any, note: Note) => { const attributedTo = `${config.url}/users/${note.userId}`; diff --git a/src/remote/activitypub/renderer/block.ts b/src/remote/activitypub/renderer/block.ts index c29a9aea8..39ad48872 100644 --- a/src/remote/activitypub/renderer/block.ts +++ b/src/remote/activitypub/renderer/block.ts @@ -1,5 +1,5 @@ -import config from '../../../config'; -import { ILocalUser, IRemoteUser } from '../../../models/entities/user'; +import config from '~/config'; +import { ILocalUser, IRemoteUser } from '~/models/entities/user'; export default (blocker: ILocalUser, blockee: IRemoteUser) => ({ type: 'Block', diff --git a/src/remote/activitypub/renderer/create.ts b/src/remote/activitypub/renderer/create.ts index e1fc0515c..b91f8a5d7 100644 --- a/src/remote/activitypub/renderer/create.ts +++ b/src/remote/activitypub/renderer/create.ts @@ -1,5 +1,5 @@ -import config from '../../../config'; -import { Note } from '../../../models/entities/note'; +import config from '~/config'; +import { Note } from '~/models/entities/note'; export default (object: any, note: Note) => { const activity = { diff --git a/src/remote/activitypub/renderer/delete.ts b/src/remote/activitypub/renderer/delete.ts index a98c97e6e..cb2fc514b 100644 --- a/src/remote/activitypub/renderer/delete.ts +++ b/src/remote/activitypub/renderer/delete.ts @@ -1,5 +1,5 @@ -import config from '../../../config'; -import { ILocalUser } from '../../../models/entities/user'; +import config from '~/config'; +import { ILocalUser } from '~/models/entities/user'; export default (object: any, user: ILocalUser) => ({ type: 'Delete', diff --git a/src/remote/activitypub/renderer/document.ts b/src/remote/activitypub/renderer/document.ts index 4f6ea8c4e..b7174ec1e 100644 --- a/src/remote/activitypub/renderer/document.ts +++ b/src/remote/activitypub/renderer/document.ts @@ -1,5 +1,5 @@ -import { DriveFile } from '../../../models/entities/drive-file'; -import { DriveFiles } from '../../../models'; +import { DriveFile } from '~/models/entities/drive-file'; +import { DriveFiles } from '~/models'; export default (file: DriveFile) => ({ type: 'Document', diff --git a/src/remote/activitypub/renderer/emoji.ts b/src/remote/activitypub/renderer/emoji.ts index 947a96df3..e34faa99f 100644 --- a/src/remote/activitypub/renderer/emoji.ts +++ b/src/remote/activitypub/renderer/emoji.ts @@ -1,5 +1,5 @@ -import config from '../../../config'; -import { Emoji } from '../../../models/entities/emoji'; +import config from '~/config'; +import { Emoji } from '~/models/entities/emoji'; export default (emoji: Emoji) => ({ id: `${config.url}/emojis/${emoji.name}`, diff --git a/src/remote/activitypub/renderer/follow-user.ts b/src/remote/activitypub/renderer/follow-user.ts index 6d354803e..a52b4ec78 100644 --- a/src/remote/activitypub/renderer/follow-user.ts +++ b/src/remote/activitypub/renderer/follow-user.ts @@ -1,7 +1,7 @@ -import config from '../../../config'; -import { Users } from '../../../models'; -import { User } from '../../../models/entities/user'; -import { ensure } from '../../../prelude/ensure'; +import config from '~/config'; +import { Users } from '~/models'; +import { User } from '~/models/entities/user'; +import { ensure } from '~/prelude/ensure'; /** * Convert (local|remote)(Follower|Followee)ID to URL diff --git a/src/remote/activitypub/renderer/follow.ts b/src/remote/activitypub/renderer/follow.ts index 400b15ec7..789293831 100644 --- a/src/remote/activitypub/renderer/follow.ts +++ b/src/remote/activitypub/renderer/follow.ts @@ -1,6 +1,6 @@ -import config from '../../../config'; -import { User } from '../../../models/entities/user'; -import { Users } from '../../../models'; +import config from '~/config'; +import { User } from '~/models/entities/user'; +import { Users } from '~/models'; export default (follower: User, followee: User, requestId?: string) => { const follow = { diff --git a/src/remote/activitypub/renderer/hashtag.ts b/src/remote/activitypub/renderer/hashtag.ts index 36563c2df..474957557 100644 --- a/src/remote/activitypub/renderer/hashtag.ts +++ b/src/remote/activitypub/renderer/hashtag.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '~/config'; export default (tag: string) => ({ type: 'Hashtag', diff --git a/src/remote/activitypub/renderer/image.ts b/src/remote/activitypub/renderer/image.ts index ce98f98c6..935333dee 100644 --- a/src/remote/activitypub/renderer/image.ts +++ b/src/remote/activitypub/renderer/image.ts @@ -1,5 +1,5 @@ -import { DriveFile } from '../../../models/entities/drive-file'; -import { DriveFiles } from '../../../models'; +import { DriveFile } from '~/models/entities/drive-file'; +import { DriveFiles } from '~/models'; export default (file: DriveFile) => ({ type: 'Image', diff --git a/src/remote/activitypub/renderer/index.ts b/src/remote/activitypub/renderer/index.ts index 2fd5d3459..b8acd5c21 100644 --- a/src/remote/activitypub/renderer/index.ts +++ b/src/remote/activitypub/renderer/index.ts @@ -1,4 +1,4 @@ -import config from '../../../config'; +import config from '~/config'; import * as uuid from 'uuid'; export const renderActivity = (x: any) => { diff --git a/src/remote/activitypub/renderer/key.ts b/src/remote/activitypub/renderer/key.ts index 334e5e00c..da2a45905 100644 --- a/src/remote/activitypub/renderer/key.ts +++ b/src/remote/activitypub/renderer/key.ts @@ -1,6 +1,6 @@ -import config from '../../../config'; -import { ILocalUser } from '../../../models/entities/user'; -import { UserKeypair } from '../../../models/entities/user-keypair'; +import config from '~/config'; +import { ILocalUser } from '~/models/entities/user'; +import { UserKeypair } from '~/models/entities/user-keypair'; export default (user: ILocalUser, key: UserKeypair) => ({ id: `${config.url}/users/${user.id}/publickey`, diff --git a/src/remote/activitypub/renderer/like.ts b/src/remote/activitypub/renderer/like.ts index 01f10ec0a..3659d9127 100644 --- a/src/remote/activitypub/renderer/like.ts +++ b/src/remote/activitypub/renderer/like.ts @@ -1,6 +1,6 @@ -import config from '../../../config'; -import { ILocalUser } from '../../../models/entities/user'; -import { Note } from '../../../models/entities/note'; +import config from '~/config'; +import { ILocalUser } from '~/models/entities/user'; +import { Note } from '~/models/entities/note'; export default (user: ILocalUser, note: Note, reaction: string) => ({ type: 'Like', diff --git a/src/remote/activitypub/renderer/mention.ts b/src/remote/activitypub/renderer/mention.ts index 889be5d85..76d809480 100644 --- a/src/remote/activitypub/renderer/mention.ts +++ b/src/remote/activitypub/renderer/mention.ts @@ -1,6 +1,6 @@ -import config from '../../../config'; -import { User, ILocalUser } from '../../../models/entities/user'; -import { Users } from '../../../models'; +import config from '~/config'; +import { User, ILocalUser } from '~/models/entities/user'; +import { Users } from '~/models'; export default (mention: User) => ({ type: 'Mention', diff --git a/src/remote/activitypub/renderer/note.ts b/src/remote/activitypub/renderer/note.ts index cbdff7d20..e38b0232b 100644 --- a/src/remote/activitypub/renderer/note.ts +++ b/src/remote/activitypub/renderer/note.ts @@ -2,15 +2,15 @@ import renderDocument from './document'; import renderHashtag from './hashtag'; import renderMention from './mention'; import renderEmoji from './emoji'; -import config from '../../../config'; -import toHtml from '../misc/get-note-html'; -import { Note, IMentionedRemoteUsers } from '../../../models/entities/note'; -import { DriveFile } from '../../../models/entities/drive-file'; -import { DriveFiles, Notes, Users, Emojis, Polls } from '../../../models'; +import config from '~/config'; +import toHtml from '~/remote/activitypub/misc/get-note-html'; +import { Note, IMentionedRemoteUsers } from '~/models/entities/note'; +import { DriveFile } from '~/models/entities/drive-file'; +import { DriveFiles, Notes, Users, Emojis, Polls } from '~/models'; import { In } from 'typeorm'; -import { Emoji } from '../../../models/entities/emoji'; -import { Poll } from '../../../models/entities/poll'; -import { ensure } from '../../../prelude/ensure'; +import { Emoji } from '~/models/entities/emoji'; +import { Poll } from '~/models/entities/poll'; +import { ensure } from '~/prelude/ensure'; export default async function renderNote(note: Note, dive = true): Promise { const promisedFiles: Promise = note.fileIds.length > 0 diff --git a/src/remote/activitypub/renderer/person.ts b/src/remote/activitypub/renderer/person.ts index d4c018fb7..92f011a5b 100644 --- a/src/remote/activitypub/renderer/person.ts +++ b/src/remote/activitypub/renderer/person.ts @@ -1,15 +1,15 @@ import renderImage from './image'; import renderKey from './key'; -import config from '../../../config'; -import { ILocalUser } from '../../../models/entities/user'; -import { toHtml } from '../../../mfm/toHtml'; -import { parse } from '../../../mfm/parse'; +import config from '~/config'; +import { ILocalUser } from '~/models/entities/user'; +import { toHtml } from '~/mfm/toHtml'; +import { parse } from '~/mfm/parse'; import { getEmojis } from './note'; import renderEmoji from './emoji'; -import { IIdentifier } from '../models/identifier'; +import { IIdentifier } from '~/remote/activitypub/models/identifier'; import renderHashtag from './hashtag'; -import { DriveFiles, UserProfiles, UserKeypairs } from '../../../models'; -import { ensure } from '../../../prelude/ensure'; +import { DriveFiles, UserProfiles, UserKeypairs } from '~/models'; +import { ensure } from '~/prelude/ensure'; export async function renderPerson(user: ILocalUser) { const id = `${config.url}/users/${user.id}`; diff --git a/src/remote/activitypub/renderer/question.ts b/src/remote/activitypub/renderer/question.ts index 6ade10d1b..2d064b618 100644 --- a/src/remote/activitypub/renderer/question.ts +++ b/src/remote/activitypub/renderer/question.ts @@ -1,7 +1,7 @@ -import config from '../../../config'; -import { ILocalUser } from '../../../models/entities/user'; -import { Note } from '../../../models/entities/note'; -import { Poll } from '../../../models/entities/poll'; +import config from '~/config'; +import { ILocalUser } from '~/models/entities/user'; +import { Note } from '~/models/entities/note'; +import { Poll } from '~/models/entities/poll'; export default async function renderQuestion(user: ILocalUser, note: Note, poll: Poll) { const question = { diff --git a/src/remote/activitypub/renderer/reject.ts b/src/remote/activitypub/renderer/reject.ts index c4e0ba0d0..99b9c457e 100644 --- a/src/remote/activitypub/renderer/reject.ts +++ b/src/remote/activitypub/renderer/reject.ts @@ -1,5 +1,5 @@ -import config from '../../../config'; -import { ILocalUser } from '../../../models/entities/user'; +import config from '~/config'; +import { ILocalUser } from '~/models/entities/user'; export default (object: any, user: ILocalUser) => ({ type: 'Reject', diff --git a/src/remote/activitypub/renderer/remove.ts b/src/remote/activitypub/renderer/remove.ts index 1b9a6b8c0..434d30eef 100644 --- a/src/remote/activitypub/renderer/remove.ts +++ b/src/remote/activitypub/renderer/remove.ts @@ -1,5 +1,5 @@ -import config from '../../../config'; -import { ILocalUser } from '../../../models/entities/user'; +import config from '~/config'; +import { ILocalUser } from '~/models/entities/user'; export default (user: ILocalUser, target: any, object: any) => ({ type: 'Remove', diff --git a/src/remote/activitypub/renderer/undo.ts b/src/remote/activitypub/renderer/undo.ts index 2ff6b61b9..48e8f9151 100644 --- a/src/remote/activitypub/renderer/undo.ts +++ b/src/remote/activitypub/renderer/undo.ts @@ -1,5 +1,5 @@ -import config from '../../../config'; -import { ILocalUser, User } from '../../../models/entities/user'; +import config from '~/config'; +import { ILocalUser, User } from '~/models/entities/user'; export default (object: any, user: ILocalUser | User) => ({ type: 'Undo', diff --git a/src/remote/activitypub/renderer/update.ts b/src/remote/activitypub/renderer/update.ts index c1d5ba29b..73e919eb4 100644 --- a/src/remote/activitypub/renderer/update.ts +++ b/src/remote/activitypub/renderer/update.ts @@ -1,5 +1,5 @@ -import config from '../../../config'; -import { ILocalUser } from '../../../models/entities/user'; +import config from '~/config'; +import { ILocalUser } from '~/models/entities/user'; export default (object: any, user: ILocalUser) => { const activity = { diff --git a/src/remote/activitypub/renderer/vote.ts b/src/remote/activitypub/renderer/vote.ts index 8929c0346..2508b8411 100644 --- a/src/remote/activitypub/renderer/vote.ts +++ b/src/remote/activitypub/renderer/vote.ts @@ -1,8 +1,8 @@ -import config from '../../../config'; -import { Note } from '../../../models/entities/note'; -import { IRemoteUser, ILocalUser } from '../../../models/entities/user'; -import { PollVote } from '../../../models/entities/poll-vote'; -import { Poll } from '../../../models/entities/poll'; +import config from '~/config'; +import { Note } from '~/models/entities/note'; +import { IRemoteUser, ILocalUser } from '~/models/entities/user'; +import { PollVote } from '~/models/entities/poll-vote'; +import { Poll } from '~/models/entities/poll'; export default async function renderVote(user: ILocalUser, vote: PollVote, note: Note, poll: Poll, pollOwner: IRemoteUser): Promise { return { diff --git a/src/remote/activitypub/request.ts b/src/remote/activitypub/request.ts index a48bc1e3f..3eabe0454 100644 --- a/src/remote/activitypub/request.ts +++ b/src/remote/activitypub/request.ts @@ -3,14 +3,14 @@ import { sign } from 'http-signature'; import * as crypto from 'crypto'; import * as cache from 'lookup-dns-cache'; -import config from '../../config'; -import { ILocalUser } from '../../models/entities/user'; -import { publishApLogStream } from '../../services/stream'; +import config from '~/config'; +import { ILocalUser } from '~/models/entities/user'; +import { publishApLogStream } from '~/services/stream'; import { apLogger } from './logger'; -import { UserKeypairs, Instances } from '../../models'; -import { fetchMeta } from '../../misc/fetch-meta'; -import { toPuny } from '../../misc/convert-host'; -import { ensure } from '../../prelude/ensure'; +import { UserKeypairs, Instances } from '~/models'; +import { fetchMeta } from '~/misc/fetch-meta'; +import { toPuny } from '~/misc/convert-host'; +import { ensure } from '~/prelude/ensure'; import * as httpsProxyAgent from 'https-proxy-agent'; export const logger = apLogger.createSubLogger('deliver'); diff --git a/src/remote/activitypub/resolver.ts b/src/remote/activitypub/resolver.ts index d656c1c5e..bb2912cb9 100644 --- a/src/remote/activitypub/resolver.ts +++ b/src/remote/activitypub/resolver.ts @@ -1,6 +1,6 @@ import * as request from 'request-promise-native'; import { IObject } from './type'; -import config from '../../config'; +import config from '~/config'; export default class Resolver { private history: Set; diff --git a/src/remote/logger.ts b/src/remote/logger.ts index d7464e7fd..ec48140bb 100644 --- a/src/remote/logger.ts +++ b/src/remote/logger.ts @@ -1,3 +1,3 @@ -import Logger from '../services/logger'; +import Logger from '~/services/logger'; export const remoteLogger = new Logger('remote', 'cyan'); diff --git a/src/remote/resolve-user.ts b/src/remote/resolve-user.ts index 5253d684d..18a82cc33 100644 --- a/src/remote/resolve-user.ts +++ b/src/remote/resolve-user.ts @@ -1,11 +1,11 @@ import webFinger from './webfinger'; -import config from '../config'; +import config from '~/config'; import { createPerson, updatePerson } from './activitypub/models/person'; import { remoteLogger } from './logger'; import chalk from 'chalk'; -import { User, IRemoteUser } from '../models/entities/user'; -import { Users } from '../models'; -import { toPuny } from '../misc/convert-host'; +import { User, IRemoteUser } from '~/models/entities/user'; +import { Users } from '~/models'; +import { toPuny } from '~/misc/convert-host'; const logger = remoteLogger.createSubLogger('resolve-user'); diff --git a/src/remote/webfinger.ts b/src/remote/webfinger.ts index 101a31aab..dd96c7e25 100644 --- a/src/remote/webfinger.ts +++ b/src/remote/webfinger.ts @@ -1,6 +1,6 @@ -import config from '../config'; +import config from '~/config'; import * as request from 'request-promise-native'; -import { query as urlQuery } from '../prelude/url'; +import { query as urlQuery } from '~/prelude/url'; type ILink = { href: string; diff --git a/src/server/activitypub.ts b/src/server/activitypub.ts index cd9ac752a..7e8bb6976 100644 --- a/src/server/activitypub.ts +++ b/src/server/activitypub.ts @@ -2,21 +2,21 @@ import * as Router from 'koa-router'; import * as json from 'koa-json-body'; import * as httpSignature from 'http-signature'; -import { renderActivity } from '../remote/activitypub/renderer'; -import renderNote from '../remote/activitypub/renderer/note'; -import renderKey from '../remote/activitypub/renderer/key'; -import { renderPerson } from '../remote/activitypub/renderer/person'; -import renderEmoji from '../remote/activitypub/renderer/emoji'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import renderNote from '~/remote/activitypub/renderer/note'; +import renderKey from '~/remote/activitypub/renderer/key'; +import { renderPerson } from '~/remote/activitypub/renderer/person'; +import renderEmoji from '~/remote/activitypub/renderer/emoji'; import Outbox, { packActivity } from './activitypub/outbox'; import Followers from './activitypub/followers'; import Following from './activitypub/following'; import Featured from './activitypub/featured'; -import { inbox as processInbox } from '../queue'; -import { isSelfHost } from '../misc/convert-host'; -import { Notes, Users, Emojis, UserKeypairs } from '../models'; -import { ILocalUser, User } from '../models/entities/user'; +import { inbox as processInbox } from '~/queue'; +import { isSelfHost } from '~/misc/convert-host'; +import { Notes, Users, Emojis, UserKeypairs } from '~/models'; +import { ILocalUser, User } from '~/models/entities/user'; import { In } from 'typeorm'; -import { ensure } from '../prelude/ensure'; +import { ensure } from '~/prelude/ensure'; // Init router const router = new Router(); diff --git a/src/server/activitypub/featured.ts b/src/server/activitypub/featured.ts index dae72f16b..186c13cb1 100644 --- a/src/server/activitypub/featured.ts +++ b/src/server/activitypub/featured.ts @@ -1,11 +1,11 @@ import * as Router from 'koa-router'; -import config from '../../config'; -import { renderActivity } from '../../remote/activitypub/renderer'; -import renderOrderedCollection from '../../remote/activitypub/renderer/ordered-collection'; -import { setResponseType } from '../activitypub'; -import renderNote from '../../remote/activitypub/renderer/note'; -import { Users, Notes, UserNotePinings } from '../../models'; -import { ensure } from '../../prelude/ensure'; +import config from '~/config'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import renderOrderedCollection from '~/remote/activitypub/renderer/ordered-collection'; +import { setResponseType } from '~/server/activitypub'; +import renderNote from '~/remote/activitypub/renderer/note'; +import { Users, Notes, UserNotePinings } from '~/models'; +import { ensure } from '~/prelude/ensure'; export default async (ctx: Router.IRouterContext) => { const userId = ctx.params.user; diff --git a/src/server/activitypub/followers.ts b/src/server/activitypub/followers.ts index e48dc57f7..1034dd370 100644 --- a/src/server/activitypub/followers.ts +++ b/src/server/activitypub/followers.ts @@ -1,14 +1,14 @@ import * as Router from 'koa-router'; -import config from '../../config'; +import config from '~/config'; import $ from 'cafy'; -import { ID } from '../../misc/cafy-id'; -import * as url from '../../prelude/url'; -import { renderActivity } from '../../remote/activitypub/renderer'; -import renderOrderedCollection from '../../remote/activitypub/renderer/ordered-collection'; -import renderOrderedCollectionPage from '../../remote/activitypub/renderer/ordered-collection-page'; -import renderFollowUser from '../../remote/activitypub/renderer/follow-user'; -import { setResponseType } from '../activitypub'; -import { Users, Followings } from '../../models'; +import { ID } from '~/misc/cafy-id'; +import * as url from '~/prelude/url'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import renderOrderedCollection from '~/remote/activitypub/renderer/ordered-collection'; +import renderOrderedCollectionPage from '~/remote/activitypub/renderer/ordered-collection-page'; +import renderFollowUser from '~/remote/activitypub/renderer/follow-user'; +import { setResponseType } from '.'; +import { Users, Followings } from '~/models'; import { LessThan } from 'typeorm'; export default async (ctx: Router.IRouterContext) => { diff --git a/src/server/activitypub/following.ts b/src/server/activitypub/following.ts index 4a7314e0c..508a9df27 100644 --- a/src/server/activitypub/following.ts +++ b/src/server/activitypub/following.ts @@ -1,16 +1,16 @@ import * as Router from 'koa-router'; -import config from '../../config'; +import config from '~/config'; import $ from 'cafy'; -import { ID } from '../../misc/cafy-id'; -import * as url from '../../prelude/url'; -import { renderActivity } from '../../remote/activitypub/renderer'; -import renderOrderedCollection from '../../remote/activitypub/renderer/ordered-collection'; -import renderOrderedCollectionPage from '../../remote/activitypub/renderer/ordered-collection-page'; -import renderFollowUser from '../../remote/activitypub/renderer/follow-user'; -import { setResponseType } from '../activitypub'; -import { Users, Followings } from '../../models'; +import { ID } from '~/misc/cafy-id'; +import * as url from '~/prelude/url'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import renderOrderedCollection from '~/remote/activitypub/renderer/ordered-collection'; +import renderOrderedCollectionPage from '~/remote/activitypub/renderer/ordered-collection-page'; +import renderFollowUser from '~/remote/activitypub/renderer/follow-user'; +import { setResponseType } from '.'; +import { Users, Followings } from '~/models'; import { LessThan, FindConditions } from 'typeorm'; -import { Following } from '../../models/entities/following'; +import { Following } from '~/models/entities/following'; export default async (ctx: Router.IRouterContext) => { const userId = ctx.params.user; diff --git a/src/server/activitypub/outbox.ts b/src/server/activitypub/outbox.ts index 118d8f00a..154775800 100644 --- a/src/server/activitypub/outbox.ts +++ b/src/server/activitypub/outbox.ts @@ -1,21 +1,21 @@ import * as Router from 'koa-router'; -import config from '../../config'; +import config from '~/config'; import $ from 'cafy'; -import { ID } from '../../misc/cafy-id'; -import { renderActivity } from '../../remote/activitypub/renderer'; -import renderOrderedCollection from '../../remote/activitypub/renderer/ordered-collection'; -import renderOrderedCollectionPage from '../../remote/activitypub/renderer/ordered-collection-page'; -import { setResponseType } from '../activitypub'; -import renderNote from '../../remote/activitypub/renderer/note'; -import renderCreate from '../../remote/activitypub/renderer/create'; -import renderAnnounce from '../../remote/activitypub/renderer/announce'; -import { countIf } from '../../prelude/array'; -import * as url from '../../prelude/url'; -import { Users, Notes } from '../../models'; -import { makePaginationQuery } from '../api/common/make-pagination-query'; +import { ID } from '~/misc/cafy-id'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import renderOrderedCollection from '~/remote/activitypub/renderer/ordered-collection'; +import renderOrderedCollectionPage from '~/remote/activitypub/renderer/ordered-collection-page'; +import { setResponseType } from '.'; +import renderNote from '~/remote/activitypub/renderer/note'; +import renderCreate from '~/remote/activitypub/renderer/create'; +import renderAnnounce from '~/remote/activitypub/renderer/announce'; +import { countIf } from '~/prelude/array'; +import * as url from '~/prelude/url'; +import { Users, Notes } from '~/models'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; import { Brackets } from 'typeorm'; -import { Note } from '../../models/entities/note'; -import { ensure } from '../../prelude/ensure'; +import { Note } from '~/models/entities/note'; +import { ensure } from '~/prelude/ensure'; export default async (ctx: Router.IRouterContext) => { const userId = ctx.params.user; diff --git a/src/server/api/2fa.ts b/src/server/api/2fa.ts index 3bc4627a6..12b4dedfb 100644 --- a/src/server/api/2fa.ts +++ b/src/server/api/2fa.ts @@ -1,5 +1,5 @@ import * as crypto from 'crypto'; -import config from '../../config'; +import config from '~/config'; import * as jsrsasign from 'jsrsasign'; const ECC_PRELUDE = Buffer.from([0x04]); diff --git a/src/server/api/authenticate.ts b/src/server/api/authenticate.ts index 519ed7738..4b8228793 100644 --- a/src/server/api/authenticate.ts +++ b/src/server/api/authenticate.ts @@ -1,7 +1,7 @@ import isNativeToken from './common/is-native-token'; -import { User } from '../../models/entities/user'; -import { App } from '../../models/entities/app'; -import { Users, AccessTokens, Apps } from '../../models'; +import { User } from '~/models/entities/user'; +import { App } from '~/models/entities/app'; +import { Users, AccessTokens, Apps } from '~/models'; export default async (token: string): Promise<[User | null | undefined, App | null | undefined]> => { if (token == null) { diff --git a/src/server/api/call.ts b/src/server/api/call.ts index 8be1b71cf..ddb771022 100644 --- a/src/server/api/call.ts +++ b/src/server/api/call.ts @@ -1,10 +1,10 @@ import { performance } from 'perf_hooks'; import limiter from './limiter'; -import { User } from '../../models/entities/user'; +import { User } from '~/models/entities/user'; import endpoints from './endpoints'; import { ApiError } from './error'; import { apiLogger } from './logger'; -import { App } from '../../models/entities/app'; +import { App } from '~/models/entities/app'; const accessDenied = { message: 'Access denied.', diff --git a/src/server/api/common/generate-block-query.ts b/src/server/api/common/generate-block-query.ts index 363641048..70aae4ac0 100644 --- a/src/server/api/common/generate-block-query.ts +++ b/src/server/api/common/generate-block-query.ts @@ -1,5 +1,5 @@ -import { User } from '../../../models/entities/user'; -import { Blockings } from '../../../models'; +import { User } from '~/models/entities/user'; +import { Blockings } from '~/models'; import { SelectQueryBuilder } from 'typeorm'; export function generateBlockQueryForUsers(q: SelectQueryBuilder, me: User) { diff --git a/src/server/api/common/generate-mute-query.ts b/src/server/api/common/generate-mute-query.ts index 090c14eb8..f9479ae9e 100644 --- a/src/server/api/common/generate-mute-query.ts +++ b/src/server/api/common/generate-mute-query.ts @@ -1,5 +1,5 @@ -import { User } from '../../../models/entities/user'; -import { Mutings } from '../../../models'; +import { User } from '~/models/entities/user'; +import { Mutings } from '~/models'; import { SelectQueryBuilder, Brackets } from 'typeorm'; export function generateMuteQuery(q: SelectQueryBuilder, me: User) { diff --git a/src/server/api/common/generate-visibility-query.ts b/src/server/api/common/generate-visibility-query.ts index 2807dc99d..2ca32f4d9 100644 --- a/src/server/api/common/generate-visibility-query.ts +++ b/src/server/api/common/generate-visibility-query.ts @@ -1,5 +1,5 @@ -import { User } from '../../../models/entities/user'; -import { Followings } from '../../../models'; +import { User } from '~/models/entities/user'; +import { Followings } from '~/models'; import { Brackets, SelectQueryBuilder } from 'typeorm'; export function generateVisibilityQuery(q: SelectQueryBuilder, me?: User) { diff --git a/src/server/api/common/getters.ts b/src/server/api/common/getters.ts index 04716d19c..13f02ef05 100644 --- a/src/server/api/common/getters.ts +++ b/src/server/api/common/getters.ts @@ -1,7 +1,7 @@ -import { IdentifiableError } from '../../../misc/identifiable-error'; -import { User } from '../../../models/entities/user'; -import { Note } from '../../../models/entities/note'; -import { Notes, Users } from '../../../models'; +import { IdentifiableError } from '~/misc/identifiable-error'; +import { User } from '~/models/entities/user'; +import { Note } from '~/models/entities/note'; +import { Notes, Users } from '~/models'; /** * Get note for API processing diff --git a/src/server/api/common/read-messaging-message.ts b/src/server/api/common/read-messaging-message.ts index d18d8cd9d..382b27f43 100644 --- a/src/server/api/common/read-messaging-message.ts +++ b/src/server/api/common/read-messaging-message.ts @@ -1,12 +1,12 @@ -import { publishMainStream, publishGroupMessagingStream } from '../../../services/stream'; -import { publishMessagingStream } from '../../../services/stream'; -import { publishMessagingIndexStream } from '../../../services/stream'; -import { User } from '../../../models/entities/user'; -import { MessagingMessage } from '../../../models/entities/messaging-message'; -import { MessagingMessages, UserGroupJoinings, Users } from '../../../models'; +import { publishMainStream, publishGroupMessagingStream } from '~/services/stream'; +import { publishMessagingStream } from '~/services/stream'; +import { publishMessagingIndexStream } from '~/services/stream'; +import { User } from '~/models/entities/user'; +import { MessagingMessage } from '~/models/entities/messaging-message'; +import { MessagingMessages, UserGroupJoinings, Users } from '~/models'; import { In } from 'typeorm'; -import { IdentifiableError } from '../../../misc/identifiable-error'; -import { UserGroup } from '../../../models/entities/user-group'; +import { IdentifiableError } from '~/misc/identifiable-error'; +import { UserGroup } from '~/models/entities/user-group'; /** * Mark messages as read diff --git a/src/server/api/common/read-notification.ts b/src/server/api/common/read-notification.ts index c8d43ba28..366132dea 100644 --- a/src/server/api/common/read-notification.ts +++ b/src/server/api/common/read-notification.ts @@ -1,7 +1,7 @@ -import { publishMainStream } from '../../../services/stream'; -import { User } from '../../../models/entities/user'; -import { Notification } from '../../../models/entities/notification'; -import { Mutings, Notifications } from '../../../models'; +import { publishMainStream } from '~/services/stream'; +import { User } from '~/models/entities/user'; +import { Notification } from '~/models/entities/notification'; +import { Mutings, Notifications } from '~/models'; import { In, Not } from 'typeorm'; /** diff --git a/src/server/api/common/signin.ts b/src/server/api/common/signin.ts index 37229ad1b..262fe199b 100644 --- a/src/server/api/common/signin.ts +++ b/src/server/api/common/signin.ts @@ -1,10 +1,10 @@ import * as Koa from 'koa'; -import config from '../../../config'; -import { ILocalUser } from '../../../models/entities/user'; -import { Signins } from '../../../models'; -import { genId } from '../../../misc/gen-id'; -import { publishMainStream } from '../../../services/stream'; +import config from '~/config'; +import { ILocalUser } from '~/models/entities/user'; +import { Signins } from '~/models'; +import { genId } from '~/misc/gen-id'; +import { publishMainStream } from '~/services/stream'; export default function(ctx: Koa.BaseContext, user: ILocalUser, redirect = false) { if (redirect) { diff --git a/src/server/api/define.ts b/src/server/api/define.ts index f9e9813a8..2c80f43f3 100644 --- a/src/server/api/define.ts +++ b/src/server/api/define.ts @@ -1,9 +1,9 @@ import * as fs from 'fs'; -import { ILocalUser } from '../../models/entities/user'; +import { ILocalUser } from '~/models/entities/user'; import { IEndpointMeta } from './endpoints'; import { ApiError } from './error'; -import { App } from '../../models/entities/app'; -import { SchemaType } from '../../misc/schema'; +import { App } from '~/models/entities/app'; +import { SchemaType } from '~/misc/schema'; type Params = { [P in keyof T['params']]: NonNullable[P]['transform'] extends Function diff --git a/src/server/api/endpoints.ts b/src/server/api/endpoints.ts index 1a8fca6df..c8ca64898 100644 --- a/src/server/api/endpoints.ts +++ b/src/server/api/endpoints.ts @@ -1,7 +1,7 @@ import { Context } from 'cafy'; import * as path from 'path'; import * as glob from 'glob'; -import { Schema } from '../../misc/schema'; +import { Schema } from '~/misc/schema'; export type Param = { validator: Context; diff --git a/src/server/api/endpoints/admin/abuse-user-reports.ts b/src/server/api/endpoints/admin/abuse-user-reports.ts index 63d1dd795..1630b4832 100644 --- a/src/server/api/endpoints/admin/abuse-user-reports.ts +++ b/src/server/api/endpoints/admin/abuse-user-reports.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { AbuseUserReports } from '../../../../models'; -import { makePaginationQuery } from '../../common/make-pagination-query'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { AbuseUserReports } from '~/models'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; export const meta = { tags: ['admin'], diff --git a/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts b/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts index 276d1f37b..92b6f267a 100644 --- a/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts +++ b/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import define from '../../define'; -import { deleteFile } from '../../../../services/drive/delete-file'; -import { DriveFiles } from '../../../../models'; -import { ID } from '../../../../misc/cafy-id'; +import define from '~/server/api/define'; +import { deleteFile } from '~/services/drive/delete-file'; +import { DriveFiles } from '~/models'; +import { ID } from '~/misc/cafy-id'; export const meta = { tags: ['admin'], diff --git a/src/server/api/endpoints/admin/delete-logs.ts b/src/server/api/endpoints/admin/delete-logs.ts index 26cf13c1f..20420693e 100644 --- a/src/server/api/endpoints/admin/delete-logs.ts +++ b/src/server/api/endpoints/admin/delete-logs.ts @@ -1,5 +1,5 @@ -import define from '../../define'; -import { Logs } from '../../../../models'; +import define from '~/server/api/define'; +import { Logs } from '~/models'; export const meta = { tags: ['admin'], diff --git a/src/server/api/endpoints/admin/drive/clean-remote-files.ts b/src/server/api/endpoints/admin/drive/clean-remote-files.ts index e837ae1bb..2c257aa0a 100644 --- a/src/server/api/endpoints/admin/drive/clean-remote-files.ts +++ b/src/server/api/endpoints/admin/drive/clean-remote-files.ts @@ -1,5 +1,5 @@ -import define from '../../../define'; -import { createCleanRemoteFilesJob } from '../../../../../queue'; +import define from '~/server/api/define'; +import { createCleanRemoteFilesJob } from '~/queue'; export const meta = { tags: ['admin'], diff --git a/src/server/api/endpoints/admin/drive/cleanup.ts b/src/server/api/endpoints/admin/drive/cleanup.ts index 272416dee..f9a6e8da7 100644 --- a/src/server/api/endpoints/admin/drive/cleanup.ts +++ b/src/server/api/endpoints/admin/drive/cleanup.ts @@ -1,7 +1,7 @@ import { IsNull } from 'typeorm'; -import define from '../../../define'; -import { deleteFile } from '../../../../../services/drive/delete-file'; -import { DriveFiles } from '../../../../../models'; +import define from '~/server/api/define'; +import { deleteFile } from '~/services/drive/delete-file'; +import { DriveFiles } from '~/models'; export const meta = { tags: ['admin'], diff --git a/src/server/api/endpoints/admin/drive/files.ts b/src/server/api/endpoints/admin/drive/files.ts index 7c6672e6d..cb26d1ead 100644 --- a/src/server/api/endpoints/admin/drive/files.ts +++ b/src/server/api/endpoints/admin/drive/files.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import define from '../../../define'; -import { fallback } from '../../../../../prelude/symbol'; -import { DriveFiles } from '../../../../../models'; +import define from '~/server/api/define'; +import { fallback } from '~/prelude/symbol'; +import { DriveFiles } from '~/models'; export const meta = { tags: ['admin'], diff --git a/src/server/api/endpoints/admin/drive/show-file.ts b/src/server/api/endpoints/admin/drive/show-file.ts index a2b6c158f..9ac71cce3 100644 --- a/src/server/api/endpoints/admin/drive/show-file.ts +++ b/src/server/api/endpoints/admin/drive/show-file.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { DriveFiles } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { DriveFiles } from '~/models'; export const meta = { tags: ['admin'], diff --git a/src/server/api/endpoints/admin/emoji/add.ts b/src/server/api/endpoints/admin/emoji/add.ts index 8c21b1c73..71f60131a 100644 --- a/src/server/api/endpoints/admin/emoji/add.ts +++ b/src/server/api/endpoints/admin/emoji/add.ts @@ -1,10 +1,10 @@ import $ from 'cafy'; -import define from '../../../define'; -import { detectUrlMine } from '../../../../../misc/detect-url-mine'; -import { Emojis } from '../../../../../models'; -import { genId } from '../../../../../misc/gen-id'; +import define from '~/server/api/define'; +import { detectUrlMine } from '~/misc/detect-url-mine'; +import { Emojis } from '~/models'; +import { genId } from '~/misc/gen-id'; import { getConnection } from 'typeorm'; -import { insertModerationLog } from '../../../../../services/insert-moderation-log'; +import { insertModerationLog } from '~/services/insert-moderation-log'; export const meta = { desc: { diff --git a/src/server/api/endpoints/admin/emoji/list.ts b/src/server/api/endpoints/admin/emoji/list.ts index 54686a5c5..a703e483e 100644 --- a/src/server/api/endpoints/admin/emoji/list.ts +++ b/src/server/api/endpoints/admin/emoji/list.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import define from '../../../define'; -import { Emojis } from '../../../../../models'; -import { toPunyNullable } from '../../../../../misc/convert-host'; +import define from '~/server/api/define'; +import { Emojis } from '~/models'; +import { toPunyNullable } from '~/misc/convert-host'; export const meta = { desc: { diff --git a/src/server/api/endpoints/admin/emoji/remove.ts b/src/server/api/endpoints/admin/emoji/remove.ts index 92c5f5f8c..8dd60a5e7 100644 --- a/src/server/api/endpoints/admin/emoji/remove.ts +++ b/src/server/api/endpoints/admin/emoji/remove.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import define from '../../../define'; -import { ID } from '../../../../../misc/cafy-id'; -import { Emojis } from '../../../../../models'; +import define from '~/server/api/define'; +import { ID } from '~/misc/cafy-id'; +import { Emojis } from '~/models'; import { getConnection } from 'typeorm'; -import { insertModerationLog } from '../../../../../services/insert-moderation-log'; +import { insertModerationLog } from '~/services/insert-moderation-log'; export const meta = { desc: { diff --git a/src/server/api/endpoints/admin/emoji/update.ts b/src/server/api/endpoints/admin/emoji/update.ts index f8bc638fc..7e2ec9fc4 100644 --- a/src/server/api/endpoints/admin/emoji/update.ts +++ b/src/server/api/endpoints/admin/emoji/update.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import define from '../../../define'; -import { detectUrlMine } from '../../../../../misc/detect-url-mine'; -import { ID } from '../../../../../misc/cafy-id'; -import { Emojis } from '../../../../../models'; +import define from '~/server/api/define'; +import { detectUrlMine } from '~/misc/detect-url-mine'; +import { ID } from '~/misc/cafy-id'; +import { Emojis } from '~/models'; import { getConnection } from 'typeorm'; export const meta = { diff --git a/src/server/api/endpoints/admin/federation/delete-all-files.ts b/src/server/api/endpoints/admin/federation/delete-all-files.ts index 24ad9ce80..6a6cc0e40 100644 --- a/src/server/api/endpoints/admin/federation/delete-all-files.ts +++ b/src/server/api/endpoints/admin/federation/delete-all-files.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import define from '../../../define'; -import { deleteFile } from '../../../../../services/drive/delete-file'; -import { DriveFiles } from '../../../../../models'; +import define from '~/server/api/define'; +import { deleteFile } from '~/services/drive/delete-file'; +import { DriveFiles } from '~/models'; export const meta = { tags: ['admin'], diff --git a/src/server/api/endpoints/admin/federation/remove-all-following.ts b/src/server/api/endpoints/admin/federation/remove-all-following.ts index 25aae6db8..65983b38d 100644 --- a/src/server/api/endpoints/admin/federation/remove-all-following.ts +++ b/src/server/api/endpoints/admin/federation/remove-all-following.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import define from '../../../define'; -import deleteFollowing from '../../../../../services/following/delete'; -import { Followings, Users } from '../../../../../models'; -import { ensure } from '../../../../../prelude/ensure'; +import define from '~/server/api/define'; +import deleteFollowing from '~/services/following/delete'; +import { Followings, Users } from '~/models'; +import { ensure } from '~/prelude/ensure'; export const meta = { tags: ['admin'], diff --git a/src/server/api/endpoints/admin/federation/update-instance.ts b/src/server/api/endpoints/admin/federation/update-instance.ts index 90ab7a3ec..2121a2d20 100644 --- a/src/server/api/endpoints/admin/federation/update-instance.ts +++ b/src/server/api/endpoints/admin/federation/update-instance.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import define from '../../../define'; -import { Instances } from '../../../../../models'; -import { toPuny } from '../../../../../misc/convert-host'; +import define from '~/server/api/define'; +import { Instances } from '~/models'; +import { toPuny } from '~/misc/convert-host'; export const meta = { tags: ['admin'], diff --git a/src/server/api/endpoints/admin/get-table-stats.ts b/src/server/api/endpoints/admin/get-table-stats.ts index 1abea1849..21ee34eb6 100644 --- a/src/server/api/endpoints/admin/get-table-stats.ts +++ b/src/server/api/endpoints/admin/get-table-stats.ts @@ -1,4 +1,4 @@ -import define from '../../define'; +import define from '~/server/api/define'; import { getConnection } from 'typeorm'; export const meta = { diff --git a/src/server/api/endpoints/admin/invite.ts b/src/server/api/endpoints/admin/invite.ts index 4e264feef..5412ff8ad 100644 --- a/src/server/api/endpoints/admin/invite.ts +++ b/src/server/api/endpoints/admin/invite.ts @@ -1,7 +1,7 @@ import rndstr from 'rndstr'; -import define from '../../define'; -import { RegistrationTickets } from '../../../../models'; -import { genId } from '../../../../misc/gen-id'; +import define from '~/server/api/define'; +import { RegistrationTickets } from '~/models'; +import { genId } from '~/misc/gen-id'; export const meta = { desc: { diff --git a/src/server/api/endpoints/admin/logs.ts b/src/server/api/endpoints/admin/logs.ts index 060df09ad..289c8f0e2 100644 --- a/src/server/api/endpoints/admin/logs.ts +++ b/src/server/api/endpoints/admin/logs.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; -import define from '../../define'; -import { Logs } from '../../../../models'; +import define from '~/server/api/define'; +import { Logs } from '~/models'; import { Brackets } from 'typeorm'; export const meta = { diff --git a/src/server/api/endpoints/admin/moderators/add.ts b/src/server/api/endpoints/admin/moderators/add.ts index a15f0a17a..2af78bbad 100644 --- a/src/server/api/endpoints/admin/moderators/add.ts +++ b/src/server/api/endpoints/admin/moderators/add.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { Users } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { Users } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/admin/moderators/remove.ts b/src/server/api/endpoints/admin/moderators/remove.ts index 209cf0814..9df627f31 100644 --- a/src/server/api/endpoints/admin/moderators/remove.ts +++ b/src/server/api/endpoints/admin/moderators/remove.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { Users } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { Users } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/admin/queue/clear.ts b/src/server/api/endpoints/admin/queue/clear.ts index 03c1ae846..4f3963c43 100644 --- a/src/server/api/endpoints/admin/queue/clear.ts +++ b/src/server/api/endpoints/admin/queue/clear.ts @@ -1,6 +1,6 @@ -import define from '../../../define'; -import { destroy } from '../../../../../queue'; -import { insertModerationLog } from '../../../../../services/insert-moderation-log'; +import define from '~/server/api/define'; +import { destroy } from '~/queue'; +import { insertModerationLog } from '~/services/insert-moderation-log'; export const meta = { tags: ['admin'], diff --git a/src/server/api/endpoints/admin/queue/jobs.ts b/src/server/api/endpoints/admin/queue/jobs.ts index 4e4777569..de5905367 100644 --- a/src/server/api/endpoints/admin/queue/jobs.ts +++ b/src/server/api/endpoints/admin/queue/jobs.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; -import define from '../../../define'; -import { deliverQueue, inboxQueue } from '../../../../../queue'; +import define from '~/server/api/define'; +import { deliverQueue, inboxQueue } from '~/queue'; export const meta = { tags: ['admin'], diff --git a/src/server/api/endpoints/admin/queue/stats.ts b/src/server/api/endpoints/admin/queue/stats.ts index 83684685f..78605e3c3 100644 --- a/src/server/api/endpoints/admin/queue/stats.ts +++ b/src/server/api/endpoints/admin/queue/stats.ts @@ -1,5 +1,5 @@ -import define from '../../../define'; -import { deliverQueue, inboxQueue, dbQueue, objectStorageQueue } from '../../../../../queue'; +import define from '~/server/api/define'; +import { deliverQueue, inboxQueue, dbQueue, objectStorageQueue } from '~/queue'; export const meta = { tags: ['admin'], diff --git a/src/server/api/endpoints/admin/remove-abuse-user-report.ts b/src/server/api/endpoints/admin/remove-abuse-user-report.ts index f293c0071..f4a7d6fcf 100644 --- a/src/server/api/endpoints/admin/remove-abuse-user-report.ts +++ b/src/server/api/endpoints/admin/remove-abuse-user-report.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { AbuseUserReports } from '../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { AbuseUserReports } from '~/models'; export const meta = { tags: ['admin'], diff --git a/src/server/api/endpoints/admin/reset-password.ts b/src/server/api/endpoints/admin/reset-password.ts index 42df66860..55a075a40 100644 --- a/src/server/api/endpoints/admin/reset-password.ts +++ b/src/server/api/endpoints/admin/reset-password.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; import * as bcrypt from 'bcryptjs'; import rndstr from 'rndstr'; -import { Users, UserProfiles } from '../../../../models'; +import { Users, UserProfiles } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/admin/send-email.ts b/src/server/api/endpoints/admin/send-email.ts index fed4f2df1..6a042cdcc 100644 --- a/src/server/api/endpoints/admin/send-email.ts +++ b/src/server/api/endpoints/admin/send-email.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; -import define from '../../define'; -import { sendEmail } from '../../../../services/send-email'; +import define from '~/server/api/define'; +import { sendEmail } from '~/services/send-email'; export const meta = { tags: ['admin'], diff --git a/src/server/api/endpoints/admin/show-moderation-logs.ts b/src/server/api/endpoints/admin/show-moderation-logs.ts index bc67b3e55..845424441 100644 --- a/src/server/api/endpoints/admin/show-moderation-logs.ts +++ b/src/server/api/endpoints/admin/show-moderation-logs.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { ModerationLogs } from '../../../../models'; -import { makePaginationQuery } from '../../common/make-pagination-query'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ModerationLogs } from '~/models'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; export const meta = { tags: ['admin'], diff --git a/src/server/api/endpoints/admin/show-user.ts b/src/server/api/endpoints/admin/show-user.ts index 452125dea..2191e134c 100644 --- a/src/server/api/endpoints/admin/show-user.ts +++ b/src/server/api/endpoints/admin/show-user.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { Users } from '../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { Users } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/admin/show-users.ts b/src/server/api/endpoints/admin/show-users.ts index 89e0cf1e2..52ee7df32 100644 --- a/src/server/api/endpoints/admin/show-users.ts +++ b/src/server/api/endpoints/admin/show-users.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; -import define from '../../define'; -import { Users } from '../../../../models'; +import define from '~/server/api/define'; +import { Users } from '~/models'; export const meta = { tags: ['admin'], diff --git a/src/server/api/endpoints/admin/silence-user.ts b/src/server/api/endpoints/admin/silence-user.ts index 8cc84aa1c..0eab14052 100644 --- a/src/server/api/endpoints/admin/silence-user.ts +++ b/src/server/api/endpoints/admin/silence-user.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { Users } from '../../../../models'; -import { insertModerationLog } from '../../../../services/insert-moderation-log'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { Users } from '~/models'; +import { insertModerationLog } from '~/services/insert-moderation-log'; export const meta = { desc: { diff --git a/src/server/api/endpoints/admin/suspend-user.ts b/src/server/api/endpoints/admin/suspend-user.ts index 6ba0d9150..83e22eb92 100644 --- a/src/server/api/endpoints/admin/suspend-user.ts +++ b/src/server/api/endpoints/admin/suspend-user.ts @@ -1,11 +1,11 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import deleteFollowing from '../../../../services/following/delete'; -import { Users, Followings } from '../../../../models'; -import { User } from '../../../../models/entities/user'; -import { insertModerationLog } from '../../../../services/insert-moderation-log'; -import { doPostSuspend } from '../../../../services/suspend-user'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import deleteFollowing from '~/services/following/delete'; +import { Users, Followings } from '~/models'; +import { User } from '~/models/entities/user'; +import { insertModerationLog } from '~/services/insert-moderation-log'; +import { doPostSuspend } from '~/services/suspend-user'; export const meta = { desc: { diff --git a/src/server/api/endpoints/admin/unsilence-user.ts b/src/server/api/endpoints/admin/unsilence-user.ts index 607c9b699..d5f6ac9eb 100644 --- a/src/server/api/endpoints/admin/unsilence-user.ts +++ b/src/server/api/endpoints/admin/unsilence-user.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { Users } from '../../../../models'; -import { insertModerationLog } from '../../../../services/insert-moderation-log'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { Users } from '~/models'; +import { insertModerationLog } from '~/services/insert-moderation-log'; export const meta = { desc: { diff --git a/src/server/api/endpoints/admin/unsuspend-user.ts b/src/server/api/endpoints/admin/unsuspend-user.ts index 237585e27..b91e7f7be 100644 --- a/src/server/api/endpoints/admin/unsuspend-user.ts +++ b/src/server/api/endpoints/admin/unsuspend-user.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { Users } from '../../../../models'; -import { insertModerationLog } from '../../../../services/insert-moderation-log'; -import { doPostUnsuspend } from '../../../../services/unsuspend-user'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { Users } from '~/models'; +import { insertModerationLog } from '~/services/insert-moderation-log'; +import { doPostUnsuspend } from '~/services/unsuspend-user'; export const meta = { desc: { diff --git a/src/server/api/endpoints/admin/update-meta.ts b/src/server/api/endpoints/admin/update-meta.ts index 834faa42b..02b7c40d0 100644 --- a/src/server/api/endpoints/admin/update-meta.ts +++ b/src/server/api/endpoints/admin/update-meta.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import define from '../../define'; +import define from '~/server/api/define'; import { getConnection } from 'typeorm'; -import { Meta } from '../../../../models/entities/meta'; -import { insertModerationLog } from '../../../../services/insert-moderation-log'; +import { Meta } from '~/models/entities/meta'; +import { insertModerationLog } from '~/services/insert-moderation-log'; export const meta = { desc: { diff --git a/src/server/api/endpoints/admin/update-remote-user.ts b/src/server/api/endpoints/admin/update-remote-user.ts index f9716328d..a7599e885 100644 --- a/src/server/api/endpoints/admin/update-remote-user.ts +++ b/src/server/api/endpoints/admin/update-remote-user.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { getRemoteUser } from '../../common/getters'; -import { updatePerson } from '../../../../remote/activitypub/models/person'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { getRemoteUser } from '~/server/api/common/getters'; +import { updatePerson } from '~/remote/activitypub/models/person'; export const meta = { desc: { diff --git a/src/server/api/endpoints/admin/vacuum.ts b/src/server/api/endpoints/admin/vacuum.ts index 4921e228e..925fa6ab0 100644 --- a/src/server/api/endpoints/admin/vacuum.ts +++ b/src/server/api/endpoints/admin/vacuum.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import define from '../../define'; +import define from '~/server/api/define'; import { getConnection } from 'typeorm'; -import { insertModerationLog } from '../../../../services/insert-moderation-log'; +import { insertModerationLog } from '~/services/insert-moderation-log'; export const meta = { tags: ['admin'], diff --git a/src/server/api/endpoints/ap/show.ts b/src/server/api/endpoints/ap/show.ts index bbaa1fa10..c2629b268 100644 --- a/src/server/api/endpoints/ap/show.ts +++ b/src/server/api/endpoints/ap/show.ts @@ -1,16 +1,16 @@ import $ from 'cafy'; -import define from '../../define'; -import config from '../../../../config'; -import { createPerson } from '../../../../remote/activitypub/models/person'; -import { createNote } from '../../../../remote/activitypub/models/note'; -import Resolver from '../../../../remote/activitypub/resolver'; -import { ApiError } from '../../error'; -import { extractDbHost } from '../../../../misc/convert-host'; -import { Users, Notes } from '../../../../models'; -import { Note } from '../../../../models/entities/note'; -import { User } from '../../../../models/entities/user'; -import { fetchMeta } from '../../../../misc/fetch-meta'; -import { validActor, validPost } from '../../../../remote/activitypub/type'; +import define from '~/server/api/define'; +import config from '~/config'; +import { createPerson } from '~/remote/activitypub/models/person'; +import { createNote } from '~/remote/activitypub/models/note'; +import Resolver from '~/remote/activitypub/resolver'; +import { ApiError } from '~/server/api/error'; +import { extractDbHost } from '~/misc/convert-host'; +import { Users, Notes } from '~/models'; +import { Note } from '~/models/entities/note'; +import { User } from '~/models/entities/user'; +import { fetchMeta } from '~/misc/fetch-meta'; +import { validActor, validPost } from '~/remote/activitypub/type'; export const meta = { tags: ['federation'], diff --git a/src/server/api/endpoints/app/create.ts b/src/server/api/endpoints/app/create.ts index 81c851f3a..ef85c6c7d 100644 --- a/src/server/api/endpoints/app/create.ts +++ b/src/server/api/endpoints/app/create.ts @@ -1,9 +1,9 @@ import rndstr from 'rndstr'; import $ from 'cafy'; -import define from '../../define'; -import { Apps } from '../../../../models'; -import { genId } from '../../../../misc/gen-id'; -import { unique } from '../../../../prelude/array'; +import define from '~/server/api/define'; +import { Apps } from '~/models'; +import { genId } from '~/misc/gen-id'; +import { unique } from '~/prelude/array'; export const meta = { tags: ['app'], diff --git a/src/server/api/endpoints/app/show.ts b/src/server/api/endpoints/app/show.ts index 2c8cdbe39..846301261 100644 --- a/src/server/api/endpoints/app/show.ts +++ b/src/server/api/endpoints/app/show.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { Apps } from '../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { Apps } from '~/models'; export const meta = { tags: ['app'], diff --git a/src/server/api/endpoints/auth/accept.ts b/src/server/api/endpoints/auth/accept.ts index be7f3b546..fb03c379c 100644 --- a/src/server/api/endpoints/auth/accept.ts +++ b/src/server/api/endpoints/auth/accept.ts @@ -1,11 +1,11 @@ import rndstr from 'rndstr'; import * as crypto from 'crypto'; import $ from 'cafy'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { AuthSessions, AccessTokens, Apps } from '../../../../models'; -import { genId } from '../../../../misc/gen-id'; -import { ensure } from '../../../../prelude/ensure'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { AuthSessions, AccessTokens, Apps } from '~/models'; +import { genId } from '~/misc/gen-id'; +import { ensure } from '~/prelude/ensure'; export const meta = { tags: ['auth'], diff --git a/src/server/api/endpoints/auth/session/generate.ts b/src/server/api/endpoints/auth/session/generate.ts index b38c275de..c0d6628b4 100644 --- a/src/server/api/endpoints/auth/session/generate.ts +++ b/src/server/api/endpoints/auth/session/generate.ts @@ -1,10 +1,10 @@ import * as uuid from 'uuid'; import $ from 'cafy'; -import config from '../../../../../config'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { Apps, AuthSessions } from '../../../../../models'; -import { genId } from '../../../../../misc/gen-id'; +import config from '~/config'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { Apps, AuthSessions } from '~/models'; +import { genId } from '~/misc/gen-id'; export const meta = { tags: ['auth'], diff --git a/src/server/api/endpoints/auth/session/show.ts b/src/server/api/endpoints/auth/session/show.ts index e6ecd8b83..9f7ef8d76 100644 --- a/src/server/api/endpoints/auth/session/show.ts +++ b/src/server/api/endpoints/auth/session/show.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { AuthSessions } from '../../../../../models'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { AuthSessions } from '~/models'; export const meta = { tags: ['auth'], diff --git a/src/server/api/endpoints/auth/session/userkey.ts b/src/server/api/endpoints/auth/session/userkey.ts index 1dc78eeab..2ad060e1e 100644 --- a/src/server/api/endpoints/auth/session/userkey.ts +++ b/src/server/api/endpoints/auth/session/userkey.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { Apps, AuthSessions, AccessTokens, Users } from '../../../../../models'; -import { ensure } from '../../../../../prelude/ensure'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { Apps, AuthSessions, AccessTokens, Users } from '~/models'; +import { ensure } from '~/prelude/ensure'; export const meta = { tags: ['auth'], diff --git a/src/server/api/endpoints/blocking/create.ts b/src/server/api/endpoints/blocking/create.ts index 045be6aef..cfb240c8f 100644 --- a/src/server/api/endpoints/blocking/create.ts +++ b/src/server/api/endpoints/blocking/create.ts @@ -1,11 +1,11 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; +import { ID } from '~/misc/cafy-id'; import * as ms from 'ms'; -import create from '../../../../services/blocking/create'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { getUser } from '../../common/getters'; -import { Blockings, NoteWatchings, Users } from '../../../../models'; +import create from '~/services/blocking/create'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { getUser } from '~/server/api/common/getters'; +import { Blockings, NoteWatchings, Users } from '~/models'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/blocking/delete.ts b/src/server/api/endpoints/blocking/delete.ts index ecb5d1109..aed68db68 100644 --- a/src/server/api/endpoints/blocking/delete.ts +++ b/src/server/api/endpoints/blocking/delete.ts @@ -1,11 +1,11 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; +import { ID } from '~/misc/cafy-id'; import * as ms from 'ms'; -import deleteBlocking from '../../../../services/blocking/delete'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { getUser } from '../../common/getters'; -import { Blockings, Users } from '../../../../models'; +import deleteBlocking from '~/services/blocking/delete'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { getUser } from '~/server/api/common/getters'; +import { Blockings, Users } from '~/models'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/blocking/list.ts b/src/server/api/endpoints/blocking/list.ts index c99ba09df..357a8e705 100644 --- a/src/server/api/endpoints/blocking/list.ts +++ b/src/server/api/endpoints/blocking/list.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { Blockings } from '../../../../models'; -import { makePaginationQuery } from '../../common/make-pagination-query'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { Blockings } from '~/models'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; export const meta = { desc: { diff --git a/src/server/api/endpoints/charts/active-users.ts b/src/server/api/endpoints/charts/active-users.ts index f0349b17f..b5558baf8 100644 --- a/src/server/api/endpoints/charts/active-users.ts +++ b/src/server/api/endpoints/charts/active-users.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import define from '../../define'; -import { convertLog } from '../../../../services/chart/core'; -import { activeUsersChart } from '../../../../services/chart'; +import define from '~/server/api/define'; +import { convertLog } from '~/services/chart/core'; +import { activeUsersChart } from '~/services/chart'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/charts/drive.ts b/src/server/api/endpoints/charts/drive.ts index ae6d89440..d1d46f27e 100644 --- a/src/server/api/endpoints/charts/drive.ts +++ b/src/server/api/endpoints/charts/drive.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import define from '../../define'; -import { convertLog } from '../../../../services/chart/core'; -import { driveChart } from '../../../../services/chart'; +import define from '~/server/api/define'; +import { convertLog } from '~/services/chart/core'; +import { driveChart } from '~/services/chart'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/charts/federation.ts b/src/server/api/endpoints/charts/federation.ts index 34e9bfee5..40540d791 100644 --- a/src/server/api/endpoints/charts/federation.ts +++ b/src/server/api/endpoints/charts/federation.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import define from '../../define'; -import { convertLog } from '../../../../services/chart/core'; -import { federationChart } from '../../../../services/chart'; +import define from '~/server/api/define'; +import { convertLog } from '~/services/chart/core'; +import { federationChart } from '~/services/chart'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/charts/hashtag.ts b/src/server/api/endpoints/charts/hashtag.ts index eceb0b275..6ea600fe1 100644 --- a/src/server/api/endpoints/charts/hashtag.ts +++ b/src/server/api/endpoints/charts/hashtag.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import define from '../../define'; -import { convertLog } from '../../../../services/chart/core'; -import { hashtagChart } from '../../../../services/chart'; +import define from '~/server/api/define'; +import { convertLog } from '~/services/chart/core'; +import { hashtagChart } from '~/services/chart'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/charts/instance.ts b/src/server/api/endpoints/charts/instance.ts index e99c17ae6..40159cc91 100644 --- a/src/server/api/endpoints/charts/instance.ts +++ b/src/server/api/endpoints/charts/instance.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import define from '../../define'; -import { convertLog } from '../../../../services/chart/core'; -import { instanceChart } from '../../../../services/chart'; +import define from '~/server/api/define'; +import { convertLog } from '~/services/chart/core'; +import { instanceChart } from '~/services/chart'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/charts/network.ts b/src/server/api/endpoints/charts/network.ts index 648588fbe..e4e1af0c5 100644 --- a/src/server/api/endpoints/charts/network.ts +++ b/src/server/api/endpoints/charts/network.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import define from '../../define'; -import { convertLog } from '../../../../services/chart/core'; -import { networkChart } from '../../../../services/chart'; +import define from '~/server/api/define'; +import { convertLog } from '~/services/chart/core'; +import { networkChart } from '~/services/chart'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/charts/notes.ts b/src/server/api/endpoints/charts/notes.ts index 074c4978c..8bd637926 100644 --- a/src/server/api/endpoints/charts/notes.ts +++ b/src/server/api/endpoints/charts/notes.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import define from '../../define'; -import { convertLog } from '../../../../services/chart/core'; -import { notesChart } from '../../../../services/chart'; +import define from '~/server/api/define'; +import { convertLog } from '~/services/chart/core'; +import { notesChart } from '~/services/chart'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/charts/user/drive.ts b/src/server/api/endpoints/charts/user/drive.ts index 918fb62c6..7a889a448 100644 --- a/src/server/api/endpoints/charts/user/drive.ts +++ b/src/server/api/endpoints/charts/user/drive.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import define from '../../../define'; -import { ID } from '../../../../../misc/cafy-id'; -import { convertLog } from '../../../../../services/chart/core'; -import { perUserDriveChart } from '../../../../../services/chart'; +import define from '~/server/api/define'; +import { ID } from '~/misc/cafy-id'; +import { convertLog } from '~/services/chart/core'; +import { perUserDriveChart } from '~/services/chart'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/charts/user/following.ts b/src/server/api/endpoints/charts/user/following.ts index 5d86e85d3..f59b678df 100644 --- a/src/server/api/endpoints/charts/user/following.ts +++ b/src/server/api/endpoints/charts/user/following.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import define from '../../../define'; -import { ID } from '../../../../../misc/cafy-id'; -import { convertLog } from '../../../../../services/chart/core'; -import { perUserFollowingChart } from '../../../../../services/chart'; +import define from '~/server/api/define'; +import { ID } from '~/misc/cafy-id'; +import { convertLog } from '~/services/chart/core'; +import { perUserFollowingChart } from '~/services/chart'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/charts/user/notes.ts b/src/server/api/endpoints/charts/user/notes.ts index d39a20df1..3e4ae1f0a 100644 --- a/src/server/api/endpoints/charts/user/notes.ts +++ b/src/server/api/endpoints/charts/user/notes.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import define from '../../../define'; -import { ID } from '../../../../../misc/cafy-id'; -import { convertLog } from '../../../../../services/chart/core'; -import { perUserNotesChart } from '../../../../../services/chart'; +import define from '~/server/api/define'; +import { ID } from '~/misc/cafy-id'; +import { convertLog } from '~/services/chart/core'; +import { perUserNotesChart } from '~/services/chart'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/charts/user/reactions.ts b/src/server/api/endpoints/charts/user/reactions.ts index 5b88a1d71..08b9cee72 100644 --- a/src/server/api/endpoints/charts/user/reactions.ts +++ b/src/server/api/endpoints/charts/user/reactions.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import define from '../../../define'; -import { ID } from '../../../../../misc/cafy-id'; -import { convertLog } from '../../../../../services/chart/core'; -import { perUserReactionsChart } from '../../../../../services/chart'; +import define from '~/server/api/define'; +import { ID } from '~/misc/cafy-id'; +import { convertLog } from '~/services/chart/core'; +import { perUserReactionsChart } from '~/services/chart'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/charts/users.ts b/src/server/api/endpoints/charts/users.ts index 17de5756d..5aefcd95a 100644 --- a/src/server/api/endpoints/charts/users.ts +++ b/src/server/api/endpoints/charts/users.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import define from '../../define'; -import { convertLog } from '../../../../services/chart/core'; -import { usersChart } from '../../../../services/chart'; +import define from '~/server/api/define'; +import { convertLog } from '~/services/chart/core'; +import { usersChart } from '~/services/chart'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/drive.ts b/src/server/api/endpoints/drive.ts index bb85bab14..457b74c08 100644 --- a/src/server/api/endpoints/drive.ts +++ b/src/server/api/endpoints/drive.ts @@ -1,6 +1,6 @@ -import define from '../define'; -import { fetchMeta } from '../../../misc/fetch-meta'; -import { DriveFiles } from '../../../models'; +import define from '~/server/api/define'; +import { fetchMeta } from '~/misc/fetch-meta'; +import { DriveFiles } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/drive/files.ts b/src/server/api/endpoints/drive/files.ts index 77cefdfbe..353cfcf19 100644 --- a/src/server/api/endpoints/drive/files.ts +++ b/src/server/api/endpoints/drive/files.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { DriveFiles } from '../../../../models'; -import { makePaginationQuery } from '../../common/make-pagination-query'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { DriveFiles } from '~/models'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; export const meta = { desc: { diff --git a/src/server/api/endpoints/drive/files/attached-notes.ts b/src/server/api/endpoints/drive/files/attached-notes.ts index 2b84e114b..b9e7591d6 100644 --- a/src/server/api/endpoints/drive/files/attached-notes.ts +++ b/src/server/api/endpoints/drive/files/attached-notes.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { DriveFiles, Notes } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { DriveFiles, Notes } from '~/models'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/drive/files/check-existence.ts b/src/server/api/endpoints/drive/files/check-existence.ts index a6cd14caf..371a93e17 100644 --- a/src/server/api/endpoints/drive/files/check-existence.ts +++ b/src/server/api/endpoints/drive/files/check-existence.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; -import define from '../../../define'; -import { DriveFiles } from '../../../../../models'; +import define from '~/server/api/define'; +import { DriveFiles } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/drive/files/create.ts b/src/server/api/endpoints/drive/files/create.ts index 61055c5d1..eab1d0604 100644 --- a/src/server/api/endpoints/drive/files/create.ts +++ b/src/server/api/endpoints/drive/files/create.ts @@ -1,11 +1,11 @@ import * as ms from 'ms'; import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import create from '../../../../../services/drive/add-file'; -import define from '../../../define'; -import { apiLogger } from '../../../logger'; -import { ApiError } from '../../../error'; -import { DriveFiles } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import create from '~/services/drive/add-file'; +import define from '~/server/api/define'; +import { apiLogger } from '~/server/api/logger'; +import { ApiError } from '~/server/api/error'; +import { DriveFiles } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/drive/files/delete.ts b/src/server/api/endpoints/drive/files/delete.ts index d6a20f352..9efcf9458 100644 --- a/src/server/api/endpoints/drive/files/delete.ts +++ b/src/server/api/endpoints/drive/files/delete.ts @@ -1,10 +1,10 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import { deleteFile } from '../../../../../services/drive/delete-file'; -import { publishDriveStream } from '../../../../../services/stream'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { DriveFiles } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import { deleteFile } from '~/services/drive/delete-file'; +import { publishDriveStream } from '~/services/stream'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { DriveFiles } from '~/models'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/drive/files/find-by-hash.ts b/src/server/api/endpoints/drive/files/find-by-hash.ts index 84cc4f92b..363a23a53 100644 --- a/src/server/api/endpoints/drive/files/find-by-hash.ts +++ b/src/server/api/endpoints/drive/files/find-by-hash.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; -import define from '../../../define'; -import { DriveFiles } from '../../../../../models'; +import define from '~/server/api/define'; +import { DriveFiles } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/drive/files/find.ts b/src/server/api/endpoints/drive/files/find.ts index 732596a33..c693de581 100644 --- a/src/server/api/endpoints/drive/files/find.ts +++ b/src/server/api/endpoints/drive/files/find.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { DriveFiles } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { DriveFiles } from '~/models'; export const meta = { requireCredential: true, diff --git a/src/server/api/endpoints/drive/files/show.ts b/src/server/api/endpoints/drive/files/show.ts index 4384b2114..4cc4d2d46 100644 --- a/src/server/api/endpoints/drive/files/show.ts +++ b/src/server/api/endpoints/drive/files/show.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { DriveFile } from '../../../../../models/entities/drive-file'; -import { DriveFiles } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { DriveFile } from '~/models/entities/drive-file'; +import { DriveFiles } from '~/models'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/drive/files/update.ts b/src/server/api/endpoints/drive/files/update.ts index 81e86a273..aefbcd91b 100644 --- a/src/server/api/endpoints/drive/files/update.ts +++ b/src/server/api/endpoints/drive/files/update.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import { publishDriveStream } from '../../../../../services/stream'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { DriveFiles, DriveFolders } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import { publishDriveStream } from '~/services/stream'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { DriveFiles, DriveFolders } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/drive/files/upload-from-url.ts b/src/server/api/endpoints/drive/files/upload-from-url.ts index 034ab10f1..00c17596b 100644 --- a/src/server/api/endpoints/drive/files/upload-from-url.ts +++ b/src/server/api/endpoints/drive/files/upload-from-url.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; +import { ID } from '~/misc/cafy-id'; import * as ms from 'ms'; -import uploadFromUrl from '../../../../../services/drive/upload-from-url'; -import define from '../../../define'; -import { DriveFiles } from '../../../../../models'; +import uploadFromUrl from '~/services/drive/upload-from-url'; +import define from '~/server/api/define'; +import { DriveFiles } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/drive/folders.ts b/src/server/api/endpoints/drive/folders.ts index e2d22e708..58c7e31d1 100644 --- a/src/server/api/endpoints/drive/folders.ts +++ b/src/server/api/endpoints/drive/folders.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { DriveFolders } from '../../../../models'; -import { makePaginationQuery } from '../../common/make-pagination-query'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { DriveFolders } from '~/models'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; export const meta = { desc: { diff --git a/src/server/api/endpoints/drive/folders/create.ts b/src/server/api/endpoints/drive/folders/create.ts index 5530abf9d..466f9d4a6 100644 --- a/src/server/api/endpoints/drive/folders/create.ts +++ b/src/server/api/endpoints/drive/folders/create.ts @@ -1,10 +1,10 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import { publishDriveStream } from '../../../../../services/stream'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { DriveFolders } from '../../../../../models'; -import { genId } from '../../../../../misc/gen-id'; +import { ID } from '~/misc/cafy-id'; +import { publishDriveStream } from '~/services/stream'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { DriveFolders } from '~/models'; +import { genId } from '~/misc/gen-id'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/drive/folders/delete.ts b/src/server/api/endpoints/drive/folders/delete.ts index fe6c05ad0..aedf256ea 100644 --- a/src/server/api/endpoints/drive/folders/delete.ts +++ b/src/server/api/endpoints/drive/folders/delete.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { publishDriveStream } from '../../../../../services/stream'; -import { ApiError } from '../../../error'; -import { DriveFolders, DriveFiles } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { publishDriveStream } from '~/services/stream'; +import { ApiError } from '~/server/api/error'; +import { DriveFolders, DriveFiles } from '~/models'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/drive/folders/find.ts b/src/server/api/endpoints/drive/folders/find.ts index 04bec1b17..0335b3889 100644 --- a/src/server/api/endpoints/drive/folders/find.ts +++ b/src/server/api/endpoints/drive/folders/find.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { DriveFolders } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { DriveFolders } from '~/models'; export const meta = { tags: ['drive'], diff --git a/src/server/api/endpoints/drive/folders/show.ts b/src/server/api/endpoints/drive/folders/show.ts index f48f21d73..cebd3953f 100644 --- a/src/server/api/endpoints/drive/folders/show.ts +++ b/src/server/api/endpoints/drive/folders/show.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { DriveFolders } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { DriveFolders } from '~/models'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/drive/folders/update.ts b/src/server/api/endpoints/drive/folders/update.ts index 7d3ece00a..4a0ec2181 100644 --- a/src/server/api/endpoints/drive/folders/update.ts +++ b/src/server/api/endpoints/drive/folders/update.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import { publishDriveStream } from '../../../../../services/stream'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { DriveFolders } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import { publishDriveStream } from '~/services/stream'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { DriveFolders } from '~/models'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/drive/stream.ts b/src/server/api/endpoints/drive/stream.ts index b93ee11a1..b7ab4e696 100644 --- a/src/server/api/endpoints/drive/stream.ts +++ b/src/server/api/endpoints/drive/stream.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { DriveFiles } from '../../../../models'; -import { makePaginationQuery } from '../../common/make-pagination-query'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { DriveFiles } from '~/models'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; export const meta = { tags: ['drive'], diff --git a/src/server/api/endpoints/endpoint.ts b/src/server/api/endpoints/endpoint.ts index 48e78cd04..72c4601e4 100644 --- a/src/server/api/endpoints/endpoint.ts +++ b/src/server/api/endpoints/endpoint.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; -import define from '../define'; -import endpoints from '../endpoints'; +import define from '~/server/api/define'; +import endpoints from '~/server/api/endpoints'; export const meta = { requireCredential: false, diff --git a/src/server/api/endpoints/endpoints.ts b/src/server/api/endpoints/endpoints.ts index d1e4edaa2..35388a325 100644 --- a/src/server/api/endpoints/endpoints.ts +++ b/src/server/api/endpoints/endpoints.ts @@ -1,5 +1,5 @@ -import define from '../define'; -import endpoints from '../endpoints'; +import define from '~/server/api/define'; +import endpoints from '~/server/api/endpoints'; export const meta = { requireCredential: false, diff --git a/src/server/api/endpoints/federation/instances.ts b/src/server/api/endpoints/federation/instances.ts index bc0eb9a1d..b2e9e3473 100644 --- a/src/server/api/endpoints/federation/instances.ts +++ b/src/server/api/endpoints/federation/instances.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import define from '../../define'; -import { Instances } from '../../../../models'; -import { fetchMeta } from '../../../../misc/fetch-meta'; +import define from '~/server/api/define'; +import { Instances } from '~/models'; +import { fetchMeta } from '~/misc/fetch-meta'; export const meta = { tags: ['federation'], diff --git a/src/server/api/endpoints/federation/show-instance.ts b/src/server/api/endpoints/federation/show-instance.ts index 9afcf28a7..92235eb26 100644 --- a/src/server/api/endpoints/federation/show-instance.ts +++ b/src/server/api/endpoints/federation/show-instance.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import define from '../../define'; -import { Instances } from '../../../../models'; -import { toPuny } from '../../../../misc/convert-host'; +import define from '~/server/api/define'; +import { Instances } from '~/models'; +import { toPuny } from '~/misc/convert-host'; export const meta = { tags: ['federation'], diff --git a/src/server/api/endpoints/following/create.ts b/src/server/api/endpoints/following/create.ts index 5b43815a5..54f293917 100644 --- a/src/server/api/endpoints/following/create.ts +++ b/src/server/api/endpoints/following/create.ts @@ -1,11 +1,11 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; +import { ID } from '~/misc/cafy-id'; import * as ms from 'ms'; -import create from '../../../../services/following/create'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { getUser } from '../../common/getters'; -import { Followings, Users } from '../../../../models'; +import create from '~/services/following/create'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { getUser } from '~/server/api/common/getters'; +import { Followings, Users } from '~/models'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/following/delete.ts b/src/server/api/endpoints/following/delete.ts index 240a037c9..d39878276 100644 --- a/src/server/api/endpoints/following/delete.ts +++ b/src/server/api/endpoints/following/delete.ts @@ -1,11 +1,11 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; +import { ID } from '~/misc/cafy-id'; import * as ms from 'ms'; -import deleteFollowing from '../../../../services/following/delete'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { getUser } from '../../common/getters'; -import { Followings, Users } from '../../../../models'; +import deleteFollowing from '~/services/following/delete'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { getUser } from '~/server/api/common/getters'; +import { Followings, Users } from '~/models'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/following/requests/accept.ts b/src/server/api/endpoints/following/requests/accept.ts index 65c24f7be..36821b071 100644 --- a/src/server/api/endpoints/following/requests/accept.ts +++ b/src/server/api/endpoints/following/requests/accept.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import acceptFollowRequest from '../../../../../services/following/requests/accept'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { getUser } from '../../../common/getters'; +import { ID } from '~/misc/cafy-id'; +import acceptFollowRequest from '~/services/following/requests/accept'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { getUser } from '~/server/api/common/getters'; export const meta = { desc: { diff --git a/src/server/api/endpoints/following/requests/cancel.ts b/src/server/api/endpoints/following/requests/cancel.ts index 79cdb776f..a50cc5025 100644 --- a/src/server/api/endpoints/following/requests/cancel.ts +++ b/src/server/api/endpoints/following/requests/cancel.ts @@ -1,10 +1,10 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import cancelFollowRequest from '../../../../../services/following/requests/cancel'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { getUser } from '../../../common/getters'; -import { Users } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import cancelFollowRequest from '~/services/following/requests/cancel'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { getUser } from '~/server/api/common/getters'; +import { Users } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/following/requests/list.ts b/src/server/api/endpoints/following/requests/list.ts index 13e4a3938..7d8d1d312 100644 --- a/src/server/api/endpoints/following/requests/list.ts +++ b/src/server/api/endpoints/following/requests/list.ts @@ -1,5 +1,5 @@ -import define from '../../../define'; -import { FollowRequests } from '../../../../../models'; +import define from '~/server/api/define'; +import { FollowRequests } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/following/requests/reject.ts b/src/server/api/endpoints/following/requests/reject.ts index cccb60b24..8858f5f5e 100644 --- a/src/server/api/endpoints/following/requests/reject.ts +++ b/src/server/api/endpoints/following/requests/reject.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import rejectFollowRequest from '../../../../../services/following/requests/reject'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { getUser } from '../../../common/getters'; +import { ID } from '~/misc/cafy-id'; +import rejectFollowRequest from '~/services/following/requests/reject'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { getUser } from '~/server/api/common/getters'; export const meta = { desc: { diff --git a/src/server/api/endpoints/games/reversi/games.ts b/src/server/api/endpoints/games/reversi/games.ts index 7267157e0..32c24be47 100644 --- a/src/server/api/endpoints/games/reversi/games.ts +++ b/src/server/api/endpoints/games/reversi/games.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { ReversiGames } from '../../../../../models'; -import { makePaginationQuery } from '../../../common/make-pagination-query'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ReversiGames } from '~/models'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; import { Brackets } from 'typeorm'; export const meta = { diff --git a/src/server/api/endpoints/games/reversi/games/show.ts b/src/server/api/endpoints/games/reversi/games/show.ts index ea2776b16..aa3a6a97a 100644 --- a/src/server/api/endpoints/games/reversi/games/show.ts +++ b/src/server/api/endpoints/games/reversi/games/show.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../../../misc/cafy-id'; -import Reversi from '../../../../../../games/reversi/core'; -import define from '../../../../define'; -import { ApiError } from '../../../../error'; -import { ReversiGames } from '../../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import Reversi from '~/games/reversi/core'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { ReversiGames } from '~/models'; export const meta = { tags: ['games'], diff --git a/src/server/api/endpoints/games/reversi/games/surrender.ts b/src/server/api/endpoints/games/reversi/games/surrender.ts index 56d66fb20..c52663541 100644 --- a/src/server/api/endpoints/games/reversi/games/surrender.ts +++ b/src/server/api/endpoints/games/reversi/games/surrender.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../../../misc/cafy-id'; -import { publishReversiGameStream } from '../../../../../../services/stream'; -import define from '../../../../define'; -import { ApiError } from '../../../../error'; -import { ReversiGames } from '../../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import { publishReversiGameStream } from '~/services/stream'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { ReversiGames } from '~/models'; export const meta = { tags: ['games'], diff --git a/src/server/api/endpoints/games/reversi/invitations.ts b/src/server/api/endpoints/games/reversi/invitations.ts index 71f5aca1d..9d513c361 100644 --- a/src/server/api/endpoints/games/reversi/invitations.ts +++ b/src/server/api/endpoints/games/reversi/invitations.ts @@ -1,5 +1,5 @@ -import define from '../../../define'; -import { ReversiMatchings } from '../../../../../models'; +import define from '~/server/api/define'; +import { ReversiMatchings } from '~/models'; export const meta = { tags: ['games'], diff --git a/src/server/api/endpoints/games/reversi/match.ts b/src/server/api/endpoints/games/reversi/match.ts index da367b597..1aad858aa 100644 --- a/src/server/api/endpoints/games/reversi/match.ts +++ b/src/server/api/endpoints/games/reversi/match.ts @@ -1,14 +1,14 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import { publishMainStream, publishReversiStream } from '../../../../../services/stream'; -import { eighteight } from '../../../../../games/reversi/maps'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { getUser } from '../../../common/getters'; -import { genId } from '../../../../../misc/gen-id'; -import { ReversiMatchings, ReversiGames } from '../../../../../models'; -import { ReversiGame } from '../../../../../models/entities/games/reversi/game'; -import { ReversiMatching } from '../../../../../models/entities/games/reversi/matching'; +import { ID } from '~/misc/cafy-id'; +import { publishMainStream, publishReversiStream } from '~/services/stream'; +import { eighteight } from '~/games/reversi/maps'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { getUser } from '~/server/api/common/getters'; +import { genId } from '~/misc/gen-id'; +import { ReversiMatchings, ReversiGames } from '~/models'; +import { ReversiGame } from '~/models/entities/games/reversi/game'; +import { ReversiMatching } from '~/models/entities/games/reversi/matching'; export const meta = { tags: ['games'], diff --git a/src/server/api/endpoints/games/reversi/match/cancel.ts b/src/server/api/endpoints/games/reversi/match/cancel.ts index 71aaae5ee..aebf80298 100644 --- a/src/server/api/endpoints/games/reversi/match/cancel.ts +++ b/src/server/api/endpoints/games/reversi/match/cancel.ts @@ -1,5 +1,5 @@ -import define from '../../../../define'; -import { ReversiMatchings } from '../../../../../../models'; +import define from '~/server/api/define'; +import { ReversiMatchings } from '~/models'; export const meta = { tags: ['games'], diff --git a/src/server/api/endpoints/hashtags/list.ts b/src/server/api/endpoints/hashtags/list.ts index 9bc267779..9901f5abe 100644 --- a/src/server/api/endpoints/hashtags/list.ts +++ b/src/server/api/endpoints/hashtags/list.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; -import define from '../../define'; -import { Hashtags } from '../../../../models'; +import define from '~/server/api/define'; +import { Hashtags } from '~/models'; export const meta = { tags: ['hashtags'], diff --git a/src/server/api/endpoints/hashtags/search.ts b/src/server/api/endpoints/hashtags/search.ts index 7caaf3484..45547f506 100644 --- a/src/server/api/endpoints/hashtags/search.ts +++ b/src/server/api/endpoints/hashtags/search.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; -import define from '../../define'; -import { Hashtags } from '../../../../models'; +import define from '~/server/api/define'; +import { Hashtags } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/hashtags/show.ts b/src/server/api/endpoints/hashtags/show.ts index 5de906fb1..9d46cf5d0 100644 --- a/src/server/api/endpoints/hashtags/show.ts +++ b/src/server/api/endpoints/hashtags/show.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { Hashtags } from '../../../../models'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { Hashtags } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/hashtags/trend.ts b/src/server/api/endpoints/hashtags/trend.ts index a004732f8..a90fb9df0 100644 --- a/src/server/api/endpoints/hashtags/trend.ts +++ b/src/server/api/endpoints/hashtags/trend.ts @@ -1,7 +1,7 @@ -import define from '../../define'; -import { fetchMeta } from '../../../../misc/fetch-meta'; -import { Notes } from '../../../../models'; -import { Note } from '../../../../models/entities/note'; +import define from '~/server/api/define'; +import { fetchMeta } from '~/misc/fetch-meta'; +import { Notes } from '~/models'; +import { Note } from '~/models/entities/note'; /* トレンドに載るためには「『直近a分間のユニーク投稿数が今からa分前～今からb分前の間のユニーク投稿数のn倍以上』のハッシュタグの上位5位以内に入る」ことが必要 diff --git a/src/server/api/endpoints/hashtags/users.ts b/src/server/api/endpoints/hashtags/users.ts index 28a78ff8e..f1d060825 100644 --- a/src/server/api/endpoints/hashtags/users.ts +++ b/src/server/api/endpoints/hashtags/users.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; -import define from '../../define'; -import { Users } from '../../../../models'; +import define from '~/server/api/define'; +import { Users } from '~/models'; export const meta = { requireCredential: false, diff --git a/src/server/api/endpoints/i.ts b/src/server/api/endpoints/i.ts index 20a0c604f..396f4010f 100644 --- a/src/server/api/endpoints/i.ts +++ b/src/server/api/endpoints/i.ts @@ -1,5 +1,5 @@ -import define from '../define'; -import { Users } from '../../../models'; +import define from '~/server/api/define'; +import { Users } from '~/models'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/i/2fa/done.ts b/src/server/api/endpoints/i/2fa/done.ts index c134e1b22..d7ed1af82 100644 --- a/src/server/api/endpoints/i/2fa/done.ts +++ b/src/server/api/endpoints/i/2fa/done.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; import * as speakeasy from 'speakeasy'; -import define from '../../../define'; -import { UserProfiles } from '../../../../../models'; -import { ensure } from '../../../../../prelude/ensure'; +import define from '~/server/api/define'; +import { UserProfiles } from '~/models'; +import { ensure } from '~/prelude/ensure'; export const meta = { requireCredential: true, diff --git a/src/server/api/endpoints/i/2fa/key-done.ts b/src/server/api/endpoints/i/2fa/key-done.ts index d751dabc4..246524a69 100644 --- a/src/server/api/endpoints/i/2fa/key-done.ts +++ b/src/server/api/endpoints/i/2fa/key-done.ts @@ -2,17 +2,17 @@ import $ from 'cafy'; import * as bcrypt from 'bcryptjs'; import { promisify } from 'util'; import * as cbor from 'cbor'; -import define from '../../../define'; +import define from '~/server/api/define'; import { UserProfiles, UserSecurityKeys, AttestationChallenges, Users -} from '../../../../../models'; -import { ensure } from '../../../../../prelude/ensure'; -import config from '../../../../../config'; -import { procedures, hash } from '../../../2fa'; -import { publishMainStream } from '../../../../../services/stream'; +} from '~/models'; +import { ensure } from '~/prelude/ensure'; +import config from '~/config'; +import { procedures, hash } from '~/server/api/2fa'; +import { publishMainStream } from '~/services/stream'; const cborDecodeFirst = promisify(cbor.decodeFirst) as any; diff --git a/src/server/api/endpoints/i/2fa/password-less.ts b/src/server/api/endpoints/i/2fa/password-less.ts index 19e75ca1c..651d9bd25 100644 --- a/src/server/api/endpoints/i/2fa/password-less.ts +++ b/src/server/api/endpoints/i/2fa/password-less.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; -import define from '../../../define'; -import { UserProfiles } from '../../../../../models'; +import define from '~/server/api/define'; +import { UserProfiles } from '~/models'; export const meta = { requireCredential: true, diff --git a/src/server/api/endpoints/i/2fa/register-key.ts b/src/server/api/endpoints/i/2fa/register-key.ts index 1c2cc32e3..2a512c290 100644 --- a/src/server/api/endpoints/i/2fa/register-key.ts +++ b/src/server/api/endpoints/i/2fa/register-key.ts @@ -1,12 +1,12 @@ import $ from 'cafy'; import * as bcrypt from 'bcryptjs'; -import define from '../../../define'; -import { UserProfiles, AttestationChallenges } from '../../../../../models'; -import { ensure } from '../../../../../prelude/ensure'; +import define from '~/server/api/define'; +import { UserProfiles, AttestationChallenges } from '~/models'; +import { ensure } from '~/prelude/ensure'; import { promisify } from 'util'; import * as crypto from 'crypto'; -import { genId } from '../../../../../misc/gen-id'; -import { hash } from '../../../2fa'; +import { genId } from '~/misc/gen-id'; +import { hash } from '~/server/api/2fa'; const randomBytes = promisify(crypto.randomBytes); diff --git a/src/server/api/endpoints/i/2fa/register.ts b/src/server/api/endpoints/i/2fa/register.ts index bd46b7c68..7dcdd287d 100644 --- a/src/server/api/endpoints/i/2fa/register.ts +++ b/src/server/api/endpoints/i/2fa/register.ts @@ -2,10 +2,10 @@ import $ from 'cafy'; import * as bcrypt from 'bcryptjs'; import * as speakeasy from 'speakeasy'; import * as QRCode from 'qrcode'; -import config from '../../../../../config'; -import define from '../../../define'; -import { UserProfiles } from '../../../../../models'; -import { ensure } from '../../../../../prelude/ensure'; +import config from '~/config'; +import define from '~/server/api/define'; +import { UserProfiles } from '~/models'; +import { ensure } from '~/prelude/ensure'; export const meta = { requireCredential: true, diff --git a/src/server/api/endpoints/i/2fa/remove-key.ts b/src/server/api/endpoints/i/2fa/remove-key.ts index cb28c8fbf..fecadb0d9 100644 --- a/src/server/api/endpoints/i/2fa/remove-key.ts +++ b/src/server/api/endpoints/i/2fa/remove-key.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; import * as bcrypt from 'bcryptjs'; -import define from '../../../define'; -import { UserProfiles, UserSecurityKeys, Users } from '../../../../../models'; -import { ensure } from '../../../../../prelude/ensure'; -import { publishMainStream } from '../../../../../services/stream'; +import define from '~/server/api/define'; +import { UserProfiles, UserSecurityKeys, Users } from '~/models'; +import { ensure } from '~/prelude/ensure'; +import { publishMainStream } from '~/services/stream'; export const meta = { requireCredential: true, diff --git a/src/server/api/endpoints/i/2fa/unregister.ts b/src/server/api/endpoints/i/2fa/unregister.ts index 99483143c..1176ccce4 100644 --- a/src/server/api/endpoints/i/2fa/unregister.ts +++ b/src/server/api/endpoints/i/2fa/unregister.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; import * as bcrypt from 'bcryptjs'; -import define from '../../../define'; -import { UserProfiles } from '../../../../../models'; -import { ensure } from '../../../../../prelude/ensure'; +import define from '~/server/api/define'; +import { UserProfiles } from '~/models'; +import { ensure } from '~/prelude/ensure'; export const meta = { requireCredential: true, diff --git a/src/server/api/endpoints/i/authorized-apps.ts b/src/server/api/endpoints/i/authorized-apps.ts index 3e9fea19e..dd85e1095 100644 --- a/src/server/api/endpoints/i/authorized-apps.ts +++ b/src/server/api/endpoints/i/authorized-apps.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; -import define from '../../define'; -import { AccessTokens, Apps } from '../../../../models'; +import define from '~/server/api/define'; +import { AccessTokens, Apps } from '~/models'; export const meta = { requireCredential: true, diff --git a/src/server/api/endpoints/i/change-password.ts b/src/server/api/endpoints/i/change-password.ts index 07d2d864d..fdfa39e2a 100644 --- a/src/server/api/endpoints/i/change-password.ts +++ b/src/server/api/endpoints/i/change-password.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; import * as bcrypt from 'bcryptjs'; -import define from '../../define'; -import { UserProfiles } from '../../../../models'; -import { ensure } from '../../../../prelude/ensure'; +import define from '~/server/api/define'; +import { UserProfiles } from '~/models'; +import { ensure } from '~/prelude/ensure'; export const meta = { requireCredential: true, diff --git a/src/server/api/endpoints/i/delete-account.ts b/src/server/api/endpoints/i/delete-account.ts index b4950cb1f..d7017435f 100644 --- a/src/server/api/endpoints/i/delete-account.ts +++ b/src/server/api/endpoints/i/delete-account.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; import * as bcrypt from 'bcryptjs'; -import define from '../../define'; -import { Users, UserProfiles } from '../../../../models'; -import { ensure } from '../../../../prelude/ensure'; -import { doPostSuspend } from '../../../../services/suspend-user'; +import define from '~/server/api/define'; +import { Users, UserProfiles } from '~/models'; +import { ensure } from '~/prelude/ensure'; +import { doPostSuspend } from '~/services/suspend-user'; export const meta = { requireCredential: true, diff --git a/src/server/api/endpoints/i/export-blocking.ts b/src/server/api/endpoints/i/export-blocking.ts index 14d49487e..03145881f 100644 --- a/src/server/api/endpoints/i/export-blocking.ts +++ b/src/server/api/endpoints/i/export-blocking.ts @@ -1,5 +1,5 @@ -import define from '../../define'; -import { createExportBlockingJob } from '../../../../queue'; +import define from '~/server/api/define'; +import { createExportBlockingJob } from '~/queue'; import ms = require('ms'); export const meta = { diff --git a/src/server/api/endpoints/i/export-following.ts b/src/server/api/endpoints/i/export-following.ts index 50dd28837..fa9cb18ee 100644 --- a/src/server/api/endpoints/i/export-following.ts +++ b/src/server/api/endpoints/i/export-following.ts @@ -1,5 +1,5 @@ -import define from '../../define'; -import { createExportFollowingJob } from '../../../../queue'; +import define from '~/server/api/define'; +import { createExportFollowingJob } from '~/queue'; import ms = require('ms'); export const meta = { diff --git a/src/server/api/endpoints/i/export-mute.ts b/src/server/api/endpoints/i/export-mute.ts index 1eb51cd77..50b07faf1 100644 --- a/src/server/api/endpoints/i/export-mute.ts +++ b/src/server/api/endpoints/i/export-mute.ts @@ -1,5 +1,5 @@ -import define from '../../define'; -import { createExportMuteJob } from '../../../../queue'; +import define from '~/server/api/define'; +import { createExportMuteJob } from '~/queue'; import ms = require('ms'); export const meta = { diff --git a/src/server/api/endpoints/i/export-notes.ts b/src/server/api/endpoints/i/export-notes.ts index dd32c18d1..871509060 100644 --- a/src/server/api/endpoints/i/export-notes.ts +++ b/src/server/api/endpoints/i/export-notes.ts @@ -1,5 +1,5 @@ -import define from '../../define'; -import { createExportNotesJob } from '../../../../queue'; +import define from '~/server/api/define'; +import { createExportNotesJob } from '~/queue'; import ms = require('ms'); export const meta = { diff --git a/src/server/api/endpoints/i/export-user-lists.ts b/src/server/api/endpoints/i/export-user-lists.ts index 7650ca721..b82382ca5 100644 --- a/src/server/api/endpoints/i/export-user-lists.ts +++ b/src/server/api/endpoints/i/export-user-lists.ts @@ -1,5 +1,5 @@ -import define from '../../define'; -import { createExportUserListsJob } from '../../../../queue'; +import define from '~/server/api/define'; +import { createExportUserListsJob } from '~/queue'; import ms = require('ms'); export const meta = { diff --git a/src/server/api/endpoints/i/favorites.ts b/src/server/api/endpoints/i/favorites.ts index 1bbc16256..ccfe9990c 100644 --- a/src/server/api/endpoints/i/favorites.ts +++ b/src/server/api/endpoints/i/favorites.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { NoteFavorites } from '../../../../models'; -import { makePaginationQuery } from '../../common/make-pagination-query'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { NoteFavorites } from '~/models'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; export const meta = { desc: { diff --git a/src/server/api/endpoints/i/import-following.ts b/src/server/api/endpoints/i/import-following.ts index deafec18e..955d346c7 100644 --- a/src/server/api/endpoints/i/import-following.ts +++ b/src/server/api/endpoints/i/import-following.ts @@ -1,10 +1,10 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { createImportFollowingJob } from '../../../../queue'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { createImportFollowingJob } from '~/queue'; import ms = require('ms'); -import { ApiError } from '../../error'; -import { DriveFiles } from '../../../../models'; +import { ApiError } from '~/server/api/error'; +import { DriveFiles } from '~/models'; export const meta = { secure: true, diff --git a/src/server/api/endpoints/i/import-user-lists.ts b/src/server/api/endpoints/i/import-user-lists.ts index b7d9d029b..86836881f 100644 --- a/src/server/api/endpoints/i/import-user-lists.ts +++ b/src/server/api/endpoints/i/import-user-lists.ts @@ -1,10 +1,10 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { createImportUserListsJob } from '../../../../queue'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { createImportUserListsJob } from '~/queue'; import ms = require('ms'); -import { ApiError } from '../../error'; -import { DriveFiles } from '../../../../models'; +import { ApiError } from '~/server/api/error'; +import { DriveFiles } from '~/models'; export const meta = { secure: true, diff --git a/src/server/api/endpoints/i/notifications.ts b/src/server/api/endpoints/i/notifications.ts index aa72e9a17..5d454f6f8 100644 --- a/src/server/api/endpoints/i/notifications.ts +++ b/src/server/api/endpoints/i/notifications.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import { readNotification } from '../../common/read-notification'; -import define from '../../define'; -import { makePaginationQuery } from '../../common/make-pagination-query'; -import { Notifications, Followings, Mutings } from '../../../../models'; +import { ID } from '~/misc/cafy-id'; +import { readNotification } from '~/server/api/common/read-notification'; +import define from '~/server/api/define'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; +import { Notifications, Followings, Mutings } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/i/page-likes.ts b/src/server/api/endpoints/i/page-likes.ts index 23bde74c9..8f0cece28 100644 --- a/src/server/api/endpoints/i/page-likes.ts +++ b/src/server/api/endpoints/i/page-likes.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { PageLikes } from '../../../../models'; -import { makePaginationQuery } from '../../common/make-pagination-query'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { PageLikes } from '~/models'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; export const meta = { desc: { diff --git a/src/server/api/endpoints/i/pages.ts b/src/server/api/endpoints/i/pages.ts index 5eb4db81b..5037a4860 100644 --- a/src/server/api/endpoints/i/pages.ts +++ b/src/server/api/endpoints/i/pages.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { Pages } from '../../../../models'; -import { makePaginationQuery } from '../../common/make-pagination-query'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { Pages } from '~/models'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; export const meta = { desc: { diff --git a/src/server/api/endpoints/i/pin.ts b/src/server/api/endpoints/i/pin.ts index ac104b19f..80e4a82c1 100644 --- a/src/server/api/endpoints/i/pin.ts +++ b/src/server/api/endpoints/i/pin.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import { addPinned } from '../../../../services/i/pin'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { Users } from '../../../../models'; +import { ID } from '~/misc/cafy-id'; +import { addPinned } from '~/services/i/pin'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { Users } from '~/models'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/i/read-all-messaging-messages.ts b/src/server/api/endpoints/i/read-all-messaging-messages.ts index e8ada277e..a7d3e59b8 100644 --- a/src/server/api/endpoints/i/read-all-messaging-messages.ts +++ b/src/server/api/endpoints/i/read-all-messaging-messages.ts @@ -1,6 +1,6 @@ -import { publishMainStream } from '../../../../services/stream'; -import define from '../../define'; -import { MessagingMessages } from '../../../../models'; +import { publishMainStream } from '~/services/stream'; +import define from '~/server/api/define'; +import { MessagingMessages } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/i/read-all-unread-notes.ts b/src/server/api/endpoints/i/read-all-unread-notes.ts index cc8ebf58e..f006fc1dd 100644 --- a/src/server/api/endpoints/i/read-all-unread-notes.ts +++ b/src/server/api/endpoints/i/read-all-unread-notes.ts @@ -1,6 +1,6 @@ -import { publishMainStream } from '../../../../services/stream'; -import define from '../../define'; -import { NoteUnreads } from '../../../../models'; +import { publishMainStream } from '~/services/stream'; +import define from '~/server/api/define'; +import { NoteUnreads } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/i/regenerate-token.ts b/src/server/api/endpoints/i/regenerate-token.ts index e27cf0b18..f2c799d29 100644 --- a/src/server/api/endpoints/i/regenerate-token.ts +++ b/src/server/api/endpoints/i/regenerate-token.ts @@ -1,10 +1,10 @@ import $ from 'cafy'; import * as bcrypt from 'bcryptjs'; -import { publishMainStream } from '../../../../services/stream'; -import generateUserToken from '../../common/generate-native-user-token'; -import define from '../../define'; -import { Users, UserProfiles } from '../../../../models'; -import { ensure } from '../../../../prelude/ensure'; +import { publishMainStream } from '~/services/stream'; +import generateUserToken from '~/server/api/common/generate-native-user-token'; +import define from '~/server/api/define'; +import { Users, UserProfiles } from '~/models'; +import { ensure } from '~/prelude/ensure'; export const meta = { requireCredential: true, diff --git a/src/server/api/endpoints/i/signin-history.ts b/src/server/api/endpoints/i/signin-history.ts index 74648951f..5daec0b35 100644 --- a/src/server/api/endpoints/i/signin-history.ts +++ b/src/server/api/endpoints/i/signin-history.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { Signins } from '../../../../models'; -import { makePaginationQuery } from '../../common/make-pagination-query'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { Signins } from '~/models'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; export const meta = { requireCredential: true, diff --git a/src/server/api/endpoints/i/unpin.ts b/src/server/api/endpoints/i/unpin.ts index 468853357..e024f01f0 100644 --- a/src/server/api/endpoints/i/unpin.ts +++ b/src/server/api/endpoints/i/unpin.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import { removePinned } from '../../../../services/i/pin'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { Users } from '../../../../models'; +import { ID } from '~/misc/cafy-id'; +import { removePinned } from '~/services/i/pin'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { Users } from '~/models'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/i/update-client-setting.ts b/src/server/api/endpoints/i/update-client-setting.ts index f79961a4f..f6f723fc5 100644 --- a/src/server/api/endpoints/i/update-client-setting.ts +++ b/src/server/api/endpoints/i/update-client-setting.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { publishMainStream } from '../../../../services/stream'; -import define from '../../define'; -import { UserProfiles } from '../../../../models'; -import { ensure } from '../../../../prelude/ensure'; +import { publishMainStream } from '~/services/stream'; +import define from '~/server/api/define'; +import { UserProfiles } from '~/models'; +import { ensure } from '~/prelude/ensure'; export const meta = { requireCredential: true, diff --git a/src/server/api/endpoints/i/update-email.ts b/src/server/api/endpoints/i/update-email.ts index ca95e612a..765a4a564 100644 --- a/src/server/api/endpoints/i/update-email.ts +++ b/src/server/api/endpoints/i/update-email.ts @@ -1,14 +1,14 @@ import $ from 'cafy'; -import { publishMainStream } from '../../../../services/stream'; -import define from '../../define'; +import { publishMainStream } from '~/services/stream'; +import define from '~/server/api/define'; import rndstr from 'rndstr'; -import config from '../../../../config'; +import config from '~/config'; import * as ms from 'ms'; import * as bcrypt from 'bcryptjs'; -import { Users, UserProfiles } from '../../../../models'; -import { ensure } from '../../../../prelude/ensure'; -import { sendEmail } from '../../../../services/send-email'; -import { ApiError } from '../../error'; +import { Users, UserProfiles } from '~/models'; +import { ensure } from '~/prelude/ensure'; +import { sendEmail } from '~/services/send-email'; +import { ApiError } from '~/server/api/error'; export const meta = { requireCredential: true, diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts index 149081e50..e256cc73f 100644 --- a/src/server/api/endpoints/i/update.ts +++ b/src/server/api/endpoints/i/update.ts @@ -1,19 +1,19 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import { publishMainStream } from '../../../../services/stream'; -import acceptAllFollowRequests from '../../../../services/following/requests/accept-all'; -import { publishToFollowers } from '../../../../services/i/update'; -import define from '../../define'; -import { parse, parsePlain } from '../../../../mfm/parse'; -import extractEmojis from '../../../../misc/extract-emojis'; -import extractHashtags from '../../../../misc/extract-hashtags'; +import { ID } from '~/misc/cafy-id'; +import { publishMainStream } from '~/services/stream'; +import acceptAllFollowRequests from '~/services/following/requests/accept-all'; +import { publishToFollowers } from '~/services/i/update'; +import define from '~/server/api/define'; +import { parse, parsePlain } from '~/mfm/parse'; +import extractEmojis from '~/misc/extract-emojis'; +import extractHashtags from '~/misc/extract-hashtags'; import * as langmap from 'langmap'; -import { updateHashtag } from '../../../../services/update-hashtag'; -import { ApiError } from '../../error'; -import { Users, DriveFiles, UserProfiles, Pages } from '../../../../models'; -import { User } from '../../../../models/entities/user'; -import { UserProfile } from '../../../../models/entities/user-profile'; -import { ensure } from '../../../../prelude/ensure'; +import { updateHashtag } from '~/services/update-hashtag'; +import { ApiError } from '~/server/api/error'; +import { Users, DriveFiles, UserProfiles, Pages } from '~/models'; +import { User } from '~/models/entities/user'; +import { UserProfile } from '~/models/entities/user-profile'; +import { ensure } from '~/prelude/ensure'; export const meta = { desc: { diff --git a/src/server/api/endpoints/i/user-group-invites.ts b/src/server/api/endpoints/i/user-group-invites.ts index 9d07fa31a..06faa0989 100644 --- a/src/server/api/endpoints/i/user-group-invites.ts +++ b/src/server/api/endpoints/i/user-group-invites.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { UserGroupInvites } from '../../../../models'; -import { makePaginationQuery } from '../../common/make-pagination-query'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { UserGroupInvites } from '~/models'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; export const meta = { desc: { diff --git a/src/server/api/endpoints/messaging/history.ts b/src/server/api/endpoints/messaging/history.ts index 2c143c26b..2e673a388 100644 --- a/src/server/api/endpoints/messaging/history.ts +++ b/src/server/api/endpoints/messaging/history.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import define from '../../define'; -import { MessagingMessage } from '../../../../models/entities/messaging-message'; -import { MessagingMessages, Mutings, UserGroupJoinings } from '../../../../models'; +import define from '~/server/api/define'; +import { MessagingMessage } from '~/models/entities/messaging-message'; +import { MessagingMessages, Mutings, UserGroupJoinings } from '~/models'; import { Brackets } from 'typeorm'; export const meta = { diff --git a/src/server/api/endpoints/messaging/messages.ts b/src/server/api/endpoints/messaging/messages.ts index b0b3e20d0..8b64c7a64 100644 --- a/src/server/api/endpoints/messaging/messages.ts +++ b/src/server/api/endpoints/messaging/messages.ts @@ -1,12 +1,12 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { getUser } from '../../common/getters'; -import { MessagingMessages, UserGroups, UserGroupJoinings } from '../../../../models'; -import { makePaginationQuery } from '../../common/make-pagination-query'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { getUser } from '~/server/api/common/getters'; +import { MessagingMessages, UserGroups, UserGroupJoinings } from '~/models'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; import { Brackets } from 'typeorm'; -import { readUserMessagingMessage, readGroupMessagingMessage } from '../../common/read-messaging-message'; +import { readUserMessagingMessage, readGroupMessagingMessage } from '~/server/api/common/read-messaging-message'; export const meta = { desc: { diff --git a/src/server/api/endpoints/messaging/messages/create.ts b/src/server/api/endpoints/messaging/messages/create.ts index d0c1ee494..e6275fcee 100644 --- a/src/server/api/endpoints/messaging/messages/create.ts +++ b/src/server/api/endpoints/messaging/messages/create.ts @@ -1,16 +1,16 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import { publishMainStream, publishGroupMessagingStream } from '../../../../../services/stream'; -import { publishMessagingStream, publishMessagingIndexStream } from '../../../../../services/stream'; -import pushSw from '../../../../../services/push-notification'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { getUser } from '../../../common/getters'; -import { MessagingMessages, DriveFiles, Mutings, UserGroups, UserGroupJoinings } from '../../../../../models'; -import { MessagingMessage } from '../../../../../models/entities/messaging-message'; -import { genId } from '../../../../../misc/gen-id'; -import { User } from '../../../../../models/entities/user'; -import { UserGroup } from '../../../../../models/entities/user-group'; +import { ID } from '~/misc/cafy-id'; +import { publishMainStream, publishGroupMessagingStream } from '~/services/stream'; +import { publishMessagingStream, publishMessagingIndexStream } from '~/services/stream'; +import pushSw from '~/services/push-notification'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { getUser } from '~/server/api/common/getters'; +import { MessagingMessages, DriveFiles, Mutings, UserGroups, UserGroupJoinings } from '~/models'; +import { MessagingMessage } from '~/models/entities/messaging-message'; +import { genId } from '~/misc/gen-id'; +import { User } from '~/models/entities/user'; +import { UserGroup } from '~/models/entities/user-group'; import { Not } from 'typeorm'; export const meta = { diff --git a/src/server/api/endpoints/messaging/messages/delete.ts b/src/server/api/endpoints/messaging/messages/delete.ts index fb1bb42a5..29e90190a 100644 --- a/src/server/api/endpoints/messaging/messages/delete.ts +++ b/src/server/api/endpoints/messaging/messages/delete.ts @@ -1,10 +1,10 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { publishMessagingStream, publishGroupMessagingStream } from '../../../../../services/stream'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { publishMessagingStream, publishGroupMessagingStream } from '~/services/stream'; import * as ms from 'ms'; -import { ApiError } from '../../../error'; -import { MessagingMessages } from '../../../../../models'; +import { ApiError } from '~/server/api/error'; +import { MessagingMessages } from '~/models'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/messaging/messages/read.ts b/src/server/api/endpoints/messaging/messages/read.ts index dd3449af1..d2ea85250 100644 --- a/src/server/api/endpoints/messaging/messages/read.ts +++ b/src/server/api/endpoints/messaging/messages/read.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { MessagingMessages } from '../../../../../models'; -import { readUserMessagingMessage, readGroupMessagingMessage } from '../../../common/read-messaging-message'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { MessagingMessages } from '~/models'; +import { readUserMessagingMessage, readGroupMessagingMessage } from '~/server/api/common/read-messaging-message'; export const meta = { desc: { diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts index a754a885a..cfe8bd2d7 100644 --- a/src/server/api/endpoints/meta.ts +++ b/src/server/api/endpoints/meta.ts @@ -1,12 +1,12 @@ import $ from 'cafy'; import * as os from 'os'; -import config from '../../../config'; -import define from '../define'; -import { fetchMeta } from '../../../misc/fetch-meta'; -import * as pkg from '../../../../package.json'; -import { Emojis } from '../../../models'; +import config from '~/config'; +import define from '~/server/api/define'; +import { fetchMeta } from '~/misc/fetch-meta'; +import * as pkg from '~/package.json'; +import { Emojis } from '~/models'; import { getConnection } from 'typeorm'; -import redis from '../../../db/redis'; +import redis from '~/db/redis'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/mute/create.ts b/src/server/api/endpoints/mute/create.ts index d13c546fd..91f7be18f 100644 --- a/src/server/api/endpoints/mute/create.ts +++ b/src/server/api/endpoints/mute/create.ts @@ -1,11 +1,11 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { getUser } from '../../common/getters'; -import { genId } from '../../../../misc/gen-id'; -import { Mutings, NoteWatchings } from '../../../../models'; -import { Muting } from '../../../../models/entities/muting'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { getUser } from '~/server/api/common/getters'; +import { genId } from '~/misc/gen-id'; +import { Mutings, NoteWatchings } from '~/models'; +import { Muting } from '~/models/entities/muting'; export const meta = { desc: { diff --git a/src/server/api/endpoints/mute/delete.ts b/src/server/api/endpoints/mute/delete.ts index 1aae15af9..be4be8d06 100644 --- a/src/server/api/endpoints/mute/delete.ts +++ b/src/server/api/endpoints/mute/delete.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { getUser } from '../../common/getters'; -import { Mutings } from '../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { getUser } from '~/server/api/common/getters'; +import { Mutings } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/mute/list.ts b/src/server/api/endpoints/mute/list.ts index 1afc120f5..dc8f33eeb 100644 --- a/src/server/api/endpoints/mute/list.ts +++ b/src/server/api/endpoints/mute/list.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { makePaginationQuery } from '../../common/make-pagination-query'; -import { Mutings } from '../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; +import { Mutings } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/my/apps.ts b/src/server/api/endpoints/my/apps.ts index e8b26362a..8e9153fab 100644 --- a/src/server/api/endpoints/my/apps.ts +++ b/src/server/api/endpoints/my/apps.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; -import define from '../../define'; -import { Apps } from '../../../../models'; +import define from '~/server/api/define'; +import { Apps } from '~/models'; export const meta = { tags: ['account', 'app'], diff --git a/src/server/api/endpoints/notes.ts b/src/server/api/endpoints/notes.ts index fab8455d7..35c828e39 100644 --- a/src/server/api/endpoints/notes.ts +++ b/src/server/api/endpoints/notes.ts @@ -1,8 +1,8 @@ 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 { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; +import { Notes } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/notes/children.ts b/src/server/api/endpoints/notes/children.ts index bc8407f31..0a6d65922 100644 --- a/src/server/api/endpoints/notes/children.ts +++ b/src/server/api/endpoints/notes/children.ts @@ -1,11 +1,11 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { makePaginationQuery } from '../../common/make-pagination-query'; -import { generateVisibilityQuery } from '../../common/generate-visibility-query'; -import { generateMuteQuery } from '../../common/generate-mute-query'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; +import { generateVisibilityQuery } from '~/server/api/common/generate-visibility-query'; +import { generateMuteQuery } from '~/server/api/common/generate-mute-query'; import { Brackets } from 'typeorm'; -import { Notes } from '../../../../models'; +import { Notes } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/notes/conversation.ts b/src/server/api/endpoints/notes/conversation.ts index 245d42792..ae1f6228c 100644 --- a/src/server/api/endpoints/notes/conversation.ts +++ b/src/server/api/endpoints/notes/conversation.ts @@ -1,10 +1,10 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { getNote } from '../../common/getters'; -import { Note } from '../../../../models/entities/note'; -import { Notes } from '../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { getNote } from '~/server/api/common/getters'; +import { Note } from '~/models/entities/note'; +import { Notes } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/notes/create.ts b/src/server/api/endpoints/notes/create.ts index 1650de907..12f423205 100644 --- a/src/server/api/endpoints/notes/create.ts +++ b/src/server/api/endpoints/notes/create.ts @@ -1,15 +1,15 @@ import $ from 'cafy'; import * as ms from 'ms'; import { length } from 'stringz'; -import create from '../../../../services/note/create'; -import define from '../../define'; -import { fetchMeta } from '../../../../misc/fetch-meta'; -import { ApiError } from '../../error'; -import { ID } from '../../../../misc/cafy-id'; -import { User } from '../../../../models/entities/user'; -import { Users, DriveFiles, Notes } from '../../../../models'; -import { DriveFile } from '../../../../models/entities/drive-file'; -import { Note } from '../../../../models/entities/note'; +import create from '~/services/note/create'; +import define from '~/server/api/define'; +import { fetchMeta } from '~/misc/fetch-meta'; +import { ApiError } from '~/server/api/error'; +import { ID } from '~/misc/cafy-id'; +import { User } from '~/models/entities/user'; +import { Users, DriveFiles, Notes } from '~/models'; +import { DriveFile } from '~/models/entities/drive-file'; +import { Note } from '~/models/entities/note'; let maxNoteTextLength = 1000; diff --git a/src/server/api/endpoints/notes/delete.ts b/src/server/api/endpoints/notes/delete.ts index 17d44c424..af51ef4ce 100644 --- a/src/server/api/endpoints/notes/delete.ts +++ b/src/server/api/endpoints/notes/delete.ts @@ -1,12 +1,12 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import deleteNote from '../../../../services/note/delete'; -import define from '../../define'; +import { ID } from '~/misc/cafy-id'; +import deleteNote from '~/services/note/delete'; +import define from '~/server/api/define'; import * as ms from 'ms'; -import { getNote } from '../../common/getters'; -import { ApiError } from '../../error'; -import { Users } from '../../../../models'; -import { ensure } from '../../../../prelude/ensure'; +import { getNote } from '~/server/api/common/getters'; +import { ApiError } from '~/server/api/error'; +import { Users } from '~/models'; +import { ensure } from '~/prelude/ensure'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/notes/favorites/create.ts b/src/server/api/endpoints/notes/favorites/create.ts index e3a786fdb..9ad3201ba 100644 --- a/src/server/api/endpoints/notes/favorites/create.ts +++ b/src/server/api/endpoints/notes/favorites/create.ts @@ -1,10 +1,10 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { getNote } from '../../../common/getters'; -import { NoteFavorites } from '../../../../../models'; -import { genId } from '../../../../../misc/gen-id'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { getNote } from '~/server/api/common/getters'; +import { NoteFavorites } from '~/models'; +import { genId } from '~/misc/gen-id'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/notes/favorites/delete.ts b/src/server/api/endpoints/notes/favorites/delete.ts index eea35ef58..be8597342 100644 --- a/src/server/api/endpoints/notes/favorites/delete.ts +++ b/src/server/api/endpoints/notes/favorites/delete.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { getNote } from '../../../common/getters'; -import { NoteFavorites } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { getNote } from '~/server/api/common/getters'; +import { NoteFavorites } from '~/models'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/notes/featured.ts b/src/server/api/endpoints/notes/featured.ts index 0a1d8668b..35aa34762 100644 --- a/src/server/api/endpoints/notes/featured.ts +++ b/src/server/api/endpoints/notes/featured.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import define from '../../define'; -import { generateMuteQuery } from '../../common/generate-mute-query'; -import { Notes } from '../../../../models'; +import define from '~/server/api/define'; +import { generateMuteQuery } from '~/server/api/common/generate-mute-query'; +import { Notes } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/notes/global-timeline.ts b/src/server/api/endpoints/notes/global-timeline.ts index 8654cf889..1caaec014 100644 --- a/src/server/api/endpoints/notes/global-timeline.ts +++ b/src/server/api/endpoints/notes/global-timeline.ts @@ -1,12 +1,12 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { fetchMeta } from '../../../../misc/fetch-meta'; -import { ApiError } from '../../error'; -import { makePaginationQuery } from '../../common/make-pagination-query'; -import { Notes } from '../../../../models'; -import { generateMuteQuery } from '../../common/generate-mute-query'; -import { activeUsersChart } from '../../../../services/chart'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { fetchMeta } from '~/misc/fetch-meta'; +import { ApiError } from '~/server/api/error'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; +import { Notes } from '~/models'; +import { generateMuteQuery } from '~/server/api/common/generate-mute-query'; +import { activeUsersChart } from '~/services/chart'; export const meta = { desc: { diff --git a/src/server/api/endpoints/notes/hybrid-timeline.ts b/src/server/api/endpoints/notes/hybrid-timeline.ts index 8c4c7a60b..5cf6af4e3 100644 --- a/src/server/api/endpoints/notes/hybrid-timeline.ts +++ b/src/server/api/endpoints/notes/hybrid-timeline.ts @@ -1,14 +1,14 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { fetchMeta } from '../../../../misc/fetch-meta'; -import { ApiError } from '../../error'; -import { makePaginationQuery } from '../../common/make-pagination-query'; -import { Followings, Notes } from '../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { fetchMeta } from '~/misc/fetch-meta'; +import { ApiError } from '~/server/api/error'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; +import { Followings, Notes } from '~/models'; import { Brackets } from 'typeorm'; -import { generateVisibilityQuery } from '../../common/generate-visibility-query'; -import { generateMuteQuery } from '../../common/generate-mute-query'; -import { activeUsersChart } from '../../../../services/chart'; +import { generateVisibilityQuery } from '~/server/api/common/generate-visibility-query'; +import { generateMuteQuery } from '~/server/api/common/generate-mute-query'; +import { activeUsersChart } from '~/services/chart'; export const meta = { desc: { diff --git a/src/server/api/endpoints/notes/local-timeline.ts b/src/server/api/endpoints/notes/local-timeline.ts index c688b9325..786f8c9c8 100644 --- a/src/server/api/endpoints/notes/local-timeline.ts +++ b/src/server/api/endpoints/notes/local-timeline.ts @@ -1,13 +1,13 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { fetchMeta } from '../../../../misc/fetch-meta'; -import { ApiError } from '../../error'; -import { Notes } from '../../../../models'; -import { generateMuteQuery } from '../../common/generate-mute-query'; -import { makePaginationQuery } from '../../common/make-pagination-query'; -import { generateVisibilityQuery } from '../../common/generate-visibility-query'; -import { activeUsersChart } from '../../../../services/chart'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { fetchMeta } from '~/misc/fetch-meta'; +import { ApiError } from '~/server/api/error'; +import { Notes } from '~/models'; +import { generateMuteQuery } from '~/server/api/common/generate-mute-query'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; +import { generateVisibilityQuery } from '~/server/api/common/generate-visibility-query'; +import { activeUsersChart } from '~/services/chart'; import { Brackets } from 'typeorm'; export const meta = { diff --git a/src/server/api/endpoints/notes/mentions.ts b/src/server/api/endpoints/notes/mentions.ts index fd3767f63..0f9e917d9 100644 --- a/src/server/api/endpoints/notes/mentions.ts +++ b/src/server/api/endpoints/notes/mentions.ts @@ -1,11 +1,11 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import read from '../../../../services/note/read'; -import { Notes, Followings } from '../../../../models'; -import { generateVisibilityQuery } from '../../common/generate-visibility-query'; -import { generateMuteQuery } from '../../common/generate-mute-query'; -import { makePaginationQuery } from '../../common/make-pagination-query'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import read from '~/services/note/read'; +import { Notes, Followings } from '~/models'; +import { generateVisibilityQuery } from '~/server/api/common/generate-visibility-query'; +import { generateMuteQuery } from '~/server/api/common/generate-mute-query'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; import { Brackets } from 'typeorm'; export const meta = { diff --git a/src/server/api/endpoints/notes/polls/recommendation.ts b/src/server/api/endpoints/notes/polls/recommendation.ts index cbd4d35cd..b5315e63c 100644 --- a/src/server/api/endpoints/notes/polls/recommendation.ts +++ b/src/server/api/endpoints/notes/polls/recommendation.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; -import define from '../../../define'; -import { Polls, Mutings, Notes, PollVotes } from '../../../../../models'; +import define from '~/server/api/define'; +import { Polls, Mutings, Notes, PollVotes } from '~/models'; import { Brackets, In } from 'typeorm'; export const meta = { diff --git a/src/server/api/endpoints/notes/polls/vote.ts b/src/server/api/endpoints/notes/polls/vote.ts index 0510e70d3..36197febf 100644 --- a/src/server/api/endpoints/notes/polls/vote.ts +++ b/src/server/api/endpoints/notes/polls/vote.ts @@ -1,20 +1,20 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import watch from '../../../../../services/note/watch'; -import { publishNoteStream } from '../../../../../services/stream'; -import { createNotification } from '../../../../../services/create-notification'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { getNote } from '../../../common/getters'; -import { deliver } from '../../../../../queue'; -import { renderActivity } from '../../../../../remote/activitypub/renderer'; -import renderVote from '../../../../../remote/activitypub/renderer/vote'; -import { deliverQuestionUpdate } from '../../../../../services/note/polls/update'; -import { PollVotes, NoteWatchings, Users, Polls, UserProfiles } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import watch from '~/services/note/watch'; +import { publishNoteStream } from '~/services/stream'; +import { createNotification } from '~/services/create-notification'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { getNote } from '~/server/api/common/getters'; +import { deliver } from '~/queue'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import renderVote from '~/remote/activitypub/renderer/vote'; +import { deliverQuestionUpdate } from '~/services/note/polls/update'; +import { PollVotes, NoteWatchings, Users, Polls, UserProfiles } from '~/models'; import { Not } from 'typeorm'; -import { IRemoteUser } from '../../../../../models/entities/user'; -import { genId } from '../../../../../misc/gen-id'; -import { ensure } from '../../../../../prelude/ensure'; +import { IRemoteUser } from '~/models/entities/user'; +import { genId } from '~/misc/gen-id'; +import { ensure } from '~/prelude/ensure'; export const meta = { desc: { diff --git a/src/server/api/endpoints/notes/reactions.ts b/src/server/api/endpoints/notes/reactions.ts index 7bea24d31..7ef5b09d8 100644 --- a/src/server/api/endpoints/notes/reactions.ts +++ b/src/server/api/endpoints/notes/reactions.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { getNote } from '../../common/getters'; -import { ApiError } from '../../error'; -import { NoteReactions } from '../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { getNote } from '~/server/api/common/getters'; +import { ApiError } from '~/server/api/error'; +import { NoteReactions } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/notes/reactions/create.ts b/src/server/api/endpoints/notes/reactions/create.ts index b6aa4c58f..52551d51e 100644 --- a/src/server/api/endpoints/notes/reactions/create.ts +++ b/src/server/api/endpoints/notes/reactions/create.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import createReaction from '../../../../../services/note/reaction/create'; -import define from '../../../define'; -import { getNote } from '../../../common/getters'; -import { ApiError } from '../../../error'; +import { ID } from '~/misc/cafy-id'; +import createReaction from '~/services/note/reaction/create'; +import define from '~/server/api/define'; +import { getNote } from '~/server/api/common/getters'; +import { ApiError } from '~/server/api/error'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/notes/reactions/delete.ts b/src/server/api/endpoints/notes/reactions/delete.ts index 0bdea5802..d36e06dd9 100644 --- a/src/server/api/endpoints/notes/reactions/delete.ts +++ b/src/server/api/endpoints/notes/reactions/delete.ts @@ -1,10 +1,10 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; import * as ms from 'ms'; -import deleteReaction from '../../../../../services/note/reaction/delete'; -import { getNote } from '../../../common/getters'; -import { ApiError } from '../../../error'; +import deleteReaction from '~/services/note/reaction/delete'; +import { getNote } from '~/server/api/common/getters'; +import { ApiError } from '~/server/api/error'; export const meta = { desc: { diff --git a/src/server/api/endpoints/notes/renotes.ts b/src/server/api/endpoints/notes/renotes.ts index a5db706e3..17dc81aad 100644 --- a/src/server/api/endpoints/notes/renotes.ts +++ b/src/server/api/endpoints/notes/renotes.ts @@ -1,12 +1,12 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { getNote } from '../../common/getters'; -import { ApiError } from '../../error'; -import { generateVisibilityQuery } from '../../common/generate-visibility-query'; -import { generateMuteQuery } from '../../common/generate-mute-query'; -import { makePaginationQuery } from '../../common/make-pagination-query'; -import { Notes } from '../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { getNote } from '~/server/api/common/getters'; +import { ApiError } from '~/server/api/error'; +import { generateVisibilityQuery } from '~/server/api/common/generate-visibility-query'; +import { generateMuteQuery } from '~/server/api/common/generate-mute-query'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; +import { Notes } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/notes/replies.ts b/src/server/api/endpoints/notes/replies.ts index cd38d4165..348e77d30 100644 --- a/src/server/api/endpoints/notes/replies.ts +++ b/src/server/api/endpoints/notes/replies.ts @@ -1,10 +1,10 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { Notes } from '../../../../models'; -import { makePaginationQuery } from '../../common/make-pagination-query'; -import { generateVisibilityQuery } from '../../common/generate-visibility-query'; -import { generateMuteQuery } from '../../common/generate-mute-query'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { Notes } from '~/models'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; +import { generateVisibilityQuery } from '~/server/api/common/generate-visibility-query'; +import { generateMuteQuery } from '~/server/api/common/generate-mute-query'; export const meta = { desc: { diff --git a/src/server/api/endpoints/notes/search-by-tag.ts b/src/server/api/endpoints/notes/search-by-tag.ts index 7f53b2699..d39807528 100644 --- a/src/server/api/endpoints/notes/search-by-tag.ts +++ b/src/server/api/endpoints/notes/search-by-tag.ts @@ -1,10 +1,10 @@ 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'; -import { generateVisibilityQuery } from '../../common/generate-visibility-query'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; +import { Notes } from '~/models'; +import { generateMuteQuery } from '~/server/api/common/generate-mute-query'; +import { generateVisibilityQuery } from '~/server/api/common/generate-visibility-query'; import { Brackets } from 'typeorm'; export const meta = { diff --git a/src/server/api/endpoints/notes/search.ts b/src/server/api/endpoints/notes/search.ts index 5557b469e..a2f8d9efd 100644 --- a/src/server/api/endpoints/notes/search.ts +++ b/src/server/api/endpoints/notes/search.ts @@ -1,11 +1,11 @@ import $ from 'cafy'; -import es from '../../../../db/elasticsearch'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { Notes } from '../../../../models'; +import es from '~/db/elasticsearch'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { Notes } from '~/models'; import { In } from 'typeorm'; -import { ID } from '../../../../misc/cafy-id'; -import config from '../../../../config'; +import { ID } from '~/misc/cafy-id'; +import config from '~/config'; export const meta = { desc: { diff --git a/src/server/api/endpoints/notes/show.ts b/src/server/api/endpoints/notes/show.ts index 75abbae55..7111f2af9 100644 --- a/src/server/api/endpoints/notes/show.ts +++ b/src/server/api/endpoints/notes/show.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { getNote } from '../../common/getters'; -import { ApiError } from '../../error'; -import { Notes } from '../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { getNote } from '~/server/api/common/getters'; +import { ApiError } from '~/server/api/error'; +import { Notes } from '~/models'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/notes/state.ts b/src/server/api/endpoints/notes/state.ts index df1d9d9fb..740d65ab0 100644 --- a/src/server/api/endpoints/notes/state.ts +++ b/src/server/api/endpoints/notes/state.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { NoteFavorites, NoteWatchings } from '../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { NoteFavorites, NoteWatchings } from '~/models'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/notes/timeline.ts b/src/server/api/endpoints/notes/timeline.ts index 25876f655..087ccd907 100644 --- a/src/server/api/endpoints/notes/timeline.ts +++ b/src/server/api/endpoints/notes/timeline.ts @@ -1,11 +1,11 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { makePaginationQuery } from '../../common/make-pagination-query'; -import { Notes, Followings } from '../../../../models'; -import { generateVisibilityQuery } from '../../common/generate-visibility-query'; -import { generateMuteQuery } from '../../common/generate-mute-query'; -import { activeUsersChart } from '../../../../services/chart'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; +import { Notes, Followings } from '~/models'; +import { generateVisibilityQuery } from '~/server/api/common/generate-visibility-query'; +import { generateMuteQuery } from '~/server/api/common/generate-mute-query'; +import { activeUsersChart } from '~/services/chart'; import { Brackets } from 'typeorm'; export const meta = { diff --git a/src/server/api/endpoints/notes/unrenote.ts b/src/server/api/endpoints/notes/unrenote.ts index a2070fd22..4966b12c0 100644 --- a/src/server/api/endpoints/notes/unrenote.ts +++ b/src/server/api/endpoints/notes/unrenote.ts @@ -1,11 +1,11 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import deleteNote from '../../../../services/note/delete'; -import define from '../../define'; +import { ID } from '~/misc/cafy-id'; +import deleteNote from '~/services/note/delete'; +import define from '~/server/api/define'; import * as ms from 'ms'; -import { getNote } from '../../common/getters'; -import { ApiError } from '../../error'; -import { Notes } from '../../../../models'; +import { getNote } from '~/server/api/common/getters'; +import { ApiError } from '~/server/api/error'; +import { Notes } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/notes/user-list-timeline.ts b/src/server/api/endpoints/notes/user-list-timeline.ts index f66221537..85c25faae 100644 --- a/src/server/api/endpoints/notes/user-list-timeline.ts +++ b/src/server/api/endpoints/notes/user-list-timeline.ts @@ -1,11 +1,11 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { UserLists, UserListJoinings, Notes } from '../../../../models'; -import { makePaginationQuery } from '../../common/make-pagination-query'; -import { generateVisibilityQuery } from '../../common/generate-visibility-query'; -import { activeUsersChart } from '../../../../services/chart'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { UserLists, UserListJoinings, Notes } from '~/models'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; +import { generateVisibilityQuery } from '~/server/api/common/generate-visibility-query'; +import { activeUsersChart } from '~/services/chart'; export const meta = { desc: { diff --git a/src/server/api/endpoints/notes/watching/create.ts b/src/server/api/endpoints/notes/watching/create.ts index b4045fe93..018d38164 100644 --- a/src/server/api/endpoints/notes/watching/create.ts +++ b/src/server/api/endpoints/notes/watching/create.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import watch from '../../../../../services/note/watch'; -import { getNote } from '../../../common/getters'; -import { ApiError } from '../../../error'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import watch from '~/services/note/watch'; +import { getNote } from '~/server/api/common/getters'; +import { ApiError } from '~/server/api/error'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/notes/watching/delete.ts b/src/server/api/endpoints/notes/watching/delete.ts index a272ecc37..1127b04f5 100644 --- a/src/server/api/endpoints/notes/watching/delete.ts +++ b/src/server/api/endpoints/notes/watching/delete.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import unwatch from '../../../../../services/note/unwatch'; -import { getNote } from '../../../common/getters'; -import { ApiError } from '../../../error'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import unwatch from '~/services/note/unwatch'; +import { getNote } from '~/server/api/common/getters'; +import { ApiError } from '~/server/api/error'; export const meta = { stability: 'stable', diff --git a/src/server/api/endpoints/notifications/mark-all-as-read.ts b/src/server/api/endpoints/notifications/mark-all-as-read.ts index 9f34a32e8..ebd562b87 100644 --- a/src/server/api/endpoints/notifications/mark-all-as-read.ts +++ b/src/server/api/endpoints/notifications/mark-all-as-read.ts @@ -1,6 +1,6 @@ -import { publishMainStream } from '../../../../services/stream'; -import define from '../../define'; -import { Notifications } from '../../../../models'; +import { publishMainStream } from '~/services/stream'; +import define from '~/server/api/define'; +import { Notifications } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/page-push.ts b/src/server/api/endpoints/page-push.ts index bdd2ebfe5..ff58c436f 100644 --- a/src/server/api/endpoints/page-push.ts +++ b/src/server/api/endpoints/page-push.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import define from '../define'; -import { ID } from '../../../misc/cafy-id'; -import { publishMainStream } from '../../../services/stream'; -import { Users, Pages } from '../../../models'; -import { ApiError } from '../error'; +import define from '~/server/api/define'; +import { ID } from '~/misc/cafy-id'; +import { publishMainStream } from '~/services/stream'; +import { Users, Pages } from '~/models'; +import { ApiError } from '~/server/api/error'; export const meta = { requireCredential: true, diff --git a/src/server/api/endpoints/pages/create.ts b/src/server/api/endpoints/pages/create.ts index a49a5d37b..23b8b262c 100644 --- a/src/server/api/endpoints/pages/create.ts +++ b/src/server/api/endpoints/pages/create.ts @@ -1,11 +1,11 @@ import $ from 'cafy'; import * as ms from 'ms'; -import define from '../../define'; -import { ID } from '../../../../misc/cafy-id'; -import { Pages, DriveFiles } from '../../../../models'; -import { genId } from '../../../../misc/gen-id'; -import { Page } from '../../../../models/entities/page'; -import { ApiError } from '../../error'; +import define from '~/server/api/define'; +import { ID } from '~/misc/cafy-id'; +import { Pages, DriveFiles } from '~/models'; +import { genId } from '~/misc/gen-id'; +import { Page } from '~/models/entities/page'; +import { ApiError } from '~/server/api/error'; export const meta = { desc: { diff --git a/src/server/api/endpoints/pages/delete.ts b/src/server/api/endpoints/pages/delete.ts index 043805aa3..9ca7ef970 100644 --- a/src/server/api/endpoints/pages/delete.ts +++ b/src/server/api/endpoints/pages/delete.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { Pages } from '../../../../models'; -import { ID } from '../../../../misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { Pages } from '~/models'; +import { ID } from '~/misc/cafy-id'; export const meta = { desc: { diff --git a/src/server/api/endpoints/pages/like.ts b/src/server/api/endpoints/pages/like.ts index 5a50bd6c6..aa16e3bdd 100644 --- a/src/server/api/endpoints/pages/like.ts +++ b/src/server/api/endpoints/pages/like.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { Pages, PageLikes } from '../../../../models'; -import { genId } from '../../../../misc/gen-id'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { Pages, PageLikes } from '~/models'; +import { genId } from '~/misc/gen-id'; export const meta = { desc: { diff --git a/src/server/api/endpoints/pages/show.ts b/src/server/api/endpoints/pages/show.ts index 84808418f..c88d9b2a1 100644 --- a/src/server/api/endpoints/pages/show.ts +++ b/src/server/api/endpoints/pages/show.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { Pages, Users } from '../../../../models'; -import { ID } from '../../../../misc/cafy-id'; -import { Page } from '../../../../models/entities/page'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { Pages, Users } from '~/models'; +import { ID } from '~/misc/cafy-id'; +import { Page } from '~/models/entities/page'; export const meta = { desc: { diff --git a/src/server/api/endpoints/pages/unlike.ts b/src/server/api/endpoints/pages/unlike.ts index 49ad999b3..5e06ace3c 100644 --- a/src/server/api/endpoints/pages/unlike.ts +++ b/src/server/api/endpoints/pages/unlike.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { Pages, PageLikes } from '../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { Pages, PageLikes } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/pages/update.ts b/src/server/api/endpoints/pages/update.ts index 9daf5e9ca..3a67d7e1e 100644 --- a/src/server/api/endpoints/pages/update.ts +++ b/src/server/api/endpoints/pages/update.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; import * as ms from 'ms'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { Pages, DriveFiles } from '../../../../models'; -import { ID } from '../../../../misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { Pages, DriveFiles } from '~/models'; +import { ID } from '~/misc/cafy-id'; export const meta = { desc: { diff --git a/src/server/api/endpoints/pinned-users.ts b/src/server/api/endpoints/pinned-users.ts index 853e1cd4b..347890e6a 100644 --- a/src/server/api/endpoints/pinned-users.ts +++ b/src/server/api/endpoints/pinned-users.ts @@ -1,8 +1,8 @@ -import define from '../define'; -import { Users } from '../../../models'; -import { fetchMeta } from '../../../misc/fetch-meta'; -import parseAcct from '../../../misc/acct/parse'; -import { User } from '../../../models/entities/user'; +import define from '~/server/api/define'; +import { Users } from '~/models'; +import { fetchMeta } from '~/misc/fetch-meta'; +import parseAcct from '~/misc/acct/parse'; +import { User } from '~/models/entities/user'; export const meta = { tags: ['users'], diff --git a/src/server/api/endpoints/stats.ts b/src/server/api/endpoints/stats.ts index c86d893d5..1bf77d4d5 100644 --- a/src/server/api/endpoints/stats.ts +++ b/src/server/api/endpoints/stats.ts @@ -1,6 +1,6 @@ -import define from '../define'; -import { Notes, Users } from '../../../models'; -import { federationChart, driveChart } from '../../../services/chart'; +import define from '~/server/api/define'; +import { Notes, Users } from '~/models'; +import { federationChart, driveChart } from '~/services/chart'; export const meta = { requireCredential: false, diff --git a/src/server/api/endpoints/sw/register.ts b/src/server/api/endpoints/sw/register.ts index a4838b456..3717ae83f 100644 --- a/src/server/api/endpoints/sw/register.ts +++ b/src/server/api/endpoints/sw/register.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import define from '../../define'; -import { fetchMeta } from '../../../../misc/fetch-meta'; -import { genId } from '../../../../misc/gen-id'; -import { SwSubscriptions } from '../../../../models'; +import define from '~/server/api/define'; +import { fetchMeta } from '~/misc/fetch-meta'; +import { genId } from '~/misc/gen-id'; +import { SwSubscriptions } from '~/models'; export const meta = { tags: ['account'], diff --git a/src/server/api/endpoints/username/available.ts b/src/server/api/endpoints/username/available.ts index f393d6ed0..b5a39e0ab 100644 --- a/src/server/api/endpoints/username/available.ts +++ b/src/server/api/endpoints/username/available.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; -import define from '../../define'; -import { Users, UsedUsernames } from '../../../../models'; +import define from '~/server/api/define'; +import { Users, UsedUsernames } from '~/models'; export const meta = { tags: ['users'], diff --git a/src/server/api/endpoints/users.ts b/src/server/api/endpoints/users.ts index 93cf01a6f..67d523a60 100644 --- a/src/server/api/endpoints/users.ts +++ b/src/server/api/endpoints/users.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import define from '../define'; -import { Users } from '../../../models'; -import { generateMuteQueryForUsers } from '../common/generate-mute-query'; +import define from '~/server/api/define'; +import { Users } from '~/models'; +import { generateMuteQueryForUsers } from '~/server/api/common/generate-mute-query'; export const meta = { tags: ['users'], diff --git a/src/server/api/endpoints/users/followers.ts b/src/server/api/endpoints/users/followers.ts index 68c32fe98..ccfcf3e6e 100644 --- a/src/server/api/endpoints/users/followers.ts +++ b/src/server/api/endpoints/users/followers.ts @@ -1,10 +1,10 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { Users, Followings } from '../../../../models'; -import { makePaginationQuery } from '../../common/make-pagination-query'; -import { toPunyNullable } from '../../../../misc/convert-host'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { Users, Followings } from '~/models'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; +import { toPunyNullable } from '~/misc/convert-host'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/following.ts b/src/server/api/endpoints/users/following.ts index eb699b290..f474e4b28 100644 --- a/src/server/api/endpoints/users/following.ts +++ b/src/server/api/endpoints/users/following.ts @@ -1,10 +1,10 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { Users, Followings } from '../../../../models'; -import { makePaginationQuery } from '../../common/make-pagination-query'; -import { toPunyNullable } from '../../../../misc/convert-host'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { Users, Followings } from '~/models'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; +import { toPunyNullable } from '~/misc/convert-host'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/get-frequently-replied-users.ts b/src/server/api/endpoints/users/get-frequently-replied-users.ts index 1a17b488f..384c1b370 100644 --- a/src/server/api/endpoints/users/get-frequently-replied-users.ts +++ b/src/server/api/endpoints/users/get-frequently-replied-users.ts @@ -1,11 +1,11 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { maximum } from '../../../../prelude/array'; -import { ApiError } from '../../error'; -import { getUser } from '../../common/getters'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { maximum } from '~/prelude/array'; +import { ApiError } from '~/server/api/error'; +import { getUser } from '~/server/api/common/getters'; import { Not, In, IsNull } from 'typeorm'; -import { Notes, Users } from '../../../../models'; +import { Notes, Users } from '~/models'; export const meta = { tags: ['users'], diff --git a/src/server/api/endpoints/users/groups/create.ts b/src/server/api/endpoints/users/groups/create.ts index 2a6e5135e..1a11ce2bf 100644 --- a/src/server/api/endpoints/users/groups/create.ts +++ b/src/server/api/endpoints/users/groups/create.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import define from '../../../define'; -import { UserGroups, UserGroupJoinings } from '../../../../../models'; -import { genId } from '../../../../../misc/gen-id'; -import { UserGroup } from '../../../../../models/entities/user-group'; -import { UserGroupJoining } from '../../../../../models/entities/user-group-joining'; +import define from '~/server/api/define'; +import { UserGroups, UserGroupJoinings } from '~/models'; +import { genId } from '~/misc/gen-id'; +import { UserGroup } from '~/models/entities/user-group'; +import { UserGroupJoining } from '~/models/entities/user-group-joining'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/groups/delete.ts b/src/server/api/endpoints/users/groups/delete.ts index 4f89c324a..b50f13665 100644 --- a/src/server/api/endpoints/users/groups/delete.ts +++ b/src/server/api/endpoints/users/groups/delete.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { UserGroups } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { UserGroups } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/groups/invitations/accept.ts b/src/server/api/endpoints/users/groups/invitations/accept.ts index 33779dd34..afc75de7a 100644 --- a/src/server/api/endpoints/users/groups/invitations/accept.ts +++ b/src/server/api/endpoints/users/groups/invitations/accept.ts @@ -1,10 +1,10 @@ import $ from 'cafy'; -import { ID } from '../../../../../../misc/cafy-id'; -import define from '../../../../define'; -import { ApiError } from '../../../../error'; -import { UserGroupJoinings, UserGroupInvites } from '../../../../../../models'; -import { genId } from '../../../../../../misc/gen-id'; -import { UserGroupJoining } from '../../../../../../models/entities/user-group-joining'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { UserGroupJoinings, UserGroupInvites } from '~/models'; +import { genId } from '~/misc/gen-id'; +import { UserGroupJoining } from '~/models/entities/user-group-joining'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/groups/invitations/reject.ts b/src/server/api/endpoints/users/groups/invitations/reject.ts index e9e7bc8b4..9ab24cc31 100644 --- a/src/server/api/endpoints/users/groups/invitations/reject.ts +++ b/src/server/api/endpoints/users/groups/invitations/reject.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../../../misc/cafy-id'; -import define from '../../../../define'; -import { ApiError } from '../../../../error'; -import { UserGroupInvites } from '../../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { UserGroupInvites } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/groups/invite.ts b/src/server/api/endpoints/users/groups/invite.ts index 503184a92..813c1b515 100644 --- a/src/server/api/endpoints/users/groups/invite.ts +++ b/src/server/api/endpoints/users/groups/invite.ts @@ -1,11 +1,11 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { getUser } from '../../../common/getters'; -import { UserGroups, UserGroupJoinings, UserGroupInvites } from '../../../../../models'; -import { genId } from '../../../../../misc/gen-id'; -import { UserGroupInvite } from '../../../../../models/entities/user-group-invite'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { getUser } from '~/server/api/common/getters'; +import { UserGroups, UserGroupJoinings, UserGroupInvites } from '~/models'; +import { genId } from '~/misc/gen-id'; +import { UserGroupInvite } from '~/models/entities/user-group-invite'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/groups/joined.ts b/src/server/api/endpoints/users/groups/joined.ts index c60ba57c0..e3ffa1231 100644 --- a/src/server/api/endpoints/users/groups/joined.ts +++ b/src/server/api/endpoints/users/groups/joined.ts @@ -1,5 +1,5 @@ -import define from '../../../define'; -import { UserGroups, UserGroupJoinings } from '../../../../../models'; +import define from '~/server/api/define'; +import { UserGroups, UserGroupJoinings } from '~/models'; import { Not, In } from 'typeorm'; export const meta = { diff --git a/src/server/api/endpoints/users/groups/owned.ts b/src/server/api/endpoints/users/groups/owned.ts index e2c0bf2fc..5188cc568 100644 --- a/src/server/api/endpoints/users/groups/owned.ts +++ b/src/server/api/endpoints/users/groups/owned.ts @@ -1,5 +1,5 @@ -import define from '../../../define'; -import { UserGroups } from '../../../../../models'; +import define from '~/server/api/define'; +import { UserGroups } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/groups/pull.ts b/src/server/api/endpoints/users/groups/pull.ts index 3943560d7..7a6f3c976 100644 --- a/src/server/api/endpoints/users/groups/pull.ts +++ b/src/server/api/endpoints/users/groups/pull.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { getUser } from '../../../common/getters'; -import { UserGroups, UserGroupJoinings } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { getUser } from '~/server/api/common/getters'; +import { UserGroups, UserGroupJoinings } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/groups/show.ts b/src/server/api/endpoints/users/groups/show.ts index 643f1acf7..38a0fc9b9 100644 --- a/src/server/api/endpoints/users/groups/show.ts +++ b/src/server/api/endpoints/users/groups/show.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { UserGroups, UserGroupJoinings } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { UserGroups, UserGroupJoinings } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/groups/transfer.ts b/src/server/api/endpoints/users/groups/transfer.ts index 012f9f4ef..31df45cfd 100644 --- a/src/server/api/endpoints/users/groups/transfer.ts +++ b/src/server/api/endpoints/users/groups/transfer.ts @@ -1,9 +1,9 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { getUser } from '../../../common/getters'; -import { UserGroups, UserGroupJoinings } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { getUser } from '~/server/api/common/getters'; +import { UserGroups, UserGroupJoinings } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/groups/update.ts b/src/server/api/endpoints/users/groups/update.ts index 2fc0a803a..d3031239a 100644 --- a/src/server/api/endpoints/users/groups/update.ts +++ b/src/server/api/endpoints/users/groups/update.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { UserGroups } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { UserGroups } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/lists/create.ts b/src/server/api/endpoints/users/lists/create.ts index 28af3c8d8..ff874b922 100644 --- a/src/server/api/endpoints/users/lists/create.ts +++ b/src/server/api/endpoints/users/lists/create.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import define from '../../../define'; -import { UserLists } from '../../../../../models'; -import { genId } from '../../../../../misc/gen-id'; -import { UserList } from '../../../../../models/entities/user-list'; +import define from '~/server/api/define'; +import { UserLists } from '~/models'; +import { genId } from '~/misc/gen-id'; +import { UserList } from '~/models/entities/user-list'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/lists/delete.ts b/src/server/api/endpoints/users/lists/delete.ts index 0634bca4e..956e9768b 100644 --- a/src/server/api/endpoints/users/lists/delete.ts +++ b/src/server/api/endpoints/users/lists/delete.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { UserLists } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { UserLists } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/lists/list.ts b/src/server/api/endpoints/users/lists/list.ts index 7b89d3431..d058789d2 100644 --- a/src/server/api/endpoints/users/lists/list.ts +++ b/src/server/api/endpoints/users/lists/list.ts @@ -1,5 +1,5 @@ -import define from '../../../define'; -import { UserLists } from '../../../../../models'; +import define from '~/server/api/define'; +import { UserLists } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/lists/pull.ts b/src/server/api/endpoints/users/lists/pull.ts index 524670b34..15119b009 100644 --- a/src/server/api/endpoints/users/lists/pull.ts +++ b/src/server/api/endpoints/users/lists/pull.ts @@ -1,10 +1,10 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import { publishUserListStream } from '../../../../../services/stream'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { getUser } from '../../../common/getters'; -import { UserLists, UserListJoinings, Users } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import { publishUserListStream } from '~/services/stream'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { getUser } from '~/server/api/common/getters'; +import { UserLists, UserListJoinings, Users } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/lists/push.ts b/src/server/api/endpoints/users/lists/push.ts index bdc840308..ec5eca0c4 100644 --- a/src/server/api/endpoints/users/lists/push.ts +++ b/src/server/api/endpoints/users/lists/push.ts @@ -1,10 +1,10 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { getUser } from '../../../common/getters'; -import { pushUserToUserList } from '../../../../../services/user-list/push'; -import { UserLists, UserListJoinings } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { getUser } from '~/server/api/common/getters'; +import { pushUserToUserList } from '~/services/user-list/push'; +import { UserLists, UserListJoinings } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/lists/show.ts b/src/server/api/endpoints/users/lists/show.ts index 01d03d1bf..566babdfc 100644 --- a/src/server/api/endpoints/users/lists/show.ts +++ b/src/server/api/endpoints/users/lists/show.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { UserLists } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { UserLists } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/lists/update.ts b/src/server/api/endpoints/users/lists/update.ts index dc08d59f6..5c4ed8c1c 100644 --- a/src/server/api/endpoints/users/lists/update.ts +++ b/src/server/api/endpoints/users/lists/update.ts @@ -1,8 +1,8 @@ import $ from 'cafy'; -import { ID } from '../../../../../misc/cafy-id'; -import define from '../../../define'; -import { ApiError } from '../../../error'; -import { UserLists } from '../../../../../models'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { UserLists } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/notes.ts b/src/server/api/endpoints/users/notes.ts index ef564b3c3..e31c4d907 100644 --- a/src/server/api/endpoints/users/notes.ts +++ b/src/server/api/endpoints/users/notes.ts @@ -1,12 +1,12 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { ApiError } from '../../error'; -import { getUser } from '../../common/getters'; -import { makePaginationQuery } from '../../common/make-pagination-query'; -import { generateVisibilityQuery } from '../../common/generate-visibility-query'; -import { Notes } from '../../../../models'; -import { generateMuteQuery } from '../../common/generate-mute-query'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { ApiError } from '~/server/api/error'; +import { getUser } from '~/server/api/common/getters'; +import { makePaginationQuery } from '~/server/api/common/make-pagination-query'; +import { generateVisibilityQuery } from '~/server/api/common/generate-visibility-query'; +import { Notes } from '~/models'; +import { generateMuteQuery } from '~/server/api/common/generate-mute-query'; import { Brackets } from 'typeorm'; export const meta = { diff --git a/src/server/api/endpoints/users/recommendation.ts b/src/server/api/endpoints/users/recommendation.ts index 5f7f287fe..34c19e720 100644 --- a/src/server/api/endpoints/users/recommendation.ts +++ b/src/server/api/endpoints/users/recommendation.ts @@ -1,9 +1,9 @@ import * as ms from 'ms'; import $ from 'cafy'; -import define from '../../define'; -import { Users, Followings } from '../../../../models'; -import { generateMuteQueryForUsers } from '../../common/generate-mute-query'; -import { generateBlockQueryForUsers } from '../../common/generate-block-query'; +import define from '~/server/api/define'; +import { Users, Followings } from '~/models'; +import { generateMuteQueryForUsers } from '~/server/api/common/generate-mute-query'; +import { generateBlockQueryForUsers } from '~/server/api/common/generate-block-query'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/relation.ts b/src/server/api/endpoints/users/relation.ts index 4971738d3..cfbdc3124 100644 --- a/src/server/api/endpoints/users/relation.ts +++ b/src/server/api/endpoints/users/relation.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import define from '../../define'; -import { ID } from '../../../../misc/cafy-id'; -import { Users } from '../../../../models'; +import define from '~/server/api/define'; +import { ID } from '~/misc/cafy-id'; +import { Users } from '~/models'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/report-abuse.ts b/src/server/api/endpoints/users/report-abuse.ts index 2ee28c900..42cac0bdb 100644 --- a/src/server/api/endpoints/users/report-abuse.ts +++ b/src/server/api/endpoints/users/report-abuse.ts @@ -1,11 +1,11 @@ import $ from 'cafy'; -import { ID } from '../../../../misc/cafy-id'; -import define from '../../define'; -import { publishAdminStream } from '../../../../services/stream'; -import { ApiError } from '../../error'; -import { getUser } from '../../common/getters'; -import { AbuseUserReports, Users } from '../../../../models'; -import { genId } from '../../../../misc/gen-id'; +import { ID } from '~/misc/cafy-id'; +import define from '~/server/api/define'; +import { publishAdminStream } from '~/services/stream'; +import { ApiError } from '~/server/api/error'; +import { getUser } from '~/server/api/common/getters'; +import { AbuseUserReports, Users } from '~/models'; +import { genId } from '~/misc/gen-id'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/search.ts b/src/server/api/endpoints/users/search.ts index 9aa9e398e..97503a811 100644 --- a/src/server/api/endpoints/users/search.ts +++ b/src/server/api/endpoints/users/search.ts @@ -1,7 +1,7 @@ import $ from 'cafy'; -import define from '../../define'; -import { Users } from '../../../../models'; -import { User } from '../../../../models/entities/user'; +import define from '~/server/api/define'; +import { Users } from '~/models'; +import { User } from '~/models/entities/user'; export const meta = { desc: { diff --git a/src/server/api/endpoints/users/show.ts b/src/server/api/endpoints/users/show.ts index d17dd51c0..9cc85152b 100644 --- a/src/server/api/endpoints/users/show.ts +++ b/src/server/api/endpoints/users/show.ts @@ -1,10 +1,10 @@ import $ from 'cafy'; -import { resolveUser } from '../../../../remote/resolve-user'; -import define from '../../define'; -import { apiLogger } from '../../logger'; -import { ApiError } from '../../error'; -import { ID } from '../../../../misc/cafy-id'; -import { Users } from '../../../../models'; +import { resolveUser } from '~/remote/resolve-user'; +import define from '~/server/api/define'; +import { apiLogger } from '~/server/api/logger'; +import { ApiError } from '~/server/api/error'; +import { ID } from '~/misc/cafy-id'; +import { Users } from '~/models'; import { In } from 'typeorm'; export const meta = { diff --git a/src/server/api/index.ts b/src/server/api/index.ts index 49500b2b4..d388ce391 100644 --- a/src/server/api/index.ts +++ b/src/server/api/index.ts @@ -15,7 +15,7 @@ import signin from './private/signin'; import discord from './service/discord'; import github from './service/github'; import twitter from './service/twitter'; -import { Instances } from '../../models'; +import { Instances } from '~/models'; // Init app const app = new Koa(); diff --git a/src/server/api/limiter.ts b/src/server/api/limiter.ts index 48d12d3cc..6d479ee25 100644 --- a/src/server/api/limiter.ts +++ b/src/server/api/limiter.ts @@ -1,9 +1,9 @@ import * as Limiter from 'ratelimiter'; -import limiterDB from '../../db/redis'; +import limiterDB from '~/db/redis'; import { IEndpoint } from './endpoints'; -import getAcct from '../../misc/acct/render'; -import { User } from '../../models/entities/user'; -import Logger from '../../services/logger'; +import getAcct from '~/misc/acct/render'; +import { User } from '~/models/entities/user'; +import Logger from '~/services/logger'; const logger = new Logger('limiter'); diff --git a/src/server/api/logger.ts b/src/server/api/logger.ts index dde4b0d5f..681b46d7b 100644 --- a/src/server/api/logger.ts +++ b/src/server/api/logger.ts @@ -1,3 +1,3 @@ -import Logger from '../../services/logger'; +import Logger from '~/services/logger'; export const apiLogger = new Logger('api'); diff --git a/src/server/api/openapi/description.ts b/src/server/api/openapi/description.ts index 9006dfbfa..42811233b 100644 --- a/src/server/api/openapi/description.ts +++ b/src/server/api/openapi/description.ts @@ -1,8 +1,8 @@ -import config from '../../../config'; -import endpoints from '../endpoints'; -import * as locale from '../../../../locales/'; -import { fromEntries } from '../../../prelude/array'; -import { kinds as kindsList } from '../kinds'; +import config from '~/config'; +import endpoints from '~/server/api/endpoints'; +import * as locale from '%'; +import { fromEntries } from '~/prelude/array'; +import { kinds as kindsList } from '~/server/api/kinds'; export interface IKindInfo { endpoints: string[]; diff --git a/src/server/api/openapi/gen-spec.ts b/src/server/api/openapi/gen-spec.ts index de26b970e..535ea05a7 100644 --- a/src/server/api/openapi/gen-spec.ts +++ b/src/server/api/openapi/gen-spec.ts @@ -1,6 +1,6 @@ -import endpoints from '../endpoints'; +import endpoints from '~/server/api/endpoints'; import { Context } from 'cafy'; -import config from '../../../config'; +import config from '~/config'; import { errors as basicErrors } from './errors'; import { schemas, convertSchemaToOpenApiSchema } from './schemas'; import { getDescription } from './description'; diff --git a/src/server/api/openapi/schemas.ts b/src/server/api/openapi/schemas.ts index 0a49607f0..27617ac51 100644 --- a/src/server/api/openapi/schemas.ts +++ b/src/server/api/openapi/schemas.ts @@ -1,20 +1,20 @@ -import { packedUserSchema } from '../../../models/repositories/user'; -import { Schema } from '../../../misc/schema'; -import { packedNoteSchema } from '../../../models/repositories/note'; -import { packedUserListSchema } from '../../../models/repositories/user-list'; -import { packedAppSchema } from '../../../models/repositories/app'; -import { packedMessagingMessageSchema } from '../../../models/repositories/messaging-message'; -import { packedNotificationSchema } from '../../../models/repositories/notification'; -import { packedDriveFileSchema } from '../../../models/repositories/drive-file'; -import { packedDriveFolderSchema } from '../../../models/repositories/drive-folder'; -import { packedFollowingSchema } from '../../../models/repositories/following'; -import { packedMutingSchema } from '../../../models/repositories/muting'; -import { packedBlockingSchema } from '../../../models/repositories/blocking'; -import { packedNoteReactionSchema } from '../../../models/repositories/note-reaction'; -import { packedHashtagSchema } from '../../../models/repositories/hashtag'; -import { packedPageSchema } from '../../../models/repositories/page'; -import { packedUserGroupSchema } from '../../../models/repositories/user-group'; -import { packedNoteFavoriteSchema } from '../../../models/repositories/note-favorite'; +import { packedUserSchema } from '~/models/repositories/user'; +import { Schema } from '~/misc/schema'; +import { packedNoteSchema } from '~/models/repositories/note'; +import { packedUserListSchema } from '~/models/repositories/user-list'; +import { packedAppSchema } from '~/models/repositories/app'; +import { packedMessagingMessageSchema } from '~/models/repositories/messaging-message'; +import { packedNotificationSchema } from '~/models/repositories/notification'; +import { packedDriveFileSchema } from '~/models/repositories/drive-file'; +import { packedDriveFolderSchema } from '~/models/repositories/drive-folder'; +import { packedFollowingSchema } from '~/models/repositories/following'; +import { packedMutingSchema } from '~/models/repositories/muting'; +import { packedBlockingSchema } from '~/models/repositories/blocking'; +import { packedNoteReactionSchema } from '~/models/repositories/note-reaction'; +import { packedHashtagSchema } from '~/models/repositories/hashtag'; +import { packedPageSchema } from '~/models/repositories/page'; +import { packedUserGroupSchema } from '~/models/repositories/user-group'; +import { packedNoteFavoriteSchema } from '~/models/repositories/note-favorite'; export function convertSchemaToOpenApiSchema(schema: Schema) { const res: any = schema; diff --git a/src/server/api/private/signin.ts b/src/server/api/private/signin.ts index de0e35f50..81acc985f 100644 --- a/src/server/api/private/signin.ts +++ b/src/server/api/private/signin.ts @@ -1,13 +1,13 @@ import * as Koa from 'koa'; import * as bcrypt from 'bcryptjs'; import * as speakeasy from 'speakeasy'; -import signin from '../common/signin'; -import config from '../../../config'; -import { Users, Signins, UserProfiles, UserSecurityKeys, AttestationChallenges } from '../../../models'; -import { ILocalUser } from '../../../models/entities/user'; -import { genId } from '../../../misc/gen-id'; -import { ensure } from '../../../prelude/ensure'; -import { verifyLogin, hash } from '../2fa'; +import signin from '~/server/api/common/signin'; +import config from '~/config'; +import { Users, Signins, UserProfiles, UserSecurityKeys, AttestationChallenges } from '~/models'; +import { ILocalUser } from '~/models/entities/user'; +import { genId } from '~/misc/gen-id'; +import { ensure } from '~/prelude/ensure'; +import { verifyLogin, hash } from '~/server/api/2fa'; import { randomBytes } from 'crypto'; export default async (ctx: Koa.BaseContext) => { diff --git a/src/server/api/private/signup.ts b/src/server/api/private/signup.ts index d535d4983..d99aee71d 100644 --- a/src/server/api/private/signup.ts +++ b/src/server/api/private/signup.ts @@ -1,19 +1,19 @@ import * as Koa from 'koa'; import * as bcrypt from 'bcryptjs'; import { generateKeyPair } from 'crypto'; -import generateUserToken from '../common/generate-native-user-token'; -import config from '../../../config'; -import { fetchMeta } from '../../../misc/fetch-meta'; +import generateUserToken from '~/server/api/common/generate-native-user-token'; +import config from '~/config'; +import { fetchMeta } from '~/misc/fetch-meta'; import * as recaptcha from 'recaptcha-promise'; -import { Users, Signins, RegistrationTickets, UsedUsernames } from '../../../models'; -import { genId } from '../../../misc/gen-id'; -import { usersChart } from '../../../services/chart'; -import { User } from '../../../models/entities/user'; -import { UserKeypair } from '../../../models/entities/user-keypair'; -import { toPunyNullable } from '../../../misc/convert-host'; -import { UserProfile } from '../../../models/entities/user-profile'; +import { Users, Signins, RegistrationTickets, UsedUsernames } from '~/models'; +import { genId } from '~/misc/gen-id'; +import { usersChart } from '~/services/chart'; +import { User } from '~/models/entities/user'; +import { UserKeypair } from '~/models/entities/user-keypair'; +import { toPunyNullable } from '~/misc/convert-host'; +import { UserProfile } from '~/models/entities/user-profile'; import { getConnection } from 'typeorm'; -import { UsedUsername } from '../../../models/entities/used-username'; +import { UsedUsername } from '~/models/entities/used-username'; export default async (ctx: Koa.BaseContext) => { const body = ctx.request.body as any; diff --git a/src/server/api/service/discord.ts b/src/server/api/service/discord.ts index 29da17dd9..0af30ce03 100644 --- a/src/server/api/service/discord.ts +++ b/src/server/api/service/discord.ts @@ -2,15 +2,15 @@ import * as Koa from 'koa'; import * as Router from 'koa-router'; import * as request from 'request'; import { OAuth2 } from 'oauth'; -import config from '../../../config'; -import { publishMainStream } from '../../../services/stream'; -import redis from '../../../db/redis'; +import config from '~/config'; +import { publishMainStream } from '~/services/stream'; +import redis from '~/db/redis'; import * as uuid from 'uuid'; -import signin from '../common/signin'; -import { fetchMeta } from '../../../misc/fetch-meta'; -import { Users, UserProfiles } from '../../../models'; -import { ILocalUser } from '../../../models/entities/user'; -import { ensure } from '../../../prelude/ensure'; +import signin from '~/server/api/common/signin'; +import { fetchMeta } from '~/misc/fetch-meta'; +import { Users, UserProfiles } from '~/models'; +import { ILocalUser } from '~/models/entities/user'; +import { ensure } from '~/prelude/ensure'; function getUserToken(ctx: Koa.BaseContext) { return ((ctx.headers['cookie'] || '').match(/i=(\w+)/) || [null, null])[1]; diff --git a/src/server/api/service/github.ts b/src/server/api/service/github.ts index de1e15f07..8f4befce9 100644 --- a/src/server/api/service/github.ts +++ b/src/server/api/service/github.ts @@ -2,15 +2,15 @@ import * as Koa from 'koa'; import * as Router from 'koa-router'; import * as request from 'request'; import { OAuth2 } from 'oauth'; -import config from '../../../config'; -import { publishMainStream } from '../../../services/stream'; -import redis from '../../../db/redis'; +import config from '~/config'; +import { publishMainStream } from '~/services/stream'; +import redis from '~/db/redis'; import * as uuid from 'uuid'; -import signin from '../common/signin'; -import { fetchMeta } from '../../../misc/fetch-meta'; -import { Users, UserProfiles } from '../../../models'; -import { ILocalUser } from '../../../models/entities/user'; -import { ensure } from '../../../prelude/ensure'; +import signin from '~/server/api/common/signin'; +import { fetchMeta } from '~/misc/fetch-meta'; +import { Users, UserProfiles } from '~/models'; +import { ILocalUser } from '~/models/entities/user'; +import { ensure } from '~/prelude/ensure'; function getUserToken(ctx: Koa.BaseContext) { return ((ctx.headers['cookie'] || '').match(/i=(\w+)/) || [null, null])[1]; diff --git a/src/server/api/service/twitter.ts b/src/server/api/service/twitter.ts index 55369d0ae..02e15790f 100644 --- a/src/server/api/service/twitter.ts +++ b/src/server/api/service/twitter.ts @@ -2,14 +2,14 @@ import * as Koa from 'koa'; import * as Router from 'koa-router'; import * as uuid from 'uuid'; import autwh from 'autwh'; -import redis from '../../../db/redis'; -import { publishMainStream } from '../../../services/stream'; -import config from '../../../config'; -import signin from '../common/signin'; -import { fetchMeta } from '../../../misc/fetch-meta'; -import { Users, UserProfiles } from '../../../models'; -import { ILocalUser } from '../../../models/entities/user'; -import { ensure } from '../../../prelude/ensure'; +import redis from '~/db/redis'; +import { publishMainStream } from '~/services/stream'; +import config from '~/config'; +import signin from '~/server/api/common/signin'; +import { fetchMeta } from '~/misc/fetch-meta'; +import { Users, UserProfiles } from '~/models'; +import { ILocalUser } from '~/models/entities/user'; +import { ensure } from '~/prelude/ensure'; function getUserToken(ctx: Koa.BaseContext) { return ((ctx.headers['cookie'] || '').match(/i=(\w+)/) || [null, null])[1]; diff --git a/src/server/api/stream/channels/admin.ts b/src/server/api/stream/channels/admin.ts index 1ff932d1d..77d21c389 100644 --- a/src/server/api/stream/channels/admin.ts +++ b/src/server/api/stream/channels/admin.ts @@ -1,5 +1,5 @@ import autobind from 'autobind-decorator'; -import Channel from '../channel'; +import Channel from '~/server/api/stream/channel'; export default class extends Channel { public readonly chName = 'admin'; diff --git a/src/server/api/stream/channels/ap-log.ts b/src/server/api/stream/channels/ap-log.ts index 867fd3670..8191bdba3 100644 --- a/src/server/api/stream/channels/ap-log.ts +++ b/src/server/api/stream/channels/ap-log.ts @@ -1,5 +1,5 @@ import autobind from 'autobind-decorator'; -import Channel from '../channel'; +import Channel from '~/server/api/stream/channel'; export default class extends Channel { public readonly chName = 'apLog'; diff --git a/src/server/api/stream/channels/drive.ts b/src/server/api/stream/channels/drive.ts index 4112dd9b0..577838760 100644 --- a/src/server/api/stream/channels/drive.ts +++ b/src/server/api/stream/channels/drive.ts @@ -1,5 +1,5 @@ import autobind from 'autobind-decorator'; -import Channel from '../channel'; +import Channel from '~/server/api/stream/channel'; export default class extends Channel { public readonly chName = 'drive'; diff --git a/src/server/api/stream/channels/games/reversi-game.ts b/src/server/api/stream/channels/games/reversi-game.ts index e60017948..093edd16b 100644 --- a/src/server/api/stream/channels/games/reversi-game.ts +++ b/src/server/api/stream/channels/games/reversi-game.ts @@ -1,11 +1,11 @@ import autobind from 'autobind-decorator'; import * as CRC32 from 'crc-32'; -import { publishReversiGameStream } from '../../../../../services/stream'; -import Reversi from '../../../../../games/reversi/core'; -import * as maps from '../../../../../games/reversi/maps'; -import Channel from '../../channel'; -import { ReversiGame } from '../../../../../models/entities/games/reversi/game'; -import { ReversiGames } from '../../../../../models'; +import { publishReversiGameStream } from '~/services/stream'; +import Reversi from '~/games/reversi/core'; +import * as maps from '~/games/reversi/maps'; +import Channel from '~/server/api/stream/channel'; +import { ReversiGame } from '~/models/entities/games/reversi/game'; +import { ReversiGames } from '~/models'; export default class extends Channel { public readonly chName = 'gamesReversiGame'; diff --git a/src/server/api/stream/channels/games/reversi.ts b/src/server/api/stream/channels/games/reversi.ts index 3db338386..e11fcf190 100644 --- a/src/server/api/stream/channels/games/reversi.ts +++ b/src/server/api/stream/channels/games/reversi.ts @@ -1,7 +1,7 @@ import autobind from 'autobind-decorator'; -import { publishMainStream } from '../../../../../services/stream'; -import Channel from '../../channel'; -import { ReversiMatchings } from '../../../../../models'; +import { publishMainStream } from '~/services/stream'; +import Channel from '~/server/api/stream/channel'; +import { ReversiMatchings } from '~/models'; export default class extends Channel { public readonly chName = 'gamesReversi'; diff --git a/src/server/api/stream/channels/global-timeline.ts b/src/server/api/stream/channels/global-timeline.ts index 1271aae3a..cd141e158 100644 --- a/src/server/api/stream/channels/global-timeline.ts +++ b/src/server/api/stream/channels/global-timeline.ts @@ -1,9 +1,9 @@ import autobind from 'autobind-decorator'; -import shouldMuteThisNote from '../../../../misc/should-mute-this-note'; -import Channel from '../channel'; -import { fetchMeta } from '../../../../misc/fetch-meta'; -import { Notes } from '../../../../models'; -import { PackedNote } from '../../../../models/repositories/note'; +import shouldMuteThisNote from '~/misc/should-mute-this-note'; +import Channel from '~/server/api/stream/channel'; +import { fetchMeta } from '~/misc/fetch-meta'; +import { Notes } from '~/models'; +import { PackedNote } from '~/models/repositories/note'; export default class extends Channel { public readonly chName = 'globalTimeline'; diff --git a/src/server/api/stream/channels/hashtag.ts b/src/server/api/stream/channels/hashtag.ts index e55a50832..a29785a88 100644 --- a/src/server/api/stream/channels/hashtag.ts +++ b/src/server/api/stream/channels/hashtag.ts @@ -1,8 +1,8 @@ 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'; +import shouldMuteThisNote from '~/misc/should-mute-this-note'; +import Channel from '~/server/api/stream/channel'; +import { Notes } from '~/models'; +import { PackedNote } from '~/models/repositories/note'; export default class extends Channel { public readonly chName = 'hashtag'; diff --git a/src/server/api/stream/channels/home-timeline.ts b/src/server/api/stream/channels/home-timeline.ts index 9aa4dc1c0..724948c4b 100644 --- a/src/server/api/stream/channels/home-timeline.ts +++ b/src/server/api/stream/channels/home-timeline.ts @@ -1,8 +1,8 @@ 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'; +import shouldMuteThisNote from '~/misc/should-mute-this-note'; +import Channel from '~/server/api/stream/channel'; +import { Notes } from '~/models'; +import { PackedNote } from '~/models/repositories/note'; export default class extends Channel { public readonly chName = 'homeTimeline'; diff --git a/src/server/api/stream/channels/hybrid-timeline.ts b/src/server/api/stream/channels/hybrid-timeline.ts index b9feb7025..a498d5427 100644 --- a/src/server/api/stream/channels/hybrid-timeline.ts +++ b/src/server/api/stream/channels/hybrid-timeline.ts @@ -1,10 +1,10 @@ import autobind from 'autobind-decorator'; -import shouldMuteThisNote from '../../../../misc/should-mute-this-note'; -import Channel from '../channel'; -import { fetchMeta } from '../../../../misc/fetch-meta'; -import { Notes } from '../../../../models'; -import { PackedNote } from '../../../../models/repositories/note'; -import { PackedUser } from '../../../../models/repositories/user'; +import shouldMuteThisNote from '~/misc/should-mute-this-note'; +import Channel from '~/server/api/stream/channel'; +import { fetchMeta } from '~/misc/fetch-meta'; +import { Notes } from '~/models'; +import { PackedNote } from '~/models/repositories/note'; +import { PackedUser } from '~/models/repositories/user'; export default class extends Channel { public readonly chName = 'hybridTimeline'; diff --git a/src/server/api/stream/channels/local-timeline.ts b/src/server/api/stream/channels/local-timeline.ts index 24cbc0a7b..d53597860 100644 --- a/src/server/api/stream/channels/local-timeline.ts +++ b/src/server/api/stream/channels/local-timeline.ts @@ -1,10 +1,10 @@ import autobind from 'autobind-decorator'; -import shouldMuteThisNote from '../../../../misc/should-mute-this-note'; -import Channel from '../channel'; -import { fetchMeta } from '../../../../misc/fetch-meta'; -import { Notes } from '../../../../models'; -import { PackedNote } from '../../../../models/repositories/note'; -import { PackedUser } from '../../../../models/repositories/user'; +import shouldMuteThisNote from '~/misc/should-mute-this-note'; +import Channel from '~/server/api/stream/channel'; +import { fetchMeta } from '~/misc/fetch-meta'; +import { Notes } from '~/models'; +import { PackedNote } from '~/models/repositories/note'; +import { PackedUser } from '~/models/repositories/user'; export default class extends Channel { public readonly chName = 'localTimeline'; diff --git a/src/server/api/stream/channels/main.ts b/src/server/api/stream/channels/main.ts index 5abe10878..d8076c074 100644 --- a/src/server/api/stream/channels/main.ts +++ b/src/server/api/stream/channels/main.ts @@ -1,6 +1,6 @@ import autobind from 'autobind-decorator'; -import Channel from '../channel'; -import { Mutings } from '../../../../models'; +import Channel from '~/server/api/stream/channel'; +import { Mutings } from '~/models'; export default class extends Channel { public readonly chName = 'main'; diff --git a/src/server/api/stream/channels/messaging-index.ts b/src/server/api/stream/channels/messaging-index.ts index 0c495398a..149f6bf42 100644 --- a/src/server/api/stream/channels/messaging-index.ts +++ b/src/server/api/stream/channels/messaging-index.ts @@ -1,5 +1,5 @@ import autobind from 'autobind-decorator'; -import Channel from '../channel'; +import Channel from '~/server/api/stream/channel'; export default class extends Channel { public readonly chName = 'messagingIndex'; diff --git a/src/server/api/stream/channels/messaging.ts b/src/server/api/stream/channels/messaging.ts index 1e5e94c1c..75cab2ccf 100644 --- a/src/server/api/stream/channels/messaging.ts +++ b/src/server/api/stream/channels/messaging.ts @@ -1,7 +1,7 @@ import autobind from 'autobind-decorator'; -import { readUserMessagingMessage, readGroupMessagingMessage } from '../../common/read-messaging-message'; -import Channel from '../channel'; -import { UserGroupJoinings } from '../../../../models'; +import { readUserMessagingMessage, readGroupMessagingMessage } from '~/server/api/common/read-messaging-message'; +import Channel from '~/server/api/stream/channel'; +import { UserGroupJoinings } from '~/models'; export default class extends Channel { public readonly chName = 'messaging'; diff --git a/src/server/api/stream/channels/notes-stats.ts b/src/server/api/stream/channels/notes-stats.ts index 0c6b84d6c..61fa0c77d 100644 --- a/src/server/api/stream/channels/notes-stats.ts +++ b/src/server/api/stream/channels/notes-stats.ts @@ -1,6 +1,6 @@ import autobind from 'autobind-decorator'; import Xev from 'xev'; -import Channel from '../channel'; +import Channel from '~/server/api/stream/channel'; const ev = new Xev(); diff --git a/src/server/api/stream/channels/queue-stats.ts b/src/server/api/stream/channels/queue-stats.ts index 0bda0cfcb..9ba56021c 100644 --- a/src/server/api/stream/channels/queue-stats.ts +++ b/src/server/api/stream/channels/queue-stats.ts @@ -1,6 +1,6 @@ import autobind from 'autobind-decorator'; import Xev from 'xev'; -import Channel from '../channel'; +import Channel from '~/server/api/stream/channel'; const ev = new Xev(); diff --git a/src/server/api/stream/channels/server-stats.ts b/src/server/api/stream/channels/server-stats.ts index d245a7f70..46e1b2f2c 100644 --- a/src/server/api/stream/channels/server-stats.ts +++ b/src/server/api/stream/channels/server-stats.ts @@ -1,6 +1,6 @@ import autobind from 'autobind-decorator'; import Xev from 'xev'; -import Channel from '../channel'; +import Channel from '~/server/api/stream/channel'; const ev = new Xev(); diff --git a/src/server/api/stream/channels/user-list.ts b/src/server/api/stream/channels/user-list.ts index 119bacf6e..65461a92a 100644 --- a/src/server/api/stream/channels/user-list.ts +++ b/src/server/api/stream/channels/user-list.ts @@ -1,9 +1,9 @@ import autobind from 'autobind-decorator'; -import Channel from '../channel'; -import { Notes, UserListJoinings } from '../../../../models'; -import shouldMuteThisNote from '../../../../misc/should-mute-this-note'; -import { User } from '../../../../models/entities/user'; -import { PackedNote } from '../../../../models/repositories/note'; +import Channel from '~/server/api/stream/channel'; +import { Notes, UserListJoinings } from '~/models'; +import shouldMuteThisNote from '~/misc/should-mute-this-note'; +import { User } from '~/models/entities/user'; +import { PackedNote } from '~/models/repositories/note'; export default class extends Channel { public readonly chName = 'userList'; diff --git a/src/server/api/stream/index.ts b/src/server/api/stream/index.ts index f73f3229d..9238b2bbf 100644 --- a/src/server/api/stream/index.ts +++ b/src/server/api/stream/index.ts @@ -1,14 +1,14 @@ import autobind from 'autobind-decorator'; import * as websocket from 'websocket'; -import { readNotification } from '../common/read-notification'; -import call from '../call'; -import readNote from '../../../services/note/read'; +import { readNotification } from '~/server/api/common/read-notification'; +import call from '~/server/api/call'; +import readNote from '~/services/note/read'; import Channel from './channel'; import channels from './channels'; import { EventEmitter } from 'events'; -import { User } from '../../../models/entities/user'; -import { App } from '../../../models/entities/app'; -import { Users, Followings, Mutings } from '../../../models'; +import { User } from '~/models/entities/user'; +import { App } from '~/models/entities/app'; +import { Users, Followings, Mutings } from '~/models'; /** * Main stream connection diff --git a/src/server/api/streaming.ts b/src/server/api/streaming.ts index 902c62ef9..80a7a509f 100644 --- a/src/server/api/streaming.ts +++ b/src/server/api/streaming.ts @@ -6,7 +6,7 @@ import MainStreamConnection from './stream'; import { ParsedUrlQuery } from 'querystring'; import authenticate from './authenticate'; import { EventEmitter } from 'events'; -import config from '../../config'; +import config from '~/config'; module.exports = (server: http.Server) => { // Init websocket server diff --git a/src/server/file/send-drive-file.ts b/src/server/file/send-drive-file.ts index 44e88be8a..5a44f9d3c 100644 --- a/src/server/file/send-drive-file.ts +++ b/src/server/file/send-drive-file.ts @@ -2,9 +2,9 @@ import * as Koa from 'koa'; import * as send from 'koa-send'; import * as rename from 'rename'; import { serverLogger } from '..'; -import { contentDisposition } from '../../misc/content-disposition'; -import { DriveFiles } from '../../models'; -import { InternalStorage } from '../../services/drive/internal-storage'; +import { contentDisposition } from '~/misc/content-disposition'; +import { DriveFiles } from '~/models'; +import { InternalStorage } from '~/services/drive/internal-storage'; const assets = `${__dirname}/../../server/file/assets/`; diff --git a/src/server/index.ts b/src/server/index.ts index b3ca47f23..2905b9fce 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -18,15 +18,15 @@ import * as slow from 'koa-slow'; import activityPub from './activitypub'; import nodeinfo from './nodeinfo'; import wellKnown from './well-known'; -import config from '../config'; +import config from '~/config'; import apiServer from './api'; -import { sum } from '../prelude/array'; -import Logger from '../services/logger'; -import { program } from '../argv'; -import { UserProfiles } from '../models'; -import { networkChart } from '../services/chart'; -import { genAvatar } from '../misc/gen-avatar'; -import { createTemp } from '../misc/create-temp'; +import { sum } from '~/prelude/array'; +import Logger from '~/services/logger'; +import { program } from '~/argv'; +import { UserProfiles } from '~/models'; +import { networkChart } from '~/services/chart'; +import { genAvatar } from '~/misc/gen-avatar'; +import { createTemp } from '~/misc/create-temp'; export const serverLogger = new Logger('server', 'gray', false); diff --git a/src/server/nodeinfo.ts b/src/server/nodeinfo.ts index da1e4e7b5..a908d8e3c 100644 --- a/src/server/nodeinfo.ts +++ b/src/server/nodeinfo.ts @@ -1,9 +1,9 @@ import * as Router from 'koa-router'; -import config from '../config'; -import { fetchMeta } from '../misc/fetch-meta'; -// import User from '../models/user'; -import { name as softwareName, version, repository } from '../../package.json'; -// import Note from '../models/note'; +import config from '~/config'; +import { fetchMeta } from '~/misc/fetch-meta'; +// import User from '~/models/user'; +import { name as softwareName, version, repository } from '~/package.json'; +// import Note from '~/models/note'; const router = new Router(); diff --git a/src/server/proxy/proxy-media.ts b/src/server/proxy/proxy-media.ts index 415eef6c3..38d4abcd9 100644 --- a/src/server/proxy/proxy-media.ts +++ b/src/server/proxy/proxy-media.ts @@ -1,10 +1,10 @@ import * as fs from 'fs'; import * as Koa from 'koa'; import { serverLogger } from '..'; -import { IImage, convertToPng, convertToJpeg } from '../../services/drive/image-processor'; -import { createTemp } from '../../misc/create-temp'; -import { downloadUrl } from '../../misc/donwload-url'; -import { detectMine } from '../../misc/detect-mine'; +import { IImage, convertToPng, convertToJpeg } from '~/services/drive/image-processor'; +import { createTemp } from '~/misc/create-temp'; +import { downloadUrl } from '~/misc/donwload-url'; +import { detectMine } from '~/misc/detect-mine'; export async function proxyMedia(ctx: Koa.BaseContext) { const url = 'url' in ctx.query ? ctx.query.url : 'https://' + ctx.params.url; diff --git a/src/server/web/docs.ts b/src/server/web/docs.ts index 374dbf3bd..c6cc2223e 100644 --- a/src/server/web/docs.ts +++ b/src/server/web/docs.ts @@ -10,10 +10,10 @@ import ms = require('ms'); import * as Router from 'koa-router'; import * as send from 'koa-send'; import * as glob from 'glob'; -import config from '../../config'; -import { licenseHtml } from '../../misc/license'; -import { copyright } from '../../const.json'; -import * as locales from '../../../locales'; +import config from '~/config'; +import { licenseHtml } from '~/misc/license'; +import { copyright } from '~/const.json'; +import * as locales from '%'; import * as nestedProperty from 'nested-property'; function getLang(lang: string): string { diff --git a/src/server/web/feed.ts b/src/server/web/feed.ts index 9c7591d74..fc82880c7 100644 --- a/src/server/web/feed.ts +++ b/src/server/web/feed.ts @@ -1,9 +1,9 @@ import { Feed } from 'feed'; -import config from '../../config'; -import { User } from '../../models/entities/user'; -import { Notes, DriveFiles, UserProfiles } from '../../models'; +import config from '~/config'; +import { User } from '~/models/entities/user'; +import { Notes, DriveFiles, UserProfiles } from '~/models'; import { In } from 'typeorm'; -import { ensure } from '../../prelude/ensure'; +import { ensure } from '~/prelude/ensure'; export default async function(user: User) { const author = { diff --git a/src/server/web/index.ts b/src/server/web/index.ts index 6c41bbde4..0683adb9c 100644 --- a/src/server/web/index.ts +++ b/src/server/web/index.ts @@ -12,16 +12,16 @@ import * as views from 'koa-views'; import docs from './docs'; import packFeed from './feed'; -import { fetchMeta } from '../../misc/fetch-meta'; -import * as pkg from '../../../package.json'; -import { genOpenapiSpec } from '../api/openapi/gen-spec'; -import config from '../../config'; -import { Users, Notes, Emojis, UserProfiles, Pages } from '../../models'; -import parseAcct from '../../misc/acct/parse'; -import getNoteSummary from '../../misc/get-note-summary'; -import { ensure } from '../../prelude/ensure'; +import { fetchMeta } from '~/misc/fetch-meta'; +import * as pkg from '~/package.json'; +import { genOpenapiSpec } from '~/server/api/openapi/gen-spec'; +import config from '~/config'; +import { Users, Notes, Emojis, UserProfiles, Pages } from '~/models'; +import parseAcct from '~/misc/acct/parse'; +import getNoteSummary from '~/misc/get-note-summary'; +import { ensure } from '~/prelude/ensure'; import { getConnection } from 'typeorm'; -import redis from '../../db/redis'; +import redis from '~/db/redis'; const client = `${__dirname}/../../client/`; diff --git a/src/server/web/manifest.ts b/src/server/web/manifest.ts index 730082da2..5187c733b 100644 --- a/src/server/web/manifest.ts +++ b/src/server/web/manifest.ts @@ -1,6 +1,6 @@ import * as Koa from 'koa'; -import * as manifest from '../../client/assets/manifest.json'; -import { fetchMeta } from '../../misc/fetch-meta'; +import * as manifest from '~/client/assets/manifest.json'; +import { fetchMeta } from '~/misc/fetch-meta'; module.exports = async (ctx: Koa.BaseContext) => { const json = JSON.parse(JSON.stringify(manifest)); diff --git a/src/server/web/url-preview.ts b/src/server/web/url-preview.ts index 5b2f8759a..8e1f78371 100644 --- a/src/server/web/url-preview.ts +++ b/src/server/web/url-preview.ts @@ -1,10 +1,10 @@ import * as Koa from 'koa'; import * as request from 'request-promise-native'; import summaly from 'summaly'; -import { fetchMeta } from '../../misc/fetch-meta'; -import Logger from '../../services/logger'; -import config from '../../config'; -import { query } from '../../prelude/url'; +import { fetchMeta } from '~/misc/fetch-meta'; +import Logger from '~/services/logger'; +import config from '~/config'; +import { query } from '~/prelude/url'; const logger = new Logger('url-preview'); diff --git a/src/server/well-known.ts b/src/server/well-known.ts index d29b7a888..2d5d8b6d9 100644 --- a/src/server/well-known.ts +++ b/src/server/well-known.ts @@ -1,12 +1,12 @@ import * as Router from 'koa-router'; -import config from '../config'; -import parseAcct from '../misc/acct/parse'; -import Acct from '../misc/acct/type'; +import config from '~/config'; +import parseAcct from '~/misc/acct/parse'; +import Acct from '~/misc/acct/type'; import { links } from './nodeinfo'; -import { escapeAttribute, escapeValue } from '../prelude/xml'; -import { Users } from '../models'; -import { User } from '../models/entities/user'; +import { escapeAttribute, escapeValue } from '~/prelude/xml'; +import { Users } from '~/models'; +import { User } from '~/models/entities/user'; // Init router const router = new Router(); diff --git a/src/services/blocking/create.ts b/src/services/blocking/create.ts index def4f3358..f13493c64 100644 --- a/src/services/blocking/create.ts +++ b/src/services/blocking/create.ts @@ -1,14 +1,14 @@ -import { publishMainStream } from '../stream'; -import { renderActivity } from '../../remote/activitypub/renderer'; -import renderFollow from '../../remote/activitypub/renderer/follow'; -import renderUndo from '../../remote/activitypub/renderer/undo'; -import renderBlock from '../../remote/activitypub/renderer/block'; -import { deliver } from '../../queue'; -import renderReject from '../../remote/activitypub/renderer/reject'; -import { User } from '../../models/entities/user'; -import { Blockings, Users, FollowRequests, Followings } from '../../models'; -import { perUserFollowingChart } from '../chart'; -import { genId } from '../../misc/gen-id'; +import { publishMainStream } from '~/services/stream'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import renderFollow from '~/remote/activitypub/renderer/follow'; +import renderUndo from '~/remote/activitypub/renderer/undo'; +import renderBlock from '~/remote/activitypub/renderer/block'; +import { deliver } from '~/queue'; +import renderReject from '~/remote/activitypub/renderer/reject'; +import { User } from '~/models/entities/user'; +import { Blockings, Users, FollowRequests, Followings } from '~/models'; +import { perUserFollowingChart } from '~/services/chart'; +import { genId } from '~/misc/gen-id'; export default async function(blocker: User, blockee: User) { await Promise.all([ diff --git a/src/services/blocking/delete.ts b/src/services/blocking/delete.ts index 2c05cb7f3..5d10c9e3e 100644 --- a/src/services/blocking/delete.ts +++ b/src/services/blocking/delete.ts @@ -1,10 +1,10 @@ -import { renderActivity } from '../../remote/activitypub/renderer'; -import renderBlock from '../../remote/activitypub/renderer/block'; -import renderUndo from '../../remote/activitypub/renderer/undo'; -import { deliver } from '../../queue'; -import Logger from '../logger'; -import { User } from '../../models/entities/user'; -import { Blockings, Users } from '../../models'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import renderBlock from '~/remote/activitypub/renderer/block'; +import renderUndo from '~/remote/activitypub/renderer/undo'; +import { deliver } from '~/queue'; +import Logger from '~/services/logger'; +import { User } from '~/models/entities/user'; +import { Blockings, Users } from '~/models'; const logger = new Logger('blocking/delete'); diff --git a/src/services/chart/charts/classes/active-users.ts b/src/services/chart/charts/classes/active-users.ts index 5128150de..e56f6caa3 100644 --- a/src/services/chart/charts/classes/active-users.ts +++ b/src/services/chart/charts/classes/active-users.ts @@ -1,9 +1,9 @@ import autobind from 'autobind-decorator'; -import Chart, { Obj, DeepPartial } from '../../core'; -import { User } from '../../../../models/entities/user'; -import { SchemaType } from '../../../../misc/schema'; -import { Users } from '../../../../models'; -import { name, schema } from '../schemas/active-users'; +import Chart, { Obj, DeepPartial } from '~/services/chart/core'; +import { User } from '~/models/entities/user'; +import { SchemaType } from '~/misc/schema'; +import { Users } from '~/models'; +import { name, schema } from '~/services/chart/charts/schemas/active-users'; type ActiveUsersLog = SchemaType; diff --git a/src/services/chart/charts/classes/drive.ts b/src/services/chart/charts/classes/drive.ts index c3bcacb7d..5472d6d9c 100644 --- a/src/services/chart/charts/classes/drive.ts +++ b/src/services/chart/charts/classes/drive.ts @@ -1,10 +1,10 @@ import autobind from 'autobind-decorator'; -import Chart, { Obj, DeepPartial } from '../../core'; -import { SchemaType } from '../../../../misc/schema'; -import { DriveFiles } from '../../../../models'; +import Chart, { Obj, DeepPartial } from '~/services/chart/core'; +import { SchemaType } from '~/misc/schema'; +import { DriveFiles } from '~/models'; import { Not, IsNull } from 'typeorm'; -import { DriveFile } from '../../../../models/entities/drive-file'; -import { name, schema } from '../schemas/drive'; +import { DriveFile } from '~/models/entities/drive-file'; +import { name, schema } from '~/services/chart/charts/schemas/drive'; type DriveLog = SchemaType; diff --git a/src/services/chart/charts/classes/federation.ts b/src/services/chart/charts/classes/federation.ts index bd2c497e7..baeb525a6 100644 --- a/src/services/chart/charts/classes/federation.ts +++ b/src/services/chart/charts/classes/federation.ts @@ -1,8 +1,8 @@ import autobind from 'autobind-decorator'; -import Chart, { Obj, DeepPartial } from '../../core'; -import { SchemaType } from '../../../../misc/schema'; -import { Instances } from '../../../../models'; -import { name, schema } from '../schemas/federation'; +import Chart, { Obj, DeepPartial } from '~/services/chart/core'; +import { SchemaType } from '~/misc/schema'; +import { Instances } from '~/models'; +import { name, schema } from '~/services/chart/charts/schemas/federation'; type FederationLog = SchemaType; diff --git a/src/services/chart/charts/classes/hashtag.ts b/src/services/chart/charts/classes/hashtag.ts index 38c3a94f0..13af3716b 100644 --- a/src/services/chart/charts/classes/hashtag.ts +++ b/src/services/chart/charts/classes/hashtag.ts @@ -1,9 +1,9 @@ import autobind from 'autobind-decorator'; -import Chart, { Obj, DeepPartial } from '../../core'; -import { User } from '../../../../models/entities/user'; -import { SchemaType } from '../../../../misc/schema'; -import { Users } from '../../../../models'; -import { name, schema } from '../schemas/hashtag'; +import Chart, { Obj, DeepPartial } from '~/services/chart/core'; +import { User } from '~/models/entities/user'; +import { SchemaType } from '~/misc/schema'; +import { Users } from '~/models'; +import { name, schema } from '~/services/chart/charts/schemas/hashtag'; type HashtagLog = SchemaType; diff --git a/src/services/chart/charts/classes/instance.ts b/src/services/chart/charts/classes/instance.ts index f3d341f38..937ef1ff6 100644 --- a/src/services/chart/charts/classes/instance.ts +++ b/src/services/chart/charts/classes/instance.ts @@ -1,11 +1,11 @@ import autobind from 'autobind-decorator'; -import Chart, { Obj, DeepPartial } from '../../core'; -import { SchemaType } from '../../../../misc/schema'; -import { DriveFiles, Followings, Users, Notes } from '../../../../models'; -import { DriveFile } from '../../../../models/entities/drive-file'; -import { name, schema } from '../schemas/instance'; -import { Note } from '../../../../models/entities/note'; -import { toPuny } from '../../../../misc/convert-host'; +import Chart, { Obj, DeepPartial } from '~/services/chart/core'; +import { SchemaType } from '~/misc/schema'; +import { DriveFiles, Followings, Users, Notes } from '~/models'; +import { DriveFile } from '~/models/entities/drive-file'; +import { name, schema } from '~/services/chart/charts/schemas/instance'; +import { Note } from '~/models/entities/note'; +import { toPuny } from '~/misc/convert-host'; type InstanceLog = SchemaType; diff --git a/src/services/chart/charts/classes/network.ts b/src/services/chart/charts/classes/network.ts index 8b26e5c4c..9500f0f2e 100644 --- a/src/services/chart/charts/classes/network.ts +++ b/src/services/chart/charts/classes/network.ts @@ -1,7 +1,7 @@ import autobind from 'autobind-decorator'; -import Chart, { DeepPartial } from '../../core'; -import { SchemaType } from '../../../../misc/schema'; -import { name, schema } from '../schemas/network'; +import Chart, { DeepPartial } from '~/services/chart/core'; +import { SchemaType } from '~/misc/schema'; +import { name, schema } from '~/services/chart/charts/schemas/network'; type NetworkLog = SchemaType; diff --git a/src/services/chart/charts/classes/notes.ts b/src/services/chart/charts/classes/notes.ts index 815061c44..088e1aeba 100644 --- a/src/services/chart/charts/classes/notes.ts +++ b/src/services/chart/charts/classes/notes.ts @@ -1,10 +1,10 @@ import autobind from 'autobind-decorator'; -import Chart, { Obj, DeepPartial } from '../../core'; -import { SchemaType } from '../../../../misc/schema'; -import { Notes } from '../../../../models'; +import Chart, { Obj, DeepPartial } from '~/services/chart/core'; +import { SchemaType } from '~/misc/schema'; +import { Notes } from '~/models'; import { Not, IsNull } from 'typeorm'; -import { Note } from '../../../../models/entities/note'; -import { name, schema } from '../schemas/notes'; +import { Note } from '~/models/entities/note'; +import { name, schema } from '~/services/chart/charts/schemas/notes'; type NotesLog = SchemaType; diff --git a/src/services/chart/charts/classes/per-user-drive.ts b/src/services/chart/charts/classes/per-user-drive.ts index 822f4eda0..325ab180a 100644 --- a/src/services/chart/charts/classes/per-user-drive.ts +++ b/src/services/chart/charts/classes/per-user-drive.ts @@ -1,9 +1,9 @@ import autobind from 'autobind-decorator'; -import Chart, { Obj, DeepPartial } from '../../core'; -import { SchemaType } from '../../../../misc/schema'; -import { DriveFiles } from '../../../../models'; -import { DriveFile } from '../../../../models/entities/drive-file'; -import { name, schema } from '../schemas/per-user-drive'; +import Chart, { Obj, DeepPartial } from '~/services/chart/core'; +import { SchemaType } from '~/misc/schema'; +import { DriveFiles } from '~/models'; +import { DriveFile } from '~/models/entities/drive-file'; +import { name, schema } from '~/services/chart/charts/schemas/per-user-drive'; type PerUserDriveLog = SchemaType; diff --git a/src/services/chart/charts/classes/per-user-following.ts b/src/services/chart/charts/classes/per-user-following.ts index 8295c0cb0..ca901b95a 100644 --- a/src/services/chart/charts/classes/per-user-following.ts +++ b/src/services/chart/charts/classes/per-user-following.ts @@ -1,10 +1,10 @@ import autobind from 'autobind-decorator'; -import Chart, { Obj, DeepPartial } from '../../core'; -import { SchemaType } from '../../../../misc/schema'; -import { Followings, Users } from '../../../../models'; +import Chart, { Obj, DeepPartial } from '~/services/chart/core'; +import { SchemaType } from '~/misc/schema'; +import { Followings, Users } from '~/models'; import { Not, IsNull } from 'typeorm'; -import { User } from '../../../../models/entities/user'; -import { name, schema } from '../schemas/per-user-following'; +import { User } from '~/models/entities/user'; +import { name, schema } from '~/services/chart/charts/schemas/per-user-following'; type PerUserFollowingLog = SchemaType; diff --git a/src/services/chart/charts/classes/per-user-notes.ts b/src/services/chart/charts/classes/per-user-notes.ts index cccd49560..70ea64404 100644 --- a/src/services/chart/charts/classes/per-user-notes.ts +++ b/src/services/chart/charts/classes/per-user-notes.ts @@ -1,10 +1,10 @@ import autobind from 'autobind-decorator'; -import Chart, { Obj, DeepPartial } from '../../core'; -import { User } from '../../../../models/entities/user'; -import { SchemaType } from '../../../../misc/schema'; -import { Notes } from '../../../../models'; -import { Note } from '../../../../models/entities/note'; -import { name, schema } from '../schemas/per-user-notes'; +import Chart, { Obj, DeepPartial } from '~/services/chart/core'; +import { User } from '~/models/entities/user'; +import { SchemaType } from '~/misc/schema'; +import { Notes } from '~/models'; +import { Note } from '~/models/entities/note'; +import { name, schema } from '~/services/chart/charts/schemas/per-user-notes'; type PerUserNotesLog = SchemaType; diff --git a/src/services/chart/charts/classes/per-user-reactions.ts b/src/services/chart/charts/classes/per-user-reactions.ts index 124fb4153..ca5053a42 100644 --- a/src/services/chart/charts/classes/per-user-reactions.ts +++ b/src/services/chart/charts/classes/per-user-reactions.ts @@ -1,10 +1,10 @@ import autobind from 'autobind-decorator'; -import Chart, { DeepPartial } from '../../core'; -import { User } from '../../../../models/entities/user'; -import { Note } from '../../../../models/entities/note'; -import { SchemaType } from '../../../../misc/schema'; -import { Users } from '../../../../models'; -import { name, schema } from '../schemas/per-user-reactions'; +import Chart, { DeepPartial } from '~/services/chart/core'; +import { User } from '~/models/entities/user'; +import { Note } from '~/models/entities/note'; +import { SchemaType } from '~/misc/schema'; +import { Users } from '~/models'; +import { name, schema } from '~/services/chart/charts/schemas/per-user-reactions'; type PerUserReactionsLog = SchemaType; diff --git a/src/services/chart/charts/classes/test-grouped.ts b/src/services/chart/charts/classes/test-grouped.ts index e32cbcf41..7a3ae4eb6 100644 --- a/src/services/chart/charts/classes/test-grouped.ts +++ b/src/services/chart/charts/classes/test-grouped.ts @@ -1,7 +1,7 @@ import autobind from 'autobind-decorator'; -import Chart, { Obj, DeepPartial } from '../../core'; -import { SchemaType } from '../../../../misc/schema'; -import { name, schema } from '../schemas/test-grouped'; +import Chart, { Obj, DeepPartial } from '~/services/chart/core'; +import { SchemaType } from '~/misc/schema'; +import { name, schema } from '~/services/chart/charts/schemas/test-grouped'; type TestGroupedLog = SchemaType; diff --git a/src/services/chart/charts/classes/test-unique.ts b/src/services/chart/charts/classes/test-unique.ts index 1eb396c29..c0d25fc1b 100644 --- a/src/services/chart/charts/classes/test-unique.ts +++ b/src/services/chart/charts/classes/test-unique.ts @@ -1,7 +1,7 @@ import autobind from 'autobind-decorator'; -import Chart, { DeepPartial } from '../../core'; -import { SchemaType } from '../../../../misc/schema'; -import { name, schema } from '../schemas/test-unique'; +import Chart, { DeepPartial } from '~/services/chart/core'; +import { SchemaType } from '~/misc/schema'; +import { name, schema } from '~/services/chart/charts/schemas/test-unique'; type TestUniqueLog = SchemaType; diff --git a/src/services/chart/charts/classes/test.ts b/src/services/chart/charts/classes/test.ts index 57c22822f..f16515c3f 100644 --- a/src/services/chart/charts/classes/test.ts +++ b/src/services/chart/charts/classes/test.ts @@ -1,7 +1,7 @@ import autobind from 'autobind-decorator'; -import Chart, { Obj, DeepPartial } from '../../core'; -import { SchemaType } from '../../../../misc/schema'; -import { name, schema } from '../schemas/test'; +import Chart, { Obj, DeepPartial } from '~/services/chart/core'; +import { SchemaType } from '~/misc/schema'; +import { name, schema } from '~/services/chart/charts/schemas/test'; type TestLog = SchemaType; diff --git a/src/services/chart/charts/classes/users.ts b/src/services/chart/charts/classes/users.ts index 47e4caa1b..26ceff25b 100644 --- a/src/services/chart/charts/classes/users.ts +++ b/src/services/chart/charts/classes/users.ts @@ -1,10 +1,10 @@ import autobind from 'autobind-decorator'; -import Chart, { Obj, DeepPartial } from '../../core'; -import { SchemaType } from '../../../../misc/schema'; -import { Users } from '../../../../models'; +import Chart, { Obj, DeepPartial } from '~/services/chart/core'; +import { SchemaType } from '~/misc/schema'; +import { Users } from '~/models'; import { Not, IsNull } from 'typeorm'; -import { User } from '../../../../models/entities/user'; -import { name, schema } from '../schemas/users'; +import { User } from '~/models/entities/user'; +import { name, schema } from '~/services/chart/charts/schemas/users'; type UsersLog = SchemaType; diff --git a/src/services/chart/core.ts b/src/services/chart/core.ts index 60ba1ebb4..87b529f41 100644 --- a/src/services/chart/core.ts +++ b/src/services/chart/core.ts @@ -6,11 +6,11 @@ import * as nestedProperty from 'nested-property'; import autobind from 'autobind-decorator'; -import Logger from '../logger'; -import { Schema } from '../../misc/schema'; +import Logger from '~/services/logger'; +import { Schema } from '~/misc/schema'; import { EntitySchema, getRepository, Repository, LessThan, MoreThanOrEqual } from 'typeorm'; -import { isDuplicateKeyValueError } from '../../misc/is-duplicate-key-value-error'; -import { DateUTC, isTimeSame, isTimeBefore, subtractTimespan } from '../../prelude/time'; +import { isDuplicateKeyValueError } from '~/misc/is-duplicate-key-value-error'; +import { DateUTC, isTimeSame, isTimeBefore, subtractTimespan } from '~/prelude/time'; const logger = new Logger('chart', 'white', process.env.NODE_ENV !== 'test'); diff --git a/src/services/create-notification.ts b/src/services/create-notification.ts index 5bff8adfd..741bfa7da 100644 --- a/src/services/create-notification.ts +++ b/src/services/create-notification.ts @@ -1,10 +1,10 @@ import { publishMainStream } from './stream'; import pushSw from './push-notification'; -import { Notifications, Mutings } from '../models'; -import { genId } from '../misc/gen-id'; -import { User } from '../models/entities/user'; -import { Note } from '../models/entities/note'; -import { Notification } from '../models/entities/notification'; +import { Notifications, Mutings } from '~/models'; +import { genId } from '~/misc/gen-id'; +import { User } from '~/models/entities/user'; +import { Note } from '~/models/entities/note'; +import { Notification } from '~/models/entities/notification'; export async function createNotification( notifieeId: User['id'], diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts index 6acad3efa..b3a6e3f56 100644 --- a/src/services/drive/add-file.ts +++ b/src/services/drive/add-file.ts @@ -5,21 +5,21 @@ import * as crypto from 'crypto'; import * as uuid from 'uuid'; import * as sharp from 'sharp'; -import { publishMainStream, publishDriveStream } from '../stream'; +import { publishMainStream, publishDriveStream } from '~/services/stream'; import { deleteFile } from './delete-file'; -import { fetchMeta } from '../../misc/fetch-meta'; +import { fetchMeta } from '~/misc/fetch-meta'; import { GenerateVideoThumbnail } from './generate-video-thumbnail'; import { driveLogger } from './logger'; import { IImage, convertToJpeg, convertToWebp, convertToPng, convertToGif, convertToApng } from './image-processor'; -import { contentDisposition } from '../../misc/content-disposition'; -import { detectMine } from '../../misc/detect-mine'; -import { DriveFiles, DriveFolders, Users, Instances, UserProfiles } from '../../models'; +import { contentDisposition } from '~/misc/content-disposition'; +import { detectMine } from '~/misc/detect-mine'; +import { DriveFiles, DriveFolders, Users, Instances, UserProfiles } from '~/models'; import { InternalStorage } from './internal-storage'; -import { DriveFile } from '../../models/entities/drive-file'; -import { IRemoteUser, User } from '../../models/entities/user'; -import { driveChart, perUserDriveChart, instanceChart } from '../chart'; -import { genId } from '../../misc/gen-id'; -import { isDuplicateKeyValueError } from '../../misc/is-duplicate-key-value-error'; +import { DriveFile } from '~/models/entities/drive-file'; +import { IRemoteUser, User } from '~/models/entities/user'; +import { driveChart, perUserDriveChart, instanceChart } from '~/services/chart'; +import { genId } from '~/misc/gen-id'; +import { isDuplicateKeyValueError } from '~/misc/is-duplicate-key-value-error'; import * as S3 from 'aws-sdk/clients/s3'; import { getS3 } from './s3'; diff --git a/src/services/drive/delete-file.ts b/src/services/drive/delete-file.ts index b288d12f9..25f69abec 100644 --- a/src/services/drive/delete-file.ts +++ b/src/services/drive/delete-file.ts @@ -1,9 +1,9 @@ -import { DriveFile } from '../../models/entities/drive-file'; +import { DriveFile } from '~/models/entities/drive-file'; import { InternalStorage } from './internal-storage'; -import { DriveFiles, Instances, Notes } from '../../models'; -import { driveChart, perUserDriveChart, instanceChart } from '../chart'; -import { createDeleteObjectStorageFileJob } from '../../queue'; -import { fetchMeta } from '../../misc/fetch-meta'; +import { DriveFiles, Instances, Notes } from '~/models'; +import { driveChart, perUserDriveChart, instanceChart } from '~/services/chart'; +import { createDeleteObjectStorageFileJob } from '~/queue'; +import { fetchMeta } from '~/misc/fetch-meta'; import { getS3 } from './s3'; export async function deleteFile(file: DriveFile, isExpired = false) { diff --git a/src/services/drive/internal-storage.ts b/src/services/drive/internal-storage.ts index ff890d7d4..4da132505 100644 --- a/src/services/drive/internal-storage.ts +++ b/src/services/drive/internal-storage.ts @@ -1,6 +1,6 @@ import * as fs from 'fs'; import * as Path from 'path'; -import config from '../../config'; +import config from '~/config'; export class InternalStorage { private static readonly path = Path.resolve(`${__dirname}/../../../files`); diff --git a/src/services/drive/logger.ts b/src/services/drive/logger.ts index 655d074d6..7daebf6c2 100644 --- a/src/services/drive/logger.ts +++ b/src/services/drive/logger.ts @@ -1,3 +1,3 @@ -import Logger from '../logger'; +import Logger from '~/services/logger'; export const driveLogger = new Logger('drive', 'blue'); diff --git a/src/services/drive/s3.ts b/src/services/drive/s3.ts index 95243d590..a117455ab 100644 --- a/src/services/drive/s3.ts +++ b/src/services/drive/s3.ts @@ -1,6 +1,6 @@ import * as S3 from 'aws-sdk/clients/s3'; -import config from '../../config'; -import { Meta } from '../../models/entities/meta'; +import config from '~/config'; +import { Meta } from '~/models/entities/meta'; import * as httpsProxyAgent from 'https-proxy-agent'; import * as agentkeepalive from 'agentkeepalive'; diff --git a/src/services/drive/upload-from-url.ts b/src/services/drive/upload-from-url.ts index bfe8c5c3b..173a459b6 100644 --- a/src/services/drive/upload-from-url.ts +++ b/src/services/drive/upload-from-url.ts @@ -1,11 +1,11 @@ import create from './add-file'; -import { User } from '../../models/entities/user'; +import { User } from '~/models/entities/user'; import { driveLogger } from './logger'; -import { createTemp } from '../../misc/create-temp'; -import { downloadUrl } from '../../misc/donwload-url'; -import { DriveFolder } from '../../models/entities/drive-folder'; -import { DriveFile } from '../../models/entities/drive-file'; -import { DriveFiles } from '../../models'; +import { createTemp } from '~/misc/create-temp'; +import { downloadUrl } from '~/misc/donwload-url'; +import { DriveFolder } from '~/models/entities/drive-folder'; +import { DriveFile } from '~/models/entities/drive-file'; +import { DriveFiles } from '~/models'; const logger = driveLogger.createSubLogger('downloader'); diff --git a/src/services/following/create.ts b/src/services/following/create.ts index b69dfe42b..347cf8ebf 100644 --- a/src/services/following/create.ts +++ b/src/services/following/create.ts @@ -1,20 +1,20 @@ -import { publishMainStream } from '../stream'; -import { renderActivity } from '../../remote/activitypub/renderer'; -import renderFollow from '../../remote/activitypub/renderer/follow'; -import renderAccept from '../../remote/activitypub/renderer/accept'; -import renderReject from '../../remote/activitypub/renderer/reject'; -import { deliver } from '../../queue'; +import { publishMainStream } from '~/services/stream'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import renderFollow from '~/remote/activitypub/renderer/follow'; +import renderAccept from '~/remote/activitypub/renderer/accept'; +import renderReject from '~/remote/activitypub/renderer/reject'; +import { deliver } from '~/queue'; import createFollowRequest from './requests/create'; -import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc'; -import Logger from '../logger'; -import { IdentifiableError } from '../../misc/identifiable-error'; -import { User } from '../../models/entities/user'; -import { Followings, Users, FollowRequests, Blockings, Instances, UserProfiles } from '../../models'; -import { instanceChart, perUserFollowingChart } from '../chart'; -import { genId } from '../../misc/gen-id'; -import { createNotification } from '../create-notification'; -import { isDuplicateKeyValueError } from '../../misc/is-duplicate-key-value-error'; -import { ensure } from '../../prelude/ensure'; +import { registerOrFetchInstanceDoc } from '~/services/register-or-fetch-instance-doc'; +import Logger from '~/services/logger'; +import { IdentifiableError } from '~/misc/identifiable-error'; +import { User } from '~/models/entities/user'; +import { Followings, Users, FollowRequests, Blockings, Instances, UserProfiles } from '~/models'; +import { instanceChart, perUserFollowingChart } from '~/services/chart'; +import { genId } from '~/misc/gen-id'; +import { createNotification } from '~/services/create-notification'; +import { isDuplicateKeyValueError } from '~/misc/is-duplicate-key-value-error'; +import { ensure } from '~/prelude/ensure'; const logger = new Logger('following/create'); diff --git a/src/services/following/delete.ts b/src/services/following/delete.ts index e3b5f8c41..2f0defab8 100644 --- a/src/services/following/delete.ts +++ b/src/services/following/delete.ts @@ -1,13 +1,13 @@ -import { publishMainStream } from '../stream'; -import { renderActivity } from '../../remote/activitypub/renderer'; -import renderFollow from '../../remote/activitypub/renderer/follow'; -import renderUndo from '../../remote/activitypub/renderer/undo'; -import { deliver } from '../../queue'; -import Logger from '../logger'; -import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc'; -import { User } from '../../models/entities/user'; -import { Followings, Users, Instances } from '../../models'; -import { instanceChart, perUserFollowingChart } from '../chart'; +import { publishMainStream } from '~/services/stream'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import renderFollow from '~/remote/activitypub/renderer/follow'; +import renderUndo from '~/remote/activitypub/renderer/undo'; +import { deliver } from '~/queue'; +import Logger from '~/services/logger'; +import { registerOrFetchInstanceDoc } from '~/services/register-or-fetch-instance-doc'; +import { User } from '~/models/entities/user'; +import { Followings, Users, Instances } from '~/models'; +import { instanceChart, perUserFollowingChart } from '~/services/chart'; const logger = new Logger('following/delete'); diff --git a/src/services/following/requests/accept-all.ts b/src/services/following/requests/accept-all.ts index 70e7448aa..e4367747f 100644 --- a/src/services/following/requests/accept-all.ts +++ b/src/services/following/requests/accept-all.ts @@ -1,7 +1,7 @@ import accept from './accept'; -import { User } from '../../../models/entities/user'; -import { FollowRequests, Users } from '../../../models'; -import { ensure } from '../../../prelude/ensure'; +import { User } from '~/models/entities/user'; +import { FollowRequests, Users } from '~/models'; +import { ensure } from '~/prelude/ensure'; /** * 指定したユーザー宛てのフォローリクエストをすべて承認 diff --git a/src/services/following/requests/accept.ts b/src/services/following/requests/accept.ts index 1397514ad..2247c0771 100644 --- a/src/services/following/requests/accept.ts +++ b/src/services/following/requests/accept.ts @@ -1,11 +1,11 @@ -import { renderActivity } from '../../../remote/activitypub/renderer'; -import renderFollow from '../../../remote/activitypub/renderer/follow'; -import renderAccept from '../../../remote/activitypub/renderer/accept'; -import { deliver } from '../../../queue'; -import { publishMainStream } from '../../stream'; -import { insertFollowingDoc } from '../create'; -import { User, ILocalUser } from '../../../models/entities/user'; -import { FollowRequests, Users } from '../../../models'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import renderFollow from '~/remote/activitypub/renderer/follow'; +import renderAccept from '~/remote/activitypub/renderer/accept'; +import { deliver } from '~/queue'; +import { publishMainStream } from '~/services/stream'; +import { insertFollowingDoc } from '~/services/following/create'; +import { User, ILocalUser } from '~/models/entities/user'; +import { FollowRequests, Users } from '~/models'; export default async function(followee: User, follower: User) { const request = await FollowRequests.findOne({ diff --git a/src/services/following/requests/cancel.ts b/src/services/following/requests/cancel.ts index 98fec5d33..ccd562a94 100644 --- a/src/services/following/requests/cancel.ts +++ b/src/services/following/requests/cancel.ts @@ -1,11 +1,11 @@ -import { renderActivity } from '../../../remote/activitypub/renderer'; -import renderFollow from '../../../remote/activitypub/renderer/follow'; -import renderUndo from '../../../remote/activitypub/renderer/undo'; -import { deliver } from '../../../queue'; -import { publishMainStream } from '../../stream'; -import { IdentifiableError } from '../../../misc/identifiable-error'; -import { User, ILocalUser } from '../../../models/entities/user'; -import { Users, FollowRequests } from '../../../models'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import renderFollow from '~/remote/activitypub/renderer/follow'; +import renderUndo from '~/remote/activitypub/renderer/undo'; +import { deliver } from '~/queue'; +import { publishMainStream } from '~/services/stream'; +import { IdentifiableError } from '~/misc/identifiable-error'; +import { User, ILocalUser } from '~/models/entities/user'; +import { Users, FollowRequests } from '~/models'; export default async function(followee: User, follower: User) { if (Users.isRemoteUser(followee)) { diff --git a/src/services/following/requests/create.ts b/src/services/following/requests/create.ts index 32e79d136..7835ada21 100644 --- a/src/services/following/requests/create.ts +++ b/src/services/following/requests/create.ts @@ -1,11 +1,11 @@ -import { publishMainStream } from '../../stream'; -import { renderActivity } from '../../../remote/activitypub/renderer'; -import renderFollow from '../../../remote/activitypub/renderer/follow'; -import { deliver } from '../../../queue'; -import { User } from '../../../models/entities/user'; -import { Blockings, FollowRequests, Users } from '../../../models'; -import { genId } from '../../../misc/gen-id'; -import { createNotification } from '../../create-notification'; +import { publishMainStream } from '~/services/stream'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import renderFollow from '~/remote/activitypub/renderer/follow'; +import { deliver } from '~/queue'; +import { User } from '~/models/entities/user'; +import { Blockings, FollowRequests, Users } from '~/models'; +import { genId } from '~/misc/gen-id'; +import { createNotification } from '~/services/create-notification'; export default async function(follower: User, followee: User, requestId?: string) { if (follower.id === followee.id) return; diff --git a/src/services/following/requests/reject.ts b/src/services/following/requests/reject.ts index d5b5e48c4..194cf90ba 100644 --- a/src/services/following/requests/reject.ts +++ b/src/services/following/requests/reject.ts @@ -1,10 +1,10 @@ -import { renderActivity } from '../../../remote/activitypub/renderer'; -import renderFollow from '../../../remote/activitypub/renderer/follow'; -import renderReject from '../../../remote/activitypub/renderer/reject'; -import { deliver } from '../../../queue'; -import { publishMainStream } from '../../stream'; -import { User, ILocalUser } from '../../../models/entities/user'; -import { Users, FollowRequests } from '../../../models'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import renderFollow from '~/remote/activitypub/renderer/follow'; +import renderReject from '~/remote/activitypub/renderer/reject'; +import { deliver } from '~/queue'; +import { publishMainStream } from '~/services/stream'; +import { User, ILocalUser } from '~/models/entities/user'; +import { Users, FollowRequests } from '~/models'; export default async function(followee: User, follower: User) { if (Users.isRemoteUser(follower)) { diff --git a/src/services/i/pin.ts b/src/services/i/pin.ts index a6d2dfcdb..b4f62cb84 100644 --- a/src/services/i/pin.ts +++ b/src/services/i/pin.ts @@ -1,14 +1,14 @@ -import config from '../../config'; -import renderAdd from '../../remote/activitypub/renderer/add'; -import renderRemove from '../../remote/activitypub/renderer/remove'; -import { renderActivity } from '../../remote/activitypub/renderer'; -import { deliver } from '../../queue'; -import { IdentifiableError } from '../../misc/identifiable-error'; -import { User, ILocalUser } from '../../models/entities/user'; -import { Note } from '../../models/entities/note'; -import { Notes, UserNotePinings, Users, Followings } from '../../models'; -import { UserNotePining } from '../../models/entities/user-note-pinings'; -import { genId } from '../../misc/gen-id'; +import config from '~/config'; +import renderAdd from '~/remote/activitypub/renderer/add'; +import renderRemove from '~/remote/activitypub/renderer/remove'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import { deliver } from '~/queue'; +import { IdentifiableError } from '~/misc/identifiable-error'; +import { User, ILocalUser } from '~/models/entities/user'; +import { Note } from '~/models/entities/note'; +import { Notes, UserNotePinings, Users, Followings } from '~/models'; +import { UserNotePining } from '~/models/entities/user-note-pinings'; +import { genId } from '~/misc/gen-id'; /** * 指定した投稿をピン留めします diff --git a/src/services/i/update.ts b/src/services/i/update.ts index ddb6704a0..22ce4868e 100644 --- a/src/services/i/update.ts +++ b/src/services/i/update.ts @@ -1,9 +1,9 @@ -import renderUpdate from '../../remote/activitypub/renderer/update'; -import { renderActivity } from '../../remote/activitypub/renderer'; -import { deliver } from '../../queue'; -import { Followings, Users } from '../../models'; -import { User } from '../../models/entities/user'; -import { renderPerson } from '../../remote/activitypub/renderer/person'; +import renderUpdate from '~/remote/activitypub/renderer/update'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import { deliver } from '~/queue'; +import { Followings, Users } from '~/models'; +import { User } from '~/models/entities/user'; +import { renderPerson } from '~/remote/activitypub/renderer/person'; export async function publishToFollowers(userId: User['id']) { const user = await Users.findOne(userId); diff --git a/src/services/insert-moderation-log.ts b/src/services/insert-moderation-log.ts index 33dab9725..eb0877681 100644 --- a/src/services/insert-moderation-log.ts +++ b/src/services/insert-moderation-log.ts @@ -1,6 +1,6 @@ -import { ILocalUser } from '../models/entities/user'; -import { ModerationLogs } from '../models'; -import { genId } from '../misc/gen-id'; +import { ILocalUser } from '~/models/entities/user'; +import { ModerationLogs } from '~/models'; +import { genId } from '~/misc/gen-id'; export async function insertModerationLog(moderator: ILocalUser, type: string, info?: Record) { await ModerationLogs.save({ diff --git a/src/services/logger.ts b/src/services/logger.ts index c393f017c..972b20aa0 100644 --- a/src/services/logger.ts +++ b/src/services/logger.ts @@ -2,10 +2,10 @@ import * as cluster from 'cluster'; import * as os from 'os'; import chalk from 'chalk'; import * as dateformat from 'dateformat'; -import { program } from '../argv'; +import { program } from '~/argv'; import { getRepository } from 'typeorm'; -import { Log } from '../models/entities/log'; -import { genId } from '../misc/gen-id'; +import { Log } from '~/models/entities/log'; +import { genId } from '~/misc/gen-id'; type Domain = { name: string; diff --git a/src/services/note/create.ts b/src/services/note/create.ts index 48d867022..1b7cafab3 100644 --- a/src/services/note/create.ts +++ b/src/services/note/create.ts @@ -1,33 +1,33 @@ -import es from '../../db/elasticsearch'; -import { publishMainStream, publishNotesStream } from '../stream'; -import { deliver } from '../../queue'; -import renderNote from '../../remote/activitypub/renderer/note'; -import renderCreate from '../../remote/activitypub/renderer/create'; -import renderAnnounce from '../../remote/activitypub/renderer/announce'; -import { renderActivity } from '../../remote/activitypub/renderer'; +import es from '~/db/elasticsearch'; +import { publishMainStream, publishNotesStream } from '~/services/stream'; +import { deliver } from '~/queue'; +import renderNote from '~/remote/activitypub/renderer/note'; +import renderCreate from '~/remote/activitypub/renderer/create'; +import renderAnnounce from '~/remote/activitypub/renderer/announce'; +import { renderActivity } from '~/remote/activitypub/renderer'; import watch from './watch'; -import { parse } from '../../mfm/parse'; -import { resolveUser } from '../../remote/resolve-user'; -import config from '../../config'; -import { updateHashtag } from '../update-hashtag'; -import { concat } from '../../prelude/array'; +import { parse } from '~/mfm/parse'; +import { resolveUser } from '~/remote/resolve-user'; +import config from '~/config'; +import { updateHashtag } from '~/services/update-hashtag'; +import { concat } from '~/prelude/array'; import insertNoteUnread from './unread'; -import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc'; -import extractMentions from '../../misc/extract-mentions'; -import extractEmojis from '../../misc/extract-emojis'; -import extractHashtags from '../../misc/extract-hashtags'; -import { Note } from '../../models/entities/note'; -import { Mutings, Users, NoteWatchings, Followings, Notes, Instances, UserProfiles } from '../../models'; -import { DriveFile } from '../../models/entities/drive-file'; -import { App } from '../../models/entities/app'; +import { registerOrFetchInstanceDoc } from '~/services/register-or-fetch-instance-doc'; +import extractMentions from '~/misc/extract-mentions'; +import extractEmojis from '~/misc/extract-emojis'; +import extractHashtags from '~/misc/extract-hashtags'; +import { Note } from '~/models/entities/note'; +import { Mutings, Users, NoteWatchings, Followings, Notes, Instances, UserProfiles } from '~/models'; +import { DriveFile } from '~/models/entities/drive-file'; +import { App } from '~/models/entities/app'; import { Not, getConnection } from 'typeorm'; -import { User, ILocalUser, IRemoteUser } from '../../models/entities/user'; -import { genId } from '../../misc/gen-id'; -import { notesChart, perUserNotesChart, activeUsersChart, instanceChart } from '../chart'; -import { Poll, IPoll } from '../../models/entities/poll'; -import { createNotification } from '../create-notification'; -import { isDuplicateKeyValueError } from '../../misc/is-duplicate-key-value-error'; -import { ensure } from '../../prelude/ensure'; +import { User, ILocalUser, IRemoteUser } from '~/models/entities/user'; +import { genId } from '~/misc/gen-id'; +import { notesChart, perUserNotesChart, activeUsersChart, instanceChart } from '~/services/chart'; +import { Poll, IPoll } from '~/models/entities/poll'; +import { createNotification } from '~/services/create-notification'; +import { isDuplicateKeyValueError } from '~/misc/is-duplicate-key-value-error'; +import { ensure } from '~/prelude/ensure'; type NotificationType = 'reply' | 'renote' | 'quote' | 'mention'; diff --git a/src/services/note/delete.ts b/src/services/note/delete.ts index 95776f728..2eca05cf2 100644 --- a/src/services/note/delete.ts +++ b/src/services/note/delete.ts @@ -1,14 +1,14 @@ -import { publishNoteStream } from '../stream'; -import renderDelete from '../../remote/activitypub/renderer/delete'; -import { renderActivity } from '../../remote/activitypub/renderer'; -import { deliver } from '../../queue'; -import renderTombstone from '../../remote/activitypub/renderer/tombstone'; -import config from '../../config'; -import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc'; -import { User } from '../../models/entities/user'; -import { Note } from '../../models/entities/note'; -import { Notes, Users, Followings, Instances } from '../../models'; -import { notesChart, perUserNotesChart, instanceChart } from '../chart'; +import { publishNoteStream } from '~/services/stream'; +import renderDelete from '~/remote/activitypub/renderer/delete'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import { deliver } from '~/queue'; +import renderTombstone from '~/remote/activitypub/renderer/tombstone'; +import config from '~/config'; +import { registerOrFetchInstanceDoc } from '~/services/register-or-fetch-instance-doc'; +import { User } from '~/models/entities/user'; +import { Note } from '~/models/entities/note'; +import { Notes, Users, Followings, Instances } from '~/models'; +import { notesChart, perUserNotesChart, instanceChart } from '~/services/chart'; /** * 投稿を削除します。 diff --git a/src/services/note/polls/update.ts b/src/services/note/polls/update.ts index f979ef2f0..9b03605f2 100644 --- a/src/services/note/polls/update.ts +++ b/src/services/note/polls/update.ts @@ -1,9 +1,9 @@ -import renderUpdate from '../../../remote/activitypub/renderer/update'; -import { renderActivity } from '../../../remote/activitypub/renderer'; -import { deliver } from '../../../queue'; -import renderNote from '../../../remote/activitypub/renderer/note'; -import { Users, Notes, Followings } from '../../../models'; -import { Note } from '../../../models/entities/note'; +import renderUpdate from '~/remote/activitypub/renderer/update'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import { deliver } from '~/queue'; +import renderNote from '~/remote/activitypub/renderer/note'; +import { Users, Notes, Followings } from '~/models'; +import { Note } from '~/models/entities/note'; export async function deliverQuestionUpdate(noteId: Note['id']) { const note = await Notes.findOne(noteId); diff --git a/src/services/note/polls/vote.ts b/src/services/note/polls/vote.ts index aee52ba10..c196a296d 100644 --- a/src/services/note/polls/vote.ts +++ b/src/services/note/polls/vote.ts @@ -1,11 +1,11 @@ -import watch from '../../../services/note/watch'; -import { publishNoteStream } from '../../stream'; -import { User } from '../../../models/entities/user'; -import { Note } from '../../../models/entities/note'; -import { PollVotes, Users, NoteWatchings, Polls, UserProfiles } from '../../../models'; +import watch from '~/services/note/watch'; +import { publishNoteStream } from '~/services/stream'; +import { User } from '~/models/entities/user'; +import { Note } from '~/models/entities/note'; +import { PollVotes, Users, NoteWatchings, Polls, UserProfiles } from '~/models'; import { Not } from 'typeorm'; -import { genId } from '../../../misc/gen-id'; -import { createNotification } from '../../create-notification'; +import { genId } from '~/misc/gen-id'; +import { createNotification } from '~/services/create-notification'; export default async function(user: User, note: Note, choice: number) { const poll = await Polls.findOne(note.id); diff --git a/src/services/note/reaction/create.ts b/src/services/note/reaction/create.ts index 436347774..c7b460bc2 100644 --- a/src/services/note/reaction/create.ts +++ b/src/services/note/reaction/create.ts @@ -1,20 +1,20 @@ -import { publishNoteStream } from '../../stream'; -import watch from '../watch'; -import renderLike from '../../../remote/activitypub/renderer/like'; -import { deliver } from '../../../queue'; -import { renderActivity } from '../../../remote/activitypub/renderer'; -import { IdentifiableError } from '../../../misc/identifiable-error'; -import { toDbReaction } from '../../../misc/reaction-lib'; -import { fetchMeta } from '../../../misc/fetch-meta'; -import { User } from '../../../models/entities/user'; -import { Note } from '../../../models/entities/note'; -import { NoteReactions, Users, NoteWatchings, Notes, UserProfiles } from '../../../models'; +import { publishNoteStream } from '~/services/stream'; +import watch from '~/services/note/watch'; +import renderLike from '~/remote/activitypub/renderer/like'; +import { deliver } from '~/queue'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import { IdentifiableError } from '~/misc/identifiable-error'; +import { toDbReaction } from '~/misc/reaction-lib'; +import { fetchMeta } from '~/misc/fetch-meta'; +import { User } from '~/models/entities/user'; +import { Note } from '~/models/entities/note'; +import { NoteReactions, Users, NoteWatchings, Notes, UserProfiles } from '~/models'; import { Not } from 'typeorm'; -import { perUserReactionsChart } from '../../chart'; -import { genId } from '../../../misc/gen-id'; -import { NoteReaction } from '../../../models/entities/note-reaction'; -import { createNotification } from '../../create-notification'; -import { isDuplicateKeyValueError } from '../../../misc/is-duplicate-key-value-error'; +import { perUserReactionsChart } from '~/services/chart'; +import { genId } from '~/misc/gen-id'; +import { NoteReaction } from '~/models/entities/note-reaction'; +import { createNotification } from '~/services/create-notification'; +import { isDuplicateKeyValueError } from '~/misc/is-duplicate-key-value-error'; export default async (user: User, note: Note, reaction?: string) => { // Myself diff --git a/src/services/note/reaction/delete.ts b/src/services/note/reaction/delete.ts index 6e9611ca5..6a1758301 100644 --- a/src/services/note/reaction/delete.ts +++ b/src/services/note/reaction/delete.ts @@ -1,12 +1,12 @@ -import { publishNoteStream } from '../../stream'; -import renderLike from '../../../remote/activitypub/renderer/like'; -import renderUndo from '../../../remote/activitypub/renderer/undo'; -import { renderActivity } from '../../../remote/activitypub/renderer'; -import { deliver } from '../../../queue'; -import { IdentifiableError } from '../../../misc/identifiable-error'; -import { User } from '../../../models/entities/user'; -import { Note } from '../../../models/entities/note'; -import { NoteReactions, Users, Notes } from '../../../models'; +import { publishNoteStream } from '~/services/stream'; +import renderLike from '~/remote/activitypub/renderer/like'; +import renderUndo from '~/remote/activitypub/renderer/undo'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import { deliver } from '~/queue'; +import { IdentifiableError } from '~/misc/identifiable-error'; +import { User } from '~/models/entities/user'; +import { Note } from '~/models/entities/note'; +import { NoteReactions, Users, Notes } from '~/models'; export default async (user: User, note: Note) => { // if already unreacted diff --git a/src/services/note/read.ts b/src/services/note/read.ts index c05a58534..0ce8f4d51 100644 --- a/src/services/note/read.ts +++ b/src/services/note/read.ts @@ -1,7 +1,7 @@ -import { publishMainStream } from '../stream'; -import { Note } from '../../models/entities/note'; -import { User } from '../../models/entities/user'; -import { NoteUnreads } from '../../models'; +import { publishMainStream } from '~/services/stream'; +import { Note } from '~/models/entities/note'; +import { User } from '~/models/entities/user'; +import { NoteUnreads } from '~/models'; /** * Mark a note as read diff --git a/src/services/note/unread.ts b/src/services/note/unread.ts index 203cff8d3..b17617ee0 100644 --- a/src/services/note/unread.ts +++ b/src/services/note/unread.ts @@ -1,8 +1,8 @@ -import { Note } from '../../models/entities/note'; -import { publishMainStream } from '../stream'; -import { User } from '../../models/entities/user'; -import { Mutings, NoteUnreads } from '../../models'; -import { genId } from '../../misc/gen-id'; +import { Note } from '~/models/entities/note'; +import { publishMainStream } from '~/services/stream'; +import { User } from '~/models/entities/user'; +import { Mutings, NoteUnreads } from '~/models'; +import { genId } from '~/misc/gen-id'; export default async function(user: User, note: Note, isSpecified = false) { //#region ミュートしているなら無視 diff --git a/src/services/note/unwatch.ts b/src/services/note/unwatch.ts index 047ac343b..0e7ae7465 100644 --- a/src/services/note/unwatch.ts +++ b/src/services/note/unwatch.ts @@ -1,6 +1,6 @@ -import { User } from '../../models/entities/user'; -import { NoteWatchings } from '../../models'; -import { Note } from '../../models/entities/note'; +import { User } from '~/models/entities/user'; +import { NoteWatchings } from '~/models'; +import { Note } from '~/models/entities/note'; export default async (me: User['id'], note: Note) => { await NoteWatchings.delete({ diff --git a/src/services/note/watch.ts b/src/services/note/watch.ts index d3c955369..87afb457d 100644 --- a/src/services/note/watch.ts +++ b/src/services/note/watch.ts @@ -1,8 +1,8 @@ -import { User } from '../../models/entities/user'; -import { Note } from '../../models/entities/note'; -import { NoteWatchings } from '../../models'; -import { genId } from '../../misc/gen-id'; -import { NoteWatching } from '../../models/entities/note-watching'; +import { User } from '~/models/entities/user'; +import { Note } from '~/models/entities/note'; +import { NoteWatchings } from '~/models'; +import { genId } from '~/misc/gen-id'; +import { NoteWatching } from '~/models/entities/note-watching'; export default async (me: User['id'], note: Note) => { // 自分の投稿はwatchできない diff --git a/src/services/push-notification.ts b/src/services/push-notification.ts index da1c1dbf5..a0e368ec0 100644 --- a/src/services/push-notification.ts +++ b/src/services/push-notification.ts @@ -1,7 +1,7 @@ import * as push from 'web-push'; -import config from '../config'; -import { SwSubscriptions } from '../models'; -import { fetchMeta } from '../misc/fetch-meta'; +import config from '~/config'; +import { SwSubscriptions } from '~/models'; +import { fetchMeta } from '~/misc/fetch-meta'; export default async function(userId: string, type: string, body?: any) { const meta = await fetchMeta(); diff --git a/src/services/register-or-fetch-instance-doc.ts b/src/services/register-or-fetch-instance-doc.ts index 9957edd3d..4377bd123 100644 --- a/src/services/register-or-fetch-instance-doc.ts +++ b/src/services/register-or-fetch-instance-doc.ts @@ -1,8 +1,8 @@ -import { Instance } from '../models/entities/instance'; -import { Instances } from '../models'; +import { Instance } from '~/models/entities/instance'; +import { Instances } from '~/models'; import { federationChart } from './chart'; -import { genId } from '../misc/gen-id'; -import { toPuny } from '../misc/convert-host'; +import { genId } from '~/misc/gen-id'; +import { toPuny } from '~/misc/convert-host'; export async function registerOrFetchInstanceDoc(host: string): Promise { host = toPuny(host); diff --git a/src/services/send-email.ts b/src/services/send-email.ts index 8818c5fcd..83b7b27f1 100644 --- a/src/services/send-email.ts +++ b/src/services/send-email.ts @@ -1,5 +1,5 @@ import * as nodemailer from 'nodemailer'; -import { fetchMeta } from '../misc/fetch-meta'; +import { fetchMeta } from '~/misc/fetch-meta'; import Logger from './logger'; export const logger = new Logger('email'); diff --git a/src/services/stream.ts b/src/services/stream.ts index a47798eef..d3edae33f 100644 --- a/src/services/stream.ts +++ b/src/services/stream.ts @@ -1,9 +1,9 @@ -import redis from '../db/redis'; -import { User } from '../models/entities/user'; -import { Note } from '../models/entities/note'; -import { UserList } from '../models/entities/user-list'; -import { ReversiGame } from '../models/entities/games/reversi/game'; -import { UserGroup } from '../models/entities/user-group'; +import redis from '~/db/redis'; +import { User } from '~/models/entities/user'; +import { Note } from '~/models/entities/note'; +import { UserList } from '~/models/entities/user-list'; +import { ReversiGame } from '~/models/entities/games/reversi/game'; +import { UserGroup } from '~/models/entities/user-group'; class Publisher { private publish = (channel: string, type: string | null, value?: any): void => { diff --git a/src/services/suspend-user.ts b/src/services/suspend-user.ts index a85188acb..74ff2358d 100644 --- a/src/services/suspend-user.ts +++ b/src/services/suspend-user.ts @@ -1,9 +1,9 @@ -import renderDelete from '../remote/activitypub/renderer/delete'; -import { renderActivity } from '../remote/activitypub/renderer'; -import { deliver } from '../queue'; -import config from '../config'; -import { User } from '../models/entities/user'; -import { Users, Followings } from '../models'; +import renderDelete from '~/remote/activitypub/renderer/delete'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import { deliver } from '~/queue'; +import config from '~/config'; +import { User } from '~/models/entities/user'; +import { Users, Followings } from '~/models'; import { Not, IsNull } from 'typeorm'; export async function doPostSuspend(user: User) { diff --git a/src/services/unsuspend-user.ts b/src/services/unsuspend-user.ts index 6cab37582..00f98d964 100644 --- a/src/services/unsuspend-user.ts +++ b/src/services/unsuspend-user.ts @@ -1,10 +1,10 @@ -import renderDelete from '../remote/activitypub/renderer/delete'; -import renderUndo from '../remote/activitypub/renderer/undo'; -import { renderActivity } from '../remote/activitypub/renderer'; -import { deliver } from '../queue'; -import config from '../config'; -import { User } from '../models/entities/user'; -import { Users, Followings } from '../models'; +import renderDelete from '~/remote/activitypub/renderer/delete'; +import renderUndo from '~/remote/activitypub/renderer/undo'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import { deliver } from '~/queue'; +import config from '~/config'; +import { User } from '~/models/entities/user'; +import { Users, Followings } from '~/models'; import { Not, IsNull } from 'typeorm'; export async function doPostUnsuspend(user: User) { diff --git a/src/services/update-hashtag.ts b/src/services/update-hashtag.ts index 3482b9ef0..be9ef220a 100644 --- a/src/services/update-hashtag.ts +++ b/src/services/update-hashtag.ts @@ -1,8 +1,8 @@ -import { User } from '../models/entities/user'; -import { Hashtags, Users } from '../models'; +import { User } from '~/models/entities/user'; +import { Hashtags, Users } from '~/models'; import { hashtagChart } from './chart'; -import { genId } from '../misc/gen-id'; -import { Hashtag } from '../models/entities/hashtag'; +import { genId } from '~/misc/gen-id'; +import { Hashtag } from '~/models/entities/hashtag'; export async function updateHashtag(user: User, tag: string, isUserAttached = false, inc = true) { tag = tag.toLowerCase(); diff --git a/src/services/user-list/push.ts b/src/services/user-list/push.ts index 958d54b09..d72d7588c 100644 --- a/src/services/user-list/push.ts +++ b/src/services/user-list/push.ts @@ -1,13 +1,13 @@ -import { renderActivity } from '../../remote/activitypub/renderer'; -import { deliver } from '../../queue'; -import renderFollow from '../../remote/activitypub/renderer/follow'; -import { publishUserListStream } from '../stream'; -import { User } from '../../models/entities/user'; -import { UserList } from '../../models/entities/user-list'; -import { UserListJoinings, Users } from '../../models'; -import { UserListJoining } from '../../models/entities/user-list-joining'; -import { genId } from '../../misc/gen-id'; -import { fetchProxyAccount } from '../../misc/fetch-proxy-account'; +import { renderActivity } from '~/remote/activitypub/renderer'; +import { deliver } from '~/queue'; +import renderFollow from '~/remote/activitypub/renderer/follow'; +import { publishUserListStream } from '~/services/stream'; +import { User } from '~/models/entities/user'; +import { UserList } from '~/models/entities/user-list'; +import { UserListJoinings, Users } from '~/models'; +import { UserListJoining } from '~/models/entities/user-list-joining'; +import { genId } from '~/misc/gen-id'; +import { fetchProxyAccount } from '~/misc/fetch-proxy-account'; export async function pushUserToUserList(target: User, list: UserList) { await UserListJoinings.save({ diff --git a/src/tools/accept-migration.ts b/src/tools/accept-migration.ts index addce86f1..72adb578b 100644 --- a/src/tools/accept-migration.ts +++ b/src/tools/accept-migration.ts @@ -1,7 +1,7 @@ // ex) node built/tools/accept-migration Yo 1000000000001 import { createConnection } from 'typeorm'; -import config from '../config'; +import config from '~/config'; createConnection({ type: 'postgres', diff --git a/src/tools/add-emoji.ts b/src/tools/add-emoji.ts index 3745b4888..2a1e32533 100644 --- a/src/tools/add-emoji.ts +++ b/src/tools/add-emoji.ts @@ -1,5 +1,5 @@ -import { Emojis } from '../models'; -import { genId } from '../misc/gen-id'; +import { Emojis } from '~/models'; +import { genId } from '~/misc/gen-id'; async function main(name: string, url: string, alias?: string): Promise { const aliases = alias != null ? [ alias ] : []; diff --git a/src/tools/refresh-question.ts b/src/tools/refresh-question.ts index 83d71ff30..c34e04b76 100644 --- a/src/tools/refresh-question.ts +++ b/src/tools/refresh-question.ts @@ -1,4 +1,4 @@ -import { updateQuestion } from '../remote/activitypub/models/question'; +import { updateQuestion } from '~/remote/activitypub/models/question'; async function main(uri: string): Promise { return await updateQuestion(uri); diff --git a/src/tools/resync-remote-user.ts b/src/tools/resync-remote-user.ts index 52f63cf1f..ad375a9be 100644 --- a/src/tools/resync-remote-user.ts +++ b/src/tools/resync-remote-user.ts @@ -1,5 +1,5 @@ -import parseAcct from '../misc/acct/parse'; -import { resolveUser } from '../remote/resolve-user'; +import parseAcct from '~/misc/acct/parse'; +import { resolveUser } from '~/remote/resolve-user'; async function main(acct: string): Promise { const { username, host } = parseAcct(acct); diff --git a/src/tools/show-signin-history.ts b/src/tools/show-signin-history.ts index fd7cd39e3..a392bde92 100644 --- a/src/tools/show-signin-history.ts +++ b/src/tools/show-signin-history.ts @@ -1,4 +1,4 @@ -import { Users, Signins } from '../models'; +import { Users, Signins } from '~/models'; // node built/tools/show-signin-history username // => {Success} {Date} {IPAddrsss} diff --git a/tsconfig.json b/tsconfig.json index 4f1d1b9cd..ffd5bd3e8 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -19,6 +19,11 @@ "experimentalDecorators": true, "emitDecoratorMetadata": true, "resolveJsonModule": true, + "baseUrl": "./", + "paths": { + "~*": ["./src*"], + "%": ["./locales/"] + }, "typeRoots": [ "node_modules/@types", "src/@types" diff --git a/webpack.config.ts b/webpack.config.ts index 24d2337a7..e6de2ad39 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -149,6 +149,7 @@ module.exports = { '.js', '.ts', '.json' ], alias: { + '~': __dirname + '/src', 'const.styl': __dirname + '/src/client/const.styl' } }, From 1dc433b292452be0eac65c07dd4f225189ec0009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Sun, 11 Aug 2019 08:51:41 +0900 Subject: [PATCH 2/3] Apply aliasing in resolving module --- index.js | 1 + package.json | 6 ++++++ yarn.lock | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/index.js b/index.js index bc7e8b2f3..e3dd0b1ac 100644 --- a/index.js +++ b/index.js @@ -1 +1,2 @@ +require('module-alias/register'); require('./built').default(); diff --git a/package.json b/package.json index 5cd0299c0..f09e8058a 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,11 @@ "test": "gulp test", "format": "gulp format" }, + "_moduleAliases": { + "package.json": "package.json", + "~": "built", + "$": "locales" + }, "resolutions": { "gulp-cssnano/cssnano/postcss-svgo/svgo/js-yaml": "^3.13.1", "lodash": "^4.17.13" @@ -173,6 +178,7 @@ "lolex": "4.1.0", "lookup-dns-cache": "2.1.0", "mocha": "6.2.0", + "module-alias": "2.2.1", "moji": "0.5.1", "ms": "2.1.2", "nested-property": "1.0.1", diff --git a/yarn.lock b/yarn.lock index 1ac9e145f..a047b9e50 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7341,6 +7341,11 @@ mocha@^5.2.0: mkdirp "0.5.1" supports-color "5.4.0" +module-alias@2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/module-alias/-/module-alias-2.2.1.tgz#553aea9dc7f99cd45fd75e34a574960dc46550da" + integrity sha512-LTez0Eo+YtfUhgzhu/LqxkUzOpD+k5C0wXBLun0L1qE2BhHf6l09dqam8e7BnoMYA6mAlP0vSsGFQ8QHhGN/aQ== + moji@0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/moji/-/moji-0.5.1.tgz#088eecd1c22c8f31a240adcf9c95e54f33eb54fb" From bfde75dae681820abbbc0a4346b278fbd8830832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Sun, 11 Aug 2019 08:51:53 +0900 Subject: [PATCH 3/3] Fix aliases --- src/@types/package.json.d.ts | 2 +- src/argv.ts | 2 +- src/boot/master.ts | 2 +- src/config/load.ts | 2 +- src/server/api/endpoints/meta.ts | 2 +- src/server/api/openapi/description.ts | 2 +- src/server/nodeinfo.ts | 2 +- src/server/web/docs.ts | 2 +- src/server/web/index.ts | 2 +- tsconfig.json | 3 ++- 10 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/@types/package.json.d.ts b/src/@types/package.json.d.ts index abe5fae68..1196057d1 100644 --- a/src/@types/package.json.d.ts +++ b/src/@types/package.json.d.ts @@ -1,4 +1,4 @@ -declare module '*/package.json' { +declare module 'package.json' { interface IRepository { type: string; url: string; diff --git a/src/argv.ts b/src/argv.ts index 8e602e346..ddfd6b332 100644 --- a/src/argv.ts +++ b/src/argv.ts @@ -1,5 +1,5 @@ import * as program from 'commander'; -import * as pkg from '~/package.json'; +import * as pkg from 'package.json'; program .version(pkg.version) diff --git a/src/boot/master.ts b/src/boot/master.ts index dd2192253..be21520e2 100644 --- a/src/boot/master.ts +++ b/src/boot/master.ts @@ -8,7 +8,7 @@ import Logger from '~/services/logger'; import loadConfig from '~/config/load'; import { Config } from '~/config/types'; import { lessThan } from '~/prelude/array'; -import * as pkg from '~/package.json'; +import * as pkg from 'package.json'; import { program } from '~/argv'; import { showMachineInfo } from '~/misc/show-machine-info'; import { initDb } from '~/db/postgre'; diff --git a/src/config/load.ts b/src/config/load.ts index 0e4c7d8cd..1716a9d32 100644 --- a/src/config/load.ts +++ b/src/config/load.ts @@ -5,7 +5,7 @@ import * as fs from 'fs'; import * as yaml from 'js-yaml'; import { Source, Mixin } from './types'; -import * as pkg from '~/package.json'; +import * as pkg from 'package.json'; /** * Path of configuration directory diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts index cfe8bd2d7..a8c97b033 100644 --- a/src/server/api/endpoints/meta.ts +++ b/src/server/api/endpoints/meta.ts @@ -3,7 +3,7 @@ import * as os from 'os'; import config from '~/config'; import define from '~/server/api/define'; import { fetchMeta } from '~/misc/fetch-meta'; -import * as pkg from '~/package.json'; +import * as pkg from 'package.json'; import { Emojis } from '~/models'; import { getConnection } from 'typeorm'; import redis from '~/db/redis'; diff --git a/src/server/api/openapi/description.ts b/src/server/api/openapi/description.ts index 42811233b..e62a744bc 100644 --- a/src/server/api/openapi/description.ts +++ b/src/server/api/openapi/description.ts @@ -1,6 +1,6 @@ import config from '~/config'; import endpoints from '~/server/api/endpoints'; -import * as locale from '%'; +import * as locale from '$'; import { fromEntries } from '~/prelude/array'; import { kinds as kindsList } from '~/server/api/kinds'; diff --git a/src/server/nodeinfo.ts b/src/server/nodeinfo.ts index a908d8e3c..008cfdeb5 100644 --- a/src/server/nodeinfo.ts +++ b/src/server/nodeinfo.ts @@ -2,7 +2,7 @@ import * as Router from 'koa-router'; import config from '~/config'; import { fetchMeta } from '~/misc/fetch-meta'; // import User from '~/models/user'; -import { name as softwareName, version, repository } from '~/package.json'; +import { name as softwareName, version, repository } from 'package.json'; // import Note from '~/models/note'; const router = new Router(); diff --git a/src/server/web/docs.ts b/src/server/web/docs.ts index c6cc2223e..41c64d6da 100644 --- a/src/server/web/docs.ts +++ b/src/server/web/docs.ts @@ -13,7 +13,7 @@ import * as glob from 'glob'; import config from '~/config'; import { licenseHtml } from '~/misc/license'; import { copyright } from '~/const.json'; -import * as locales from '%'; +import * as locales from '$'; import * as nestedProperty from 'nested-property'; function getLang(lang: string): string { diff --git a/src/server/web/index.ts b/src/server/web/index.ts index 0683adb9c..4d9efbd1b 100644 --- a/src/server/web/index.ts +++ b/src/server/web/index.ts @@ -13,7 +13,7 @@ import * as views from 'koa-views'; import docs from './docs'; import packFeed from './feed'; import { fetchMeta } from '~/misc/fetch-meta'; -import * as pkg from '~/package.json'; +import * as pkg from 'package.json'; import { genOpenapiSpec } from '~/server/api/openapi/gen-spec'; import config from '~/config'; import { Users, Notes, Emojis, UserProfiles, Pages } from '~/models'; diff --git a/tsconfig.json b/tsconfig.json index ffd5bd3e8..e3be0d357 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -21,8 +21,9 @@ "resolveJsonModule": true, "baseUrl": "./", "paths": { + "package.json": ["./package.json"], "~*": ["./src*"], - "%": ["./locales/"] + "$": ["./locales/"] }, "typeRoots": [ "node_modules/@types",