mirror of
https://activitypub.software/TransFem-org/Sharkey.git
synced 2024-12-14 01:50:45 +01:00
Abolish common and misc directories
This commit is contained in:
parent
a0f8b4e940
commit
5b9f3701f5
111 changed files with 133 additions and 133 deletions
|
@ -229,7 +229,7 @@
|
|||
|
||||
</style>
|
||||
<script lang="typescript">
|
||||
import getAcct from '../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../user/get-acct';
|
||||
|
||||
this.post = this.opts.post;
|
||||
this.form = this.opts.form;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import getPostSummary from '../../../../misc/get-post-summary';
|
||||
import getReactionEmoji from '../../../../misc/get-reaction-emoji';
|
||||
import getPostSummary from '../../../../get-post-summary';
|
||||
import getReactionEmoji from '../../../../get-reaction-emoji';
|
||||
|
||||
type Notification = {
|
||||
title: string;
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
import Vue from 'vue';
|
||||
import * as emojilib from 'emojilib';
|
||||
import contains from '../../../common/scripts/contains';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
const lib = Object.entries(emojilib.lib).filter((x: any) => {
|
||||
return x[1].category != 'flags';
|
||||
|
|
|
@ -34,8 +34,8 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import parse from '../../../../../common/text/parse';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import parse from '../../../../../text/parse';
|
||||
|
||||
export default Vue.extend({
|
||||
props: {
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
props: {
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import * as CRC32 from 'crc-32';
|
||||
import Othello, { Color } from '../../../../../misc/othello/core';
|
||||
import Othello, { Color } from '../../../../../othello/core';
|
||||
import { url } from '../../../config';
|
||||
|
||||
export default Vue.extend({
|
||||
|
|
|
@ -94,7 +94,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import * as maps from '../../../../../misc/othello/maps';
|
||||
import * as maps from '../../../../../othello/maps';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['game', 'connection'],
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import Vue from 'vue';
|
||||
import * as emojilib from 'emojilib';
|
||||
import parse from '../../../../../common/text/parse';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import parse from '../../../../../text/parse';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import { url } from '../../../config';
|
||||
import MkUrl from './url.vue';
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
data() {
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
data() {
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import { url } from '../../../config';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['user'],
|
||||
|
|
|
@ -102,8 +102,8 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getPostSummary from '../../../../../misc/get-post-summary';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getPostSummary from '../../../../../get-post-summary';
|
||||
|
||||
export default Vue.extend({
|
||||
data() {
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import dateStringify from '../../../common/scripts/date-stringify';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['post'],
|
||||
|
|
|
@ -78,8 +78,8 @@
|
|||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import dateStringify from '../../../common/scripts/date-stringify';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import parse from '../../../../../common/text/parse';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import parse from '../../../../../text/parse';
|
||||
|
||||
import MkPostFormWindow from './post-form-window.vue';
|
||||
import MkRepostFormWindow from './repost-form-window.vue';
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import dateStringify from '../../../common/scripts/date-stringify';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['post'],
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import dateStringify from '../../../common/scripts/date-stringify';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['post'],
|
||||
|
|
|
@ -85,8 +85,8 @@
|
|||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import dateStringify from '../../../common/scripts/date-stringify';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import parse from '../../../../../common/text/parse';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import parse from '../../../../../text/parse';
|
||||
|
||||
import MkPostFormWindow from './post-form-window.vue';
|
||||
import MkRepostFormWindow from './repost-form-window.vue';
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
data() {
|
||||
|
|
|
@ -29,8 +29,8 @@
|
|||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import * as anime from 'animejs';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import parseAcct from '../../../../../misc/user/parse-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import parseAcct from '../../../../../user/parse-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
props: {
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['user'],
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import Progress from '../../../common/scripts/loading';
|
||||
import getPostSummary from '../../../../../misc/get-post-summary';
|
||||
import getPostSummary from '../../../../../get-post-summary';
|
||||
|
||||
export default Vue.extend({
|
||||
props: {
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import Progress from '../../../common/scripts/loading';
|
||||
import parseAcct from '../../../../../misc/user/parse-acct';
|
||||
import parseAcct from '../../../../../user/parse-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
data() {
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['user'],
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['user'],
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['user'],
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import parseAcct from '../../../../../../misc/user/parse-acct';
|
||||
import parseAcct from '../../../../../../user/parse-acct';
|
||||
import Progress from '../../../../common/scripts/loading';
|
||||
import XHeader from './user.header.vue';
|
||||
import XHome from './user.home.vue';
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import { docsUrl, copyright, lang } from '../../../config';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
const shares = [
|
||||
'Everything!',
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['post'],
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import define from '../../../common/define-widget';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
export default define({
|
||||
name: 'polls',
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import define from '../../../common/define-widget';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
export default define({
|
||||
name: 'trends',
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import define from '../../../common/define-widget';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
const limit = 3;
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import PostForm from '../views/components/post-form.vue';
|
||||
//import RepostForm from '../views/components/repost-form.vue';
|
||||
import getPostSummary from '../../../../misc/get-post-summary';
|
||||
import getPostSummary from '../../../../get-post-summary';
|
||||
|
||||
export default (os) => (opts) => {
|
||||
const o = opts || {};
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getPostSummary from '../../../../../misc/get-post-summary';
|
||||
import getPostSummary from '../../../../../get-post-summary';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['notification'],
|
||||
|
|
|
@ -78,8 +78,8 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getPostSummary from '../../../../../misc/get-post-summary';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getPostSummary from '../../../../../get-post-summary';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['notification'],
|
||||
|
|
|
@ -14,8 +14,8 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import summary from '../../../../../misc/get-post-summary';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import summary from '../../../../../get-post-summary';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['post'],
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['post'],
|
||||
|
|
|
@ -80,8 +80,8 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import parse from '../../../../../common/text/parse';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import parse from '../../../../../text/parse';
|
||||
|
||||
import MkPostMenu from '../../../common/views/components/post-menu.vue';
|
||||
import MkReactionPicker from '../../../common/views/components/reaction-picker.vue';
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['post'],
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['post'],
|
||||
|
|
|
@ -77,8 +77,8 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import parse from '../../../../../common/text/parse';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import parse from '../../../../../text/parse';
|
||||
|
||||
import MkPostMenu from '../../../common/views/components/post-menu.vue';
|
||||
import MkReactionPicker from '../../../common/views/components/reaction-picker.vue';
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['user'],
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['user'],
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import Progress from '../../../common/scripts/loading';
|
||||
import parseAcct from '../../../../../misc/user/parse-acct';
|
||||
import parseAcct from '../../../../../user/parse-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
data() {
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import Progress from '../../../common/scripts/loading';
|
||||
import parseAcct from '../../../../../misc/user/parse-acct';
|
||||
import parseAcct from '../../../../../user/parse-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
data() {
|
||||
|
|
|
@ -64,7 +64,7 @@ import Vue from 'vue';
|
|||
import * as XDraggable from 'vuedraggable';
|
||||
import * as uuid from 'uuid';
|
||||
import Progress from '../../../common/scripts/loading';
|
||||
import getPostSummary from '../../../../../misc/get-post-summary';
|
||||
import getPostSummary from '../../../../../get-post-summary';
|
||||
|
||||
export default Vue.extend({
|
||||
components: {
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import parseAcct from '../../../../../misc/user/parse-acct';
|
||||
import parseAcct from '../../../../../user/parse-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
data() {
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
mounted() {
|
||||
|
|
|
@ -60,8 +60,8 @@
|
|||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import * as age from 's-age';
|
||||
import getAcct from '../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../misc/user/parse-acct';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../user/parse-acct';
|
||||
import Progress from '../../../common/scripts/loading';
|
||||
import XHome from './user/home.vue';
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['user'],
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../../misc/user/get-acct';
|
||||
import getAcct from '../../../../../../user/get-acct';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['user'],
|
||||
|
|
|
@ -10,12 +10,12 @@ import * as debug from 'debug';
|
|||
import fileType = require('file-type');
|
||||
import prominence = require('prominence');
|
||||
|
||||
import DriveFile, { getGridFSBucket } from '../../models/drive-file';
|
||||
import DriveFolder from '../../models/drive-folder';
|
||||
import { pack } from '../../models/drive-file';
|
||||
import DriveFile, { getGridFSBucket } from '../models/drive-file';
|
||||
import DriveFolder from '../models/drive-folder';
|
||||
import { pack } from '../models/drive-file';
|
||||
import event, { publishDriveStream } from '../event';
|
||||
import getAcct from '../../misc/user/get-acct';
|
||||
import config from '../../conf';
|
||||
import getAcct from '../user/get-acct';
|
||||
import config from '../conf';
|
||||
|
||||
const gm = _gm.subClass({
|
||||
imageMagick: true
|
||||
|
@ -290,7 +290,7 @@ export default (user: any, file: string | stream.Readable, ...args) => new Promi
|
|||
|
||||
// Register to search database
|
||||
if (config.elasticsearch.enable) {
|
||||
const es = require('../../db/elasticsearch');
|
||||
const es = require('../db/elasticsearch');
|
||||
es.index({
|
||||
index: 'misskey',
|
||||
type: 'drive_file',
|
|
@ -1,5 +1,5 @@
|
|||
import * as URL from 'url';
|
||||
import { IDriveFile, validateFileName } from '../../models/drive-file';
|
||||
import { IDriveFile, validateFileName } from '../models/drive-file';
|
||||
import create from './add-file';
|
||||
import * as debug from 'debug';
|
||||
import * as tmp from 'tmp';
|
|
@ -1,7 +1,7 @@
|
|||
import * as mongo from 'mongodb';
|
||||
import * as redis from 'redis';
|
||||
import swPush from './push-sw';
|
||||
import config from '../conf';
|
||||
import config from './conf';
|
||||
|
||||
type ID = string | mongo.ObjectID;
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
import * as mongo from 'mongodb';
|
||||
import Notification from '../models/notification';
|
||||
import Mute from '../models/mute';
|
||||
import Notification from './models/notification';
|
||||
import Mute from './models/mute';
|
||||
import event from './event';
|
||||
import { pack } from '../models/notification';
|
||||
import { pack } from './models/notification';
|
||||
|
||||
export default (
|
||||
notifiee: mongo.ObjectID,
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
import * as request from 'request-promise-native';
|
||||
import Othello, { Color } from '../core';
|
||||
import conf from '../../../conf';
|
||||
import conf from '../../conf';
|
||||
|
||||
let game;
|
||||
let form;
|
|
@ -10,7 +10,7 @@ import * as childProcess from 'child_process';
|
|||
const WebSocket = require('ws');
|
||||
import * as ReconnectingWebSocket from 'reconnecting-websocket';
|
||||
import * as request from 'request-promise-native';
|
||||
import conf from '../../../conf';
|
||||
import conf from '../../conf';
|
||||
|
||||
// 設定 ////////////////////////////////////////////////////////
|
||||
|
|
@ -3,8 +3,8 @@ import { sign } from 'http-signature';
|
|||
import { URL } from 'url';
|
||||
import User, { isLocalUser, pack as packUser, ILocalUser } from '../../models/user';
|
||||
import Following from '../../models/following';
|
||||
import event from '../../common/event';
|
||||
import notify from '../../common/notify';
|
||||
import event from '../../event';
|
||||
import notify from '../../notify';
|
||||
import context from '../../remote/activitypub/renderer/context';
|
||||
import render from '../../remote/activitypub/renderer/follow';
|
||||
import config from '../../conf';
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
const push = require('web-push');
|
||||
import * as mongo from 'mongodb';
|
||||
import Subscription from '../models/sw-subscription';
|
||||
import config from '../conf';
|
||||
import Subscription from './models/sw-subscription';
|
||||
import config from './conf';
|
||||
|
||||
if (config.sw) {
|
||||
// アプリケーションの連絡先と、サーバーサイドの鍵ペアの情報を登録
|
|
@ -2,7 +2,7 @@ import { JSDOM } from 'jsdom';
|
|||
import config from '../../conf';
|
||||
import Post from '../../models/post';
|
||||
import RemoteUserObject, { IRemoteUserObject } from '../../models/remote-user-object';
|
||||
import uploadFromUrl from '../../common/drive/upload-from-url';
|
||||
import uploadFromUrl from '../../drive/upload-from-url';
|
||||
import Resolver from './resolver';
|
||||
const createDOMPurify = require('dompurify');
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ import * as express from 'express';
|
|||
import { parseRequest, verifySignature } from 'http-signature';
|
||||
import User, { IRemoteUser } from '../../models/user';
|
||||
import queue from '../../queue';
|
||||
import parseAcct from '../../misc/user/parse-acct';
|
||||
import parseAcct from '../../user/parse-acct';
|
||||
|
||||
const app = express();
|
||||
app.disable('x-powered-by');
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import * as express from 'express';
|
||||
import context from '../../remote/activitypub/renderer/context';
|
||||
import render from '../../remote/activitypub/renderer/note';
|
||||
import parseAcct from '../../misc/user/parse-acct';
|
||||
import parseAcct from '../../user/parse-acct';
|
||||
import Post from '../../models/post';
|
||||
import User from '../../models/user';
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import parseAcct from '../../misc/user/parse-acct';
|
||||
import parseAcct from '../../user/parse-acct';
|
||||
import User from '../../models/user';
|
||||
|
||||
export default (redirect, respond) => async (req, res, next) => {
|
||||
|
|
|
@ -3,10 +3,10 @@ import * as bcrypt from 'bcryptjs';
|
|||
|
||||
import User, { IUser, init as initUser, ILocalUser } from '../../../models/user';
|
||||
|
||||
import getPostSummary from '../../../misc/get-post-summary';
|
||||
import getUserSummary from '../../../misc/user/get-summary';
|
||||
import parseAcct from '../../../misc/user/parse-acct';
|
||||
import getNotificationSummary from '../../../misc/get-notification-summary';
|
||||
import getPostSummary from '../../../get-post-summary';
|
||||
import getUserSummary from '../../../user/get-summary';
|
||||
import parseAcct from '../../../user/parse-acct';
|
||||
import getNotificationSummary from '../../../get-notification-summary';
|
||||
|
||||
const hmm = [
|
||||
'?',
|
||||
|
|
|
@ -7,9 +7,9 @@ import config from '../../../../conf';
|
|||
import BotCore from '../core';
|
||||
import _redis from '../../../../db/redis';
|
||||
import prominence = require('prominence');
|
||||
import getAcct from '../../../../misc/user/get-acct';
|
||||
import parseAcct from '../../../../misc/user/parse-acct';
|
||||
import getPostSummary from '../../../../misc/get-post-summary';
|
||||
import getAcct from '../../../../user/get-acct';
|
||||
import parseAcct from '../../../../user/parse-acct';
|
||||
import getPostSummary from '../../../../get-post-summary';
|
||||
|
||||
const redis = prominence(_redis);
|
||||
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
import * as mongo from 'mongodb';
|
||||
import Message from '../../../models/messaging-message';
|
||||
import { IMessagingMessage as IMessage } from '../../../models/messaging-message';
|
||||
import publishUserStream from '../../../common/event';
|
||||
import { publishMessagingStream } from '../../../common/event';
|
||||
import { publishMessagingIndexStream } from '../../../common/event';
|
||||
import publishUserStream from '../../../event';
|
||||
import { publishMessagingStream } from '../../../event';
|
||||
import { publishMessagingIndexStream } from '../../../event';
|
||||
|
||||
/**
|
||||
* Mark as read message(s)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import * as mongo from 'mongodb';
|
||||
import { default as Notification, INotification } from '../../../models/notification';
|
||||
import publishUserStream from '../../../common/event';
|
||||
import publishUserStream from '../../../event';
|
||||
|
||||
/**
|
||||
* Mark as read notification(s)
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*/
|
||||
import $ from 'cafy';
|
||||
import { validateFileName, pack } from '../../../../../models/drive-file';
|
||||
import create from '../../../../../common/drive/add-file';
|
||||
import create from '../../../../../drive/add-file';
|
||||
|
||||
/**
|
||||
* Create a file
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
import $ from 'cafy';
|
||||
import DriveFolder from '../../../../../models/drive-folder';
|
||||
import DriveFile, { validateFileName, pack } from '../../../../../models/drive-file';
|
||||
import { publishDriveStream } from '../../../../../common/event';
|
||||
import { publishDriveStream } from '../../../../../event';
|
||||
|
||||
/**
|
||||
* Update a file
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*/
|
||||
import $ from 'cafy';
|
||||
import { pack } from '../../../../../models/drive-file';
|
||||
import uploadFromUrl from '../../../../../common/drive/upload-from-url';
|
||||
import uploadFromUrl from '../../../../../drive/upload-from-url';
|
||||
|
||||
/**
|
||||
* Create a file from a URL
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*/
|
||||
import $ from 'cafy';
|
||||
import DriveFolder, { isValidFolderName, pack } from '../../../../../models/drive-folder';
|
||||
import { publishDriveStream } from '../../../../../common/event';
|
||||
import { publishDriveStream } from '../../../../../event';
|
||||
|
||||
/**
|
||||
* Create drive folder
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*/
|
||||
import $ from 'cafy';
|
||||
import DriveFolder, { isValidFolderName, pack } from '../../../../../models/drive-folder';
|
||||
import { publishDriveStream } from '../../../../../common/event';
|
||||
import { publishDriveStream } from '../../../../../event';
|
||||
|
||||
/**
|
||||
* Update a folder
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
import $ from 'cafy';
|
||||
import User, { pack as packUser } from '../../../../models/user';
|
||||
import Following from '../../../../models/following';
|
||||
import event from '../../../../common/event';
|
||||
import event from '../../../../event';
|
||||
|
||||
/**
|
||||
* Unfollow a user
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
import $ from 'cafy';
|
||||
import * as bcrypt from 'bcryptjs';
|
||||
import User from '../../../../models/user';
|
||||
import event from '../../../../common/event';
|
||||
import event from '../../../../event';
|
||||
import generateUserToken from '../../common/generate-native-user-token';
|
||||
|
||||
/**
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*/
|
||||
import $ from 'cafy';
|
||||
import User, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack } from '../../../../models/user';
|
||||
import event from '../../../../common/event';
|
||||
import event from '../../../../event';
|
||||
import config from '../../../../conf';
|
||||
|
||||
/**
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*/
|
||||
import $ from 'cafy';
|
||||
import User, { pack } from '../../../../models/user';
|
||||
import event from '../../../../common/event';
|
||||
import event from '../../../../event';
|
||||
|
||||
/**
|
||||
* Update myself
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*/
|
||||
import $ from 'cafy';
|
||||
import User from '../../../../models/user';
|
||||
import event from '../../../../common/event';
|
||||
import event from '../../../../event';
|
||||
|
||||
module.exports = async (params, user) => new Promise(async (res, rej) => {
|
||||
// Get 'home' parameter
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*/
|
||||
import $ from 'cafy';
|
||||
import User from '../../../../models/user';
|
||||
import event from '../../../../common/event';
|
||||
import event from '../../../../event';
|
||||
|
||||
module.exports = async (params, user) => new Promise(async (res, rej) => {
|
||||
// Get 'home' parameter
|
||||
|
|
|
@ -9,10 +9,10 @@ import User from '../../../../../models/user';
|
|||
import Mute from '../../../../../models/mute';
|
||||
import DriveFile from '../../../../../models/drive-file';
|
||||
import { pack } from '../../../../../models/messaging-message';
|
||||
import publishUserStream from '../../../../../common/event';
|
||||
import { publishMessagingStream, publishMessagingIndexStream, pushSw } from '../../../../../common/event';
|
||||
import html from '../../../../../common/text/html';
|
||||
import parse from '../../../../../common/text/parse';
|
||||
import publishUserStream from '../../../../../event';
|
||||
import { publishMessagingStream, publishMessagingIndexStream, pushSw } from '../../../../../event';
|
||||
import html from '../../../../../text/html';
|
||||
import parse from '../../../../../text/parse';
|
||||
import config from '../../../../../conf';
|
||||
|
||||
/**
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Module dependencies
|
||||
*/
|
||||
import Notification from '../../../../models/notification';
|
||||
import event from '../../../../common/event';
|
||||
import event from '../../../../event';
|
||||
|
||||
/**
|
||||
* Mark as read all notifications
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import $ from 'cafy';
|
||||
import OthelloGame, { pack } from '../../../../../models/othello-game';
|
||||
import Othello from '../../../../../misc/othello/core';
|
||||
import Othello from '../../../../../othello/core';
|
||||
|
||||
module.exports = (params, user) => new Promise(async (res, rej) => {
|
||||
// Get 'gameId' parameter
|
||||
|
|
|
@ -2,8 +2,8 @@ import $ from 'cafy';
|
|||
import Matching, { pack as packMatching } from '../../../../models/othello-matching';
|
||||
import OthelloGame, { pack as packGame } from '../../../../models/othello-game';
|
||||
import User from '../../../../models/user';
|
||||
import publishUserStream, { publishOthelloStream } from '../../../../common/event';
|
||||
import { eighteight } from '../../../../misc/othello/maps';
|
||||
import publishUserStream, { publishOthelloStream } from '../../../../event';
|
||||
import { eighteight } from '../../../../othello/maps';
|
||||
|
||||
module.exports = (params, user) => new Promise(async (res, rej) => {
|
||||
// Get 'userId' parameter
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
*/
|
||||
import $ from 'cafy';
|
||||
import deepEqual = require('deep-equal');
|
||||
import html from '../../../../common/text/html';
|
||||
import parse from '../../../../common/text/parse';
|
||||
import html from '../../../../text/html';
|
||||
import parse from '../../../../text/parse';
|
||||
import Post, { IPost, isValidText, isValidCw } from '../../../../models/post';
|
||||
import User, { ILocalUser } from '../../../../models/user';
|
||||
import Channel, { IChannel } from '../../../../models/channel';
|
||||
|
@ -15,10 +15,10 @@ import Watching from '../../../../models/post-watching';
|
|||
import ChannelWatching from '../../../../models/channel-watching';
|
||||
import { pack } from '../../../../models/post';
|
||||
import watch from '../../common/watch-post';
|
||||
import event, { pushSw, publishChannelStream } from '../../../../common/event';
|
||||
import notify from '../../../../common/notify';
|
||||
import getAcct from '../../../../misc/user/get-acct';
|
||||
import parseAcct from '../../../../misc/user/parse-acct';
|
||||
import event, { pushSw, publishChannelStream } from '../../../../event';
|
||||
import notify from '../../../../notify';
|
||||
import getAcct from '../../../../user/get-acct';
|
||||
import parseAcct from '../../../../user/parse-acct';
|
||||
import config from '../../../../conf';
|
||||
|
||||
/**
|
||||
|
|
|
@ -6,8 +6,8 @@ import Vote from '../../../../../models/poll-vote';
|
|||
import Post from '../../../../../models/post';
|
||||
import Watching from '../../../../../models/post-watching';
|
||||
import watch from '../../../common/watch-post';
|
||||
import { publishPostStream } from '../../../../../common/event';
|
||||
import notify from '../../../../../common/notify';
|
||||
import { publishPostStream } from '../../../../../event';
|
||||
import notify from '../../../../../notify';
|
||||
|
||||
/**
|
||||
* Vote poll of a post
|
||||
|
|
|
@ -7,8 +7,8 @@ import Post, { pack as packPost } from '../../../../../models/post';
|
|||
import { pack as packUser } from '../../../../../models/user';
|
||||
import Watching from '../../../../../models/post-watching';
|
||||
import watch from '../../../common/watch-post';
|
||||
import { publishPostStream, pushSw } from '../../../../../common/event';
|
||||
import notify from '../../../../../common/notify';
|
||||
import { publishPostStream, pushSw } from '../../../../../event';
|
||||
import notify from '../../../../../notify';
|
||||
|
||||
/**
|
||||
* React to a post
|
||||
|
|
|
@ -3,7 +3,7 @@ import * as debug from 'debug';
|
|||
import limiterDB from '../../db/redis';
|
||||
import { Endpoint } from './endpoints';
|
||||
import { IAuthContext } from './authenticate';
|
||||
import getAcct from '../../misc/user/get-acct';
|
||||
import getAcct from '../../user/get-acct';
|
||||
|
||||
const log = debug('misskey:limitter');
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ import * as bcrypt from 'bcryptjs';
|
|||
import * as speakeasy from 'speakeasy';
|
||||
import User, { ILocalUser } from '../../../models/user';
|
||||
import Signin, { pack } from '../../../models/signin';
|
||||
import event from '../../../common/event';
|
||||
import event from '../../../event';
|
||||
import signin from '../common/signin';
|
||||
import config from '../../../conf';
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ import * as uuid from 'uuid';
|
|||
import autwh from 'autwh';
|
||||
import redis from '../../../db/redis';
|
||||
import User, { pack } from '../../../models/user';
|
||||
import event from '../../../common/event';
|
||||
import event from '../../../event';
|
||||
import config from '../../../conf';
|
||||
import signin from '../common/signin';
|
||||
|
||||
|
|
|
@ -2,9 +2,9 @@ import * as websocket from 'websocket';
|
|||
import * as redis from 'redis';
|
||||
import * as CRC32 from 'crc-32';
|
||||
import OthelloGame, { pack } from '../../../models/othello-game';
|
||||
import { publishOthelloGameStream } from '../../../common/event';
|
||||
import Othello from '../../../misc/othello/core';
|
||||
import * as maps from '../../../misc/othello/maps';
|
||||
import { publishOthelloGameStream } from '../../../event';
|
||||
import Othello from '../../../othello/core';
|
||||
import * as maps from '../../../othello/maps';
|
||||
import { ParsedUrlQuery } from 'querystring';
|
||||
|
||||
export default function(request: websocket.request, connection: websocket.connection, subscriber: redis.RedisClient, user?: any): void {
|
||||
|
|
|
@ -2,7 +2,7 @@ import * as mongo from 'mongodb';
|
|||
import * as websocket from 'websocket';
|
||||
import * as redis from 'redis';
|
||||
import Matching, { pack } from '../../../models/othello-matching';
|
||||
import publishUserStream from '../../../common/event';
|
||||
import publishUserStream from '../../../event';
|
||||
|
||||
export default function(request: websocket.request, connection: websocket.connection, subscriber: redis.RedisClient, user: any): void {
|
||||
// Subscribe othello stream
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import config from '../conf';
|
||||
import parseAcct from '../misc/user/parse-acct';
|
||||
import parseAcct from '../user/parse-acct';
|
||||
import User from '../models/user';
|
||||
const express = require('express');
|
||||
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue