Merge pull request #1361 from akihikodaki/misc

Abolish common and misc directories
This commit is contained in:
syuilo 2018-04-02 13:00:42 +09:00 committed by GitHub
commit 0781c0886e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
111 changed files with 133 additions and 133 deletions

View File

@ -229,7 +229,7 @@
</style> </style>
<script lang="typescript"> <script lang="typescript">
import getAcct from '../../../../misc/user/get-acct'; import getAcct from '../../../../user/get-acct';
this.post = this.opts.post; this.post = this.opts.post;
this.form = this.opts.form; this.form = this.opts.form;

View File

@ -1,5 +1,5 @@
import getPostSummary from '../../../../misc/get-post-summary'; import getPostSummary from '../../../../get-post-summary';
import getReactionEmoji from '../../../../misc/get-reaction-emoji'; import getReactionEmoji from '../../../../get-reaction-emoji';
type Notification = { type Notification = {
title: string; title: string;

View File

@ -21,7 +21,7 @@
import Vue from 'vue'; import Vue from 'vue';
import * as emojilib from 'emojilib'; import * as emojilib from 'emojilib';
import contains from '../../../common/scripts/contains'; 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) => { const lib = Object.entries(emojilib.lib).filter((x: any) => {
return x[1].category != 'flags'; return x[1].category != 'flags';

View File

@ -34,8 +34,8 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
import parse from '../../../../../common/text/parse'; import parse from '../../../../../text/parse';
export default Vue.extend({ export default Vue.extend({
props: { props: {

View File

@ -51,7 +51,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
props: { props: {

View File

@ -43,7 +43,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import * as CRC32 from 'crc-32'; import * as CRC32 from 'crc-32';
import Othello, { Color } from '../../../../../misc/othello/core'; import Othello, { Color } from '../../../../../othello/core';
import { url } from '../../../config'; import { url } from '../../../config';
export default Vue.extend({ export default Vue.extend({

View File

@ -94,7 +94,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import * as maps from '../../../../../misc/othello/maps'; import * as maps from '../../../../../othello/maps';
export default Vue.extend({ export default Vue.extend({
props: ['game', 'connection'], props: ['game', 'connection'],

View File

@ -1,7 +1,7 @@
import Vue from 'vue'; import Vue from 'vue';
import * as emojilib from 'emojilib'; import * as emojilib from 'emojilib';
import parse from '../../../../../common/text/parse'; import parse from '../../../../../text/parse';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
import { url } from '../../../config'; import { url } from '../../../config';
import MkUrl from './url.vue'; import MkUrl from './url.vue';

View File

@ -24,7 +24,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
data() { data() {

View File

@ -22,7 +22,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
data() { data() {

View File

@ -8,7 +8,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import { url } from '../../../config'; import { url } from '../../../config';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
props: ['user'], props: ['user'],

View File

@ -102,8 +102,8 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
import getPostSummary from '../../../../../misc/get-post-summary'; import getPostSummary from '../../../../../get-post-summary';
export default Vue.extend({ export default Vue.extend({
data() { data() {

View File

@ -28,7 +28,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import dateStringify from '../../../common/scripts/date-stringify'; import dateStringify from '../../../common/scripts/date-stringify';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
props: ['post'], props: ['post'],

View File

@ -78,8 +78,8 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import dateStringify from '../../../common/scripts/date-stringify'; import dateStringify from '../../../common/scripts/date-stringify';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
import parse from '../../../../../common/text/parse'; import parse from '../../../../../text/parse';
import MkPostFormWindow from './post-form-window.vue'; import MkPostFormWindow from './post-form-window.vue';
import MkRepostFormWindow from './repost-form-window.vue'; import MkRepostFormWindow from './repost-form-window.vue';

View File

@ -21,7 +21,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import dateStringify from '../../../common/scripts/date-stringify'; import dateStringify from '../../../common/scripts/date-stringify';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
props: ['post'], props: ['post'],

View File

@ -21,7 +21,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import dateStringify from '../../../common/scripts/date-stringify'; import dateStringify from '../../../common/scripts/date-stringify';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
props: ['post'], props: ['post'],

View File

@ -85,8 +85,8 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import dateStringify from '../../../common/scripts/date-stringify'; import dateStringify from '../../../common/scripts/date-stringify';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
import parse from '../../../../../common/text/parse'; import parse from '../../../../../text/parse';
import MkPostFormWindow from './post-form-window.vue'; import MkPostFormWindow from './post-form-window.vue';
import MkRepostFormWindow from './repost-form-window.vue'; import MkRepostFormWindow from './repost-form-window.vue';

View File

@ -13,7 +13,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
data() { data() {

View File

@ -29,8 +29,8 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import * as anime from 'animejs'; import * as anime from 'animejs';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
import parseAcct from '../../../../../misc/user/parse-acct'; import parseAcct from '../../../../../user/parse-acct';
export default Vue.extend({ export default Vue.extend({
props: { props: {

View File

@ -19,7 +19,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
props: ['user'], props: ['user'],

View File

@ -7,7 +7,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import Progress from '../../../common/scripts/loading'; import Progress from '../../../common/scripts/loading';
import getPostSummary from '../../../../../misc/get-post-summary'; import getPostSummary from '../../../../../get-post-summary';
export default Vue.extend({ export default Vue.extend({
props: { props: {

View File

@ -7,7 +7,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import Progress from '../../../common/scripts/loading'; import Progress from '../../../common/scripts/loading';
import parseAcct from '../../../../../misc/user/parse-acct'; import parseAcct from '../../../../../user/parse-acct';
export default Vue.extend({ export default Vue.extend({
data() { data() {

View File

@ -13,7 +13,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../../misc/user/get-acct'; import getAcct from '../../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
props: ['user'], props: ['user'],

View File

@ -20,7 +20,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../../misc/user/get-acct'; import getAcct from '../../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
props: ['user'], props: ['user'],

View File

@ -22,7 +22,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../../misc/user/get-acct'; import getAcct from '../../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
props: ['user'], props: ['user'],

View File

@ -9,7 +9,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import parseAcct from '../../../../../../misc/user/parse-acct'; import parseAcct from '../../../../../../user/parse-acct';
import Progress from '../../../../common/scripts/loading'; import Progress from '../../../../common/scripts/loading';
import XHeader from './user.header.vue'; import XHeader from './user.header.vue';
import XHome from './user.home.vue'; import XHome from './user.home.vue';

View File

@ -43,7 +43,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import { docsUrl, copyright, lang } from '../../../config'; import { docsUrl, copyright, lang } from '../../../config';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
const shares = [ const shares = [
'Everything!', 'Everything!',

View File

@ -19,7 +19,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
props: ['post'], props: ['post'],

View File

@ -16,7 +16,7 @@
<script lang="ts"> <script lang="ts">
import define from '../../../common/define-widget'; import define from '../../../common/define-widget';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
export default define({ export default define({
name: 'polls', name: 'polls',

View File

@ -15,7 +15,7 @@
<script lang="ts"> <script lang="ts">
import define from '../../../common/define-widget'; import define from '../../../common/define-widget';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
export default define({ export default define({
name: 'trends', name: 'trends',

View File

@ -23,7 +23,7 @@
<script lang="ts"> <script lang="ts">
import define from '../../../common/define-widget'; import define from '../../../common/define-widget';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
const limit = 3; const limit = 3;

View File

@ -1,6 +1,6 @@
import PostForm from '../views/components/post-form.vue'; import PostForm from '../views/components/post-form.vue';
//import RepostForm from '../views/components/repost-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) => { export default (os) => (opts) => {
const o = opts || {}; const o = opts || {};

View File

@ -59,7 +59,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getPostSummary from '../../../../../misc/get-post-summary'; import getPostSummary from '../../../../../get-post-summary';
export default Vue.extend({ export default Vue.extend({
props: ['notification'], props: ['notification'],

View File

@ -78,8 +78,8 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getPostSummary from '../../../../../misc/get-post-summary'; import getPostSummary from '../../../../../get-post-summary';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
props: ['notification'], props: ['notification'],

View File

@ -14,8 +14,8 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import summary from '../../../../../misc/get-post-summary'; import summary from '../../../../../get-post-summary';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
props: ['post'], props: ['post'],

View File

@ -20,7 +20,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
props: ['post'], props: ['post'],

View File

@ -80,8 +80,8 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
import parse from '../../../../../common/text/parse'; import parse from '../../../../../text/parse';
import MkPostMenu from '../../../common/views/components/post-menu.vue'; import MkPostMenu from '../../../common/views/components/post-menu.vue';
import MkReactionPicker from '../../../common/views/components/reaction-picker.vue'; import MkReactionPicker from '../../../common/views/components/reaction-picker.vue';

View File

@ -20,7 +20,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
props: ['post'], props: ['post'],

View File

@ -20,7 +20,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
props: ['post'], props: ['post'],

View File

@ -77,8 +77,8 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
import parse from '../../../../../common/text/parse'; import parse from '../../../../../text/parse';
import MkPostMenu from '../../../common/views/components/post-menu.vue'; import MkPostMenu from '../../../common/views/components/post-menu.vue';
import MkReactionPicker from '../../../common/views/components/reaction-picker.vue'; import MkReactionPicker from '../../../common/views/components/reaction-picker.vue';

View File

@ -13,7 +13,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
props: ['user'], props: ['user'],

View File

@ -17,7 +17,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
props: ['user'], props: ['user'],

View File

@ -19,7 +19,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import Progress from '../../../common/scripts/loading'; import Progress from '../../../common/scripts/loading';
import parseAcct from '../../../../../misc/user/parse-acct'; import parseAcct from '../../../../../user/parse-acct';
export default Vue.extend({ export default Vue.extend({
data() { data() {

View File

@ -19,7 +19,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import Progress from '../../../common/scripts/loading'; import Progress from '../../../common/scripts/loading';
import parseAcct from '../../../../../misc/user/parse-acct'; import parseAcct from '../../../../../user/parse-acct';
export default Vue.extend({ export default Vue.extend({
data() { data() {

View File

@ -64,7 +64,7 @@ import Vue from 'vue';
import * as XDraggable from 'vuedraggable'; import * as XDraggable from 'vuedraggable';
import * as uuid from 'uuid'; import * as uuid from 'uuid';
import Progress from '../../../common/scripts/loading'; import Progress from '../../../common/scripts/loading';
import getPostSummary from '../../../../../misc/get-post-summary'; import getPostSummary from '../../../../../get-post-summary';
export default Vue.extend({ export default Vue.extend({
components: { components: {

View File

@ -10,7 +10,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import parseAcct from '../../../../../misc/user/parse-acct'; import parseAcct from '../../../../../user/parse-acct';
export default Vue.extend({ export default Vue.extend({
data() { data() {

View File

@ -7,7 +7,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
mounted() { mounted() {

View File

@ -60,8 +60,8 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import * as age from 's-age'; import * as age from 's-age';
import getAcct from '../../../../../misc/user/get-acct'; import getAcct from '../../../../../user/get-acct';
import getAcct from '../../../../../misc/user/parse-acct'; import getAcct from '../../../../../user/parse-acct';
import Progress from '../../../common/scripts/loading'; import Progress from '../../../common/scripts/loading';
import XHome from './user/home.vue'; import XHome from './user/home.vue';

View File

@ -12,7 +12,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../../misc/user/get-acct'; import getAcct from '../../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
props: ['user'], props: ['user'],

View File

@ -14,7 +14,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../../misc/user/get-acct'; import getAcct from '../../../../../../user/get-acct';
export default Vue.extend({ export default Vue.extend({
props: ['user'], props: ['user'],

View File

@ -10,12 +10,12 @@ import * as debug from 'debug';
import fileType = require('file-type'); import fileType = require('file-type');
import prominence = require('prominence'); import prominence = require('prominence');
import DriveFile, { getGridFSBucket } from '../../models/drive-file'; import DriveFile, { getGridFSBucket } from '../models/drive-file';
import DriveFolder from '../../models/drive-folder'; import DriveFolder from '../models/drive-folder';
import { pack } from '../../models/drive-file'; import { pack } from '../models/drive-file';
import event, { publishDriveStream } from '../event'; import event, { publishDriveStream } from '../event';
import getAcct from '../../misc/user/get-acct'; import getAcct from '../user/get-acct';
import config from '../../conf'; import config from '../conf';
const gm = _gm.subClass({ const gm = _gm.subClass({
imageMagick: true imageMagick: true
@ -290,7 +290,7 @@ export default (user: any, file: string | stream.Readable, ...args) => new Promi
// Register to search database // Register to search database
if (config.elasticsearch.enable) { if (config.elasticsearch.enable) {
const es = require('../../db/elasticsearch'); const es = require('../db/elasticsearch');
es.index({ es.index({
index: 'misskey', index: 'misskey',
type: 'drive_file', type: 'drive_file',

View File

@ -1,5 +1,5 @@
import * as URL from 'url'; 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 create from './add-file';
import * as debug from 'debug'; import * as debug from 'debug';
import * as tmp from 'tmp'; import * as tmp from 'tmp';

View File

@ -1,7 +1,7 @@
import * as mongo from 'mongodb'; import * as mongo from 'mongodb';
import * as redis from 'redis'; import * as redis from 'redis';
import swPush from './push-sw'; import swPush from './push-sw';
import config from '../conf'; import config from './conf';
type ID = string | mongo.ObjectID; type ID = string | mongo.ObjectID;

View File

@ -1,8 +1,8 @@
import * as mongo from 'mongodb'; import * as mongo from 'mongodb';
import Notification from '../models/notification'; import Notification from './models/notification';
import Mute from '../models/mute'; import Mute from './models/mute';
import event from './event'; import event from './event';
import { pack } from '../models/notification'; import { pack } from './models/notification';
export default ( export default (
notifiee: mongo.ObjectID, notifiee: mongo.ObjectID,

View File

@ -8,7 +8,7 @@
import * as request from 'request-promise-native'; import * as request from 'request-promise-native';
import Othello, { Color } from '../core'; import Othello, { Color } from '../core';
import conf from '../../../conf'; import conf from '../../conf';
let game; let game;
let form; let form;

View File

@ -10,7 +10,7 @@ import * as childProcess from 'child_process';
const WebSocket = require('ws'); const WebSocket = require('ws');
import * as ReconnectingWebSocket from 'reconnecting-websocket'; import * as ReconnectingWebSocket from 'reconnecting-websocket';
import * as request from 'request-promise-native'; import * as request from 'request-promise-native';
import conf from '../../../conf'; import conf from '../../conf';
// 設定 //////////////////////////////////////////////////////// // 設定 ////////////////////////////////////////////////////////

View File

@ -3,8 +3,8 @@ import { sign } from 'http-signature';
import { URL } from 'url'; import { URL } from 'url';
import User, { isLocalUser, pack as packUser, ILocalUser } from '../../models/user'; import User, { isLocalUser, pack as packUser, ILocalUser } from '../../models/user';
import Following from '../../models/following'; import Following from '../../models/following';
import event from '../../common/event'; import event from '../../event';
import notify from '../../common/notify'; import notify from '../../notify';
import context from '../../remote/activitypub/renderer/context'; import context from '../../remote/activitypub/renderer/context';
import render from '../../remote/activitypub/renderer/follow'; import render from '../../remote/activitypub/renderer/follow';
import config from '../../conf'; import config from '../../conf';

View File

@ -1,7 +1,7 @@
const push = require('web-push'); const push = require('web-push');
import * as mongo from 'mongodb'; import * as mongo from 'mongodb';
import Subscription from '../models/sw-subscription'; import Subscription from './models/sw-subscription';
import config from '../conf'; import config from './conf';
if (config.sw) { if (config.sw) {
// アプリケーションの連絡先と、サーバーサイドの鍵ペアの情報を登録 // アプリケーションの連絡先と、サーバーサイドの鍵ペアの情報を登録

View File

@ -2,7 +2,7 @@ import { JSDOM } from 'jsdom';
import config from '../../conf'; import config from '../../conf';
import Post from '../../models/post'; import Post from '../../models/post';
import RemoteUserObject, { IRemoteUserObject } from '../../models/remote-user-object'; 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'; import Resolver from './resolver';
const createDOMPurify = require('dompurify'); const createDOMPurify = require('dompurify');

View File

@ -3,7 +3,7 @@ import * as express from 'express';
import { parseRequest, verifySignature } from 'http-signature'; import { parseRequest, verifySignature } from 'http-signature';
import User, { IRemoteUser } from '../../models/user'; import User, { IRemoteUser } from '../../models/user';
import queue from '../../queue'; import queue from '../../queue';
import parseAcct from '../../misc/user/parse-acct'; import parseAcct from '../../user/parse-acct';
const app = express(); const app = express();
app.disable('x-powered-by'); app.disable('x-powered-by');

View File

@ -1,7 +1,7 @@
import * as express from 'express'; import * as express from 'express';
import context from '../../remote/activitypub/renderer/context'; import context from '../../remote/activitypub/renderer/context';
import render from '../../remote/activitypub/renderer/note'; 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 Post from '../../models/post';
import User from '../../models/user'; import User from '../../models/user';

View File

@ -1,4 +1,4 @@
import parseAcct from '../../misc/user/parse-acct'; import parseAcct from '../../user/parse-acct';
import User from '../../models/user'; import User from '../../models/user';
export default (redirect, respond) => async (req, res, next) => { export default (redirect, respond) => async (req, res, next) => {

View File

@ -3,10 +3,10 @@ import * as bcrypt from 'bcryptjs';
import User, { IUser, init as initUser, ILocalUser } from '../../../models/user'; import User, { IUser, init as initUser, ILocalUser } from '../../../models/user';
import getPostSummary from '../../../misc/get-post-summary'; import getPostSummary from '../../../get-post-summary';
import getUserSummary from '../../../misc/user/get-summary'; import getUserSummary from '../../../user/get-summary';
import parseAcct from '../../../misc/user/parse-acct'; import parseAcct from '../../../user/parse-acct';
import getNotificationSummary from '../../../misc/get-notification-summary'; import getNotificationSummary from '../../../get-notification-summary';
const hmm = [ const hmm = [
'', '',

View File

@ -7,9 +7,9 @@ import config from '../../../../conf';
import BotCore from '../core'; import BotCore from '../core';
import _redis from '../../../../db/redis'; import _redis from '../../../../db/redis';
import prominence = require('prominence'); import prominence = require('prominence');
import getAcct from '../../../../misc/user/get-acct'; import getAcct from '../../../../user/get-acct';
import parseAcct from '../../../../misc/user/parse-acct'; import parseAcct from '../../../../user/parse-acct';
import getPostSummary from '../../../../misc/get-post-summary'; import getPostSummary from '../../../../get-post-summary';
const redis = prominence(_redis); const redis = prominence(_redis);

View File

@ -1,9 +1,9 @@
import * as mongo from 'mongodb'; import * as mongo from 'mongodb';
import Message from '../../../models/messaging-message'; import Message from '../../../models/messaging-message';
import { IMessagingMessage as IMessage } from '../../../models/messaging-message'; import { IMessagingMessage as IMessage } from '../../../models/messaging-message';
import publishUserStream from '../../../common/event'; import publishUserStream from '../../../event';
import { publishMessagingStream } from '../../../common/event'; import { publishMessagingStream } from '../../../event';
import { publishMessagingIndexStream } from '../../../common/event'; import { publishMessagingIndexStream } from '../../../event';
/** /**
* Mark as read message(s) * Mark as read message(s)

View File

@ -1,6 +1,6 @@
import * as mongo from 'mongodb'; import * as mongo from 'mongodb';
import { default as Notification, INotification } from '../../../models/notification'; import { default as Notification, INotification } from '../../../models/notification';
import publishUserStream from '../../../common/event'; import publishUserStream from '../../../event';
/** /**
* Mark as read notification(s) * Mark as read notification(s)

View File

@ -3,7 +3,7 @@
*/ */
import $ from 'cafy'; import $ from 'cafy';
import { validateFileName, pack } from '../../../../../models/drive-file'; import { validateFileName, pack } from '../../../../../models/drive-file';
import create from '../../../../../common/drive/add-file'; import create from '../../../../../drive/add-file';
/** /**
* Create a file * Create a file

View File

@ -4,7 +4,7 @@
import $ from 'cafy'; import $ from 'cafy';
import DriveFolder from '../../../../../models/drive-folder'; import DriveFolder from '../../../../../models/drive-folder';
import DriveFile, { validateFileName, pack } from '../../../../../models/drive-file'; import DriveFile, { validateFileName, pack } from '../../../../../models/drive-file';
import { publishDriveStream } from '../../../../../common/event'; import { publishDriveStream } from '../../../../../event';
/** /**
* Update a file * Update a file

View File

@ -3,7 +3,7 @@
*/ */
import $ from 'cafy'; import $ from 'cafy';
import { pack } from '../../../../../models/drive-file'; 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 * Create a file from a URL

View File

@ -3,7 +3,7 @@
*/ */
import $ from 'cafy'; import $ from 'cafy';
import DriveFolder, { isValidFolderName, pack } from '../../../../../models/drive-folder'; import DriveFolder, { isValidFolderName, pack } from '../../../../../models/drive-folder';
import { publishDriveStream } from '../../../../../common/event'; import { publishDriveStream } from '../../../../../event';
/** /**
* Create drive folder * Create drive folder

View File

@ -3,7 +3,7 @@
*/ */
import $ from 'cafy'; import $ from 'cafy';
import DriveFolder, { isValidFolderName, pack } from '../../../../../models/drive-folder'; import DriveFolder, { isValidFolderName, pack } from '../../../../../models/drive-folder';
import { publishDriveStream } from '../../../../../common/event'; import { publishDriveStream } from '../../../../../event';
/** /**
* Update a folder * Update a folder

View File

@ -4,7 +4,7 @@
import $ from 'cafy'; import $ from 'cafy';
import User, { pack as packUser } from '../../../../models/user'; import User, { pack as packUser } from '../../../../models/user';
import Following from '../../../../models/following'; import Following from '../../../../models/following';
import event from '../../../../common/event'; import event from '../../../../event';
/** /**
* Unfollow a user * Unfollow a user

View File

@ -4,7 +4,7 @@
import $ from 'cafy'; import $ from 'cafy';
import * as bcrypt from 'bcryptjs'; import * as bcrypt from 'bcryptjs';
import User from '../../../../models/user'; import User from '../../../../models/user';
import event from '../../../../common/event'; import event from '../../../../event';
import generateUserToken from '../../common/generate-native-user-token'; import generateUserToken from '../../common/generate-native-user-token';
/** /**

View File

@ -3,7 +3,7 @@
*/ */
import $ from 'cafy'; import $ from 'cafy';
import User, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack } from '../../../../models/user'; import User, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack } from '../../../../models/user';
import event from '../../../../common/event'; import event from '../../../../event';
import config from '../../../../conf'; import config from '../../../../conf';
/** /**

View File

@ -3,7 +3,7 @@
*/ */
import $ from 'cafy'; import $ from 'cafy';
import User, { pack } from '../../../../models/user'; import User, { pack } from '../../../../models/user';
import event from '../../../../common/event'; import event from '../../../../event';
/** /**
* Update myself * Update myself

View File

@ -3,7 +3,7 @@
*/ */
import $ from 'cafy'; import $ from 'cafy';
import User from '../../../../models/user'; import User from '../../../../models/user';
import event from '../../../../common/event'; import event from '../../../../event';
module.exports = async (params, user) => new Promise(async (res, rej) => { module.exports = async (params, user) => new Promise(async (res, rej) => {
// Get 'home' parameter // Get 'home' parameter

View File

@ -3,7 +3,7 @@
*/ */
import $ from 'cafy'; import $ from 'cafy';
import User from '../../../../models/user'; import User from '../../../../models/user';
import event from '../../../../common/event'; import event from '../../../../event';
module.exports = async (params, user) => new Promise(async (res, rej) => { module.exports = async (params, user) => new Promise(async (res, rej) => {
// Get 'home' parameter // Get 'home' parameter

View File

@ -9,10 +9,10 @@ import User from '../../../../../models/user';
import Mute from '../../../../../models/mute'; import Mute from '../../../../../models/mute';
import DriveFile from '../../../../../models/drive-file'; import DriveFile from '../../../../../models/drive-file';
import { pack } from '../../../../../models/messaging-message'; import { pack } from '../../../../../models/messaging-message';
import publishUserStream from '../../../../../common/event'; import publishUserStream from '../../../../../event';
import { publishMessagingStream, publishMessagingIndexStream, pushSw } from '../../../../../common/event'; import { publishMessagingStream, publishMessagingIndexStream, pushSw } from '../../../../../event';
import html from '../../../../../common/text/html'; import html from '../../../../../text/html';
import parse from '../../../../../common/text/parse'; import parse from '../../../../../text/parse';
import config from '../../../../../conf'; import config from '../../../../../conf';
/** /**

View File

@ -2,7 +2,7 @@
* Module dependencies * Module dependencies
*/ */
import Notification from '../../../../models/notification'; import Notification from '../../../../models/notification';
import event from '../../../../common/event'; import event from '../../../../event';
/** /**
* Mark as read all notifications * Mark as read all notifications

View File

@ -1,6 +1,6 @@
import $ from 'cafy'; import $ from 'cafy';
import OthelloGame, { pack } from '../../../../../models/othello-game'; 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) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'gameId' parameter // Get 'gameId' parameter

View File

@ -2,8 +2,8 @@ import $ from 'cafy';
import Matching, { pack as packMatching } from '../../../../models/othello-matching'; import Matching, { pack as packMatching } from '../../../../models/othello-matching';
import OthelloGame, { pack as packGame } from '../../../../models/othello-game'; import OthelloGame, { pack as packGame } from '../../../../models/othello-game';
import User from '../../../../models/user'; import User from '../../../../models/user';
import publishUserStream, { publishOthelloStream } from '../../../../common/event'; import publishUserStream, { publishOthelloStream } from '../../../../event';
import { eighteight } from '../../../../misc/othello/maps'; import { eighteight } from '../../../../othello/maps';
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'userId' parameter // Get 'userId' parameter

View File

@ -3,8 +3,8 @@
*/ */
import $ from 'cafy'; import $ from 'cafy';
import deepEqual = require('deep-equal'); import deepEqual = require('deep-equal');
import html from '../../../../common/text/html'; import html from '../../../../text/html';
import parse from '../../../../common/text/parse'; import parse from '../../../../text/parse';
import Post, { IPost, isValidText, isValidCw } from '../../../../models/post'; import Post, { IPost, isValidText, isValidCw } from '../../../../models/post';
import User, { ILocalUser } from '../../../../models/user'; import User, { ILocalUser } from '../../../../models/user';
import Channel, { IChannel } from '../../../../models/channel'; import Channel, { IChannel } from '../../../../models/channel';
@ -15,10 +15,10 @@ import Watching from '../../../../models/post-watching';
import ChannelWatching from '../../../../models/channel-watching'; import ChannelWatching from '../../../../models/channel-watching';
import { pack } from '../../../../models/post'; import { pack } from '../../../../models/post';
import watch from '../../common/watch-post'; import watch from '../../common/watch-post';
import event, { pushSw, publishChannelStream } from '../../../../common/event'; import event, { pushSw, publishChannelStream } from '../../../../event';
import notify from '../../../../common/notify'; import notify from '../../../../notify';
import getAcct from '../../../../misc/user/get-acct'; import getAcct from '../../../../user/get-acct';
import parseAcct from '../../../../misc/user/parse-acct'; import parseAcct from '../../../../user/parse-acct';
import config from '../../../../conf'; import config from '../../../../conf';
/** /**

View File

@ -6,8 +6,8 @@ import Vote from '../../../../../models/poll-vote';
import Post from '../../../../../models/post'; import Post from '../../../../../models/post';
import Watching from '../../../../../models/post-watching'; import Watching from '../../../../../models/post-watching';
import watch from '../../../common/watch-post'; import watch from '../../../common/watch-post';
import { publishPostStream } from '../../../../../common/event'; import { publishPostStream } from '../../../../../event';
import notify from '../../../../../common/notify'; import notify from '../../../../../notify';
/** /**
* Vote poll of a post * Vote poll of a post

View File

@ -7,8 +7,8 @@ import Post, { pack as packPost } from '../../../../../models/post';
import { pack as packUser } from '../../../../../models/user'; import { pack as packUser } from '../../../../../models/user';
import Watching from '../../../../../models/post-watching'; import Watching from '../../../../../models/post-watching';
import watch from '../../../common/watch-post'; import watch from '../../../common/watch-post';
import { publishPostStream, pushSw } from '../../../../../common/event'; import { publishPostStream, pushSw } from '../../../../../event';
import notify from '../../../../../common/notify'; import notify from '../../../../../notify';
/** /**
* React to a post * React to a post

View File

@ -3,7 +3,7 @@ import * as debug from 'debug';
import limiterDB from '../../db/redis'; import limiterDB from '../../db/redis';
import { Endpoint } from './endpoints'; import { Endpoint } from './endpoints';
import { IAuthContext } from './authenticate'; import { IAuthContext } from './authenticate';
import getAcct from '../../misc/user/get-acct'; import getAcct from '../../user/get-acct';
const log = debug('misskey:limitter'); const log = debug('misskey:limitter');

View File

@ -3,7 +3,7 @@ import * as bcrypt from 'bcryptjs';
import * as speakeasy from 'speakeasy'; import * as speakeasy from 'speakeasy';
import User, { ILocalUser } from '../../../models/user'; import User, { ILocalUser } from '../../../models/user';
import Signin, { pack } from '../../../models/signin'; import Signin, { pack } from '../../../models/signin';
import event from '../../../common/event'; import event from '../../../event';
import signin from '../common/signin'; import signin from '../common/signin';
import config from '../../../conf'; import config from '../../../conf';

View File

@ -6,7 +6,7 @@ import * as uuid from 'uuid';
import autwh from 'autwh'; import autwh from 'autwh';
import redis from '../../../db/redis'; import redis from '../../../db/redis';
import User, { pack } from '../../../models/user'; import User, { pack } from '../../../models/user';
import event from '../../../common/event'; import event from '../../../event';
import config from '../../../conf'; import config from '../../../conf';
import signin from '../common/signin'; import signin from '../common/signin';

View File

@ -2,9 +2,9 @@ import * as websocket from 'websocket';
import * as redis from 'redis'; import * as redis from 'redis';
import * as CRC32 from 'crc-32'; import * as CRC32 from 'crc-32';
import OthelloGame, { pack } from '../../../models/othello-game'; import OthelloGame, { pack } from '../../../models/othello-game';
import { publishOthelloGameStream } from '../../../common/event'; import { publishOthelloGameStream } from '../../../event';
import Othello from '../../../misc/othello/core'; import Othello from '../../../othello/core';
import * as maps from '../../../misc/othello/maps'; import * as maps from '../../../othello/maps';
import { ParsedUrlQuery } from 'querystring'; import { ParsedUrlQuery } from 'querystring';
export default function(request: websocket.request, connection: websocket.connection, subscriber: redis.RedisClient, user?: any): void { export default function(request: websocket.request, connection: websocket.connection, subscriber: redis.RedisClient, user?: any): void {

View File

@ -2,7 +2,7 @@ import * as mongo from 'mongodb';
import * as websocket from 'websocket'; import * as websocket from 'websocket';
import * as redis from 'redis'; import * as redis from 'redis';
import Matching, { pack } from '../../../models/othello-matching'; 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 { export default function(request: websocket.request, connection: websocket.connection, subscriber: redis.RedisClient, user: any): void {
// Subscribe othello stream // Subscribe othello stream

View File

@ -1,5 +1,5 @@
import config from '../conf'; import config from '../conf';
import parseAcct from '../misc/user/parse-acct'; import parseAcct from '../user/parse-acct';
import User from '../models/user'; import User from '../models/user';
const express = require('express'); const express = require('express');

Some files were not shown because too many files have changed in this diff Show More