5 files changed, 55 insertions, 4 deletions

@@ -1,9 +1,19 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
+  before_action :choose_random_song
 
   private
 
     def after_sign_out_path_for(resource)
       new_session_path(resource)
     end
+
+    def choose_random_song
+      ids = Scrobble.ids
+      if ids.empty?
+        @random_song = nil
+      else
+        @random_song = Scrobble.find(ids.sample)
+      end
+    end
 end
@@ -1,6 +1,7 @@
-require 'redcarpet/render_strip'
+
 
 class BlogsController < ApplicationController
+  include ApplicationHelper
 
   def summary
     @blogs = Blog.where(published: true).order(published_at: :desc).paginate(page: params[:page], per_page: 10)
@@ -27,12 +28,12 @@ class BlogsController < ApplicationController
     @prev = @blog.prev
     @next = @blog.next
 
-    body = Redcarpet::Markdown.new(Redcarpet::Render::StripDown).render(@blog.body)
+    body = stripped_markdown(@blog.body)
 
     set_meta_tags(og: {
       title: @blog.title,
       type: "article",
-      description: (body.length <= 300 ? body : body[0..299]),
+      description: body[0, 299],
       url: blog_url(@blog, host: "www.fourisland.com"),
       article: {
         published_time: @blog.published_at.iso8601,
@@ -5,6 +5,12 @@ class CommentsController < ApplicationController
     raise ActiveRecord::RecordNotFound unless @blog
     raise ActiveRecord::RecordNotFound unless @blog.published
 
+    unless verify_recaptcha
+      flash.alert = "Error posting comment."
+      render "blogs/show"
+      return
+    end
+
     @comment = @blog.comments.new(comment_params)
     @comment.request_ip = request.ip
     @comment.user_agent = request.user_agent
@@ -56,7 +62,8 @@ class CommentsController < ApplicationController
             CommentMailer.with(comment: @comment).reply_comment_email.deliver_later
           end
         else
-          CommentMailer.with(comment: @comment).new_pending_comment_email.deliver_later
+          # CommentMailer.with(comment: @comment).new_pending_comment_email.deliver_later
+          # I'm disabling pending comment emails, at least for now, because I am getting too many.
         end
       else
         flash.alert = "Error posting comment."
@@ -30,6 +30,20 @@ class QuotesController < ApplicationController
     end
   end
 
+  def search_form
+    @q = Quote.published.ransack
+  end
+
+  def search
+    @quotes = Quote.published.ransack(params[:q]).result(distinct: true).paginate(page: params[:page], per_page: 10)
+
+    respond_to do |format|
+      format.html { render :list }
+      format.json { render :json => @quotes }
+      format.xml { render :xml => @quotes }
+    end
+  end
+
   def random
     picked = Quote.where(state: :published).ids.sample
     redirect_to quote_url(picked)
@@ -1,7 +1,26 @@
 class StreamsController < ApplicationController
+  include ApplicationHelper
+
+  def index
+    @streams = Stream.order(latest_post_at: :desc).paginate(page: params[:page], per_page: 10)
+  end
 
   def show
     @stream = Stream.find_by_slug(params[:slug])
+    @updates = @stream.updates.paginate(page: params[:page], per_page: 10)
+
+    body = stripped_markdown(@stream.body)
+
+    set_meta_tags(og: {
+      title: @stream.title,
+      type: "article",
+      description: body[0, 299],
+      url: stream_url(@stream, host: "www.fourisland.com"),
+      article: {
+        published_time: @stream.created_at.iso8601,
+        modified_time: @stream.latest_post_at.iso8601
+      }
+    })
   end
 
 end