33 files changed, 471 insertions, 195 deletions

@@ -1,111 +1,118 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.1)
-      actionpack (= 7.1.1)
-      activesupport (= 7.1.1)
+    actioncable (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.1)
-      actionpack (= 7.1.1)
-      activejob (= 7.1.1)
-      activerecord (= 7.1.1)
-      activestorage (= 7.1.1)
-      activesupport (= 7.1.1)
+    actionmailbox (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.1)
-      actionpack (= 7.1.1)
-      actionview (= 7.1.1)
-      activejob (= 7.1.1)
-      activesupport (= 7.1.1)
+    actionmailer (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      actionview (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.1)
-      actionview (= 7.1.1)
-      activesupport (= 7.1.1)
+    actionpack (7.1.5.1)
+      actionview (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       nokogiri (>= 1.8.5)
+      racc
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.1)
-      actionpack (= 7.1.1)
-      activerecord (= 7.1.1)
-      activestorage (= 7.1.1)
-      activesupport (= 7.1.1)
+    actiontext (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.1)
-      activesupport (= 7.1.1)
+    actionview (7.1.5.1)
+      activesupport (= 7.1.5.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    active_storage_validations (1.1.1)
-      activejob (>= 5.2.0)
-      activemodel (>= 5.2.0)
-      activestorage (>= 5.2.0)
-      activesupport (>= 5.2.0)
-    activejob (7.1.1)
-      activesupport (= 7.1.1)
+    active_storage_validations (2.0.3)
+      activejob (>= 6.1.4)
+      activemodel (>= 6.1.4)
+      activestorage (>= 6.1.4)
+      activesupport (>= 6.1.4)
+      marcel (>= 1.0.3)
+    activejob (7.1.5.1)
+      activesupport (= 7.1.5.1)
       globalid (>= 0.3.6)
-    activemodel (7.1.1)
-      activesupport (= 7.1.1)
-    activerecord (7.1.1)
-      activemodel (= 7.1.1)
-      activesupport (= 7.1.1)
+    activemodel (7.1.5.1)
+      activesupport (= 7.1.5.1)
+    activerecord (7.1.5.1)
+      activemodel (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       timeout (>= 0.4.0)
-    activestorage (7.1.1)
-      actionpack (= 7.1.1)
-      activejob (= 7.1.1)
-      activerecord (= 7.1.1)
-      activesupport (= 7.1.1)
+    activestorage (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       marcel (~> 1.0)
-    activesupport (7.1.1)
+    activesupport (7.1.5.1)
       base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
       mutex_m
+      securerandom (>= 0.3)
       tzinfo (~> 2.0)
-    acts-as-taggable-on (10.0.0)
-      activerecord (>= 6.1, < 7.2)
-    addressable (2.8.5)
-      public_suffix (>= 2.0.2, < 6.0)
-    airbrussh (1.5.0)
+    acts-as-taggable-on (12.0.0)
+      activerecord (>= 7.1, < 8.1)
+      zeitwerk (>= 2.4, < 3.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    airbrussh (1.5.3)
       sshkit (>= 1.6.1, != 1.7.0)
     akismet (3.0.0)
-    audited (5.4.0)
-      activerecord (>= 5.0, < 7.2)
-      request_store (~> 1.2)
+    audited (5.8.0)
+      activerecord (>= 5.2, < 8.2)
+      activesupport (>= 5.2, < 8.2)
     base64 (0.2.0)
-    bcrypt (3.1.19)
+    bcrypt (3.1.20)
     bcrypt_pbkdf (1.1.1)
-    bigdecimal (3.1.4)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     bindex (0.8.1)
-    builder (3.2.4)
-    byebug (11.1.3)
-    capistrano (3.18.0)
+    builder (3.3.0)
+    byebug (12.0.0)
+    capistrano (3.19.2)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    capistrano-bundler (2.1.0)
+    capistrano-bundler (2.1.1)
       capistrano (~> 3.1)
     capistrano-passenger (0.2.1)
       capistrano (~> 3.0)
-    capistrano-rails (1.6.3)
+    capistrano-rails (1.7.0)
       capistrano (~> 3.1)
       capistrano-bundler (>= 1.1, < 3)
     capistrano-rvm (0.1.2)
@@ -127,35 +134,35 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.2.2)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
     crass (1.0.6)
-    date (3.3.4)
-    devise (4.9.3)
+    date (3.4.1)
+    devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
     domain_name (0.6.20240107)
-    drb (2.2.0)
-      ruby2_keywords
-    ed25519 (1.3.0)
-    enumerize (2.7.0)
+    drb (2.2.1)
+    ed25519 (1.4.0)
+    enumerize (2.8.1)
       activesupport (>= 3.2)
-    erubi (1.12.0)
-    execjs (2.9.1)
-    ffi (1.16.3)
+    erubi (1.13.1)
+    execjs (2.10.0)
+    ffi (1.17.2)
     ffi-compiler (1.3.2)
       ffi (>= 1.15.5)
       rake
     globalid (1.2.1)
       activesupport (>= 6.1)
-    haml (6.2.3)
+    haml (6.3.0)
       temple (>= 0.8.2)
       thor
       tilt
-    highline (2.1.0)
+    highline (3.1.2)
+      reline
     http (5.2.0)
       addressable (~> 2.8)
       base64 (~> 0.1)
@@ -165,40 +172,43 @@ GEM
     http-cookie (1.0.8)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
-    i18n (1.14.1)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    image_processing (1.12.2)
-      mini_magick (>= 4.9.5, < 5)
+    image_processing (1.14.0)
+      mini_magick (>= 4.9.5, < 6)
       ruby-vips (>= 2.0.17, < 3)
-    indieweb-endpoints (8.0.0)
-      http (~> 5.0)
-      link-header-parser (~> 5.0)
+    indieweb-endpoints (9.1.0)
+      http (~> 5.2)
+      link-header-parser (~> 6.1)
       nokogiri (>= 1.13)
-    io-console (0.6.0)
-    irb (1.8.3)
-      rdoc
-      reline (>= 0.3.8)
-    jbuilder (2.11.5)
+    io-console (0.8.0)
+    irb (1.15.2)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    jbuilder (2.13.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jquery-rails (4.6.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (6.0.1)
+    jquery-ui-rails (8.0.0)
       railties (>= 3.2.16)
-    js-routes (2.2.7)
-      railties (>= 4)
-    json (2.9.0)
-    libv8-node (18.16.0.0)
-    link-header-parser (5.1.1)
+    js-routes (2.3.5)
+      railties (>= 5)
+      sorbet-runtime
+    json (2.12.0)
+    libv8-node (23.6.1.0)
+    link-header-parser (6.1.1)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    llhttp-ffi (0.5.0)
+    llhttp-ffi (0.5.1)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
-    loofah (2.21.4)
+    logger (1.7.0)
+    loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -206,120 +216,128 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
-    meta-tags (2.19.0)
-      actionpack (>= 3.2.0, < 7.2)
+    marcel (1.0.4)
+    meta-tags (2.22.1)
+      actionpack (>= 6.0.0, < 8.1)
     microformats (4.5.0)
       json
       nokogiri
-    mime-types (3.5.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.1003)
+    mime-types (3.7.0)
+      logger
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2025.0507)
     mimemagic (0.3.10)
       nokogiri (~> 1)
       rake
-    mini_magick (4.12.0)
+    mini_magick (5.2.0)
+      benchmark
+      logger
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
-    mini_racer (0.8.0)
-      libv8-node (~> 18.16.0.0)
-    minitest (5.20.0)
-    mutex_m (0.2.0)
-    mysql2 (0.5.5)
-    net-imap (0.4.4)
+    mini_portile2 (2.8.9)
+    mini_racer (0.18.1)
+      libv8-node (~> 23.6.1.0)
+    minitest (5.25.5)
+    mutex_m (0.3.0)
+    mysql2 (0.5.6)
+    net-imap (0.5.8)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-scp (4.0.0)
+    net-scp (4.1.0)
       net-ssh (>= 2.6.5, < 8.0.0)
-    net-smtp (0.4.0)
+    net-sftp (4.0.0)
+      net-ssh (>= 5.0.0, < 8.0.0)
+    net-smtp (0.5.1)
       net-protocol
-    net-ssh (7.2.0)
-    nio4r (2.5.9)
-    nokogiri (1.15.4)
+    net-ssh (7.3.0)
+    nio4r (2.7.4)
+    nokogiri (1.18.8)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     normalize-rails (8.0.1)
     orm_adapter (0.5.0)
+    ostruct (0.6.1)
     paperclip (6.1.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
       mime-types
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
-    psych (5.1.1.1)
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
+    psych (5.2.6)
+      date
       stringio
-    public_suffix (5.0.3)
-    racc (1.7.3)
-    rack (2.2.8)
-    rack-session (1.0.1)
+    public_suffix (6.0.2)
+    racc (1.8.1)
+    rack (2.2.14)
+    rack-session (1.0.2)
       rack (< 3)
-    rack-test (2.1.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
-    rackup (1.0.0)
+    rackup (1.0.1)
       rack (< 3)
       webrick
-    rails (7.1.1)
-      actioncable (= 7.1.1)
-      actionmailbox (= 7.1.1)
-      actionmailer (= 7.1.1)
-      actionpack (= 7.1.1)
-      actiontext (= 7.1.1)
-      actionview (= 7.1.1)
-      activejob (= 7.1.1)
-      activemodel (= 7.1.1)
-      activerecord (= 7.1.1)
-      activestorage (= 7.1.1)
-      activesupport (= 7.1.1)
+    rails (7.1.5.1)
+      actioncable (= 7.1.5.1)
+      actionmailbox (= 7.1.5.1)
+      actionmailer (= 7.1.5.1)
+      actionpack (= 7.1.5.1)
+      actiontext (= 7.1.5.1)
+      actionview (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activemodel (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       bundler (>= 1.15.0)
-      railties (= 7.1.1)
+      railties (= 7.1.5.1)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails_autolink (1.1.8)
       actionview (> 3.1)
       activesupport (> 3.1)
       railties (> 3.1)
-    railties (7.1.1)
-      actionpack (= 7.1.1)
-      activesupport (= 7.1.1)
+    railties (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
-    rake (13.1.0)
+    rake (13.2.1)
     ransack (4.3.0)
       activerecord (>= 6.1.5)
       activesupport (>= 6.1.5)
       i18n
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rdoc (6.6.0)
+    rdoc (6.13.1)
       psych (>= 4.0.0)
     recaptcha (5.19.0)
-    redcarpet (3.6.0)
-    reline (0.3.9)
+    redcarpet (3.6.1)
+    reline (0.6.1)
       io-console (~> 0.5)
-    request_store (1.5.1)
-      rack (>= 1.4)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.2.6)
-    rouge (4.2.0)
-    ruby-vips (2.2.0)
+    rexml (3.4.1)
+    rouge (4.5.2)
+    ruby-vips (2.2.3)
       ffi (~> 1.12)
-    ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
+      logger
+    rubyzip (2.4.1)
     sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
@@ -328,10 +346,14 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    selenium-webdriver (4.14.0)
+    securerandom (0.4.1)
+    selenium-webdriver (4.32.0)
+      base64 (~> 0.2)
+      logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
+    sorbet-runtime (0.5.12087)
     spring (2.1.1)
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
@@ -339,24 +361,28 @@ GEM
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
+    sprockets-rails (3.5.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    sqlite3 (1.6.7)
+    sqlite3 (2.6.0)
       mini_portile2 (~> 2.8.0)
-    sshkit (1.21.5)
+    sshkit (1.24.0)
+      base64
+      logger
       net-scp (>= 1.1.2)
+      net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
-    stringio (3.0.8)
+      ostruct
+    stringio (3.1.7)
     temple (0.10.3)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
-    terser (1.1.19)
+    terser (1.1.20)
       execjs (>= 0.3.0, < 3)
-    thor (1.3.0)
-    tilt (2.3.0)
-    timeout (0.4.1)
+    thor (1.3.2)
+    tilt (2.6.0)
+    timeout (0.4.3)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
@@ -369,21 +395,22 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmention (7.0.0)
-      http (~> 5.0)
-      indieweb-endpoints (~> 8.0)
-      nokogiri (>= 1.13)
-    webrick (1.8.1)
-    websocket (1.2.10)
-    websocket-driver (0.7.6)
+    webmention (8.0.0)
+      http (~> 5.2)
+      indieweb-endpoints (~> 9.0)
+      nokogiri (>= 1.16)
+    webrick (1.9.1)
+    websocket (1.2.11)
+    websocket-driver (0.7.7)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     whenever (1.0.0)
       chronic (>= 0.6.3)
-    will_paginate (4.0.0)
+    will_paginate (4.0.1)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.12)
+    zeitwerk (2.7.2)
 
 PLATFORMS
   ruby
@@ -153,7 +153,6 @@
 
     .update-posted {
       display: block;
-      font-style: italic;
       background-color: #EAADEA;
       font-size: 16px;
       margin: .5em -20px;
@@ -161,6 +160,16 @@
       border-width: 1px 0 1px 0;
       border-style: solid;
       border-color: #DB70DB;
+
+      time {
+        font-style: italic;
+      }
+
+      .update-edit-link {
+        float: right;
+        color: blue;
+        font-weight: normal;
+      }
     }
   }
 }
@@ -463,3 +472,46 @@
 .next-post {
   float: right;
 }
+
+#streams-index {
+  width: 100%;
+  border-collapse: collapse;
+
+  #streams-index-header-row {
+    th {
+      background-color: #bdbdbd;
+      padding-left: 0.5em;
+      border-top: 1px solid #848484;
+      border-bottom: 1px solid #848484;
+    }
+  }
+
+  th {
+    padding-bottom: 0.5em;
+    padding-top: 0.5em;
+    text-align: left;
+  }
+
+  td {
+    padding-top: 1em;
+    padding-left: 0.5em;
+
+    time {
+      font-size: .75em;
+    }
+
+    .stream-link {
+      font-weight: bold;
+      text-decoration: none;
+
+      &, &:visited {
+        color: #ee2c2c;
+      }
+
+      &:hover {
+        text-decoration: underline;
+        color: #9ea1ad;
+      }
+    }
+  }
+}
@@ -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
@@ -1,12 +1,7 @@
-require 'redcarpet/render_strip'
 
-class StrippedSummary < Redcarpet::Render::StripDown
-  def block_html(raw_html)
-    nil
-  end
-end
 
 class BlogsController < ApplicationController
+  include ApplicationHelper
 
   def summary
     @blogs = Blog.where(published: true).order(published_at: :desc).paginate(page: params[:page], per_page: 10)
@@ -33,12 +28,12 @@ class BlogsController < ApplicationController
     @prev = @blog.prev
     @next = @blog.next
 
-    body = Redcarpet::Markdown.new(StrippedSummary).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,
@@ -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
@@ -1,6 +1,7 @@
 require 'redcarpet'
 require 'rouge'
 require 'rouge/plugins/redcarpet'
+require 'redcarpet/render_strip'
 
 module ApplicationHelper
 
@@ -45,4 +46,14 @@ module ApplicationHelper
     ]
   end
 
+  class StrippedSummary < Redcarpet::Render::StripDown
+    def block_html(raw_html)
+      nil
+    end
+  end
+
+  def stripped_markdown(text)
+    Redcarpet::Markdown.new(StrippedSummary).render(text)
+  end
+
 end
@@ -0,0 +1,2 @@
+class Scrobble < ApplicationRecord
+end
@@ -8,11 +8,22 @@ class Stream < ApplicationRecord
   validates :title, presence: true
   validates :slug, presence: true, format: /\A[-a-z0-9]+\z/
 
+  before_create :set_post_timestamp
+
   def path
     "/thinks/#{slug}"
   end
 
+  def to_param
+    slug
+  end
+
   def taggable
     self
   end
+
+  private
+    def set_post_timestamp
+      self.latest_post_at = self.created_at
+    end
 end
@@ -5,6 +5,8 @@ class Update < ApplicationRecord
 
   validates :stream, :body, presence: true
 
+  after_create :set_latest_timestamp
+
   def path
     "/thinks/#{stream.slug}\#update-#{id}"
   end
@@ -12,4 +14,10 @@ class Update < ApplicationRecord
   def taggable
     stream
   end
+
+  private
+    def set_latest_timestamp
+      self.stream.latest_post_at = self.created_at
+      self.stream.save!
+    end
 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)
@@ -1,3 +1,3 @@
 - title "Editing stream update"
-= form_for @update, url: admin_stream_update_url(@stream, @update), html: { id: "entry-form" } do |f|
+= form_for @update, url: admin_stream_update_url(@stream.id, @update), html: { id: "entry-form" } do |f|
   = render partial: "form", locals: { f: f }
@@ -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,11 +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 "Stats", stats_quotes_url
+          %li= link_to_unless_current "Search", search_form_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,6 +1,8 @@
 %article#stream-post
   %h2#stream-title= stream.title
   - unless stream.body.blank?
-    %header#stream-intro.entry-content= stream.body.html_safe
-  - unless stream.updates.empty?
-    = render stream.updates
+    %header#stream-intro.entry-content= markdown(stream.body)
+  = will_paginate @updates
+  - unless @updates.empty?
+    = render @updates
+  = will_paginate @updates
@@ -0,0 +1,19 @@
+%table#streams-index
+  %tr#streams-index-header-row
+    %th Stream Topic
+    %th Updates
+    %th Last Post
+  - @streams.each do |stream|
+    %tr
+      %td
+        = link_to stream.title, stream, class: "stream-link"
+        %br
+        %time= stream.created_at.strftime("%B #{stream.created_at.day.ordinalize}, %Y at %-I:%M:%S%P")
+      %td= stream.updates.size
+      %td
+        - unless stream.updates.empty?
+          - latest_post = stream.updates.order(created_at: :desc).first
+          = link_to (stripped_markdown(latest_post.body)[0, 30] + "..."), stream
+          %br
+          %time= latest_post.created_at.strftime("%B #{latest_post.created_at.day.ordinalize}, %Y at %-I:%M:%S%P")
+= will_paginate @streams
@@ -1,3 +1,3 @@
 - title @stream.title
-.breadcrumb= link_to "← Back to home page", root_path
+.breadcrumb= link_to "← Back to streams", streams_path
 = render @stream
@@ -1,3 +1,6 @@
 %section.stream-update.entry-content{ id: "update-#{update.id}" }
-  %time.update-posted= update.created_at.strftime("%B #{update.created_at.day.ordinalize}, %Y at %-I:%M:%S%P")
-  = update.body.html_safe
+  %header.update-posted
+    %time= update.created_at.strftime("%B #{update.created_at.day.ordinalize}, %Y at %-I:%M:%S%P")
+    - if user_signed_in? and !update.new_record?
+      = link_to "Edit", edit_admin_stream_update_path(update.stream.id, update), :class => "update-edit-link"
+  = markdown(update.body)
@@ -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,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"
@@ -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"
@@ -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'
@@ -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,21 @@
+class AddLatestPostAtToStream < ActiveRecord::Migration[7.1]
+  def up
+    add_column :streams, :latest_post_at, :datetime
+    
+    Stream.all.each do |stream|
+      if stream.updates.empty?
+        stream.latest_post_at = stream.created_at
+      else
+        stream.latest_post_at = stream.updates.order(created_at: :desc).first.created_at
+      end
+
+      stream.save!
+    end
+
+    change_column_null :streams, :latest_post_at, false
+  end
+
+  def down
+    remove_column :streams, :latest_post_at, :datetime
+  end
+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_01_12_025207) 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,12 +352,22 @@ ActiveRecord::Schema[7.1].define(version: 2025_01_12_025207) 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"
     t.string "slug"
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
+    t.datetime "latest_post_at", null: false
   end
 
   create_table "taggings", force: :cascade do |t|
@@ -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