Fix showing if user has voted for reaction on post

FriendsOfFlarum · Jan 13, 2024 · c1714d6 · c1714d6
1 parent ae3c82c
commit c1714d6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/js/src/@types/shims.d.ts b/js/src/@types/shims.d.ts
@@ -4,7 +4,7 @@ import Reaction from '../common/models/Reaction';
 declare module 'flarum/common/models/Post' {
   export default interface Post {
     reactionCounts(): Record<string, number>;
-    userReaction(): PostReaction | null;
+    userReaction(): number | undefined;
 
     canReact(): boolean;
     canDeletePostReactions(): boolean;

diff --git a/js/src/forum/components/PostReactAction.js b/js/src/forum/components/PostReactAction.js
@@ -77,9 +77,7 @@ export default class PostReactAction extends Component {
 
             return Button.component(
               {
-                className: `Button Button--flat Button-emoji-parent ${
-                  this.post.userReaction() && this.post.userReaction() == reaction.id() && 'active'
-                }`,
+                className: `Button Button--flat Button-emoji-parent ${this.post.userReaction() == reaction.id() && 'active'}`,
                 onclick: canReact ? this.react.bind(this, reaction) : '',
                 'data-reaction': reaction.identifier(),
                 disabled: !canReact,

diff --git a/js/src/forum/index.js b/js/src/forum/index.js
@@ -29,7 +29,7 @@ app.initializers.add('fof/reactions', () => {
   Post.prototype.canReact = Model.attribute('canReact');
   Post.prototype.canDeletePostReactions = Model.attribute('canDeletePostReactions');
   Post.prototype.reactionCounts = Model.attribute('reactionCounts');
-  Post.prototype.userReaction = Model.attribute('userReaction');
+  Post.prototype.userReaction = Model.attribute('userReactionIdentifier');
 
   Forum.prototype.reactions = Model.hasMany('reactions');