Merge pull request #2423 from syuilo/develop

8.0.0
This commit is contained in:
syuilo 2018-08-23 15:42:14 +09:00 committed by GitHub
commit 91f1c3a10a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 260 additions and 79 deletions

144
cli/migration/8.0.0.js Normal file
View file

@ -0,0 +1,144 @@
const { default: Stats } = require('../../built/models/stats');
const { default: User } = require('../../built/models/user');
const { default: Note } = require('../../built/models/note');
const { default: DriveFile } = require('../../built/models/drive-file');
const now = new Date();
const y = now.getFullYear();
const m = now.getMonth();
const d = now.getDate();
const h = now.getHours();
const date = new Date(y, m, d, h);
async function main() {
await Stats.update({}, {
$set: {
span: 'day'
}
}, {
multi: true
});
const localUsersCount = await User.count({
host: null
});
const remoteUsersCount = await User.count({
host: { $ne: null }
});
const localNotesCount = await Note.count({
'_user.host': null
});
const remoteNotesCount = await Note.count({
'_user.host': { $ne: null }
});
const localDriveFilesCount = await DriveFile.count({
'metadata._user.host': null
});
const remoteDriveFilesCount = await DriveFile.count({
'metadata._user.host': { $ne: null }
});
const localDriveFilesSize = await DriveFile
.aggregate([{
$match: {
'metadata._user.host': null,
'metadata.deletedAt': { $exists: false }
}
}, {
$project: {
length: true
}
}, {
$group: {
_id: null,
usage: { $sum: '$length' }
}
}])
.then(aggregates => {
if (aggregates.length > 0) {
return aggregates[0].usage;
}
return 0;
});
const remoteDriveFilesSize = await DriveFile
.aggregate([{
$match: {
'metadata._user.host': { $ne: null },
'metadata.deletedAt': { $exists: false }
}
}, {
$project: {
length: true
}
}, {
$group: {
_id: null,
usage: { $sum: '$length' }
}
}])
.then(aggregates => {
if (aggregates.length > 0) {
return aggregates[0].usage;
}
return 0;
});
await Stats.insert({
date: date,
span: 'hour',
users: {
local: {
total: localUsersCount,
diff: 0
},
remote: {
total: remoteUsersCount,
diff: 0
}
},
notes: {
local: {
total: localNotesCount,
diff: 0,
diffs: {
normal: 0,
reply: 0,
renote: 0
}
},
remote: {
total: remoteNotesCount,
diff: 0,
diffs: {
normal: 0,
reply: 0,
renote: 0
}
}
},
drive: {
local: {
totalCount: localDriveFilesCount,
totalSize: localDriveFilesSize,
diffCount: 0,
diffSize: 0
},
remote: {
totalCount: remoteDriveFilesCount,
totalSize: remoteDriveFilesSize,
diffCount: 0,
diffSize: 0
}
}
});
console.log('done');
}
main();

View file

@ -1,7 +1,7 @@
{ {
"name": "misskey", "name": "misskey",
"author": "syuilo <i@syuilo.com>", "author": "syuilo <i@syuilo.com>",
"version": "7.4.1", "version": "8.0.0",
"clientVersion": "1.0.8790", "clientVersion": "1.0.8790",
"codename": "nighthike", "codename": "nighthike",
"main": "./built/index.js", "main": "./built/index.js",

View file

@ -10,6 +10,8 @@ export interface IStats {
date: Date; date: Date;
span: 'day' | 'hour';
/** /**
* *
*/ */

View file

@ -15,7 +15,7 @@ export default async (username: string, _host: string, option?: any): Promise<IU
const host = toUnicode(hostAscii); const host = toUnicode(hostAscii);
if (config.host == host) { if (config.host == host) {
return await User.findOne({ usernameLower }); return await User.findOne({ usernameLower, host: null });
} }
let user = await User.findOne({ usernameLower, host }, option); let user = await User.findOne({ usernameLower, host }, option);

View file

@ -14,6 +14,7 @@ export default (params: any) => new Promise(async (res, rej) => {
const d = now.getDate(); const d = now.getDate();
const stats = await Stats.find({ const stats = await Stats.find({
span: 'day',
date: { date: {
$gt: new Date(y - 1, m, d) $gt: new Date(y - 1, m, d)
} }
@ -44,6 +45,7 @@ export default (params: any) => new Promise(async (res, rej) => {
} else { } else {
chart.unshift({ chart.unshift({
date: day, date: day,
span: 'day',
users: { users: {
local: { local: {
total: 0, total: 0,

View file

@ -27,7 +27,11 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
return rej('followee not found'); return rej('followee not found');
} }
try {
await cancelFollowRequest(followee, user); await cancelFollowRequest(followee, user);
} catch (e) {
return rej(e);
}
// Send response // Send response
res(await pack(followee._id, user)); res(await pack(followee._id, user));

View file

@ -12,6 +12,15 @@ export default async function(followee: IUser, follower: IUser) {
deliver(follower as ILocalUser, content, followee.inbox); deliver(follower as ILocalUser, content, followee.inbox);
} }
const request = await FollowRequest.findOne({
followeeId: followee._id,
followerId: follower._id
});
if (request == null) {
throw 'request not found';
}
await FollowRequest.remove({ await FollowRequest.remove({
followeeId: followee._id, followeeId: followee._id,
followerId: follower._id followerId: follower._id

View file

@ -5,89 +5,46 @@ import { IDriveFile } from '../models/drive-file';
type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>; type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
async function getTodayStats(): Promise<IStats> { async function getCurrentStats(span: 'day' | 'hour'): Promise<IStats> {
const now = new Date(); const now = new Date();
const y = now.getFullYear(); const y = now.getFullYear();
const m = now.getMonth(); const m = now.getMonth();
const d = now.getDate(); const d = now.getDate();
const today = new Date(y, m, d); const h = now.getHours();
// 今日の統計 const current =
const todayStats = await Stats.findOne({ span == 'day' ? new Date(y, m, d) :
date: today span == 'hour' ? new Date(y, m, d, h) :
null;
// 現在(今日または今のHour)の統計
const currentStats = await Stats.findOne({
span: span,
date: current
}); });
// 日付が変わってから、初めてのチャート更新なら if (currentStats) {
if (todayStats == null) { return currentStats;
} else {
// 集計期間が変わってから、初めてのチャート更新なら
// 最も最近の統計を持ってくる // 最も最近の統計を持ってくる
// * 例えば集計期間が「日」である場合で考えると、
// * 昨日何もチャートを更新するような出来事がなかった場合は、 // * 昨日何もチャートを更新するような出来事がなかった場合は、
// 統計がそもそも作られずドキュメントが存在しないということがあり得るため、 // * 統計がそもそも作られずドキュメントが存在しないということがあり得るため、
// 「昨日の」と決め打ちせずに「もっとも最近の」とします // * 「昨日の」と決め打ちせずに「もっとも最近の」とします
const mostRecentStats = await Stats.findOne({}, { const mostRecentStats = await Stats.findOne({
span: span
}, {
sort: { sort: {
date: -1 date: -1
} }
}); });
// 統計が存在しなかったら if (mostRecentStats) {
// * Misskeyインスタンスを建てて初めてのチャート更新時など // 現在の統計を初期挿入
if (mostRecentStats == null) {
// 空の統計を作成
const data: Omit<IStats, '_id'> = { const data: Omit<IStats, '_id'> = {
date: today, span: span,
users: { date: current,
local: {
total: 0,
diff: 0
},
remote: {
total: 0,
diff: 0
}
},
notes: {
local: {
total: 0,
diff: 0,
diffs: {
normal: 0,
reply: 0,
renote: 0
}
},
remote: {
total: 0,
diff: 0,
diffs: {
normal: 0,
reply: 0,
renote: 0
}
}
},
drive: {
local: {
totalCount: 0,
totalSize: 0,
diffCount: 0,
diffSize: 0
},
remote: {
totalCount: 0,
totalSize: 0,
diffCount: 0,
diffSize: 0
}
}
};
const stats = await Stats.insert(data);
return stats;
} else {
// 今日の統計を初期挿入
const data: Omit<IStats, '_id'> = {
date: today,
users: { users: {
local: { local: {
total: mostRecentStats.users.local.total, total: mostRecentStats.users.local.total,
@ -137,20 +94,83 @@ async function getTodayStats(): Promise<IStats> {
const stats = await Stats.insert(data); const stats = await Stats.insert(data);
return stats; return stats;
}
} else { } else {
return todayStats; // 統計が存在しなかったら
// * Misskeyインスタンスを建てて初めてのチャート更新時など
// 空の統計を作成
const emptyStat: Omit<IStats, '_id'> = {
span: span,
date: current,
users: {
local: {
total: 0,
diff: 0
},
remote: {
total: 0,
diff: 0
}
},
notes: {
local: {
total: 0,
diff: 0,
diffs: {
normal: 0,
reply: 0,
renote: 0
}
},
remote: {
total: 0,
diff: 0,
diffs: {
normal: 0,
reply: 0,
renote: 0
}
}
},
drive: {
local: {
totalCount: 0,
totalSize: 0,
diffCount: 0,
diffSize: 0
},
remote: {
totalCount: 0,
totalSize: 0,
diffCount: 0,
diffSize: 0
}
}
};
const stats = await Stats.insert(emptyStat);
return stats;
}
} }
} }
async function update(inc: any) { function update(inc: any) {
const stats = await getTodayStats(); getCurrentStats('day').then(stats => {
Stats.findOneAndUpdate({
await Stats.findOneAndUpdate({
_id: stats._id _id: stats._id
}, { }, {
$inc: inc $inc: inc
}); });
});
getCurrentStats('hour').then(stats => {
Stats.findOneAndUpdate({
_id: stats._id
}, {
$inc: inc
});
});
} }
export async function updateUserStats(user: IUser, isAdditional: boolean) { export async function updateUserStats(user: IUser, isAdditional: boolean) {