Terncode/pixel.horse
1
0
Fork 0
mirror of https://github.com/Terncode/pixel.horse.git synced 2026-09-25 22:25:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Angular 9

Browse Source
This commit is contained in:
Terncode
2026-03-22 08:43:45 +01:00
parent 3addbc1a4e
commit 3045419fe8
7 changed files with 7281 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ts/server/api/merge.ts
+4 -3
View File
@@ -119,11 +119,12 @@ async function merge(
const merges = mergeLists(account.merges, merge.merges, 20);
const state = mergeStates(account.state, merge.state);
const alert = account.alert || merge.alert;
merges.push({ id: withId, name: merge.name, date: new Date(), reason, data });
merges.push({ id: withId, name: merge.name, date: new Date(), reason, data } as any);
const update: Partial<AccountBase<string>> = {
origins, ignores, emails, note, lastVisit, ban, shadow, mute, flags, counters, patreon, supporter, merges,
createdAt, supporterLog, supporterTotal, banLog, state, alert, birthdate,
origins, ignores, emails, note, lastVisit, ban, shadow, mute, flags,
counters, patreon, supporter, merges: merges as any, createdAt, supporterLog: supporterLog as any,
supporterTotal, banLog: banLog as any, state, alert, birthdate,
};
await Promise.all([