Resolve conflicts

This commit is contained in:
syuilo 2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions

View file

@ -16,7 +16,7 @@ export class HomeStream extends Stream {
// 最終利用日時を更新するため定期的にaliveメッセージを送信
setInterval(() => {
this.send({ type: 'alive' });
me.account.last_used_at = new Date();
me.account.lastUsedAt = new Date();
}, 1000 * 60);
// 自分の情報が更新されたとき