7 files changed, 18 insertions, 7 deletions
diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc
index 90d7ee5..e08912f 100644
--- a/config/credentials.yml.enc
+++ b/config/credentials.yml.enc

@@ -1 +1 @@
-KrLA+ftWWLuC9JQBmExf5RXFOqp9q+CZCY6DJ8d0sgVUQXxcDToVqntxRRsqrTHvJ48xmRUgA4OmXUI1ZE3JtJQOuRmQHJf3bMtSlXDOzQTgNeIyzH3++Kcss3dIeM2+gnT8wxE2y6Tj2+KyB4tJGMeX1elSFK41rGz4zQzYVva3MVNKUmD1wV9p28sxtUSkDbiFxa2tDLGddor3Nqf7n4nuBLxpU4G1b7lhsAAQ4MYALvll0q3Uk54vEqyoiWEDC0fzqi1eWH/MQjcY6h6tXKEgElrXekx8N3agScXS50n2OzGx2ZbW99AwD0DxY6v1PtlAuW2OwEPFPvYaTu5cfsfaAJ5NKEMN4ahkHAerZpuJuoYgPOmnoM+mUZVPkaUWTRFkPBFRomrXtZ6e6OTAi/6Tnq9r/PAgpK9xeK0t8B2g0EpY/1FGvoByC0GDrzF2iJZg79y7B5xqhP9APrkTSJLCiNB3IdWwc2n45U6lPqt8ew1s9uxHQ5M9olBOkXnTDsj2--XBeKpE20qGij/dTL--9IG+AQxUdaR/ZcaUQ/cRvQ==
-\ No newline at end of file
+MTHDW1ZOa9otC2lb9iG3bKlhzM8WgEoJddmcsv22b7TEv+ZxlnjBvql1MGJjfo+tNl9dT4gqUOH41Q2WfRhwIokibD6cLMKl8z3VPLHdARR3HW4OzEJoLYXYB5ycLtSFmL3jq/TkMBkctRvPo7jeGGBwtEHvh1tBx6cGr/fEvzWMKYMUPiugaMN3OPExZ5VaD1sCHTMm7erwP06+8KTABwGfF6quthHctj/39RusmAWaObVsUwm70nqij+/qekJEZS3xYEuCDZlKqQvwC7Z+qJlmO8vj8CYNFq80bD9MiuEL0kiTVp22ZyMj2TY6YXy2jabkVx5c7FVytx/+kbaNdGtLYqvvuqDXodcai18OWUhR3r+tzPqcinggWmzZeJ0O54dE7Srpe3wGFH3xmgXHRa1jczmCDwlGRTqmjX7E6CBiP7u5NAKLeALvADWGocJwUi0r8r6E3/a8rpsaL97JCjL1GNCDlRSAapqHafzszDWN31yG5mLc9OUoE2RJjU7bgohrhoAPyHpetRxO7fBpZ0quNAh1awiTXVTcNUlDT+UPkQi1mvQo47G3CM9OG8hlgKtfkMMKsl9D92k/g7zIyJzLsPKqYnxHj+qcnU0939xJ0x4MnUPam1oq7OF2FtBgU/OCDxMuM//qSI2Q4+RRKRHs/NLdADxRgO3WJZ+oe2r9YBfTYTlbdOEKmCxSrQMzpB/1jq0jSTRYynn/GO0Z1Pjx0wVzH8vjVosXfh6/PaKslMdHbOM=--A5y7uJSVaL0539+f--FP9Oigql2/EdcYszZ6hj/A==
+\ No newline at end of file
diff --git a/config/credentials/production.yml.enc b/config/credentials/production.yml.enc
index a4724d9..6359cc9 100644
--- a/config/credentials/production.yml.enc
+++ b/config/credentials/production.yml.enc

@@ -1 +1 @@
-d4uIaJsejFxp80UN6tMjOdA63ERQWbOxbgHuo+FyTRTHXAJbriKgcx2GLhMFOjk7ft8IZm0Nv5/e6NOzaqTYRiwNMG+X4jaX267pIAccMYBDoZmIhfQGqkav8bEMvA3PODeoaEVHTEP1dOFtI5u2rGi2EUYRThPXLzdOpoOjFAnC8cQawiFJn6B9EpYu5zlAfCJ9LonCVPCaOlWqzjd+8RbgqLvtw7fNBlIX8u1cli8JwBiV8C1UNlqmv6b1Lqp1S20PizOnUA2GU2Pi2EWEtjavO82MCakS2I0rt90Cikd9mlp+LOcWpk3AgVr3dhi86XepTk5Ds3v6g7axzvTxUZjV9ACXhSHufPlDvqVqAcwpEE5C/o7WHj3T3xy4kVs36LScMcyQ/bg85wYxgT+Wl0EVSMg7DPsl/pY/QkttizStx++r8x6sExcPxD5n8ZLA5aOXjcfeYJC+BYg+7OWlPYHqup8s/70gjm8hZ75Rv+yPD7PEz6MIJu+pG2MUfgJspmYag0Wc2hrHxHnMi4S+Jf+kK+7x44nVXPJ5kT8WXYVQkHdj6ibgwPqe4OWbr0dWkoowIcyztmdj+nKRulzwgYNgyd23XZqu30TTuyqVtzzyVfXLteGDSDS4kmXyn/hx2LtG6LHzAeptsIChPJOCu9+1Zp4M9haCSw8mX/d8/nAt5MyxZUm/2SXogD2dE4eNbGhMFeDJkeJ/--T1kw8AC3IoFq+eQx--2bqSYqOxBpLVMJnddXLegQ==
-\ No newline at end of file
+uzTsEcFmu5QyOod1jjNQT8pqdQ9Tq8+OuH5qOulURR+Ew3+DBAN9/kYZ0b5OBcxnNGlN3suMC6fpgev4fYoaucCufXgNVAhhl1Lch9SJ2jo/1jCIS1U6mTPmwbF1aWM/P7jJhw8535RdlzohVStrIO0Rn3ygshVFFPODSccqyIhDbiiK5j0bvErzt5fDN091SIB0pdtxzy/XBwwfcQ6EaTg170Pv1mmIyCSWD1AGyzGlRhFVYhyv3sEabsC1dfYXjyZYrpbhvfZbi46TzeNA4kPLIVfVNiW0QoJtT90UqpOLcnQKwf23WIxPemzsT9iQj0/pEci+umHG6MkH2zE1eBOlj2VdopBqVEwQEgDvqt6zQMKAbLPU1E3VM94gCxeTidwIMoFGhSXl6nlGwI9ozBXvKyFNgMiz9UKtjEXcQOG3cIBxxMEQ+sjGEu3vAMvD7OymSGSC81JCbcdOqHWH/iIh2K3IcGyibJ4ScVsUBMn7lnsMEPrQQEJ/Df0X2mplJc0i8n19H1S7SrLKSaO7FDENPC0d1dN5nnOt5nDGU2/qkiGJ+LepX/Gb3cxc0fpcnC359rB5WCTKsxBOzjqW5IapCRSa0ztZz+xeXUBN4sDRUzPun2yCqaCxe+ptzTxzT+Ej9oMKSJJncc/zUuwRmd6KbnyQ3/ISeNNIC0BLWaohaj3lP/tRkLkcBNqu/MA4pxUxs1Lwu/8gW9d4GrrxCxOSsQnDk5VzF80LCk4oq+BVrjPYY0vWzVxtj+56slIoUIBIUWRjFTbBuyr3gejPjis5NwiFMyi8emH+a9aa3Ge44YnrDSAA+JVzqHSAF8erIuiqgaTAFwprSmED8pIIV2A0/WWrPcuI5xaAv4e2bQWfzM3SujvY--rs7RvQb911E+dh50--fCsEmvYD6LcaB6ReBcHGrA==
+\ No newline at end of file
diff --git a/config/deploy.rb b/config/deploy.rb
index f28894f..de297e3 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb

@@ -1,5 +1,5 @@
 # config valid only for current version of Capistrano
-lock "3.18.0"
+lock "3.19.2"
 set :application, "thoughts"
 set :repo_url, "/srv/git/thoughts"
diff --git a/config/initializers/recaptcha.rb b/config/initializers/recaptcha.rb
new file mode 100644
index 0000000..807a23c
--- /dev/null
+++ b/config/initializers/recaptcha.rb

@@ -0,0 +1,4 @@
+Recaptcha.configure do |config|
+  config.site_key = Rails.application.credentials.recaptcha_site_key
+  config.secret_key = Rails.application.credentials.recaptcha_secret_key
+end
diff --git a/config/mail.yml b/config/mail.yml
index e2d15c3..6c0435d 100644
--- a/config/mail.yml
+++ b/config/mail.yml

@@ -1,8 +1,8 @@
 production:
  smtp_settings:
-    address: "smtp.sendgrid.com"
+    address: "mail.smtp2go.com"
-    port: 587
+    port: 2525
-    user_name: "apikey"
+    user_name: "fourisland.com"
-    password: <%= Rails.application.credentials.sendgrid_api_key %>
+    password: <%= Rails.application.credentials.smtp2go_password %>
    authentication: "plain"
    openssl_verify_mode: "none"
diff --git a/config/routes.rb b/config/routes.rb
index 76378c4..ad66501 100644
--- a/config/routes.rb
+++ b/config/routes.rb

@@ -56,6 +56,7 @@ Rails.application.routes.draw do
    end
  end
+  get 'thinks', to: 'streams#index', as: :streams
  get 'thinks/:slug', to: 'streams#show', as: :stream
  get 'plays', to: 'games#index'
@@ -74,6 +75,8 @@ Rails.application.routes.draw do
      get 'tags'
      get 'tags/:id', :action => "tag", :as => "tag"
      get 'stats'
+      get 'search_form'
+      get 'search'
    end
    member do
diff --git a/config/schedule.rb b/config/schedule.rb
index e53ebf4..268dfcb 100644
--- a/config/schedule.rb
+++ b/config/schedule.rb

@@ -21,3 +21,7 @@
 every 1.day, at: "6:00am" do
  rake "thoughts:email_upvote_report"
 end
+every 6.hours do
+  rake "thoughts:refresh_scrobbles"
+end