forked from mirror/misskey
refactor: Use path alias
This commit is contained in:
parent
d6e23b803b
commit
c74fe3c6e2
@ -1,5 +1,5 @@
|
|||||||
import * as program from 'commander';
|
import * as program from 'commander';
|
||||||
import config from './config';
|
import config from '@/config';
|
||||||
|
|
||||||
program
|
program
|
||||||
.version(config.version)
|
.version(config.version)
|
||||||
|
@ -6,11 +6,11 @@ import * as isRoot from 'is-root';
|
|||||||
import { getConnection } from 'typeorm';
|
import { getConnection } from 'typeorm';
|
||||||
|
|
||||||
import Logger from '../services/logger';
|
import Logger from '../services/logger';
|
||||||
import loadConfig from '../config/load';
|
import loadConfig from '@/config/load';
|
||||||
import { Config } from '../config/types';
|
import { Config } from '@/config/types';
|
||||||
import { lessThan } from '../prelude/array';
|
import { lessThan } from '../prelude/array';
|
||||||
import { program } from '../argv';
|
import { program } from '../argv';
|
||||||
import { showMachineInfo } from '../misc/show-machine-info';
|
import { showMachineInfo } from '@/misc/show-machine-info';
|
||||||
import { initDb } from '../db/postgre';
|
import { initDb } from '../db/postgre';
|
||||||
const meta = require('../meta.json');
|
const meta = require('../meta.json');
|
||||||
|
|
||||||
|
@ -29,9 +29,9 @@
|
|||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { defineComponent, markRaw } from 'vue';
|
import { defineComponent, markRaw } from 'vue';
|
||||||
import { emojilist } from '../../misc/emojilist';
|
import { emojilist } from '@/misc/emojilist';
|
||||||
import contains from '@client/scripts/contains';
|
import contains from '@client/scripts/contains';
|
||||||
import { twemojiSvgBase } from '../../misc/twemoji-base';
|
import { twemojiSvgBase } from '@/misc/twemoji-base';
|
||||||
import { getStaticImageUrl } from '@client/scripts/get-static-image-url';
|
import { getStaticImageUrl } from '@client/scripts/get-static-image-url';
|
||||||
import { acct } from '@client/filters/user';
|
import { acct } from '@client/filters/user';
|
||||||
import * as os from '@client/os';
|
import * as os from '@client/os';
|
||||||
|
@ -74,7 +74,7 @@
|
|||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { defineComponent, markRaw } from 'vue';
|
import { defineComponent, markRaw } from 'vue';
|
||||||
import { emojilist } from '../../misc/emojilist';
|
import { emojilist } from '@/misc/emojilist';
|
||||||
import { getStaticImageUrl } from '@client/scripts/get-static-image-url';
|
import { getStaticImageUrl } from '@client/scripts/get-static-image-url';
|
||||||
import { faAsterisk, faLeaf, faUtensils, faFutbol, faCity, faDice, faGlobe, faClock, faUser, faChevronDown, faShapes, faBicycle, faHashtag } from '@fortawesome/free-solid-svg-icons';
|
import { faAsterisk, faLeaf, faUtensils, faFutbol, faCity, faDice, faGlobe, faClock, faUser, faChevronDown, faShapes, faBicycle, faHashtag } from '@fortawesome/free-solid-svg-icons';
|
||||||
import { faHeart, faFlag, faLaugh } from '@fortawesome/free-regular-svg-icons';
|
import { faHeart, faFlag, faLaugh } from '@fortawesome/free-regular-svg-icons';
|
||||||
|
@ -61,7 +61,7 @@
|
|||||||
import { defineComponent } from 'vue';
|
import { defineComponent } from 'vue';
|
||||||
import { faIdCardAlt, faPlus, faQuoteLeft, faQuoteRight, faRetweet, faReply, faAt, faCheck, faPollH } from '@fortawesome/free-solid-svg-icons';
|
import { faIdCardAlt, faPlus, faQuoteLeft, faQuoteRight, faRetweet, faReply, faAt, faCheck, faPollH } from '@fortawesome/free-solid-svg-icons';
|
||||||
import { faClock } from '@fortawesome/free-regular-svg-icons';
|
import { faClock } from '@fortawesome/free-regular-svg-icons';
|
||||||
import { getNoteSummary } from '../../misc/get-note-summary';
|
import { getNoteSummary } from '@/misc/get-note-summary';
|
||||||
import XReactionIcon from './reaction-icon.vue';
|
import XReactionIcon from './reaction-icon.vue';
|
||||||
import MkFollowButton from './follow-button.vue';
|
import MkFollowButton from './follow-button.vue';
|
||||||
import notePage from '../filters/note';
|
import notePage from '../filters/note';
|
||||||
|
@ -52,7 +52,7 @@
|
|||||||
import { defineComponent } from 'vue';
|
import { defineComponent } from 'vue';
|
||||||
import { faExclamationTriangle, faTimes } from '@fortawesome/free-solid-svg-icons';
|
import { faExclamationTriangle, faTimes } from '@fortawesome/free-solid-svg-icons';
|
||||||
import { addTime } from '../../prelude/time';
|
import { addTime } from '../../prelude/time';
|
||||||
import { formatDateTimeString } from '../../misc/format-time-string';
|
import { formatDateTimeString } from '@/misc/format-time-string';
|
||||||
import MkInput from './ui/input.vue';
|
import MkInput from './ui/input.vue';
|
||||||
import MkSelect from './ui/select.vue';
|
import MkSelect from './ui/select.vue';
|
||||||
import MkSwitch from './ui/switch.vue';
|
import MkSwitch from './ui/switch.vue';
|
||||||
|
@ -61,9 +61,9 @@ import XNotePreview from './note-preview.vue';
|
|||||||
import { parse } from '../../mfm/parse';
|
import { parse } from '../../mfm/parse';
|
||||||
import { host, url } from '@client/config';
|
import { host, url } from '@client/config';
|
||||||
import { erase, unique } from '../../prelude/array';
|
import { erase, unique } from '../../prelude/array';
|
||||||
import extractMentions from '../../misc/extract-mentions';
|
import extractMentions from '@/misc/extract-mentions';
|
||||||
import getAcct from '../../misc/acct/render';
|
import getAcct from '@/misc/acct/render';
|
||||||
import { formatTimeString } from '../../misc/format-time-string';
|
import { formatTimeString } from '@/misc/format-time-string';
|
||||||
import { Autocomplete } from '@client/scripts/autocomplete';
|
import { Autocomplete } from '@client/scripts/autocomplete';
|
||||||
import { noteVisibilities } from '../../types';
|
import { noteVisibilities } from '../../types';
|
||||||
import * as os from '@client/os';
|
import * as os from '@client/os';
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { defineComponent } from 'vue';
|
import { defineComponent } from 'vue';
|
||||||
import { kinds } from '../../misc/api-permissions';
|
import { kinds } from '@/misc/api-permissions';
|
||||||
import XModalWindow from '@client/components/ui/modal-window.vue';
|
import XModalWindow from '@client/components/ui/modal-window.vue';
|
||||||
import MkInput from './ui/input.vue';
|
import MkInput from './ui/input.vue';
|
||||||
import MkTextarea from './ui/textarea.vue';
|
import MkTextarea from './ui/textarea.vue';
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { defineComponent } from 'vue';
|
import { defineComponent } from 'vue';
|
||||||
import parseAcct from '../../misc/acct/parse';
|
import parseAcct from '@/misc/acct/parse';
|
||||||
import MkFollowButton from './follow-button.vue';
|
import MkFollowButton from './follow-button.vue';
|
||||||
import { userPage } from '../filters/user';
|
import { userPage } from '../filters/user';
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { defineComponent } from 'vue';
|
import { defineComponent } from 'vue';
|
||||||
import parseAcct from '../../misc/acct/parse';
|
import parseAcct from '@/misc/acct/parse';
|
||||||
import MkFollowButton from './follow-button.vue';
|
import MkFollowButton from './follow-button.vue';
|
||||||
import { userPage } from '../filters/user';
|
import { userPage } from '../filters/user';
|
||||||
import * as os from '@client/os';
|
import * as os from '@client/os';
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import getAcct from '../../misc/acct/render';
|
import getAcct from '@/misc/acct/render';
|
||||||
import getUserName from '../../misc/get-user-name';
|
import getUserName from '@/misc/get-user-name';
|
||||||
import { url } from '@client/config';
|
import { url } from '@client/config';
|
||||||
|
|
||||||
export const acct = user => {
|
export const acct = user => {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { markRaw } from 'vue';
|
import { markRaw } from 'vue';
|
||||||
import { locale } from '@client/config';
|
import { locale } from '@client/config';
|
||||||
import { I18n } from '../misc/i18n';
|
import { I18n } from '@/misc/i18n';
|
||||||
|
|
||||||
export const i18n = markRaw(new I18n(locale));
|
export const i18n = markRaw(new I18n(locale));
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { defineComponent } from 'vue';
|
import { defineComponent } from 'vue';
|
||||||
import * as os from '@client/os';
|
import * as os from '@client/os';
|
||||||
import parseAcct from '../../misc/acct/parse';
|
import parseAcct from '@/misc/acct/parse';
|
||||||
|
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
created() {
|
created() {
|
||||||
|
@ -65,7 +65,7 @@
|
|||||||
import { defineComponent } from 'vue';
|
import { defineComponent } from 'vue';
|
||||||
import { faPlus, faUsers, faSearch, faBookmark, faMicrophoneSlash, faExclamationCircle } from '@fortawesome/free-solid-svg-icons';
|
import { faPlus, faUsers, faSearch, faBookmark, faMicrophoneSlash, faExclamationCircle } from '@fortawesome/free-solid-svg-icons';
|
||||||
import { faSnowflake, faBookmark as farBookmark } from '@fortawesome/free-regular-svg-icons';
|
import { faSnowflake, faBookmark as farBookmark } from '@fortawesome/free-regular-svg-icons';
|
||||||
import parseAcct from '../../../misc/acct/parse';
|
import parseAcct from '@/misc/acct/parse';
|
||||||
import MkButton from '@client/components/ui/button.vue';
|
import MkButton from '@client/components/ui/button.vue';
|
||||||
import MkInput from '@client/components/ui/input.vue';
|
import MkInput from '@client/components/ui/input.vue';
|
||||||
import MkSelect from '@client/components/ui/select.vue';
|
import MkSelect from '@client/components/ui/select.vue';
|
||||||
|
@ -258,7 +258,7 @@ import MkTextarea from '@client/components/ui/textarea.vue';
|
|||||||
import MkSwitch from '@client/components/ui/switch.vue';
|
import MkSwitch from '@client/components/ui/switch.vue';
|
||||||
import MkInfo from '@client/components/ui/info.vue';
|
import MkInfo from '@client/components/ui/info.vue';
|
||||||
import { url } from '@client/config';
|
import { url } from '@client/config';
|
||||||
import getAcct from '../../../misc/acct/render';
|
import getAcct from '@/misc/acct/render';
|
||||||
import * as os from '@client/os';
|
import * as os from '@client/os';
|
||||||
import { fetchInstance } from '@client/instance';
|
import { fetchInstance } from '@client/instance';
|
||||||
|
|
||||||
|
@ -82,7 +82,7 @@
|
|||||||
import { defineComponent } from 'vue';
|
import { defineComponent } from 'vue';
|
||||||
import { faPlus, faUsers, faSearch, faBookmark, faMicrophoneSlash } from '@fortawesome/free-solid-svg-icons';
|
import { faPlus, faUsers, faSearch, faBookmark, faMicrophoneSlash } from '@fortawesome/free-solid-svg-icons';
|
||||||
import { faSnowflake, faBookmark as farBookmark } from '@fortawesome/free-regular-svg-icons';
|
import { faSnowflake, faBookmark as farBookmark } from '@fortawesome/free-regular-svg-icons';
|
||||||
import parseAcct from '../../../misc/acct/parse';
|
import parseAcct from '@/misc/acct/parse';
|
||||||
import MkButton from '@client/components/ui/button.vue';
|
import MkButton from '@client/components/ui/button.vue';
|
||||||
import MkInput from '@client/components/ui/input.vue';
|
import MkInput from '@client/components/ui/input.vue';
|
||||||
import MkSelect from '@client/components/ui/select.vue';
|
import MkSelect from '@client/components/ui/select.vue';
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { defineAsyncComponent, defineComponent } from 'vue';
|
import { defineAsyncComponent, defineComponent } from 'vue';
|
||||||
import { faUser, faUsers, faComments, faPlus } from '@fortawesome/free-solid-svg-icons';
|
import { faUser, faUsers, faComments, faPlus } from '@fortawesome/free-solid-svg-icons';
|
||||||
import getAcct from '../../../misc/acct/render';
|
import getAcct from '@/misc/acct/render';
|
||||||
import MkButton from '@client/components/ui/button.vue';
|
import MkButton from '@client/components/ui/button.vue';
|
||||||
import { acct } from '../../filters/user';
|
import { acct } from '../../filters/user';
|
||||||
import * as os from '@client/os';
|
import * as os from '@client/os';
|
||||||
|
@ -26,7 +26,7 @@ import { defineComponent, defineAsyncComponent } from 'vue';
|
|||||||
import { faPaperPlane, faPhotoVideo, faLaughSquint } from '@fortawesome/free-solid-svg-icons';
|
import { faPaperPlane, faPhotoVideo, faLaughSquint } from '@fortawesome/free-solid-svg-icons';
|
||||||
import insertTextAtCursor from 'insert-text-at-cursor';
|
import insertTextAtCursor from 'insert-text-at-cursor';
|
||||||
import * as autosize from 'autosize';
|
import * as autosize from 'autosize';
|
||||||
import { formatTimeString } from '../../../misc/format-time-string';
|
import { formatTimeString } from '@/misc/format-time-string';
|
||||||
import { selectFile } from '@client/scripts/select-file';
|
import { selectFile } from '@client/scripts/select-file';
|
||||||
import * as os from '@client/os';
|
import * as os from '@client/os';
|
||||||
import { Autocomplete } from '@client/scripts/autocomplete';
|
import { Autocomplete } from '@client/scripts/autocomplete';
|
||||||
|
@ -42,7 +42,7 @@ import { faWindowMaximize } from '@fortawesome/free-regular-svg-icons';
|
|||||||
import XList from '@client/components/date-separated-list.vue';
|
import XList from '@client/components/date-separated-list.vue';
|
||||||
import XMessage from './messaging-room.message.vue';
|
import XMessage from './messaging-room.message.vue';
|
||||||
import XForm from './messaging-room.form.vue';
|
import XForm from './messaging-room.form.vue';
|
||||||
import parseAcct from '../../../misc/acct/parse';
|
import parseAcct from '@/misc/acct/parse';
|
||||||
import { isBottom, onScrollBottom, scroll } from '@client/scripts/scroll';
|
import { isBottom, onScrollBottom, scroll } from '@client/scripts/scroll';
|
||||||
import * as os from '@client/os';
|
import * as os from '@client/os';
|
||||||
import { popout } from '@client/scripts/popout';
|
import { popout } from '@client/scripts/popout';
|
||||||
|
@ -53,7 +53,7 @@ import MkInput from '@client/components/ui/input.vue';
|
|||||||
import MkTextarea from '@client/components/ui/textarea.vue';
|
import MkTextarea from '@client/components/ui/textarea.vue';
|
||||||
import MkSelect from '@client/components/ui/select.vue';
|
import MkSelect from '@client/components/ui/select.vue';
|
||||||
import MkSwitch from '@client/components/ui/switch.vue';
|
import MkSwitch from '@client/components/ui/switch.vue';
|
||||||
import getAcct from '../../../misc/acct/render';
|
import getAcct from '@/misc/acct/render';
|
||||||
import * as os from '@client/os';
|
import * as os from '@client/os';
|
||||||
|
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
|
@ -52,7 +52,7 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { computed, defineComponent } from 'vue';
|
import { computed, defineComponent } from 'vue';
|
||||||
import { Room } from '@client/scripts/room/room';
|
import { Room } from '@client/scripts/room/room';
|
||||||
import parseAcct from '../../../misc/acct/parse';
|
import parseAcct from '@/misc/acct/parse';
|
||||||
import XPreview from './preview.vue';
|
import XPreview from './preview.vue';
|
||||||
const storeItems = require('@client/scripts/room/furnitures.json5');
|
const storeItems = require('@client/scripts/room/furnitures.json5');
|
||||||
import { faBoxOpen, faUndo, faArrowsAlt, faBan, faBroom } from '@fortawesome/free-solid-svg-icons';
|
import { faBoxOpen, faUndo, faArrowsAlt, faBan, faBroom } from '@fortawesome/free-solid-svg-icons';
|
||||||
|
@ -228,7 +228,7 @@ import MkFolder from '@client/components/ui/folder.vue';
|
|||||||
import MkRemoteCaution from '@client/components/remote-caution.vue';
|
import MkRemoteCaution from '@client/components/remote-caution.vue';
|
||||||
import MkTab from '@client/components/tab.vue';
|
import MkTab from '@client/components/tab.vue';
|
||||||
import Progress from '@client/scripts/loading';
|
import Progress from '@client/scripts/loading';
|
||||||
import parseAcct from '../../../misc/acct/parse';
|
import parseAcct from '@/misc/acct/parse';
|
||||||
import { getScrollPosition } from '@client/scripts/scroll';
|
import { getScrollPosition } from '@client/scripts/scroll';
|
||||||
import { getUserMenu } from '@client/scripts/get-user-menu';
|
import { getUserMenu } from '@client/scripts/get-user-menu';
|
||||||
import number from '../../filters/number';
|
import number from '../../filters/number';
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import parseAcct from '../../misc/acct/parse';
|
import parseAcct from '@/misc/acct/parse';
|
||||||
import { host as localHost } from '@client/config';
|
import { host as localHost } from '@client/config';
|
||||||
|
|
||||||
export async function genSearchQuery(v: any, q: string) {
|
export async function genSearchQuery(v: any, q: string) {
|
||||||
|
@ -3,7 +3,7 @@ import { faSnowflake, faEnvelope } from '@fortawesome/free-regular-svg-icons';
|
|||||||
import { i18n } from '@client/i18n';
|
import { i18n } from '@client/i18n';
|
||||||
import copyToClipboard from '@client/scripts/copy-to-clipboard';
|
import copyToClipboard from '@client/scripts/copy-to-clipboard';
|
||||||
import { host } from '@client/config';
|
import { host } from '@client/config';
|
||||||
import getAcct from '../../misc/acct/render';
|
import getAcct from '@/misc/acct/render';
|
||||||
import * as os from '@client/os';
|
import * as os from '@client/os';
|
||||||
import { userActions } from '@client/store';
|
import { userActions } from '@client/store';
|
||||||
import { router } from '@client/router';
|
import { router } from '@client/router';
|
||||||
|
@ -3,8 +3,8 @@
|
|||||||
*/
|
*/
|
||||||
declare var self: ServiceWorkerGlobalScope;
|
declare var self: ServiceWorkerGlobalScope;
|
||||||
|
|
||||||
import { getNoteSummary } from '../../misc/get-note-summary';
|
import { getNoteSummary } from '@/misc/get-note-summary';
|
||||||
import getUserName from '../../misc/get-user-name';
|
import getUserName from '@/misc/get-user-name';
|
||||||
|
|
||||||
export default async function(type, data, i18n): Promise<[string, NotificationOptions] | null | undefined> {
|
export default async function(type, data, i18n): Promise<[string, NotificationOptions] | null | undefined> {
|
||||||
if (!i18n) {
|
if (!i18n) {
|
||||||
|
@ -5,7 +5,7 @@ declare var self: ServiceWorkerGlobalScope;
|
|||||||
|
|
||||||
import { get, set } from 'idb-keyval';
|
import { get, set } from 'idb-keyval';
|
||||||
import composeNotification from '@client/sw/compose-notification';
|
import composeNotification from '@client/sw/compose-notification';
|
||||||
import { I18n } from '../../misc/i18n';
|
import { I18n } from '@/misc/i18n';
|
||||||
|
|
||||||
//#region Variables
|
//#region Variables
|
||||||
const version = _VERSION_;
|
const version = _VERSION_;
|
||||||
|
@ -56,9 +56,9 @@ import { toASCII } from 'punycode';
|
|||||||
import { parse } from '../../../mfm/parse';
|
import { parse } from '../../../mfm/parse';
|
||||||
import { host, url } from '@client/config';
|
import { host, url } from '@client/config';
|
||||||
import { erase, unique } from '../../../prelude/array';
|
import { erase, unique } from '../../../prelude/array';
|
||||||
import extractMentions from '../../../misc/extract-mentions';
|
import extractMentions from '@/misc/extract-mentions';
|
||||||
import getAcct from '../../../misc/acct/render';
|
import getAcct from '@/misc/acct/render';
|
||||||
import { formatTimeString } from '../../../misc/format-time-string';
|
import { formatTimeString } from '@/misc/format-time-string';
|
||||||
import { Autocomplete } from '@client/scripts/autocomplete';
|
import { Autocomplete } from '@client/scripts/autocomplete';
|
||||||
import { noteVisibilities } from '../../../types';
|
import { noteVisibilities } from '../../../types';
|
||||||
import * as os from '@client/os';
|
import * as os from '@client/os';
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import * as elasticsearch from '@elastic/elasticsearch';
|
import * as elasticsearch from '@elastic/elasticsearch';
|
||||||
import config from '../config';
|
import config from '@/config';
|
||||||
|
|
||||||
const index = {
|
const index = {
|
||||||
settings: {
|
settings: {
|
||||||
|
@ -3,7 +3,7 @@ const types = require('pg').types;
|
|||||||
types.setTypeParser(20, Number);
|
types.setTypeParser(20, Number);
|
||||||
|
|
||||||
import { createConnection, Logger, getConnection } from 'typeorm';
|
import { createConnection, Logger, getConnection } from 'typeorm';
|
||||||
import config from '../config';
|
import config from '@/config';
|
||||||
import { entities as charts } from '../services/chart/entities';
|
import { entities as charts } from '../services/chart/entities';
|
||||||
import { dbLogger } from './logger';
|
import { dbLogger } from './logger';
|
||||||
import * as highlight from 'cli-highlight';
|
import * as highlight from 'cli-highlight';
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import * as redis from 'redis';
|
import * as redis from 'redis';
|
||||||
import config from '../config';
|
import config from '@/config';
|
||||||
|
|
||||||
export function createConnection() {
|
export function createConnection() {
|
||||||
return redis.createClient(
|
return redis.createClient(
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
import * as P from 'parsimmon';
|
import * as P from 'parsimmon';
|
||||||
import { createLeaf, createTree, urlRegex } from './prelude';
|
import { createLeaf, createTree, urlRegex } from './prelude';
|
||||||
import { takeWhile, cumulativeSum } from '../prelude/array';
|
import { takeWhile, cumulativeSum } from '../prelude/array';
|
||||||
import parseAcct from '../misc/acct/parse';
|
import parseAcct from '@/misc/acct/parse';
|
||||||
import { toUnicode } from 'punycode';
|
import { toUnicode } from 'punycode';
|
||||||
import { emojiRegex } from '../misc/emoji-regex';
|
import { emojiRegex } from '@/misc/emoji-regex';
|
||||||
|
|
||||||
export function removeOrphanedBrackets(s: string): string {
|
export function removeOrphanedBrackets(s: string): string {
|
||||||
const openBrackets = ['(', '「', '['];
|
const openBrackets = ['(', '「', '['];
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { JSDOM } from 'jsdom';
|
import { JSDOM } from 'jsdom';
|
||||||
import config from '../config';
|
import config from '@/config';
|
||||||
import { intersperse } from '../prelude/array';
|
import { intersperse } from '../prelude/array';
|
||||||
import { MfmForest, MfmTree } from './prelude';
|
import { MfmForest, MfmTree } from './prelude';
|
||||||
import { IMentionedRemoteUsers } from '../models/entities/note';
|
import { IMentionedRemoteUsers } from '../models/entities/note';
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { MfmForest, MfmTree } from './prelude';
|
import { MfmForest, MfmTree } from './prelude';
|
||||||
import { nyaize } from '../misc/nyaize';
|
import { nyaize } from '@/misc/nyaize';
|
||||||
|
|
||||||
export type RestoreOptions = {
|
export type RestoreOptions = {
|
||||||
doNyaize?: boolean;
|
doNyaize?: boolean;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import fetch from 'node-fetch';
|
import fetch from 'node-fetch';
|
||||||
import { URLSearchParams } from 'url';
|
import { URLSearchParams } from 'url';
|
||||||
import { getAgentByUrl } from './fetch';
|
import { getAgentByUrl } from './fetch';
|
||||||
import config from '../config';
|
import config from '@/config';
|
||||||
|
|
||||||
export async function verifyRecaptcha(secret: string, response: string) {
|
export async function verifyRecaptcha(secret: string, response: string) {
|
||||||
const result = await getCaptchaResponse('https://www.recaptcha.net/recaptcha/api/siteverify', secret, response).catch(e => {
|
const result = await getCaptchaResponse('https://www.recaptcha.net/recaptcha/api/siteverify', secret, response).catch(e => {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../config';
|
import config from '@/config';
|
||||||
import { toASCII } from 'punycode';
|
import { toASCII } from 'punycode';
|
||||||
|
|
||||||
export function getFullApAccount(username: string, host: string | null) {
|
export function getFullApAccount(username: string, host: string | null) {
|
||||||
|
@ -4,7 +4,7 @@ import * as util from 'util';
|
|||||||
import fetch from 'node-fetch';
|
import fetch from 'node-fetch';
|
||||||
import { getAgentByUrl } from './fetch';
|
import { getAgentByUrl } from './fetch';
|
||||||
import { AbortController } from 'abort-controller';
|
import { AbortController } from 'abort-controller';
|
||||||
import config from '../config';
|
import config from '@/config';
|
||||||
import * as chalk from 'chalk';
|
import * as chalk from 'chalk';
|
||||||
import Logger from '../services/logger';
|
import Logger from '../services/logger';
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ import * as cache from 'lookup-dns-cache';
|
|||||||
import fetch, { HeadersInit } from 'node-fetch';
|
import fetch, { HeadersInit } from 'node-fetch';
|
||||||
import { HttpProxyAgent } from 'http-proxy-agent';
|
import { HttpProxyAgent } from 'http-proxy-agent';
|
||||||
import { HttpsProxyAgent } from 'https-proxy-agent';
|
import { HttpsProxyAgent } from 'https-proxy-agent';
|
||||||
import config from '../config';
|
import config from '@/config';
|
||||||
import { URL } from 'url';
|
import { URL } from 'url';
|
||||||
|
|
||||||
export async function getJson(url: string, accept = 'application/json, */*', timeout = 10000, headers?: HeadersInit) {
|
export async function getJson(url: string, accept = 'application/json, */*', timeout = 10000, headers?: HeadersInit) {
|
||||||
|
@ -3,7 +3,7 @@ import { genAid } from './id/aid';
|
|||||||
import { genMeid } from './id/meid';
|
import { genMeid } from './id/meid';
|
||||||
import { genMeidg } from './id/meidg';
|
import { genMeidg } from './id/meidg';
|
||||||
import { genObjectId } from './id/object-id';
|
import { genObjectId } from './id/object-id';
|
||||||
import config from '../config';
|
import config from '@/config';
|
||||||
|
|
||||||
const metohd = config.id.toLowerCase();
|
const metohd = config.id.toLowerCase();
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { EntityRepository, Repository } from 'typeorm';
|
import { EntityRepository, Repository } from 'typeorm';
|
||||||
import { Antenna } from '../entities/antenna';
|
import { Antenna } from '../entities/antenna';
|
||||||
import { SchemaType } from '../../misc/schema';
|
import { SchemaType } from '@/misc/schema';
|
||||||
import { AntennaNotes, UserGroupJoinings } from '..';
|
import { AntennaNotes, UserGroupJoinings } from '..';
|
||||||
|
|
||||||
export type PackedAntenna = SchemaType<typeof packedAntennaSchema>;
|
export type PackedAntenna = SchemaType<typeof packedAntennaSchema>;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { EntityRepository, Repository } from 'typeorm';
|
import { EntityRepository, Repository } from 'typeorm';
|
||||||
import { App } from '../entities/app';
|
import { App } from '../entities/app';
|
||||||
import { AccessTokens } from '..';
|
import { AccessTokens } from '..';
|
||||||
import { SchemaType } from '../../misc/schema';
|
import { SchemaType } from '@/misc/schema';
|
||||||
|
|
||||||
export type PackedApp = SchemaType<typeof packedAppSchema>;
|
export type PackedApp = SchemaType<typeof packedAppSchema>;
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ import { EntityRepository, Repository } from 'typeorm';
|
|||||||
import { Users } from '..';
|
import { Users } from '..';
|
||||||
import { Blocking } from '../entities/blocking';
|
import { Blocking } from '../entities/blocking';
|
||||||
import { awaitAll } from '../../prelude/await-all';
|
import { awaitAll } from '../../prelude/await-all';
|
||||||
import { SchemaType } from '../../misc/schema';
|
import { SchemaType } from '@/misc/schema';
|
||||||
|
|
||||||
export type PackedBlocking = SchemaType<typeof packedBlockingSchema>;
|
export type PackedBlocking = SchemaType<typeof packedBlockingSchema>;
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { EntityRepository, Repository } from 'typeorm';
|
import { EntityRepository, Repository } from 'typeorm';
|
||||||
import { Channel } from '../entities/channel';
|
import { Channel } from '../entities/channel';
|
||||||
import { SchemaType } from '../../misc/schema';
|
import { SchemaType } from '@/misc/schema';
|
||||||
import { DriveFiles, ChannelFollowings, NoteUnreads } from '..';
|
import { DriveFiles, ChannelFollowings, NoteUnreads } from '..';
|
||||||
import { User } from '../entities/user';
|
import { User } from '../entities/user';
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { EntityRepository, Repository } from 'typeorm';
|
import { EntityRepository, Repository } from 'typeorm';
|
||||||
import { Clip } from '../entities/clip';
|
import { Clip } from '../entities/clip';
|
||||||
import { SchemaType } from '../../misc/schema';
|
import { SchemaType } from '@/misc/schema';
|
||||||
import { Users } from '..';
|
import { Users } from '..';
|
||||||
import { awaitAll } from '../../prelude/await-all';
|
import { awaitAll } from '../../prelude/await-all';
|
||||||
|
|
||||||
|
@ -2,13 +2,13 @@ import { EntityRepository, Repository } from 'typeorm';
|
|||||||
import { DriveFile } from '../entities/drive-file';
|
import { DriveFile } from '../entities/drive-file';
|
||||||
import { Users, DriveFolders } from '..';
|
import { Users, DriveFolders } from '..';
|
||||||
import { User } from '../entities/user';
|
import { User } from '../entities/user';
|
||||||
import { toPuny } from '../../misc/convert-host';
|
import { toPuny } from '@/misc/convert-host';
|
||||||
import { awaitAll } from '../../prelude/await-all';
|
import { awaitAll } from '../../prelude/await-all';
|
||||||
import { SchemaType } from '../../misc/schema';
|
import { SchemaType } from '@/misc/schema';
|
||||||
import config from '../../config';
|
import config from '@/config';
|
||||||
import { query, appendQuery } from '../../prelude/url';
|
import { query, appendQuery } from '../../prelude/url';
|
||||||
import { Meta } from '../entities/meta';
|
import { Meta } from '../entities/meta';
|
||||||
import { fetchMeta } from '../../misc/fetch-meta';
|
import { fetchMeta } from '@/misc/fetch-meta';
|
||||||
|
|
||||||
export type PackedDriveFile = SchemaType<typeof packedDriveFileSchema>;
|
export type PackedDriveFile = SchemaType<typeof packedDriveFileSchema>;
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ import { EntityRepository, Repository } from 'typeorm';
|
|||||||
import { DriveFolders, DriveFiles } from '..';
|
import { DriveFolders, DriveFiles } from '..';
|
||||||
import { DriveFolder } from '../entities/drive-folder';
|
import { DriveFolder } from '../entities/drive-folder';
|
||||||
import { awaitAll } from '../../prelude/await-all';
|
import { awaitAll } from '../../prelude/await-all';
|
||||||
import { SchemaType } from '../../misc/schema';
|
import { SchemaType } from '@/misc/schema';
|
||||||
|
|
||||||
export type PackedDriveFolder = SchemaType<typeof packedDriveFolderSchema>;
|
export type PackedDriveFolder = SchemaType<typeof packedDriveFolderSchema>;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../../config';
|
import config from '@/config';
|
||||||
|
|
||||||
export const packedFederationInstanceSchema = {
|
export const packedFederationInstanceSchema = {
|
||||||
type: 'object' as const,
|
type: 'object' as const,
|
||||||
|
@ -2,7 +2,7 @@ import { EntityRepository, Repository } from 'typeorm';
|
|||||||
import { Users } from '..';
|
import { Users } from '..';
|
||||||
import { Following } from '../entities/following';
|
import { Following } from '../entities/following';
|
||||||
import { awaitAll } from '../../prelude/await-all';
|
import { awaitAll } from '../../prelude/await-all';
|
||||||
import { SchemaType } from '../../misc/schema';
|
import { SchemaType } from '@/misc/schema';
|
||||||
|
|
||||||
type LocalFollowerFollowing = Following & {
|
type LocalFollowerFollowing = Following & {
|
||||||
followerHost: null;
|
followerHost: null;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { EntityRepository, Repository } from 'typeorm';
|
import { EntityRepository, Repository } from 'typeorm';
|
||||||
import { Hashtag } from '../entities/hashtag';
|
import { Hashtag } from '../entities/hashtag';
|
||||||
import { SchemaType } from '../../misc/schema';
|
import { SchemaType } from '@/misc/schema';
|
||||||
|
|
||||||
export type PackedHashtag = SchemaType<typeof packedHashtagSchema>;
|
export type PackedHashtag = SchemaType<typeof packedHashtagSchema>;
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { EntityRepository, Repository } from 'typeorm';
|
import { EntityRepository, Repository } from 'typeorm';
|
||||||
import { MessagingMessage } from '../entities/messaging-message';
|
import { MessagingMessage } from '../entities/messaging-message';
|
||||||
import { Users, DriveFiles, UserGroups } from '..';
|
import { Users, DriveFiles, UserGroups } from '..';
|
||||||
import { SchemaType } from '../../misc/schema';
|
import { SchemaType } from '@/misc/schema';
|
||||||
|
|
||||||
export type PackedMessagingMessage = SchemaType<typeof packedMessagingMessageSchema>;
|
export type PackedMessagingMessage = SchemaType<typeof packedMessagingMessageSchema>;
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ import { EntityRepository, Repository } from 'typeorm';
|
|||||||
import { Users } from '..';
|
import { Users } from '..';
|
||||||
import { Muting } from '../entities/muting';
|
import { Muting } from '../entities/muting';
|
||||||
import { awaitAll } from '../../prelude/await-all';
|
import { awaitAll } from '../../prelude/await-all';
|
||||||
import { SchemaType } from '../../misc/schema';
|
import { SchemaType } from '@/misc/schema';
|
||||||
|
|
||||||
export type PackedMuting = SchemaType<typeof packedMutingSchema>;
|
export type PackedMuting = SchemaType<typeof packedMutingSchema>;
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
import { EntityRepository, Repository } from 'typeorm';
|
import { EntityRepository, Repository } from 'typeorm';
|
||||||
import { NoteReaction } from '../entities/note-reaction';
|
import { NoteReaction } from '../entities/note-reaction';
|
||||||
import { Users } from '..';
|
import { Users } from '..';
|
||||||
import { SchemaType } from '../../misc/schema';
|
import { SchemaType } from '@/misc/schema';
|
||||||
import { convertLegacyReaction } from '../../misc/reaction-lib';
|
import { convertLegacyReaction } from '@/misc/reaction-lib';
|
||||||
|
|
||||||
export type PackedNoteReaction = SchemaType<typeof packedNoteReactionSchema>;
|
export type PackedNoteReaction = SchemaType<typeof packedNoteReactionSchema>;
|
||||||
|
|
||||||
|
@ -2,13 +2,13 @@ import { EntityRepository, Repository, In } from 'typeorm';
|
|||||||
import { Note } from '../entities/note';
|
import { Note } from '../entities/note';
|
||||||
import { User } from '../entities/user';
|
import { User } from '../entities/user';
|
||||||
import { Users, PollVotes, DriveFiles, NoteReactions, Followings, Polls, Channels } from '..';
|
import { Users, PollVotes, DriveFiles, NoteReactions, Followings, Polls, Channels } from '..';
|
||||||
import { SchemaType } from '../../misc/schema';
|
import { SchemaType } from '@/misc/schema';
|
||||||
import { awaitAll } from '../../prelude/await-all';
|
import { awaitAll } from '../../prelude/await-all';
|
||||||
import { convertLegacyReaction, convertLegacyReactions, decodeReaction } from '../../misc/reaction-lib';
|
import { convertLegacyReaction, convertLegacyReactions, decodeReaction } from '@/misc/reaction-lib';
|
||||||
import { toString } from '../../mfm/to-string';
|
import { toString } from '../../mfm/to-string';
|
||||||
import { parse } from '../../mfm/parse';
|
import { parse } from '../../mfm/parse';
|
||||||
import { NoteReaction } from '../entities/note-reaction';
|
import { NoteReaction } from '../entities/note-reaction';
|
||||||
import { aggregateNoteEmojis, populateEmojis, prefetchEmojis } from '../../misc/populate-emojis';
|
import { aggregateNoteEmojis, populateEmojis, prefetchEmojis } from '@/misc/populate-emojis';
|
||||||
|
|
||||||
export type PackedNote = SchemaType<typeof packedNoteSchema>;
|
export type PackedNote = SchemaType<typeof packedNoteSchema>;
|
||||||
|
|
||||||
|
@ -2,11 +2,11 @@ import { EntityRepository, In, Repository } from 'typeorm';
|
|||||||
import { Users, Notes, UserGroupInvitations, AccessTokens, NoteReactions } from '..';
|
import { Users, Notes, UserGroupInvitations, AccessTokens, NoteReactions } from '..';
|
||||||
import { Notification } from '../entities/notification';
|
import { Notification } from '../entities/notification';
|
||||||
import { awaitAll } from '../../prelude/await-all';
|
import { awaitAll } from '../../prelude/await-all';
|
||||||
import { SchemaType } from '../../misc/schema';
|
import { SchemaType } from '@/misc/schema';
|
||||||
import { Note } from '../entities/note';
|
import { Note } from '../entities/note';
|
||||||
import { NoteReaction } from '../entities/note-reaction';
|
import { NoteReaction } from '../entities/note-reaction';
|
||||||
import { User } from '../entities/user';
|
import { User } from '../entities/user';
|
||||||
import { aggregateNoteEmojis, prefetchEmojis } from '../../misc/populate-emojis';
|
import { aggregateNoteEmojis, prefetchEmojis } from '@/misc/populate-emojis';
|
||||||
|
|
||||||
export type PackedNotification = SchemaType<typeof packedNotificationSchema>;
|
export type PackedNotification = SchemaType<typeof packedNotificationSchema>;
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { EntityRepository, Repository } from 'typeorm';
|
import { EntityRepository, Repository } from 'typeorm';
|
||||||
import { Page } from '../entities/page';
|
import { Page } from '../entities/page';
|
||||||
import { SchemaType } from '../../misc/schema';
|
import { SchemaType } from '@/misc/schema';
|
||||||
import { Users, DriveFiles, PageLikes } from '..';
|
import { Users, DriveFiles, PageLikes } from '..';
|
||||||
import { awaitAll } from '../../prelude/await-all';
|
import { awaitAll } from '../../prelude/await-all';
|
||||||
import { DriveFile } from '../entities/drive-file';
|
import { DriveFile } from '../entities/drive-file';
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { EntityRepository, Repository } from 'typeorm';
|
import { EntityRepository, Repository } from 'typeorm';
|
||||||
import { UserGroup } from '../entities/user-group';
|
import { UserGroup } from '../entities/user-group';
|
||||||
import { UserGroupJoinings } from '..';
|
import { UserGroupJoinings } from '..';
|
||||||
import { SchemaType } from '../../misc/schema';
|
import { SchemaType } from '@/misc/schema';
|
||||||
|
|
||||||
export type PackedUserGroup = SchemaType<typeof packedUserGroupSchema>;
|
export type PackedUserGroup = SchemaType<typeof packedUserGroupSchema>;
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { EntityRepository, Repository } from 'typeorm';
|
import { EntityRepository, Repository } from 'typeorm';
|
||||||
import { UserList } from '../entities/user-list';
|
import { UserList } from '../entities/user-list';
|
||||||
import { UserListJoinings } from '..';
|
import { UserListJoinings } from '..';
|
||||||
import { SchemaType } from '../../misc/schema';
|
import { SchemaType } from '@/misc/schema';
|
||||||
|
|
||||||
export type PackedUserList = SchemaType<typeof packedUserListSchema>;
|
export type PackedUserList = SchemaType<typeof packedUserListSchema>;
|
||||||
|
|
||||||
|
@ -2,11 +2,11 @@ import $ from 'cafy';
|
|||||||
import { EntityRepository, Repository, In, Not } from 'typeorm';
|
import { EntityRepository, Repository, In, Not } from 'typeorm';
|
||||||
import { User, ILocalUser, IRemoteUser } from '../entities/user';
|
import { User, ILocalUser, IRemoteUser } from '../entities/user';
|
||||||
import { Notes, NoteUnreads, FollowRequests, Notifications, MessagingMessages, UserNotePinings, Followings, Blockings, Mutings, UserProfiles, UserSecurityKeys, UserGroupJoinings, Pages, Announcements, AnnouncementReads, Antennas, AntennaNotes, ChannelFollowings, Instances } from '..';
|
import { Notes, NoteUnreads, FollowRequests, Notifications, MessagingMessages, UserNotePinings, Followings, Blockings, Mutings, UserProfiles, UserSecurityKeys, UserGroupJoinings, Pages, Announcements, AnnouncementReads, Antennas, AntennaNotes, ChannelFollowings, Instances } from '..';
|
||||||
import config from '../../config';
|
import config from '@/config';
|
||||||
import { SchemaType } from '../../misc/schema';
|
import { SchemaType } from '@/misc/schema';
|
||||||
import { awaitAll } from '../../prelude/await-all';
|
import { awaitAll } from '../../prelude/await-all';
|
||||||
import { populateEmojis } from '../../misc/populate-emojis';
|
import { populateEmojis } from '@/misc/populate-emojis';
|
||||||
import { getAntennas } from '../../misc/antenna-cache';
|
import { getAntennas } from '@/misc/antenna-cache';
|
||||||
|
|
||||||
export type PackedUser = SchemaType<typeof packedUserSchema>;
|
export type PackedUser = SchemaType<typeof packedUserSchema>;
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import * as httpSignature from 'http-signature';
|
import * as httpSignature from 'http-signature';
|
||||||
|
|
||||||
import config from '../config';
|
import config from '@/config';
|
||||||
import { ILocalUser } from '../models/entities/user';
|
import { ILocalUser } from '../models/entities/user';
|
||||||
import { program } from '../argv';
|
import { program } from '../argv';
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import * as Queue from 'bull';
|
import * as Queue from 'bull';
|
||||||
import config from '../config';
|
import config from '@/config';
|
||||||
|
|
||||||
export function initialize(name: string, limitPerSec = -1) {
|
export function initialize(name: string, limitPerSec = -1) {
|
||||||
return new Queue(name, {
|
return new Queue(name, {
|
||||||
|
@ -5,7 +5,7 @@ import * as fs from 'fs';
|
|||||||
import { queueLogger } from '../../logger';
|
import { queueLogger } from '../../logger';
|
||||||
import addFile from '../../../services/drive/add-file';
|
import addFile from '../../../services/drive/add-file';
|
||||||
import dateFormat = require('dateformat');
|
import dateFormat = require('dateformat');
|
||||||
import { getFullApAccount } from '../../../misc/convert-host';
|
import { getFullApAccount } from '@/misc/convert-host';
|
||||||
import { Users, Blockings } from '../../../models';
|
import { Users, Blockings } from '../../../models';
|
||||||
import { MoreThan } from 'typeorm';
|
import { MoreThan } from 'typeorm';
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ import * as fs from 'fs';
|
|||||||
import { queueLogger } from '../../logger';
|
import { queueLogger } from '../../logger';
|
||||||
import addFile from '../../../services/drive/add-file';
|
import addFile from '../../../services/drive/add-file';
|
||||||
import dateFormat = require('dateformat');
|
import dateFormat = require('dateformat');
|
||||||
import { getFullApAccount } from '../../../misc/convert-host';
|
import { getFullApAccount } from '@/misc/convert-host';
|
||||||
import { Users, Followings } from '../../../models';
|
import { Users, Followings } from '../../../models';
|
||||||
import { MoreThan } from 'typeorm';
|
import { MoreThan } from 'typeorm';
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ import * as fs from 'fs';
|
|||||||
import { queueLogger } from '../../logger';
|
import { queueLogger } from '../../logger';
|
||||||
import addFile from '../../../services/drive/add-file';
|
import addFile from '../../../services/drive/add-file';
|
||||||
import dateFormat = require('dateformat');
|
import dateFormat = require('dateformat');
|
||||||
import { getFullApAccount } from '../../../misc/convert-host';
|
import { getFullApAccount } from '@/misc/convert-host';
|
||||||
import { Users, Mutings } from '../../../models';
|
import { Users, Mutings } from '../../../models';
|
||||||
import { MoreThan } from 'typeorm';
|
import { MoreThan } from 'typeorm';
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ import * as fs from 'fs';
|
|||||||
import { queueLogger } from '../../logger';
|
import { queueLogger } from '../../logger';
|
||||||
import addFile from '../../../services/drive/add-file';
|
import addFile from '../../../services/drive/add-file';
|
||||||
import dateFormat = require('dateformat');
|
import dateFormat = require('dateformat');
|
||||||
import { getFullApAccount } from '../../../misc/convert-host';
|
import { getFullApAccount } from '@/misc/convert-host';
|
||||||
import { Users, UserLists, UserListJoinings } from '../../../models';
|
import { Users, UserLists, UserListJoinings } from '../../../models';
|
||||||
import { In } from 'typeorm';
|
import { In } from 'typeorm';
|
||||||
|
|
||||||
|
@ -2,10 +2,10 @@ import * as Bull from 'bull';
|
|||||||
|
|
||||||
import { queueLogger } from '../../logger';
|
import { queueLogger } from '../../logger';
|
||||||
import follow from '../../../services/following/create';
|
import follow from '../../../services/following/create';
|
||||||
import parseAcct from '../../../misc/acct/parse';
|
import parseAcct from '@/misc/acct/parse';
|
||||||
import { resolveUser } from '../../../remote/resolve-user';
|
import { resolveUser } from '../../../remote/resolve-user';
|
||||||
import { downloadTextFile } from '../../../misc/download-text-file';
|
import { downloadTextFile } from '@/misc/download-text-file';
|
||||||
import { isSelfHost, toPuny } from '../../../misc/convert-host';
|
import { isSelfHost, toPuny } from '@/misc/convert-host';
|
||||||
import { Users, DriveFiles } from '../../../models';
|
import { Users, DriveFiles } from '../../../models';
|
||||||
|
|
||||||
const logger = queueLogger.createSubLogger('import-following');
|
const logger = queueLogger.createSubLogger('import-following');
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
import * as Bull from 'bull';
|
import * as Bull from 'bull';
|
||||||
|
|
||||||
import { queueLogger } from '../../logger';
|
import { queueLogger } from '../../logger';
|
||||||
import parseAcct from '../../../misc/acct/parse';
|
import parseAcct from '@/misc/acct/parse';
|
||||||
import { resolveUser } from '../../../remote/resolve-user';
|
import { resolveUser } from '../../../remote/resolve-user';
|
||||||
import { pushUserToUserList } from '../../../services/user-list/push';
|
import { pushUserToUserList } from '../../../services/user-list/push';
|
||||||
import { downloadTextFile } from '../../../misc/download-text-file';
|
import { downloadTextFile } from '@/misc/download-text-file';
|
||||||
import { isSelfHost, toPuny } from '../../../misc/convert-host';
|
import { isSelfHost, toPuny } from '@/misc/convert-host';
|
||||||
import { DriveFiles, Users, UserLists, UserListJoinings } from '../../../models';
|
import { DriveFiles, Users, UserLists, UserListJoinings } from '../../../models';
|
||||||
import { genId } from '../../../misc/gen-id';
|
import { genId } from '@/misc/gen-id';
|
||||||
|
|
||||||
const logger = queueLogger.createSubLogger('import-user-lists');
|
const logger = queueLogger.createSubLogger('import-user-lists');
|
||||||
|
|
||||||
|
@ -5,9 +5,9 @@ import Logger from '../../services/logger';
|
|||||||
import { Instances } from '../../models';
|
import { Instances } from '../../models';
|
||||||
import { instanceChart } from '../../services/chart';
|
import { instanceChart } from '../../services/chart';
|
||||||
import { fetchInstanceMetadata } from '../../services/fetch-instance-metadata';
|
import { fetchInstanceMetadata } from '../../services/fetch-instance-metadata';
|
||||||
import { fetchMeta } from '../../misc/fetch-meta';
|
import { fetchMeta } from '@/misc/fetch-meta';
|
||||||
import { toPuny } from '../../misc/convert-host';
|
import { toPuny } from '@/misc/convert-host';
|
||||||
import { Cache } from '../../misc/cache';
|
import { Cache } from '@/misc/cache';
|
||||||
import { Instance } from '../../models/entities/instance';
|
import { Instance } from '../../models/entities/instance';
|
||||||
|
|
||||||
const logger = new Logger('deliver');
|
const logger = new Logger('deliver');
|
||||||
|
@ -5,8 +5,8 @@ import Logger from '../../services/logger';
|
|||||||
import { registerOrFetchInstanceDoc } from '../../services/register-or-fetch-instance-doc';
|
import { registerOrFetchInstanceDoc } from '../../services/register-or-fetch-instance-doc';
|
||||||
import { Instances } from '../../models';
|
import { Instances } from '../../models';
|
||||||
import { instanceChart } from '../../services/chart';
|
import { instanceChart } from '../../services/chart';
|
||||||
import { fetchMeta } from '../../misc/fetch-meta';
|
import { fetchMeta } from '@/misc/fetch-meta';
|
||||||
import { toPuny, extractDbHost } from '../../misc/convert-host';
|
import { toPuny, extractDbHost } from '@/misc/convert-host';
|
||||||
import { getApId } from '../../remote/activitypub/type';
|
import { getApId } from '../../remote/activitypub/type';
|
||||||
import { fetchInstanceMetadata } from '../../services/fetch-instance-metadata';
|
import { fetchInstanceMetadata } from '../../services/fetch-instance-metadata';
|
||||||
import { InboxJobData } from '..';
|
import { InboxJobData } from '..';
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../config';
|
import config from '@/config';
|
||||||
import { initialize as initializeQueue } from './initialize';
|
import { initialize as initializeQueue } from './initialize';
|
||||||
|
|
||||||
export const deliverQueue = initializeQueue('deliver', config.deliverJobPerSec || 128);
|
export const deliverQueue = initializeQueue('deliver', config.deliverJobPerSec || 128);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../../config';
|
import config from '@/config';
|
||||||
import { Note } from '../../models/entities/note';
|
import { Note } from '../../models/entities/note';
|
||||||
import { User, IRemoteUser } from '../../models/entities/user';
|
import { User, IRemoteUser } from '../../models/entities/user';
|
||||||
import { UserPublickey } from '../../models/entities/user-publickey';
|
import { UserPublickey } from '../../models/entities/user-publickey';
|
||||||
|
@ -4,9 +4,9 @@ import { IRemoteUser } from '../../../../models/entities/user';
|
|||||||
import { IAnnounce, getApId } from '../../type';
|
import { IAnnounce, getApId } from '../../type';
|
||||||
import { fetchNote, resolveNote } from '../../models/note';
|
import { fetchNote, resolveNote } from '../../models/note';
|
||||||
import { apLogger } from '../../logger';
|
import { apLogger } from '../../logger';
|
||||||
import { extractDbHost } from '../../../../misc/convert-host';
|
import { extractDbHost } from '@/misc/convert-host';
|
||||||
import { fetchMeta } from '../../../../misc/fetch-meta';
|
import { fetchMeta } from '@/misc/fetch-meta';
|
||||||
import { getApLock } from '../../../../misc/app-lock';
|
import { getApLock } from '@/misc/app-lock';
|
||||||
import { parseAudience } from '../../audience';
|
import { parseAudience } from '../../audience';
|
||||||
|
|
||||||
const logger = apLogger;
|
const logger = apLogger;
|
||||||
|
@ -2,8 +2,8 @@ import Resolver from '../../resolver';
|
|||||||
import { IRemoteUser } from '../../../../models/entities/user';
|
import { IRemoteUser } from '../../../../models/entities/user';
|
||||||
import { createNote, fetchNote } from '../../models/note';
|
import { createNote, fetchNote } from '../../models/note';
|
||||||
import { getApId, IObject, ICreate } from '../../type';
|
import { getApId, IObject, ICreate } from '../../type';
|
||||||
import { getApLock } from '../../../../misc/app-lock';
|
import { getApLock } from '@/misc/app-lock';
|
||||||
import { extractDbHost } from '../../../../misc/convert-host';
|
import { extractDbHost } from '@/misc/convert-host';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 投稿作成アクティビティを捌きます
|
* 投稿作成アクティビティを捌きます
|
||||||
|
@ -2,7 +2,7 @@ import { IRemoteUser } from '../../../../models/entities/user';
|
|||||||
import deleteNode from '../../../../services/note/delete';
|
import deleteNode from '../../../../services/note/delete';
|
||||||
import { apLogger } from '../../logger';
|
import { apLogger } from '../../logger';
|
||||||
import DbResolver from '../../db-resolver';
|
import DbResolver from '../../db-resolver';
|
||||||
import { getApLock } from '../../../../misc/app-lock';
|
import { getApLock } from '@/misc/app-lock';
|
||||||
import { deleteMessage } from '../../../../services/messages/delete';
|
import { deleteMessage } from '../../../../services/messages/delete';
|
||||||
|
|
||||||
const logger = apLogger;
|
const logger = apLogger;
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
import { IRemoteUser } from '../../../../models/entities/user';
|
import { IRemoteUser } from '../../../../models/entities/user';
|
||||||
import config from '../../../../config';
|
import config from '@/config';
|
||||||
import { IFlag, getApIds } from '../../type';
|
import { IFlag, getApIds } from '../../type';
|
||||||
import { AbuseUserReports, Users } from '../../../../models';
|
import { AbuseUserReports, Users } from '../../../../models';
|
||||||
import { In } from 'typeorm';
|
import { In } from 'typeorm';
|
||||||
import { genId } from '../../../../misc/gen-id';
|
import { genId } from '@/misc/gen-id';
|
||||||
|
|
||||||
export default async (actor: IRemoteUser, activity: IFlag): Promise<string> => {
|
export default async (actor: IRemoteUser, activity: IFlag): Promise<string> => {
|
||||||
// objectは `(User|Note) | (User|Note)[]` だけど、全パターンDBスキーマと対応させられないので
|
// objectは `(User|Note) | (User|Note)[]` だけど、全パターンDBスキーマと対応させられないので
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { IRemoteUser } from '../../../models/entities/user';
|
import { IRemoteUser } from '../../../models/entities/user';
|
||||||
import { IRead, getApId } from '../type';
|
import { IRead, getApId } from '../type';
|
||||||
import { isSelfHost, extractDbHost } from '../../../misc/convert-host';
|
import { isSelfHost, extractDbHost } from '@/misc/convert-host';
|
||||||
import { MessagingMessages } from '../../../models';
|
import { MessagingMessages } from '../../../models';
|
||||||
import { readUserMessagingMessage } from '../../../server/api/common/read-messaging-message';
|
import { readUserMessagingMessage } from '../../../server/api/common/read-messaging-message';
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ import * as crypto from 'crypto';
|
|||||||
import * as jsonld from 'jsonld';
|
import * as jsonld from 'jsonld';
|
||||||
import { CONTEXTS } from './contexts';
|
import { CONTEXTS } from './contexts';
|
||||||
import fetch from 'node-fetch';
|
import fetch from 'node-fetch';
|
||||||
import { httpAgent, httpsAgent } from '../../../misc/fetch';
|
import { httpAgent, httpsAgent } from '@/misc/fetch';
|
||||||
|
|
||||||
// RsaSignature2017 based from https://github.com/transmute-industries/RsaSignature2017
|
// RsaSignature2017 based from https://github.com/transmute-industries/RsaSignature2017
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import uploadFromUrl from '../../../services/drive/upload-from-url';
|
import uploadFromUrl from '../../../services/drive/upload-from-url';
|
||||||
import { IRemoteUser } from '../../../models/entities/user';
|
import { IRemoteUser } from '../../../models/entities/user';
|
||||||
import Resolver from '../resolver';
|
import Resolver from '../resolver';
|
||||||
import { fetchMeta } from '../../../misc/fetch-meta';
|
import { fetchMeta } from '@/misc/fetch-meta';
|
||||||
import { apLogger } from '../logger';
|
import { apLogger } from '../logger';
|
||||||
import { DriveFile } from '../../../models/entities/drive-file';
|
import { DriveFile } from '../../../models/entities/drive-file';
|
||||||
import { DriveFiles } from '../../../models';
|
import { DriveFiles } from '../../../models';
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import * as promiseLimit from 'promise-limit';
|
import * as promiseLimit from 'promise-limit';
|
||||||
|
|
||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import Resolver from '../resolver';
|
import Resolver from '../resolver';
|
||||||
import post from '../../../services/note/create';
|
import post from '../../../services/note/create';
|
||||||
import { resolvePerson, updatePerson } from './person';
|
import { resolvePerson, updatePerson } from './person';
|
||||||
@ -14,14 +14,14 @@ import vote from '../../../services/note/polls/vote';
|
|||||||
import { apLogger } from '../logger';
|
import { apLogger } from '../logger';
|
||||||
import { DriveFile } from '../../../models/entities/drive-file';
|
import { DriveFile } from '../../../models/entities/drive-file';
|
||||||
import { deliverQuestionUpdate } from '../../../services/note/polls/update';
|
import { deliverQuestionUpdate } from '../../../services/note/polls/update';
|
||||||
import { extractDbHost, toPuny } from '../../../misc/convert-host';
|
import { extractDbHost, toPuny } from '@/misc/convert-host';
|
||||||
import { Emojis, Polls, MessagingMessages } from '../../../models';
|
import { Emojis, Polls, MessagingMessages } from '../../../models';
|
||||||
import { Note } from '../../../models/entities/note';
|
import { Note } from '../../../models/entities/note';
|
||||||
import { IObject, getOneApId, getApId, getOneApHrefNullable, validPost, IPost, isEmoji } from '../type';
|
import { IObject, getOneApId, getApId, getOneApHrefNullable, validPost, IPost, isEmoji } from '../type';
|
||||||
import { Emoji } from '../../../models/entities/emoji';
|
import { Emoji } from '../../../models/entities/emoji';
|
||||||
import { genId } from '../../../misc/gen-id';
|
import { genId } from '@/misc/gen-id';
|
||||||
import { fetchMeta } from '../../../misc/fetch-meta';
|
import { fetchMeta } from '@/misc/fetch-meta';
|
||||||
import { getApLock } from '../../../misc/app-lock';
|
import { getApLock } from '@/misc/app-lock';
|
||||||
import { createMessage } from '../../../services/messages/create';
|
import { createMessage } from '../../../services/messages/create';
|
||||||
import { parseAudience } from '../audience';
|
import { parseAudience } from '../audience';
|
||||||
import { extractApMentions } from './mention';
|
import { extractApMentions } from './mention';
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import * as promiseLimit from 'promise-limit';
|
import * as promiseLimit from 'promise-limit';
|
||||||
|
|
||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import Resolver from '../resolver';
|
import Resolver from '../resolver';
|
||||||
import { resolveImage } from './image';
|
import { resolveImage } from './image';
|
||||||
import { isCollectionOrOrderedCollection, isCollection, IPerson, getApId, getOneApHrefNullable, IObject, isPropertyValue, IApPropertyValue } from '../type';
|
import { isCollectionOrOrderedCollection, isCollection, IPerson, getApId, getOneApHrefNullable, IObject, isPropertyValue, IApPropertyValue } from '../type';
|
||||||
@ -16,17 +16,17 @@ import { Users, Instances, DriveFiles, Followings, UserProfiles, UserPublickeys
|
|||||||
import { User, IRemoteUser } from '../../../models/entities/user';
|
import { User, IRemoteUser } from '../../../models/entities/user';
|
||||||
import { Emoji } from '../../../models/entities/emoji';
|
import { Emoji } from '../../../models/entities/emoji';
|
||||||
import { UserNotePining } from '../../../models/entities/user-note-pining';
|
import { UserNotePining } from '../../../models/entities/user-note-pining';
|
||||||
import { genId } from '../../../misc/gen-id';
|
import { genId } from '@/misc/gen-id';
|
||||||
import { instanceChart, usersChart } from '../../../services/chart';
|
import { instanceChart, usersChart } from '../../../services/chart';
|
||||||
import { UserPublickey } from '../../../models/entities/user-publickey';
|
import { UserPublickey } from '../../../models/entities/user-publickey';
|
||||||
import { isDuplicateKeyValueError } from '../../../misc/is-duplicate-key-value-error';
|
import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error';
|
||||||
import { toPuny } from '../../../misc/convert-host';
|
import { toPuny } from '@/misc/convert-host';
|
||||||
import { UserProfile } from '../../../models/entities/user-profile';
|
import { UserProfile } from '../../../models/entities/user-profile';
|
||||||
import { validActor } from '../../../remote/activitypub/type';
|
import { validActor } from '../../../remote/activitypub/type';
|
||||||
import { getConnection } from 'typeorm';
|
import { getConnection } from 'typeorm';
|
||||||
import { toArray } from '../../../prelude/array';
|
import { toArray } from '../../../prelude/array';
|
||||||
import { fetchInstanceMetadata } from '../../../services/fetch-instance-metadata';
|
import { fetchInstanceMetadata } from '../../../services/fetch-instance-metadata';
|
||||||
import { normalizeForSearch } from '../../../misc/normalize-for-search';
|
import { normalizeForSearch } from '@/misc/normalize-for-search';
|
||||||
|
|
||||||
const logger = apLogger;
|
const logger = apLogger;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import Resolver from '../resolver';
|
import Resolver from '../resolver';
|
||||||
import { IObject, IQuestion, isQuestion, } from '../type';
|
import { IObject, IQuestion, isQuestion, } from '../type';
|
||||||
import { apLogger } from '../logger';
|
import { apLogger } from '../logger';
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import { ILocalUser } from '../../../models/entities/user';
|
import { ILocalUser } from '../../../models/entities/user';
|
||||||
|
|
||||||
export default (object: any, user: ILocalUser) => ({
|
export default (object: any, user: ILocalUser) => ({
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import { ILocalUser } from '../../../models/entities/user';
|
import { ILocalUser } from '../../../models/entities/user';
|
||||||
|
|
||||||
export default (user: ILocalUser, target: any, object: any) => ({
|
export default (user: ILocalUser, target: any, object: any) => ({
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import { Note } from '../../../models/entities/note';
|
import { Note } from '../../../models/entities/note';
|
||||||
|
|
||||||
export default (object: any, note: Note) => {
|
export default (object: any, note: Note) => {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import { ILocalUser, IRemoteUser } from '../../../models/entities/user';
|
import { ILocalUser, IRemoteUser } from '../../../models/entities/user';
|
||||||
|
|
||||||
export default (blocker: ILocalUser, blockee: IRemoteUser) => ({
|
export default (blocker: ILocalUser, blockee: IRemoteUser) => ({
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import { Note } from '../../../models/entities/note';
|
import { Note } from '../../../models/entities/note';
|
||||||
|
|
||||||
export default (object: any, note: Note) => {
|
export default (object: any, note: Note) => {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import { ILocalUser } from '../../../models/entities/user';
|
import { ILocalUser } from '../../../models/entities/user';
|
||||||
|
|
||||||
export default (object: any, user: ILocalUser) => ({
|
export default (object: any, user: ILocalUser) => ({
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import { Emoji } from '../../../models/entities/emoji';
|
import { Emoji } from '../../../models/entities/emoji';
|
||||||
|
|
||||||
export default (emoji: Emoji) => ({
|
export default (emoji: Emoji) => ({
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import { Relay } from '../../../models/entities/relay';
|
import { Relay } from '../../../models/entities/relay';
|
||||||
import { ILocalUser } from '../../../models/entities/user';
|
import { ILocalUser } from '../../../models/entities/user';
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import { Users } from '../../../models';
|
import { Users } from '../../../models';
|
||||||
import { User } from '../../../models/entities/user';
|
import { User } from '../../../models/entities/user';
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import { User } from '../../../models/entities/user';
|
import { User } from '../../../models/entities/user';
|
||||||
import { Users } from '../../../models';
|
import { Users } from '../../../models';
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
|
|
||||||
export default (tag: string) => ({
|
export default (tag: string) => ({
|
||||||
type: 'Hashtag',
|
type: 'Hashtag',
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import { v4 as uuid } from 'uuid';
|
import { v4 as uuid } from 'uuid';
|
||||||
import { IActivity } from '../type';
|
import { IActivity } from '../type';
|
||||||
import { LdSignature } from '../misc/ld-signature';
|
import { LdSignature } from '../misc/ld-signature';
|
||||||
import { ILocalUser } from '../../../models/entities/user';
|
import { ILocalUser } from '../../../models/entities/user';
|
||||||
import { getUserKeypair } from '../../../misc/keypair-store';
|
import { getUserKeypair } from '@/misc/keypair-store';
|
||||||
|
|
||||||
export const renderActivity = (x: any): IActivity | null => {
|
export const renderActivity = (x: any): IActivity | null => {
|
||||||
if (x == null) return null;
|
if (x == null) return null;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import { ILocalUser } from '../../../models/entities/user';
|
import { ILocalUser } from '../../../models/entities/user';
|
||||||
import { UserKeypair } from '../../../models/entities/user-keypair';
|
import { UserKeypair } from '../../../models/entities/user-keypair';
|
||||||
import { createPublicKey } from 'crypto';
|
import { createPublicKey } from 'crypto';
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import { NoteReaction } from '../../../models/entities/note-reaction';
|
import { NoteReaction } from '../../../models/entities/note-reaction';
|
||||||
import { Note } from '../../../models/entities/note';
|
import { Note } from '../../../models/entities/note';
|
||||||
import { Emojis } from '../../../models';
|
import { Emojis } from '../../../models';
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import { User, ILocalUser } from '../../../models/entities/user';
|
import { User, ILocalUser } from '../../../models/entities/user';
|
||||||
import { Users } from '../../../models';
|
import { Users } from '../../../models';
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ import renderDocument from './document';
|
|||||||
import renderHashtag from './hashtag';
|
import renderHashtag from './hashtag';
|
||||||
import renderMention from './mention';
|
import renderMention from './mention';
|
||||||
import renderEmoji from './emoji';
|
import renderEmoji from './emoji';
|
||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import toHtml from '../misc/get-note-html';
|
import toHtml from '../misc/get-note-html';
|
||||||
import { Note, IMentionedRemoteUsers } from '../../../models/entities/note';
|
import { Note, IMentionedRemoteUsers } from '../../../models/entities/note';
|
||||||
import { DriveFile } from '../../../models/entities/drive-file';
|
import { DriveFile } from '../../../models/entities/drive-file';
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import renderImage from './image';
|
import renderImage from './image';
|
||||||
import renderKey from './key';
|
import renderKey from './key';
|
||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import { ILocalUser } from '../../../models/entities/user';
|
import { ILocalUser } from '../../../models/entities/user';
|
||||||
import { toHtml } from '../../../mfm/to-html';
|
import { toHtml } from '../../../mfm/to-html';
|
||||||
import { parse } from '../../../mfm/parse';
|
import { parse } from '../../../mfm/parse';
|
||||||
@ -9,7 +9,7 @@ import renderEmoji from './emoji';
|
|||||||
import { IIdentifier } from '../models/identifier';
|
import { IIdentifier } from '../models/identifier';
|
||||||
import renderHashtag from './hashtag';
|
import renderHashtag from './hashtag';
|
||||||
import { DriveFiles, UserProfiles } from '../../../models';
|
import { DriveFiles, UserProfiles } from '../../../models';
|
||||||
import { getUserKeypair } from '../../../misc/keypair-store';
|
import { getUserKeypair } from '@/misc/keypair-store';
|
||||||
|
|
||||||
export async function renderPerson(user: ILocalUser) {
|
export async function renderPerson(user: ILocalUser) {
|
||||||
const id = `${config.url}/users/${user.id}`;
|
const id = `${config.url}/users/${user.id}`;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import { ILocalUser } from '../../../models/entities/user';
|
import { ILocalUser } from '../../../models/entities/user';
|
||||||
import { Note } from '../../../models/entities/note';
|
import { Note } from '../../../models/entities/note';
|
||||||
import { Poll } from '../../../models/entities/poll';
|
import { Poll } from '../../../models/entities/poll';
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import { ILocalUser } from '../../../models/entities/user';
|
import { ILocalUser } from '../../../models/entities/user';
|
||||||
import { MessagingMessage } from '../../../models/entities/messaging-message';
|
import { MessagingMessage } from '../../../models/entities/messaging-message';
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import { ILocalUser } from '../../../models/entities/user';
|
import { ILocalUser } from '../../../models/entities/user';
|
||||||
|
|
||||||
export default (object: any, user: ILocalUser) => ({
|
export default (object: any, user: ILocalUser) => ({
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import config from '../../../config';
|
import config from '@/config';
|
||||||
import { ILocalUser } from '../../../models/entities/user';
|
import { ILocalUser } from '../../../models/entities/user';
|
||||||
|
|
||||||
export default (user: ILocalUser, target: any, object: any) => ({
|
export default (user: ILocalUser, target: any, object: any) => ({
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user