8 files changed, 49 insertions, 38 deletions

@@ -1,9 +1,6 @@
-require 'microformats'
 require 'redcarpet/render_strip'
-require 'webmention'
 
 class BlogsController < ApplicationController
-  skip_before_action :verify_authenticity_token, only: [:webmention]
 
   def summary
     @blogs = Blog.where(published: true).order(published_at: :desc).paginate(page: params[:page], per_page: 10)
@@ -92,35 +89,4 @@ class BlogsController < ApplicationController
     end
   end
 
-  def webmention
-    @blog = Blog.find_by_slug(params[:slug])
-
-    raise ActiveRecord::RecordNotFound unless @blog
-    raise ActiveRecord::RecordNotFound unless @blog.published
-
-    permalink = url_for(@blog)
-
-    target = params[:target]
-    unless target == permalink
-      render json: { error: "Incorrect target for webmention endpoint (#{target} != #{permalink})." }
-      return
-    end
-
-    source = params[:source]
-    verification = Webmention.verify_webmention(source, target)
-    unless verification.verified?
-      render json: { error: "Webmention could not be verified." }
-      return
-    end
-
-    response = Webmention::Request.get(source)
-    parsed = Microformats.parse(response.body.to_s)
-
-    if parsed.entry.properties.to_hash.include?("like-of") and parsed.entry.like_of(:all).map(&:to_s).include? permalink
-      @blog.like!(parsed.entry.author.url, parsed.entry.author.name)
-    end
-
-    head :ok
-  end
-
 end
@@ -0,0 +1,36 @@
+require 'microformats'
+require 'webmention'
+
+class WebmentionsController < ApplicationController
+  skip_before_action :verify_authenticity_token
+
+  def create
+    source = params[:source]
+    target = params[:target]
+
+    verification = Webmention.verify_webmention(source, target)
+    unless verification.verified?
+      render json: { error: "Webmention could not be verified." }
+      return
+    end
+
+    target_parts = URI.parse(target).path.split("/").drop(1)
+
+    if target_parts[0] == "blog"
+      blog = Blog.find_by_slug(target_parts[1])
+
+      raise ActiveRecord::RecordNotFound unless blog
+      raise ActiveRecord::RecordNotFound unless blog.published
+
+      response = Webmention::Request.get(source)
+      parsed = Microformats.parse(response.body.to_s)
+
+      if parsed.entry.properties.to_hash.include?("like-of") and parsed.entry.like_of(:all).map(&:to_s).include? target
+        blog.like!(parsed.entry.author.url, parsed.entry.author.name)
+      end
+    end
+
+    head :ok
+  end
+  
+end
@@ -0,0 +1,2 @@
+module WebmentionsHelper
+end
@@ -1,5 +1,4 @@
 - title @blog.title
-- content_for :webmention_endpoint, webmention_blog_url(@blog)
 - unless @prev.nil?
   .back-post= link_to "← #{@prev.title}", @prev
 - unless @next.nil?
@@ -7,8 +7,7 @@
     = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
     = display_meta_tags og: { site_name: "Four Island" }
     %link{rel: "me", href: "mailto:fefferburbia+thoughts@gmail.com"}
-    - if content_for?(:webmention_endpoint)
-      %link{rel: "webmention", href: yield(:webmention_endpoint)}
+    %link{rel: "webmention", href: webmentions_url}
   %body#main-body
     - if flash[:alert]
       %div#flash.flash-alert= flash[:alert]
@@ -51,7 +51,6 @@ Rails.application.routes.draw do
     member do
       post 'upvote'
       post 'downvote'
-      post 'webmention'
 
       resources :comments, only: [:create]
     end
@@ -82,4 +81,6 @@ Rails.application.routes.draw do
       post 'downvote'
     end
   end
+
+  resources :webmentions, only: [:create]
 end
@@ -0,0 +1,8 @@
+require "test_helper"
+
+class WebmentionsControllerTest < ActionDispatch::IntegrationTest
+  test "should get create" do
+    get webmentions_create_url
+    assert_response :success
+  end
+end