Skip to content

Commit

Permalink
Merge branch 'misskey-dev:develop' into hanami
Browse files Browse the repository at this point in the history
  • Loading branch information
kakkokari-gtyih authored Aug 12, 2024
2 parents f02267f + 41936c1 commit e53d4bf
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion packages/backend/src/core/NoteDeleteService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export class NoteDeleteService {
this.deliverToConcerned(user, note, content);
}

// also deliever delete activity to cascaded notes
// also deliver delete activity to cascaded notes
const federatedLocalCascadingNotes = (cascadingNotes).filter(note => !note.localOnly && note.userHost == null); // filter out local-only notes
for (const cascadingNote of federatedLocalCascadingNotes) {
if (!cascadingNote.user) continue;
Expand Down
4 changes: 2 additions & 2 deletions packages/misskey-js/test-d/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ describe('API', () => {
expectType<Misskey.entities.MetaResponse>(res);
});

test('conditional respose type (meta)', async () => {
test('conditional response type (meta)', async () => {
const cli = new Misskey.api.APIClient({
origin: 'https://misskey.test',
credential: 'TOKEN'
Expand All @@ -30,7 +30,7 @@ describe('API', () => {
expectType<Misskey.entities.MetaResponse>(res4);
});

test('conditional respose type (users/show)', async () => {
test('conditional response type (users/show)', async () => {
const cli = new Misskey.api.APIClient({
origin: 'https://misskey.test',
credential: 'TOKEN'
Expand Down

0 comments on commit e53d4bf

Please sign in to comment.