therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into develop

Browse source
This commit is contained in:
sadposter 2021-12-30 21:09:22 +00:00
commit dfb376cbd4
26 changed files with 4 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/follow_button/follow_button.js
View file

@ -14,7 +14,7 @@ export default {
if (this.inProgress || this.relationship.following) {
return this.$t('user_card.follow_unfollow')
} else if (this.relationship.requested) {
return this.$t('user_card.follow_again')
return this.$t('user_card.follow_cancel')
} else {
return this.$t('user_card.follow')
}
@ -33,7 +33,7 @@ export default {
},
methods: {
onClick () {
this.relationship.following ? this.unfollow() : this.follow()
this.relationship.following || this.relationship.requested ? this.unfollow() : this.follow()
},
follow () {
this.inProgress = true