Merge remote-tracking branch 'upstream/main' into cursor/split-sidebar-membership-queries-8545

Co-authored-by: Thomas Klemm <github@tklemm.eu>

app/controllers/searches_controller.rb

@@ -20,7 +20,7 @@ class SearchesController < ApplicationController
   private
     def set_messages
       if query.present?
-        @messages = Current.user.reachable_messages.search(query).with_presentation.last_page_of(100)
+        @messages = Current.user.reachable_messages.search(query).with_presentation.last_page_of_matches(100)
       else
         @messages = Message.none
       end

app/models/message/searchable.rb

@@ -17,6 +17,14 @@ module Message::Searchable
     end
   end
 
+  class_methods do
+    # Orders by the index's rowid, which is the message id, so SQLite walks the full-text index
+    # newest first and stops at the page. Ordering by created_at sorted every match before paging.
+    def last_page_of_matches(size)
+      Message::Pagination::Page.load(reorder("idx.rowid"), :last, size)
+    end
+  end
+
   private
     def create_in_index
       execute_sql_with_binds "insert into message_search_index(rowid, body) values (?, ?)", id, plain_text_body

app/models/webhook.rb

@@ -63,7 +63,7 @@ class Webhook < ApplicationRecord
     end
 
     def extract_attachment_from(response)
-      if response.content_type && mime_type = Mime::Type.lookup(response.content_type)
+      if response.code == "200" && response.content_type && mime_type = Mime::Type.lookup(response.content_type)
         ActiveStorage::Blob.create_and_upload! \
           io: StringIO.new(response.body), filename: "attachment.#{mime_type.symbol}", content_type: mime_type.to_s
       end

app/views/pwa/_install_instructions.html.erb

@@ -9,7 +9,7 @@
     <% case
       when platform.edge? %>
         <ol>
-          <li>Click <em><%= image_tag "install-edge.svg", alt: "the app available - install Campfire chat button", size: 16 %></em>in the address bar.</li>
+          <li>Click <em><%= image_tag "external/install-edge.svg", alt: "the app available - install Campfire chat button", size: 16 %></em>in the address bar.</li>
           <li>Click <em>Install</em>.</li>
         </ol>
       <% when platform.chrome? && platform.android? %>