natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

take back button after quote button if combined

This commit is contained in:
thatonecalculator 2022-12-01 23:37:25 -08:00 committed by Gitea
parent 3ba740bcd1
commit e08326abab
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
packages/client/src/components/MkRenoteButton.vue
View File

@ -55,6 +55,15 @@ useTooltip(buttonRef, async (showing) => {
const renote = async (viaKeyboard = false, ev?: MouseEvent) => { const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
pleaseLogin(); pleaseLogin();
const renotes = await os.api('notes/renotes', {
noteId: props.note.id,
limit: 11,
});
const users = renotes.map(x => x.user.id);
const hasRenotedBefore = users.includes($i.id);
let buttonActions = [{ let buttonActions = [{
text: i18n.ts.renote, text: i18n.ts.renote,
icon: 'ph-repeat-bold ph-lg', icon: 'ph-repeat-bold ph-lg',
@ -73,13 +82,19 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
} }
}, },
}]; }];
const renotes = await os.api('notes/renotes', {
noteId: props.note.id,
limit: 11,
});
const users = renotes.map(x => x.user.id); if (!defaultStore.state.seperateRenoteQuote) {
const hasRenotedBefore = users.includes($i.id); buttonActions.push({
text: i18n.ts.quote,
icon: 'ph-quotes-bold ph-lg',
danger: false,
action: () => {
os.post({
renote: props.note,
});
},
});
}
if (hasRenotedBefore) { if (hasRenotedBefore) {
buttonActions.push({ buttonActions.push({
@ -93,18 +108,6 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
}, },
}); });
} }
if (!defaultStore.state.seperateRenoteQuote) {
buttonActions.push({
text: i18n.ts.quote,
icon: 'ph-quotes-bold ph-lg',
danger: false,
action: () => {
os.post({
renote: props.note,
});
},
});
}
os.popupMenu(buttonActions, buttonRef.value, { viaKeyboard }); os.popupMenu(buttonActions, buttonRef.value, { viaKeyboard });
}; };
</script> </script>