Fix commenting issues

Dave Newman · Dave Newman · commit 6738d8e3c73b · 2016-06-01T08:53:18.000-07:00
diff --git a/app/assets/javascripts/components/Chat.es6.jsx b/app/assets/javascripts/components/Chat.es6.jsx
@@ -5,7 +5,7 @@ class Chat extends React.Component {
     super(props)
     this.state = {
       moreComments: true,
-      comments: props.comments
+      comments: props.comments,
     }
   }
 
@@ -37,7 +37,7 @@ class Chat extends React.Component {
   }
 
   renderChatInput() {
-    if (this.props.signedIn) {
+    if (this.props.signedIn && this.pusher) {
       return (
         <form onSubmit={this.handleSubmit.bind(this)}>
           <input type="text" ref="body" defaultValue="" placeholder="Ask question" className="col-9 focus-no-border font-sm resize-chat-on-change m0" style={{"border": "none", "outline": "none"}} />
@@ -71,7 +71,7 @@ class Chat extends React.Component {
       method: 'POST',
       dataType: 'json',
       data: {
-        socket_id: pusher.connection.socket_id,
+        socket_id: this.pusher.connection.socket_id,
         comment: {
           article_id: this.props.stream.id,
           body: this.refs.body.value,
@@ -122,8 +122,13 @@ class Chat extends React.Component {
     })
   }
 
+  componentWillMount() {
+    this.pusher = new Pusher(this.props.pusherKey)
+    this.channel = this.pusher.subscribe(this.props.chatChannel)
+  }
+
   componentDidMount() {
-    window.channel.bind('new-comment', comment => {
+    this.channel.bind('new-comment', comment => {
       this.setState({comments: [...this.state.comments, comment]})
     })
 
@@ -177,8 +182,10 @@ class Chat extends React.Component {
 }
 
 Chat.propTypes = {
-  stream: React.PropTypes.object.isRequired,
+  chatChannel: React.PropTypes.string.isRequired,
   comments: React.PropTypes.array.isRequired,
-  signedIn: React.PropTypes.bool,
   isLive: React.PropTypes.bool,
+  pusherKey: React.PropTypes.string.isRequired,
+  signedIn: React.PropTypes.bool,
+  stream: React.PropTypes.object.isRequired,
 }
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
@@ -2,9 +2,12 @@ class CommentsController < ApplicationController
   before_action :require_login, only: [:create, :destroy]
 
   def index
-    return head(:forbidden) unless admin?
     respond_to do |format|
-      format.html { @comments = Comment.order(created_at: :desc).page(params[:page]) }
+      format.html {
+        # TODO: do we need this check?
+        return head(:forbidden) unless admin?
+        @comments = Comment.order(created_at: :desc).page(params[:page])
+      }
       format.json {
         @comments = Comment.
           where(article_id: params[:article_id]).
diff --git a/app/views/streams/_chat.html.erb b/app/views/streams/_chat.html.erb
@@ -1,6 +1,2 @@
 <script src="https://js.pusher.com/2.2/pusher.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/marked/0.3.5/marked.min.js"></script>
-<script>
-window.pusher = new Pusher('<%= Pusher.key %>');
-window.channel = pusher.subscribe('<%= @stream.dom_id %>');
-</script>
diff --git a/app/views/streams/show.json.jbuilder b/app/views/streams/show.json.jbuilder
@@ -3,6 +3,8 @@ if current_user
   json.authorUsername current_user.username
 end
 json.signedIn !!current_user
+json.pusherKey ENV['PUSHER_KEY']
+json.chatChannel @stream.dom_id
 
 json.stream do
   json.extract! @stream, :id
