heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Fix #4556 (#4558)

Browse source
This commit is contained in:
MeiMei 2019-04-06 00:41:08 +09:00 committed by syuilo
parent 59dc929431
commit 63b1689155
1 changed files with 30 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/queue/processors/db/import-following.ts
View file

@ -28,29 +28,41 @@ export async function importFollowing(job: Bull.Job, done: any): Promise<void> {
const csv = await downloadTextFile(url);
let linenum = 0;
for (const line of csv.trim().split('\n')) {
const { username, host } = parseAcct(line.trim());
linenum++;
let target = isSelfHost(host) ? await User.findOne({
host: null,
usernameLower: username.toLowerCase()
}) : await User.findOne({
host: toDbHost(host),
usernameLower: username.toLowerCase()
});
try {
const { username, host } = parseAcct(line.trim());
if (host == null && target == null) continue;
let target = isSelfHost(host) ? await User.findOne({
host: null,
usernameLower: username.toLowerCase()
}) : await User.findOne({
host: toDbHost(host),
usernameLower: username.toLowerCase()
});
if (target == null) {
target = await resolveUser(username, host);
if (host == null && target == null) continue;
if (target == null) {
target = await resolveUser(username, host);
}
if (target == null) {
throw `cannot resolve user: @${username}@${host}`;
}
// skip myself
if (target._id.equals(job.data.user._id)) continue;
logger.info(`Follow[${linenum}] ${target._id} ...`);
follow(user, target);
} catch (e) {
logger.warn(`Error in line:${linenum} ${e}`);
}
// skip myself
if (target._id.equals(job.data.user._id)) continue;
logger.info(`Follow ${target._id} ...`);
follow(user, target);
}
logger.succ('Imported');