Abolish common and misc directories
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user