Add missing user null checks, Fixes #26 (beta 14)

FriendsOfFlarum · Nov 24, 2020 · 8bcd271 · 8bcd271
1 parent 868a35b
commit 8bcd271
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/js/dist/forum.js b/js/dist/forum.js
diff --git a/js/dist/forum.js.map b/js/dist/forum.js.map
diff --git a/js/src/forum/addDiscussionComposerItem.js b/js/src/forum/addDiscussionComposerItem.js
@@ -13,7 +13,7 @@ export default () => {
 
  // Add button to DiscussionComposer header
  extend(DiscussionComposer.prototype, 'headerItems', function (items) {
- if (app.session.user.canStartPolls()) {
+ if (app.session.user && app.session.user.canStartPolls()) {
  items.add(
  'polls',
  <a className="DiscussionComposer-poll" onclick={this.addPoll.bind(this)}>

diff --git a/js/src/forum/addDiscussionControls.js b/js/src/forum/addDiscussionControls.js
@@ -10,7 +10,7 @@ export default () => {
  const poll = discussion.poll();
  const user = app.session.user;
 
- if (!(poll && ((user && user.canEditPolls()) || (post.user().canSelfEditPolls() && post.user().id() === user.id())) && post.number() === 1)) {
+ if (!(poll && ((user && user.canEditPolls()) || (post.user() && post.user().canSelfEditPolls() && post.user().id() === user.id())) && post.number() === 1)) {
  return;
  }
 

diff --git a/js/src/forum/addPollToDiscussion.js b/js/src/forum/addPollToDiscussion.js
@@ -24,7 +24,7 @@ export default () => {
  channels.main.bind('newPollVote', (data) => {
  var userId = parseInt(data['user_id']);
 
- if (userId == app.session.user.id()) return;
+ if (app.session.user && userId == app.session.user.id()) return;
 
  let poll = app.store.getById('polls', this.attrs.post.discussion().poll().id());
 
@@ -41,7 +41,7 @@ export default () => {
  let newVotes = poll.votes();
 
  newVotes.some((vote, i) => {
- if (parseInt(vote.user().id()) === userId) {
+ if (parseInt(vote.user() && vote.user().id()) === userId) {
  newVotes.splice(i, 1);
  }
  });