oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

Fix #4484 (#4485)

Browse source 
* Fix #4484

* import order
This commit is contained in:
MeiMei 2019-03-12 23:38:11 +09:00 • committed by syuilo
parent c56b94ae96
commit 0a0aa0e2db
7 changed files with 35 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/queue/processors/db/export-blocking.ts
View file

@ -8,7 +8,7 @@ import addFile from '../../../services/drive/add-file';
import User from '../../../models/user';
import dateFormat = require('dateformat');
import Blocking from '../../../models/blocking';
import config from '../../../config';
import { getFullApAccount } from '../../../misc/convert-host';
const logger = queueLogger.createSubLogger('export-blocking');
@ -56,7 +56,7 @@ export async function exportBlocking(job: Bull.Job, done: any): Promise<void> {
for (const block of blockings) {
const u = await User.findOne({ _id: block.blockeeId }, { fields: { username: true, host: true } });
const content = u.host ? `${u.username}@${u.host}` : `${u.username}@${config.host}`;
const content = getFullApAccount(u.username, u.host);
await new Promise((res, rej) => {
stream.write(content + '\n', err => {
if (err) {