mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-08 22:23:08 +02:00
merge: Reactions not working on child notes in detailed view (!438)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/438 Approved-by: Amelia Yukii <amelia.yukii@shourai.de> Approved-by: dakkar <dakkar@thenautilus.net>
This commit is contained in:
commit
c2e02a4c61
2 changed files with 4 additions and 4 deletions
|
@ -141,7 +141,7 @@ const replies = ref<Misskey.entities.Note[]>([]);
|
||||||
const isRenote = (
|
const isRenote = (
|
||||||
props.note.renote != null &&
|
props.note.renote != null &&
|
||||||
props.note.text == null &&
|
props.note.text == null &&
|
||||||
props.note.fileIds.length === 0 &&
|
props.note.fileIds && props.note.fileIds.length === 0 &&
|
||||||
props.note.poll == null
|
props.note.poll == null
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -211,7 +211,7 @@ function react(viaKeyboard = false): void {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
blur();
|
blur();
|
||||||
reactionPicker.show(reactButton.value, reaction => {
|
reactionPicker.show(reactButton.value ?? null, props.note, reaction => {
|
||||||
misskeyApi('notes/reactions/create', {
|
misskeyApi('notes/reactions/create', {
|
||||||
noteId: props.note.id,
|
noteId: props.note.id,
|
||||||
reaction: reaction,
|
reaction: reaction,
|
||||||
|
|
|
@ -155,7 +155,7 @@ const replies = ref<Misskey.entities.Note[]>([]);
|
||||||
const isRenote = (
|
const isRenote = (
|
||||||
props.note.renote != null &&
|
props.note.renote != null &&
|
||||||
props.note.text == null &&
|
props.note.text == null &&
|
||||||
props.note.fileIds.length === 0 &&
|
props.note.fileIds && props.note.fileIds.length === 0 &&
|
||||||
props.note.poll == null
|
props.note.poll == null
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -225,7 +225,7 @@ function react(viaKeyboard = false): void {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
blur();
|
blur();
|
||||||
reactionPicker.show(reactButton.value, reaction => {
|
reactionPicker.show(reactButton.value ?? null, props.note, reaction => {
|
||||||
misskeyApi('notes/reactions/create', {
|
misskeyApi('notes/reactions/create', {
|
||||||
noteId: props.note.id,
|
noteId: props.note.id,
|
||||||
reaction: reaction,
|
reaction: reaction,
|
||||||
|
|
Loading…
Reference in a new issue