Merge branch 'develop' into feature/2024.9.0
# Conflicts: # locales/en-US.yml # locales/ja-JP.yml # packages/backend/src/core/NoteCreateService.ts # packages/backend/src/core/NoteDeleteService.ts # packages/backend/src/core/NoteEditService.ts # packages/frontend-shared/js/config.ts # packages/frontend/src/boot/common.ts # packages/frontend/src/pages/following-feed.vue # packages/misskey-js/src/autogen/endpoint.ts
This commit is contained in:
commit
8a34d8e9d2
52 changed files with 1073 additions and 268 deletions
7
packages/backend/src/misc/from-tuple.ts
Normal file
7
packages/backend/src/misc/from-tuple.ts
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
export function fromTuple<T>(value: T | [T]): T {
|
||||
if (Array.isArray(value)) {
|
||||
return value[0];
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
|
|
@ -23,6 +23,17 @@ type Quote =
|
|||
hasPoll: true
|
||||
});
|
||||
|
||||
type PureRenote =
|
||||
Renote & {
|
||||
text: null,
|
||||
cw: null,
|
||||
replyId: null,
|
||||
hasPoll: false,
|
||||
fileIds: {
|
||||
length: 0,
|
||||
},
|
||||
};
|
||||
|
||||
export function isRenote(note: MiNote): note is Renote {
|
||||
return note.renoteId != null;
|
||||
}
|
||||
|
|
@ -36,6 +47,10 @@ export function isQuote(note: Renote): note is Quote {
|
|||
note.fileIds.length > 0;
|
||||
}
|
||||
|
||||
export function isPureRenote(note: MiNote): note is PureRenote {
|
||||
return isRenote(note) && !isQuote(note);
|
||||
}
|
||||
|
||||
type PackedRenote =
|
||||
Packed<'Note'> & {
|
||||
renoteId: NonNullable<Packed<'Note'>['renoteId']>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue