Refactoring
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import es from '../../db/elasticsearch';
|
||||
import Note, { pack, INote, IChoice } from '../../models/note';
|
||||
import User, { isLocalUser, IUser, isRemoteUser, IRemoteUser, ILocalUser } from '../../models/user';
|
||||
import { publishMainStream, publishHomeTimelineStream, publishLocalTimelineStream, publishHybridTimelineStream, publishGlobalTimelineStream, publishUserListStream, publishHashtagStream } from '../../stream';
|
||||
import { publishMainStream, publishHomeTimelineStream, publishLocalTimelineStream, publishHybridTimelineStream, publishGlobalTimelineStream, publishUserListStream, publishHashtagStream } from '../stream';
|
||||
import Following from '../../models/following';
|
||||
import { deliver } from '../../queue';
|
||||
import renderNote from '../../remote/activitypub/renderer/note';
|
||||
@@ -9,7 +9,7 @@ import renderCreate from '../../remote/activitypub/renderer/create';
|
||||
import renderAnnounce from '../../remote/activitypub/renderer/announce';
|
||||
import { renderActivity } from '../../remote/activitypub/renderer';
|
||||
import DriveFile, { IDriveFile } from '../../models/drive-file';
|
||||
import notify from '../../notify';
|
||||
import notify from '../../services/create-notification';
|
||||
import NoteWatching from '../../models/note-watching';
|
||||
import watch from './watch';
|
||||
import Mute from '../../models/mute';
|
||||
|
@@ -1,6 +1,6 @@
|
||||
import Note, { INote } from '../../models/note';
|
||||
import { IUser, isLocalUser } from '../../models/user';
|
||||
import { publishNoteStream } from '../../stream';
|
||||
import { publishNoteStream } from '../stream';
|
||||
import renderDelete from '../../remote/activitypub/renderer/delete';
|
||||
import { renderActivity } from '../../remote/activitypub/renderer';
|
||||
import { deliver } from '../../queue';
|
||||
|
@@ -2,8 +2,8 @@ import Vote from '../../../models/poll-vote';
|
||||
import Note, { INote } from '../../../models/note';
|
||||
import Watching from '../../../models/note-watching';
|
||||
import watch from '../../../services/note/watch';
|
||||
import { publishNoteStream } from '../../../stream';
|
||||
import notify from '../../../notify';
|
||||
import { publishNoteStream } from '../../stream';
|
||||
import notify from '../../../services/create-notification';
|
||||
import { isLocalUser, IUser } from '../../../models/user';
|
||||
|
||||
export default (user: IUser, note: INote, choice: number) => new Promise(async (res, rej) => {
|
||||
|
@@ -1,8 +1,8 @@
|
||||
import { IUser, isLocalUser, isRemoteUser } from '../../../models/user';
|
||||
import Note, { INote } from '../../../models/note';
|
||||
import NoteReaction from '../../../models/note-reaction';
|
||||
import { publishNoteStream } from '../../../stream';
|
||||
import notify from '../../../notify';
|
||||
import { publishNoteStream } from '../../stream';
|
||||
import notify from '../../create-notification';
|
||||
import NoteWatching from '../../../models/note-watching';
|
||||
import watch from '../watch';
|
||||
import renderLike from '../../../remote/activitypub/renderer/like';
|
||||
|
@@ -1,7 +1,7 @@
|
||||
import { IUser, isLocalUser, isRemoteUser } from '../../../models/user';
|
||||
import Note, { INote } from '../../../models/note';
|
||||
import Reaction from '../../../models/note-reaction';
|
||||
import { publishNoteStream } from '../../../stream';
|
||||
import { publishNoteStream } from '../../stream';
|
||||
import renderLike from '../../../remote/activitypub/renderer/like';
|
||||
import renderUndo from '../../../remote/activitypub/renderer/undo';
|
||||
import { renderActivity } from '../../../remote/activitypub/renderer';
|
||||
|
@@ -1,6 +1,6 @@
|
||||
import * as mongo from 'mongodb';
|
||||
import isObjectId from '../../misc/is-objectid';
|
||||
import { publishMainStream } from '../../stream';
|
||||
import { publishMainStream } from '../stream';
|
||||
import User from '../../models/user';
|
||||
import NoteUnread from '../../models/note-unread';
|
||||
|
||||
|
@@ -2,7 +2,7 @@ import NoteUnread from '../../models/note-unread';
|
||||
import User, { IUser } from '../../models/user';
|
||||
import { INote } from '../../models/note';
|
||||
import Mute from '../../models/mute';
|
||||
import { publishMainStream } from '../../stream';
|
||||
import { publishMainStream } from '../stream';
|
||||
|
||||
export default async function(user: IUser, note: INote, isSpecified = false) {
|
||||
//#region ミュートしているなら無視
|
||||
|
Reference in New Issue
Block a user