18 files changed, 118 insertions, 13 deletions

@@ -228,3 +228,14 @@ h2.centered {
     text-decoration: none;
   }
 }
+
+#scrobble-box {
+  img {
+    margin: 0 auto;
+    display: block;
+  }
+
+  p {
+    text-align: center;
+  }
+}
@@ -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
@@ -0,0 +1,2 @@
+class Scrobble < ApplicationRecord
+end
@@ -1,3 +1,3 @@
 - title "Editing #{@stream.title}"
-= form_for @stream, url: admin_stream_url(@stream), html: { id: "entry-form" } do |f|
+= form_for @stream, url: admin_stream_url(@stream.id), html: { id: "entry-form" } do |f|
   = render partial: "form", locals: { f: f }
@@ -10,5 +10,5 @@
       %td= stream.created_at.strftime("%B %d, %Y, %l:%M%P")
       %td
         %ul.admin-actions
-          %li= link_to "Edit", edit_admin_stream_url(stream)
-          %li= link_to "Add Update", new_admin_stream_update_url(stream)
+          %li= link_to "Edit", edit_admin_stream_url(stream.id)
+          %li= link_to "Add Update", new_admin_stream_update_url(stream.id)
@@ -24,5 +24,5 @@
     %time.dt-published{ datetime: blog.visible_date.strftime("%Y-%m-%dT%H:%M:%SZ%z") }= blog.visible_date.strftime("%B #{blog.visible_date.day.ordinalize}, %Y at %-I:%M:%S%P")
   .post-vote{ id: "blog-vote-section-#{blog.id}" }
     %span.vote-link{ id: "blog-upvote-link-#{blog.id}" }= link_to_unless (not blog.published or blog.already_upvoted?(request.remote_ip)), "👍", upvote_blog_path(blog), remote: true, rel: "nofollow", class: "blog-upvote-link", method: :post
-    %span.post-rating{ id: "blog-rating-#{blog.id}" }= blog.upvotes - blog.downvotes
+    %span.post-rating{ id: "blog-rating-#{blog.id}" }= blog.upvotes
     %span.vote-link{ id: "blog-downvote-link-#{blog.id}" }= link_to_unless (not blog.published or blog.already_downvoted?(request.remote_ip)), "👎", downvote_blog_path(blog), remote: true, rel: "nofollow", class: "blog-downvote-link", method: :post
@@ -73,6 +73,16 @@
                 %li
                   = image_tag "feed.png"
                   = link_to "Atom feed", blogs_url(format: :atom)
+          - unless @random_song.nil?
+            .sidebar-module#scrobble-box
+              .bubble.rounded
+                %h2 Listening to
+                = image_tag @random_song.image, width: "174px"
+                %p
+                  %strong= @random_song.title
+                  by
+                  = @random_song.artist
+                %p= @random_song.album
           .sidebar-module
             .bubble.rounded
               %h2 Meta
@@ -21,12 +21,12 @@
           %li= link_to_unless_current "Home", quotes_url
           %li= link_to_unless_current "Latest", latest_quotes_url
           %li= link_to_unless_current "Top", top_quotes_url
-          %li= link_to "Random", random_quotes_url
+          %li{"data-turbolinks" => "false"}= link_to "Random", random_quotes_url
           - if user_signed_in?
             %li= link_to_unless_current "Submit", new_quote_url
           %li= link_to_unless_current "Tags", tags_quotes_url
           %li= link_to_unless_current "Search", search_form_quotes_url
-          %li= link_to_unless_current "Stats", stats_quotes_url
+          %li{"data-turbolinks" => "false"}= link_to_unless_current "Stats", stats_quotes_url 
           %li= link_to_unless_current "Feed", latest_quotes_url(:atom)
           - if user_signed_in?
             %li= link_to_unless_current "Admin", admin_url
@@ -1 +1 @@
-TMbFARKxiuopoIWE/n0a8KMCh28dFjTGFpfXoXHUQmDlVhA40doz/aLWCYDE00djC70eM4BwXZmaDFC7tly1miU0OymvYijYKNb5Kv9bu2rihSprleyjnBrCF4qykWpDh8XfzXGfiDegSuZzw5RUGKkEU+EGJNIPTnPKAm2MSSnPStVFt1gGxGuYRd0pXCgFUW/USVYnbJEPv6DOxqh3HmKmneP29fcx1V+N/RccyzHsjL2S5lej5s8Q4oAy+SZ4+xLK9Pdh6nA3dZ82fNTLffqmnFxEovuW5n6Cjt0Ka2MZRvYg6sBNDvUVvQSw4u1BRXx7JOHcIWiKdykF/uHdrSwmIPepwd+zs/HCxrthdMSry+yrLwJpZ67JiMA/VKIMYzgLy8yk2JEblBXq3FGo44TWwumIkfTn4H/6UZNb4jGJ4dH+LAFiE7il2X3BbvBb4EkYB3xbu+zqvnohOzuVKkJtjILV6RBrEFzbCijwi3PBOoX8O9fwW8B0BduSp4AhFa+dyenOkD2HjtyEMttJAPuuw3neQKhkv/4SaPaugcD4vKONSwU3F/7nB7yMVQqofVLIc2a1tJaTjWIlNIwVssZS2HS5OZFTpv1XJpCyMcLO/EAe9poqiPieE8WwpdXntRs9O/QQqPWyt2ZdHD8RMKerZjbU1wV58h4rJmmAKUkTCuo=--Jo9AwrM/hr9nWWoS--iHpkNsZwBWB0lySmzkcLdA==
\ 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
@@ -1 +1 @@
-V//BL1LV+HIfxWVXgfAHG5TrUakYlbjN5V3gkDi9StysvSQ0rM3Opo2/Vt0KbU4FHhjiHoGAOZRPdf08j5k3zS3i4YroBfR3HwOj7snvq2mdBleL9D1UqkBLldjdaco1MnSLSfS2yJe8F3VhtVxesz/Sh4LXoZWemsWGJLu0GfRxPDwswTvdWBgyASnKUOlFyQNypgRTWGMqCe99Z5pw8co8JqZho29Dk6Tp7UJzoim8j5YU+tfgBZ4GF81c0eT8SvBJhHHbcTm/DPUMGxvUJAT9adjQnjPq0tferHziTGl54/ROQCXqrJHKLUOH5JRqh2lAkY3EK3SvTezuYSoV0MwsOxntxC54bQYznN5Dz6/I31UbWpydPGY8P+/Sjdh4QInD51VcDeuJ/QaDSeqJFxHUWDJ0Da55rwsZFr6jmpgbqcmunXLl2B+VDH7sSQOn71IEyNikq5l/9m2dYEdXZpWFsujkyVXzg4O5WFkLtmqoe4wudN7kk8nEZffd6xPtKNpl51Ml1BpSoNMNwGAf72Xxq5/5Z9QFK7mtyPhBVYqalR0kEZPbxmeZGmedcE/fgQXlZYNw4tzBy2/24hJokMLRoX5prmOGMf+6f62wEbBozyaDU2eAMC0HCwg/rb22hDPvzs1XKu2TTEGK7iT3BvdsUHIVnHdUd//hLEeNHeI43FLxPKgyaG7Ovnn8DmNrvUuapaFHjykVsQ2GOLQ9a7GGrwObqr0w33HG/UAwhzEE8s9KwF6qMdqPCCPuYOsbj5xgTyv5X5s0oIgCinvkfAIyFV7WXwLbbE9yxc6UumXbLLTSQE2s8mZ2yL+gdE+iYkSOhz8Z3bj9agOQD5zHMu/NxzTdpNwH6rsLLXq5EfToIWNXEl9kTU8=--x7Ic40D296IOMLm6--VBDaN0LLlyO8zeyfWW+UBA==
\ 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
@@ -1,8 +1,8 @@
 production:
   smtp_settings:
-    address: "smtp.sendgrid.com"
-    port: 587
-    user_name: "apikey"
-    password: <%= Rails.application.credentials.sendgrid_api_key %>
+    address: "mail.smtp2go.com"
+    port: 2525
+    user_name: "fourisland.com"
+    password: <%= Rails.application.credentials.smtp2go_password %>
     authentication: "plain"
     openssl_verify_mode: "none"
@@ -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
@@ -0,0 +1,12 @@
+class CreateScrobbles < ActiveRecord::Migration[7.1]
+  def change
+    create_table :scrobbles do |t|
+      t.string :title
+      t.string :artist
+      t.string :album
+      t.string :image
+
+      t.timestamps
+    end
+  end
+end
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2025_05_12_181245) do
+ActiveRecord::Schema[7.1].define(version: 2025_11_22_012500) do
   create_table "active_storage_attachments", force: :cascade do |t|
     t.string "name", null: false
     t.string "record_type", null: false
@@ -352,6 +352,15 @@ ActiveRecord::Schema[7.1].define(version: 2025_05_12_181245) do
     t.index ["recordable_type", "recordable_id"], name: "index_records_on_recordable_type_and_recordable_id"
   end
 
+  create_table "scrobbles", force: :cascade do |t|
+    t.string "title"
+    t.string "artist"
+    t.string "album"
+    t.string "image"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "streams", force: :cascade do |t|
     t.string "title"
     t.text "body"
@@ -1,3 +1,5 @@
+require 'net/http'
+
 namespace :thoughts do
   desc "Email a review of the last day's upvotes"
   task :email_upvote_report => :environment do
@@ -7,4 +9,23 @@ namespace :thoughts do
       VoteMailer.with(votes: votes).daily_report_email.deliver
     end
   end
+
+  desc "Refresh the recently listened tracks"
+  task :refresh_scrobbles => :environment do
+    Scrobble.destroy_all
+
+    api_key = Rails.application.credentials.lastfm_api_key
+    url = URI.parse("http://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&user=fefferburbia&api_key=#{api_key}&format=json")
+    req = Net::HTTP::Get.new(url.to_s)
+    res = Net::HTTP.start(url.host, url.port) {|http|
+      http.request(req)
+    }
+    output = JSON.parse(res.body)
+
+    items = output["recenttracks"]["track"].map {|p| [p["name"], p["artist"]["#text"], p["album"]["#text"], p["image"][2]["#text"]]}.sort.uniq
+
+    items.each do |item|
+      Scrobble.create!(title: item[0], artist: item[1], album: item[2], image: item[3])
+    end
+  end
 end
@@ -1 +1,7 @@
 # See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
+User-agent: PetalBot
+Disallow: / 
+
+User-agent: AI2Bot
+Disallow: /
+
@@ -0,0 +1,13 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  title: MyString
+  artist: MyString
+  album: MyString
+  image: MyString
+
+two:
+  title: MyString
+  artist: MyString
+  album: MyString
+  image: MyString
@@ -0,0 +1,7 @@
+require "test_helper"
+
+class ScrobbleTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end