natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'just using merge bc easier' (#9185) from recieve_moveto into account_migration 

Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9185
This commit is contained in:
Cleo 2022-12-06 16:56:12 +00:00
parent 283fedd8ca 8ff823eca6
commit 170957ef05
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/backend/src/models/entities/user.ts
View File

@ -69,7 +69,7 @@ export class User {
public followingCount: number; public followingCount: number;
@Column('varchar', { @Column('varchar', {
length: 512, nullable: true, nullable: true,
comment: 'The URI of the new account of the User', comment: 'The URI of the new account of the User',
}) })
public movedToUri: string | null; public movedToUri: string | null;

4
packages/backend/src/remote/resolve-user.ts
View File

@ -49,9 +49,9 @@ export async function resolveUser(username: string, host: string | null): Promis
return await createPerson(self.href); return await createPerson(self.href);
} }
// ユーザー情報が古い場合は、WebFilgerからやりなおして返す // If user information is out of date, return it by starting over from WebFilger
if (user.lastFetchedAt == null || Date.now() - user.lastFetchedAt.getTime() > 1000 * 60 * 60 * 24) { if (user.lastFetchedAt == null || Date.now() - user.lastFetchedAt.getTime() > 1000 * 60 * 60 * 24) {
// 繋がらないインスタンスに何回も試行するのを防ぐ, 後続の同様処理の連続試行を防ぐ ため 試行前にも更新する // Prevent multiple attempts to connect to unconnected instances, update before each attempt to prevent subsequent similar attempts
await Users.update(user.id, { await Users.update(user.id, {
lastFetchedAt: new Date(), lastFetchedAt: new Date(),
}); });