zio
/
elk
2
0
Fork 0
Code Packages Releases 2 Activity

fix: checkLogin in StatusCard (#270)

zio/stable
Chris 2022-12-02 10:18:57 +08:00 committed by GitHub
parent c4cf3fb371
commit 18d5fd4804
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/status/StatusActionButton.vue
View File

@ -29,6 +29,8 @@ useCommand({
icon: () => props.icon,
onActivate() {
if (!checkLogin())
return
const clickEvent = new MouseEvent('click', {
view: window,
bubbles: true,

2
components/status/StatusActions.vue
View File

@ -18,6 +18,8 @@ const {
} = $(useStatusActions(props))
const reply = () => {
if (!checkLogin())
return
if (details) {
// TODO focus to editor
}

15
composables/status.ts
View File

@ -25,7 +25,10 @@ export function useStatusActions(props: StatusActionsProps) {
translation: false,
})
async function toggleStatusAction(action: Action, newStatus: Promise<Status>, countField?: CountField) {
async function toggleStatusAction(action: Action, newStatus: () => Promise<Status>, countField?: CountField) {
// check login
if (!checkLogin())
return
// Optimistic update
status[action] = !status[action]
if (countField)
@ -33,7 +36,7 @@ export function useStatusActions(props: StatusActionsProps) {
try {
isLoading[action] = true
Object.assign(status, await newStatus)
Object.assign(status, await newStatus())
}
finally {
isLoading[action] = false
@ -41,7 +44,7 @@ export function useStatusActions(props: StatusActionsProps) {
}
const toggleReblog = () => toggleStatusAction(
'reblogged',
useMasto().statuses[status.reblogged ? 'unreblog' : 'reblog'](status.id).then((res) => {
() => useMasto().statuses[status.reblogged ? 'unreblog' : 'reblog'](status.id).then((res) => {
if (status.reblogged)
// returns the original status
return res.reblog!
@ -52,18 +55,18 @@ export function useStatusActions(props: StatusActionsProps) {
const toggleFavourite = () => toggleStatusAction(
'favourited',
useMasto().statuses[status.favourited ? 'unfavourite' : 'favourite'](status.id),
() => useMasto().statuses[status.favourited ? 'unfavourite' : 'favourite'](status.id),
'favouritesCount',
)
const toggleBookmark = () => toggleStatusAction(
'bookmarked',
useMasto().statuses[status.bookmarked ? 'unbookmark' : 'bookmark'](status.id),
() => useMasto().statuses[status.bookmarked ? 'unbookmark' : 'bookmark'](status.id),
)
const togglePin = async () => toggleStatusAction(
'pinned',
useMasto().statuses[status.pinned ? 'unpin' : 'pin'](status.id),
() => useMasto().statuses[status.pinned ? 'unpin' : 'pin'](status.id),
)
return {

8
composables/users.ts
View File

@ -96,3 +96,11 @@ export async function signout() {
await loginTo(currentUser.value)
}
export function checkLogin() {
if (!currentUser.value) {
openSigninDialog()
return false
}
return true
}