Disable chat on inactive streams

Dave Newman · Dave Newman · commit fc15262f6124 · 2016-06-07T19:41:41.000-07:00
diff --git a/app/assets/javascripts/components/Chat.es6.jsx b/app/assets/javascripts/components/Chat.es6.jsx
@@ -37,7 +37,7 @@ class Chat extends React.Component {
   }
 
   renderChatInput() {
-    if (this.props.signedIn && this.pusher) {
+    if (this.props.active && 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"}} />
@@ -186,6 +186,6 @@ Chat.propTypes = {
   comments: React.PropTypes.array.isRequired,
   isLive: React.PropTypes.bool,
   pusherKey: React.PropTypes.string.isRequired,
-  signedIn: React.PropTypes.bool,
+  active: React.PropTypes.bool,
   stream: React.PropTypes.object.isRequired,
 }
diff --git a/app/controllers/streams_controller.rb b/app/controllers/streams_controller.rb
@@ -32,7 +32,7 @@ def update
   def show
     if params[:username]
       @user = User.find_by!(username: params[:username])
-      if @stream = @user.streams.order(created_at: :desc).first!
+      if @stream = @user.active_stream
         @stream.broadcasting = !!cached_stats
       end
     else
diff --git a/app/models/stream.rb b/app/models/stream.rb
@@ -42,6 +42,10 @@ def archived?
     !!archived_at
   end
 
+  def active
+    published? && !archived?
+  end
+
   def preview_image_url
     "https://api.quickstream.io/coderwall/streams/#{user.username}.png?size=400x"
   end
diff --git a/app/views/streams/show.json.jbuilder b/app/views/streams/show.json.jbuilder
@@ -2,12 +2,11 @@ if current_user
   json.authorUrl user_path(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
+  json.extract! @stream, :id, :active
 end
 
 json.comments @comments, partial: 'comments/comment', as: :comment
