Merge branch 'master' into dependabot/bundler/puma-5.6.9

Author: drusepth

.gitignore

@@ -26,6 +26,7 @@ storage/*
 
 # Super-secret stuff
 set_aws_credentials.sh
+.env
 
 # Ignore map images uploaded to Locations
 /locations
@@ -39,3 +40,4 @@ node_modules
 /yarn-error.log
 yarn-debug.log*
 .yarn-integrity
+

.ruby-version

@@ -1 +1 @@
-3.2.1
+3.2.3

Gemfile

@@ -3,7 +3,10 @@ ruby "~> 3.2"
 
 # Server core
 gem 'rails', '~> 6.1'
-gem 'puma', '~> 5.6'
+
+#gem 'puma', '~> 5.6'
+gem 'passenger'
+
 # gem 'bootsnap', require: false
 gem 'sprockets', '~> 4.2.0'
 gem 'terser'
@@ -88,6 +91,8 @@ gem 'discordrb'
 # Smarts
 gem 'word_count_analyzer'
 
+gem 'will_paginate', '~> 4.0'
+
 # Workers
 gem 'sidekiq'
 gem 'redis'
@@ -108,7 +113,6 @@ end
 
 group :production do
   gem 'uglifier', '>= 1.3.0'
-  gem 'newrelic_rpm'
 end
 
 group :test, :production do
@@ -130,10 +134,16 @@ group :development do
   gem 'rack-mini-profiler'
   gem 'memory_profiler'
   gem 'flamegraph'
-  gem 'stackprof'
   gem 'bundler-audit'
 end
 
+group :development, :production do
+  # Profiling / error tracking
+  gem "stackprof"
+  gem "sentry-ruby"
+  gem "sentry-rails"
+end
+
 group :worker do
   # These gems are only used in workers (and just so happen to slow down app startup
   # by quite a bit), so we exclude them from all groups other than RAILS_GROUPS=worker.

Gemfile.lock

@@ -1270,6 +1270,7 @@ GEM
       multi_json (~> 1)
       statsd-ruby (~> 1.1)
     bcrypt (3.1.18)
+    bigdecimal (3.1.9)
     bindex (0.8.1)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
@@ -1475,8 +1476,7 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     netrc (0.11.0)
-    newrelic_rpm (9.2.0)
-    nio4r (2.7.3)
+    nio4r (2.5.9)
     nokogiri (1.16.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -1493,6 +1493,10 @@ GEM
       terrapin (~> 0.6.0)
     paranoia (2.6.1)
       activerecord (>= 5.1, < 7.1)
+    passenger (6.0.23)
+      rack (>= 1.6.13)
+      rackup
+      rake (>= 12.3.3)
     paypal-checkout-sdk (1.0.4)
       paypalhttp (~> 1.0.1)
     paypal_client (0.4.1)
@@ -1520,6 +1524,9 @@ GEM
       rack
     rack-test (2.1.0)
       rack (>= 1.3)
+    rackup (1.0.1)
+      rack (< 3)
+      webrick
     rails (6.1.7.2)
       actioncable (= 6.1.7.2)
       actionmailbox (= 6.1.7.2)
@@ -1609,6 +1616,12 @@ GEM
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
     semantic_range (3.0.0)
+    sentry-rails (5.23.0)
+      railties (>= 5.0)
+      sentry-ruby (~> 5.23.0)
+    sentry-ruby (5.23.0)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
     sidekiq (6.5.5)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
@@ -1675,13 +1688,15 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
+    webrick (1.9.1)
     websocket (1.2.9)
     websocket-client-simple (0.3.0)
       event_emitter
       websocket
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
+    will_paginate (4.0.1)
     word_count_analyzer (1.0.1)
       engtagger
     zeitwerk (2.6.16)
@@ -1724,15 +1739,14 @@ DEPENDENCIES
   memory_profiler
   meta-tags
   mini_racer (~> 0.6.3)
-  newrelic_rpm
   onebox!
   paperclip
   paranoia
+  passenger
   paypal-checkout-sdk
   paypal_client
   pg (~> 1.5)
   pry
-  puma (~> 5.6)
   puma-heroku
   rack-mini-profiler
   rails (~> 6.1)
@@ -1745,6 +1759,8 @@ DEPENDENCIES
   rmagick
   sass-rails
   selenium-webdriver
+  sentry-rails
+  sentry-ruby
   serendipitous!
   sidekiq
   slack-notifier
@@ -1760,6 +1776,7 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
   web-console
   webpacker
+  will_paginate (~> 4.0)
   word_count_analyzer
 
 RUBY VERSION

app/controllers/document_revisions_controller.rb

@@ -4,7 +4,7 @@ class DocumentRevisionsController < ApplicationController
 
   # GET /document_revisions
   def index
-    @document_revisions = @document.document_revisions.order('created_at DESC')
+    @document_revisions = @document.document_revisions.order('created_at DESC').paginate(page: params[:page], per_page: 10)
   end
 
   # GET /document_revisions/1

app/javascript/components/Footer.js

@@ -26,7 +26,7 @@ class Footer extends React.Component {
               </div>
             </div>
 
-            Notebook.ai © 2016-2023 <a href='http://www.indentlabs.com' className='grey-text'>
+            Notebook.ai © 2016-2025 <a href='http://www.indentlabs.com' className='grey-text'>
               Indent Labs, LLC
             </a>
           </div>

app/services/forum_replacement_service.rb

@@ -408,6 +408,56 @@ class ForumReplacementService < Service
     'yoga'              => 'bendy business',
     'yuge'              => '<span style="font-size: 40px">yuge</span>',
     'zalgo'             => 'H̶̛̼̼̪̝̞͓̞͕͇̯͚͎͚̘̳͕̱̤̠̗͔͇̙̣̰͓̖̰̯̀̓̐̑̇͊͂̀͋̒̐̓͒̒͊͊̕͜͝ͅE̴̡̧̨̨̲̥̯͎̭̻̩̞̘̞̪̞̗̭͖̻͙͕͎̮͕̺͕̲̘̻̣͚̳̥͍̙͈͚͍͉̗͙̱͖͚̾̂̇͛̉͋͊̾͛̆̀́͑͛̅̋͊̕͘͜͜͜͝ͅͅͅͅ ̸̡̡̨̡̨̛̞͎̹̩̬̗̗̞̬̰̮̙̪̖͈̣̹͔̺̫̰̓̔̉̋̈̈́͐́̿̈̀͊̿̈̉̅̃̊̽͗̈̿̈́̓̈́̎͌̄̀̆̌̎͗̋͒̋̿̋̊̈́͆̋̾̈̏̈́̋̿̕̕̚͝͝͠͠ͅͅͅC̵̛̘̳͙̪̭͖̲̞̯̰̜͇̈̾̈́͋̌̉̽̽͑̎͌̾̈́͌̑͊̊̔̀͆̌̀̇̓͊̀̂̇̿̃͑́̈́̆͂̈́̾̓́̂̂̓̂̍̍͛͆͌͌̽̎̍̀̒̆̀͗͋͘͘͘͝͠͝͝͠͝͝Ǫ̸͕̻̞̝̜͚̗̮̼͎̤͔̤̱͔̫͂̄̉̋̈͊͐͂̇̀̌̎́͑̐̀̈́͋̓̾̅͒̒̄͑̒̆̑̾͜͝͝͝͝M̷̧̧̡̨̛̛̩̭̞͍̼̝̗͕̖͇̣̣̩͆̿̑͒́̉̅̓̌̆̈́͐͒̾̐̂̿̓̚͘̚͜E̵̡̨̢̧̢̢̡̢̨̛̠̱̻̺̦͚̹͓̬͔̪̟̼̥̯̠̘͚̫̯͍̺͔̫̟͇̱̦̟̪͚͉̣̳͓͍̬̙̲͔̘͙͔̤̰̜͍̠̩͉͐̂̊̏̐̿̊̋͑̿̇̊̈́͗̎̋́́̉̓̂̐͑̇̐̐͋́̒̈́͛͑͒̂͒̂̔̀̄̈́̓͂͆̈́͒̌͆̓͗̋͐̔̑͐̕͘ͅͅͅŞ̴̧̧̡̢̧̡̢͕̝͚̝̖͚̣̞̫̻̯͔̳̗̝̰̗̰̰̥̭͕̜̜̫͍̪̳̘̣̺̠͉̗̟͕̹͇̬̘̘̪͆͗̎̕',
+    'antagonist'        => 'plot troublemaker',
+    'character arc'     => 'protagonist pilgrimage',
+    'dialogue'          => 'character ping-pong',
+    'epilogue'          => 'literary afterparty',
+    'exposition'        => 'backstory breadcrumbs',
+    'first draft'       => 'word vomit masterpiece',
+    'flashback'         => 'temporal boomerang',
+    'literary device'   => 'wordsmith multitool',
+    'narrative'         => 'tale trajectory',
+    'plot hole'         => 'story oopsie',
+    'plot twist'        => 'narrative pretzel',
+    'prologue'          => 'story appetizer',
+    'protagonist'       => 'trouble magnet',
+    'subplot'           => 'story side quest',
+    'afternoon'         => 'post-meridian jaunt',
+    'constellation'     => 'connect-the-stars doodle',
+    'dimension'         => 'reality flavor',
+    'galaxy'            => 'cosmic spiraly-whirly',
+    'gravity'           => 'universal clingy-ness',
+    'infinity'          => 'endless et cetera',
+    'light year'        => 'space marathon',
+    'parallel universe' => 'reality neighbor',
+    'quantum physics'   => 'subatomic tomfoolery',
+    'anti-hero'         => 'morally flexible protagonist',
+    'mentor'            => 'wisdom dispenser',
+    'artificial intelligence' => 'silicon smartypants',
+    'social media'      => 'digital popularity contest',
+    'streaming service' => 'endless content waterfall',
+    'viral'             => 'internet famous adjacent',
+    'Wi-Fi'             => 'invisible knowledge tubes',
+    'footnote'          => 'page whisper',
+    'hypothesis'        => 'educated guess-timate',
+    'peer review'       => 'academic fact-checking party',
+    'autocorrect'       => 'automated word mangler',
+    'backspace'         => 'letter eating key',
+    'font'              => 'letter costume',
+    'grammar checker'   => 'sentence referee',
+    'spell check'       => 'typo detective',
+    'word count'        => 'verbose-o-meter',
+    'epiphany'          => 'brain lightning',
+    'existential crisis' => 'reality maintenance check',
+    'inspiration'       => 'creativity lightning strike',
+    'procrastination'   => 'productive avoidance',
+    'writers block'     => 'creativity traffic jam',
+    'fantasy'           => 'dragons-and-magic soup',
+    'horror'            => 'spooky word collection',
+    'romance'           => 'heart-squeezy tale',
+    'science fiction'   => 'future speculation story',
+    'consciousness'     => 'reality subscription service',
+    'philosophy'        => 'professional pondering',
   }
 
   OVERLOAD_WORDS_REPLACEMENTS = {
@@ -527,7 +577,7 @@ class ForumReplacementService < Service
   }
 
   def self.replace_for(text, user)
-    gremlins_phase = 1
+    gremlins_phase = 0
     replaced_text = text.dup
 
     # Page tag replacements
@@ -587,4 +637,4 @@ def self.replace_for(text, user)
   def self.wrapped(text, tooltip, color='blue')
     "<span class='#{color} lighten-5 tooltipped black-text' style='padding: 4px' data-tooltip='#{tooltip}'>#{text}</span>"
   end
-end
+end

app/views/document_revisions/index.html.erb

@@ -10,6 +10,7 @@
         <tr>
             <th>Title</th>
             <th>Backed up</th>
+            <th>Word Count</th>
             <th>Actions</th>
         </tr>
       </thead>
@@ -18,12 +19,14 @@
         <tr>
           <td><%= @document.title %></td>
           <td>Latest version</td>
+          <td><%= @document.cached_word_count %></td>
           <td><%= link_to 'Edit document', edit_document_path(@document), class: 'btn' %></td>
         </tr>
         <% @document_revisions.each do |document_revision| %>
           <tr>
             <td><%= document_revision.title %></td>
             <td><span class="tooltipped" data-tooltip="Backed up at <%= document_revision.created_at %>"><%= time_ago_in_words document_revision.created_at %> ago</span></td>
+            <td><%= document_revision.cached_word_count %></td>
             <td>
               <%= link_to 'View', document_document_revision_path(id: document_revision.id), class: 'btn' %>
               <%= link_to 'Delete', document_document_revision_path(document: @document, id: document_revision.id), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn red lighten-5 red-text' %>
@@ -32,5 +35,6 @@
         <% end %>
       </tbody>
     </table>
+    <%= will_paginate @document_revisions %>
   </div>
 </div>

app/views/layouts/_common_head.html.erb

@@ -13,7 +13,7 @@
 <%= render 'layouts/seo' %>
 
 <%# todo: Is there a way to play nicer with thredded's jquery? %>
-<% unless request.env.fetch('REQUEST_PATH', '').start_with?('/forum') %>
+<% unless request.fullpath.start_with?('/forum') %>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-ujs/1.2.2/rails.min.js" integrity="sha256-BbyWhCn0G+F6xbWJ2pcI5LnnpsnpSzyjJNVtl7ABp+M=" crossorigin="anonymous"></script>
 <% end %>
 

app/views/layouts/application.html.erb

@@ -2,7 +2,8 @@
 <html lang="en">
 <head>
   <%= render 'layouts/common_head' %>
-</head>
+  <%= Sentry.get_trace_propagation_meta.html_safe %>
+  </head>
 <body data-in-app="true"
       class="<%= controller_name %> <%= action_name %> <%= 'has-fixed-sidenav' if user_signed_in? %> <%= 'dark' if user_signed_in? && current_user.dark_mode_enabled? %>"
 >