misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix rebase errors

Browse source
This commit is contained in:
Hazelnoot 2025-11-06 21:44:54 -05:00
parent 893b4ae260
commit c32ebdd4cd
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packages/backend/src/core/NoteEditService.ts
View file

@ -350,12 +350,12 @@ export class NoteEditService implements OnApplicationShutdown {
}
// Check for recursion
if (data.renote.id === oldnote.id) {
throw new IdentifiableError('33510210-8452-094c-6227-4a6c05d99f02', `edit failed for ${oldnote.id}: note cannot quote itself`);
if (data.renote.id === oldNote.id) {
throw new IdentifiableError('33510210-8452-094c-6227-4a6c05d99f02', `edit failed for ${oldNote.id}: note cannot quote itself`);
}
for (let nextRenoteId = data.renote.renoteId; nextRenoteId != null;) {
if (nextRenoteId === oldnote.id) {
throw new IdentifiableError('ea93b7c2-3d6c-4e10-946b-00d50b1a75cb', `edit failed for ${oldnote.id}: note cannot quote a quote of itself`);
if (nextRenoteId === oldNote.id) {
throw new IdentifiableError('ea93b7c2-3d6c-4e10-946b-00d50b1a75cb', `edit failed for ${oldNote.id}: note cannot quote a quote of itself`);
}
// TODO create something like threadId but for quotes, that way we don't need full recursion

2
packages/backend/src/server/api/endpoints/get-online-users-count.ts
View file

@ -75,6 +75,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
});
});
this.cache = cacheManagementService.createMemorySingleCache<{ count: number, countAcrossNetwork: number }>(1000 * 60); // 1 minute
this.cache = cacheManagementService.createMemorySingleCache<{ count: number, countAcrossNetwork: number }>('onlineUsers', { lifetime: 1000 * 60 }); // 1 minute
}
}