- <%= f.label :weblog_feed_url, "Weblog Feed URL:",
- :class => "required" %>
- <%= f.text_field :weblog_feed_url, :placeholder => "optional",
- :size => 40 %>
-
- For RSS/Atom feed aggregation; restrict to a technical feed if possible
-
-
-
-
<%= f.label :about, "About:", :class => "required" %>
<%= f.text_area :about, :size => "100x5", :style => "width: 600px;" %>
diff --git a/app/views/weblogs/index.html.erb b/app/views/weblogs/index.html.erb
deleted file mode 100644
index 5a1968d..0000000
--- a/app/views/weblogs/index.html.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-
-<% @weblogs.each do |weblog| %>
- -
-
-
- <%= weblog.sanitized_content %>
-
-
-<% end %>
-
-
-
diff --git a/config/routes.rb b/config/routes.rb
index 3f72ff3..195207b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,128 +1,117 @@
Lobsters::Application.routes.draw do
- constraints(:subdomain => "planet") do
- root :to => "weblogs#index",
- :subdomain => "planet",
- :as => "weblogs_root",
- :protocol => (Rails.env == "production" ? "https://" : "http://")
+ scope :format => "html" do
+ root :to => "home#index",
+ :protocol => (Rails.env == "production" ? "https://" : "http://"),
+ :as => "root"
- get "/page/:page" => "weblogs#index"
- end
+ get "/rss" => "home#index", :format => "rss"
+ get "/hottest" => "home#index", :format => "json"
- constraints do
- scope :format => "html" do
- root :to => "home#index",
- :protocol => (Rails.env == "production" ? "https://" : "http://"),
- :as => "root"
+ get "/page/:page" => "home#index"
- get "/rss" => "home#index", :format => "rss"
- get "/hottest" => "home#index", :format => "json"
+ get "/newest" => "home#newest", :format => /html|json|rss/
+ get "/newest/page/:page" => "home#newest"
+ get "/newest/:user" => "home#newest_by_user"
+ get "/newest/:user/page/:page" => "home#newest_by_user"
+ get "/recent" => "home#recent"
+ get "/recent/page/:page" => "home#recent"
+ get "/hidden" => "home#hidden"
+ get "/hidden/page/:page" => "home#hidden"
- get "/page/:page" => "home#index"
+ get "/upvoted(.format)" => "home#upvoted"
+ get "/upvoted/page/:page" => "home#upvoted"
- get "/newest" => "home#newest", :format => /html|json|rss/
- get "/newest/page/:page" => "home#newest"
- get "/newest/:user" => "home#newest_by_user"
- get "/newest/:user/page/:page" => "home#newest_by_user"
- get "/recent" => "home#recent"
- get "/recent/page/:page" => "home#recent"
- get "/hidden" => "home#hidden"
- get "/hidden/page/:page" => "home#hidden"
+ get "/top" => "home#top"
+ get "/top/page/:page" => "home#top"
+ get "/top/:length" => "home#top"
+ get "/top/:length/page/:page" => "home#top"
- get "/upvoted(.format)" => "home#upvoted"
- get "/upvoted/page/:page" => "home#upvoted"
+ get "/threads" => "comments#threads"
+ get "/threads/:user" => "comments#threads"
- get "/top" => "home#top"
- get "/top/page/:page" => "home#top"
- get "/top/:length" => "home#top"
- get "/top/:length/page/:page" => "home#top"
+ get "/login" => "login#index"
+ post "/login" => "login#login"
+ post "/logout" => "login#logout"
- get "/threads" => "comments#threads"
- get "/threads/:user" => "comments#threads"
+ get "/signup" => "signup#index"
+ post "/signup" => "signup#signup"
+ get "/signup/invite" => "signup#invite"
- get "/login" => "login#index"
- post "/login" => "login#login"
- post "/logout" => "login#logout"
+ get "/login/forgot_password" => "login#forgot_password",
+ :as => "forgot_password"
+ post "/login/reset_password" => "login#reset_password",
+ :as => "reset_password"
+ match "/login/set_new_password" => "login#set_new_password",
+ :as => "set_new_password", :via => [:get, :post]
- get "/signup" => "signup#index"
- post "/signup" => "signup#signup"
- get "/signup/invite" => "signup#invite"
+ get "/t/:tag" => "home#tagged", :as => "tag", :format => /html|rss/
+ get "/t/:tag/page/:page" => "home#tagged"
- get "/login/forgot_password" => "login#forgot_password",
- :as => "forgot_password"
- post "/login/reset_password" => "login#reset_password",
- :as => "reset_password"
- match "/login/set_new_password" => "login#set_new_password",
- :as => "set_new_password", :via => [:get, :post]
+ get "/search" => "search#index"
- get "/t/:tag" => "home#tagged", :as => "tag", :format => /html|rss/
- get "/t/:tag/page/:page" => "home#tagged"
+ resources :stories do
+ post "upvote"
+ post "downvote"
+ post "unvote"
+ post "undelete"
+ post "hide"
+ post "unhide"
+ end
+ post "/stories/fetch_url_title", :format => "json"
+ post "/stories/preview" => "stories#preview"
- get "/search" => "search#index"
-
- resources :stories do
+ resources :comments do
+ member do
+ get "reply"
post "upvote"
post "downvote"
post "unvote"
+
+ post "delete"
post "undelete"
- post "hide"
- post "unhide"
end
- post "/stories/fetch_url_title", :format => "json"
- post "/stories/preview" => "stories#preview"
-
- resources :comments do
- member do
- get "reply"
- post "upvote"
- post "downvote"
- post "unvote"
-
- post "delete"
- post "undelete"
- end
- end
- get "/comments/page/:page" => "comments#index"
-
- get "/messages/sent" => "messages#sent"
- post "/messages/batch_delete" => "messages#batch_delete",
- :as => "batch_delete_messages"
- resources :messages do
- post "keep_as_new"
- end
-
- get "/s/:id/:title/comments/:comment_short_id" => "stories#show"
- get "/s/:id/(:title)" => "stories#show", :format => /html|json/
-
- get "/u" => "users#tree"
- get "/u/:username" => "users#show", :as => "user"
-
- get "/settings" => "settings#index"
- post "/settings" => "settings#update"
- post "/settings/delete_account" => "settings#delete_account",
- :as => "delete_account"
-
- get "/filters" => "filters#index"
- post "/filters" => "filters#update"
-
- post "/invitations" => "invitations#create"
- get "/invitations" => "invitations#index"
- get "/invitations/request" => "invitations#build"
- post "/invitations/create_by_request" => "invitations#create_by_request",
- :as => "create_invitation_by_request"
- get "/invitations/confirm/:code" => "invitations#confirm_email"
- post "/invitations/send_for_request" => "invitations#send_for_request",
- :as => "send_invitation_for_request"
- get "/invitations/:invitation_code" => "signup#invited"
- post "/invitations/delete_request" => "invitations#delete_request",
- :as => "delete_invitation_request"
-
- get "/moderations" => "moderations#index"
- get "/moderations/page/:page" => "moderations#index"
-
- get "/privacy" => "home#privacy"
- get "/about" => "home#about"
-
- get "/resettraffic" => "home#resettraffic"
end
+ get "/comments/page/:page" => "comments#index"
+
+ get "/messages/sent" => "messages#sent"
+ post "/messages/batch_delete" => "messages#batch_delete",
+ :as => "batch_delete_messages"
+ resources :messages do
+ post "keep_as_new"
+ end
+
+ get "/s/:id/:title/comments/:comment_short_id" => "stories#show"
+ get "/s/:id/(:title)" => "stories#show", :format => /html|json/
+
+ get "/u" => "users#tree"
+ get "/u/:username" => "users#show", :as => "user"
+
+ get "/settings" => "settings#index"
+ post "/settings" => "settings#update"
+ post "/settings/delete_account" => "settings#delete_account",
+ :as => "delete_account"
+
+ get "/filters" => "filters#index"
+ post "/filters" => "filters#update"
+
+ post "/invitations" => "invitations#create"
+ get "/invitations" => "invitations#index"
+ get "/invitations/request" => "invitations#build"
+ post "/invitations/create_by_request" => "invitations#create_by_request",
+ :as => "create_invitation_by_request"
+ get "/invitations/confirm/:code" => "invitations#confirm_email"
+ post "/invitations/send_for_request" => "invitations#send_for_request",
+ :as => "send_invitation_for_request"
+ get "/invitations/:invitation_code" => "signup#invited"
+ post "/invitations/delete_request" => "invitations#delete_request",
+ :as => "delete_invitation_request"
+
+ get "/moderations" => "moderations#index"
+ get "/moderations/page/:page" => "moderations#index"
+
+ get "/privacy" => "home#privacy"
+ get "/about" => "home#about"
+
+ get "/resettraffic" => "home#resettraffic"
end
end
diff --git a/db/migrate/20140901013149_drop_weblogs.rb b/db/migrate/20140901013149_drop_weblogs.rb
new file mode 100644
index 0000000..01fdc04
--- /dev/null
+++ b/db/migrate/20140901013149_drop_weblogs.rb
@@ -0,0 +1,6 @@
+class DropWeblogs < ActiveRecord::Migration
+ def change
+ drop_table :weblogs
+ remove_column :users, :weblog_feed_url
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 54bccea..d6fa1ec 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20140825225915) do
+ActiveRecord::Schema.define(version: 20140901013149) do
create_table "comments", force: true do |t|
t.datetime "created_at", null: false
@@ -168,7 +168,6 @@ ActiveRecord::Schema.define(version: 20140825225915) do
t.string "banned_reason", limit: 200
t.datetime "deleted_at"
t.string "pushover_sound"
- t.string "weblog_feed_url"
end
add_index "users", ["mailing_list_mode"], name: "mailing_list_enabled", using: :btree
@@ -189,19 +188,4 @@ ActiveRecord::Schema.define(version: 20140825225915) do
add_index "votes", ["user_id", "comment_id"], name: "user_id_comment_id", using: :btree
add_index "votes", ["user_id", "story_id"], name: "user_id_story_id", using: :btree
- create_table "weblogs", force: true do |t|
- t.datetime "created_at"
- t.datetime "updated_at"
- t.integer "user_id"
- t.string "title", limit: 512
- t.string "url", limit: 512
- t.string "site_title", limit: 512
- t.string "site_url", limit: 512
- t.text "content", limit: 16777215
- t.text "tags"
- t.string "uuid", limit: 200
- end
-
- add_index "weblogs", ["user_id", "uuid"], name: "user_and_uuid", unique: true, using: :btree
-
end
diff --git a/script/update_weblogs b/script/update_weblogs
deleted file mode 100755
index b2e1cf8..0000000
--- a/script/update_weblogs
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env ruby
-
-ENV["RAILS_ENV"] ||= "production"
-
-APP_PATH = File.expand_path('../../config/application', __FILE__)
-require File.expand_path('../../config/boot', __FILE__)
-require APP_PATH
-Rails.application.require_environment!
-
-require "feed-normalizer"
-
-User.where("weblog_feed_url <> ''").each do |u|
- begin
- s = Sponge.new
- data = s.fetch(u.weblog_feed_url, :get, nil, nil, {
- "User-Agent" => "Mozilla/5.0 (compatible; Planet Lobsters; " <<
- "https://#{Rails.application.domain}/)" })
- if !data
- raise "no data returned"
- end
-
- feed = FeedNormalizer::FeedNormalizer.parse(data)
- if !feed
- raise "could not parse feed"
- end
- rescue => e
- puts "error updating user #{u.id} from #{u.weblog_feed_url}: #{e}"
- # TODO: send the user a private message on failure, probably limit to every
- # x tries/days
- next
- end
-
- feed.entries.each do |e|
- w = u.weblogs.where(:uuid => e.id).first
- if !w
- w = u.weblogs.build(:uuid => e.id)
- end
-
- # prevent entries with bogus or future times from dominating the front page
- if e.last_updated > Time.now
- puts "skipping future entry #{e.id} with time #{e.last_updated}"
- next
- end
-
- # TODO: compare these manually, AR seems to always mark them dirty even if
- # the content is the same
- w.created_at = e.last_updated
- w.url = e.url
- w.title = e.title
- w.content = e.content
- w.tags = e.categories
-
- w.site_url = feed.url
- w.site_title = feed.title
-
- w.save
- end
-end