diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-06-07 17:38:53 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-06-07 17:38:53 +0000 |
| commit | 88f95e30e1f5528bcc97a6e26bc20469e0d896d1 (patch) | |
| tree | e0119c465317d82ffc653d2a5948618d8fff5e46 /src/components | |
| parent | e33734b4747c8484530644d759759d53266f9b0e (diff) | |
| parent | 631c2532aafdfcbdb19ea3d48c9ce143ce7ef376 (diff) | |
Merge branch 'fix/profile-mentions' into 'develop'
Fix profile mentions causing a 422 error
See merge request pleroma/pleroma-fe!1919
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/post_status_form/post_status_form.js | 5 | ||||
| -rw-r--r-- | src/components/user_card/user_card.js | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 5564b118..563dfb96 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -87,7 +87,8 @@ const PostStatusForm = { 'fileLimit', 'submitOnEnter', 'emojiPickerPlacement', - 'optimisticPosting' + 'optimisticPosting', + 'profileMention' ], emits: [ 'posted', @@ -125,7 +126,7 @@ const PostStatusForm = { const { scopeCopy } = this.$store.getters.mergedConfig - if (this.replyTo) { + if (this.replyTo || this.profileMention) { const currentUser = this.$store.state.users.currentUser statusText = buildMentionsString({ user: this.repliedUser, attentions: this.attentions }, currentUser) } diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js index e17bf8eb..b1fe2e8f 100644 --- a/src/components/user_card/user_card.js +++ b/src/components/user_card/user_card.js @@ -225,7 +225,7 @@ export default { this.$store.dispatch('setCurrentMedia', attachment) }, mentionUser () { - this.$store.dispatch('openPostStatusModal', { replyTo: true, repliedUser: this.user }) + this.$store.dispatch('openPostStatusModal', { profileMention: true, repliedUser: this.user }) }, onAvatarClickHandler (e) { if (this.onAvatarClick) { |