cybrespace
/
pinafore
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

fix incorrect toast notification for follow requests (#493)

This commit is contained in:
Nolan Lawson 2018-08-26 10:31:13 -07:00 committed by GitHub
parent 4a0cfb8d6e
commit 8959cdaeb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
routes/_actions/follow.js
View File

@ -2,28 +2,19 @@ import { store } from '../_store/store'
import { followAccount, unfollowAccount } from '../_api/follow' import { followAccount, unfollowAccount } from '../_api/follow'
import { toast } from '../_utils/toast' import { toast } from '../_utils/toast'
import { updateProfileAndRelationship } from './accounts' import { updateProfileAndRelationship } from './accounts'
import {
getRelationship as getRelationshipFromDatabase
} from '../_database/relationships'
export async function setAccountFollowed (accountId, follow, toastOnSuccess) { export async function setAccountFollowed (accountId, follow, toastOnSuccess) {
let { currentInstance, accessToken } = store.get() let { currentInstance, accessToken } = store.get()
try { try {
let account
if (follow) { if (follow) {
account = await followAccount(currentInstance, accessToken, accountId) await followAccount(currentInstance, accessToken, accountId)
} else { } else {
account = await unfollowAccount(currentInstance, accessToken, accountId) await unfollowAccount(currentInstance, accessToken, accountId)
} }
await updateProfileAndRelationship(accountId) await updateProfileAndRelationship(accountId)
let relationship = await getRelationshipFromDatabase(currentInstance, accountId)
if (toastOnSuccess) { if (toastOnSuccess) {
if (follow) { if (follow) {
if (account.locked && relationship.requested) {
toast.say('Requested to follow account')
} else {
toast.say('Followed account') toast.say('Followed account')
}
} else { } else {
toast.say('Unfollowed account') toast.say('Unfollowed account')
} }