Merge pull request #3773 from pooza/dev/4.33.3

4.33.3

Gemfile.lock

@@ -86,9 +86,9 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.2.1)
-      actionview (= 7.2.1)
-      activesupport (= 7.2.1)
+    actionpack (7.2.1.1)
+      actionview (= 7.2.1.1)
+      activesupport (= 7.2.1.1)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4, < 3.2)
@@ -97,13 +97,13 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actionview (7.2.1)
-      activesupport (= 7.2.1)
+    actionview (7.2.1.1)
+      activesupport (= 7.2.1.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activesupport (7.2.1)
+    activesupport (7.2.1.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -197,9 +197,9 @@ GEM
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     json (2.7.2)
-    json-schema (5.0.0)
+    json-schema (5.0.1)
       addressable (~> 2.8)
-    jwt (2.9.1)
+    jwt (2.9.3)
       base64
     language_server-protocol (3.17.0.3)
     logger (1.6.1)
@@ -212,9 +212,10 @@ GEM
       net-pop
       net-smtp
     marcel (1.0.4)
-    mime-types (3.5.2)
+    mime-types (3.6.0)
+      logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0903)
+    mime-types-data (3.2024.1001)
     mini_magick (5.0.1)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
@@ -228,7 +229,7 @@ GEM
       ruby2_keywords (~> 0.0.1)
     net-http (0.4.1)
       uri
-    net-imap (0.4.16)
+    net-imap (0.5.0)
       date
       net-protocol
     net-pop (0.1.2)
@@ -266,13 +267,13 @@ GEM
       ast (~> 2.4.1)
       racc
     pg (1.5.8)
-    power_assert (2.0.3)
+    power_assert (2.0.4)
     public_suffix (6.0.1)
     puma (6.4.3)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (3.1.7)
+    rack (3.1.8)
     rack-protection (4.0.0)
       base64 (>= 0.1.0)
       rack (>= 3.0.0, < 4)
@@ -301,15 +302,15 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.3.7)
+    rexml (3.3.8)
     ricecream (0.2.1)
-    rspotify (2.12.2)
+    rspotify (2.12.4)
       addressable (~> 2.8.0)
       omniauth-oauth2 (>= 1.6)
       rest-client (~> 2.0.2)
     rss (0.3.1)
       rexml
-    rubocop (1.66.1)
+    rubocop (1.67.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -341,7 +342,7 @@ GEM
     sassc (2.4.0)
       ffi (~> 1.9)
     securerandom (0.3.1)
-    sequel (5.84.0)
+    sequel (5.85.0)
       bigdecimal
     set (1.1.0)
     sidekiq (7.2.4)
@@ -362,7 +363,7 @@ GEM
     slim (5.2.1)
       temple (~> 0.10.0)
       tilt (>= 2.1.0)
-    slim_lint (0.29.0)
+    slim_lint (0.31.0)
       rexml (~> 3.2)
       rubocop (>= 1.0, < 2.0)
       slim (>= 3.0, < 6.0)
@@ -391,7 +392,7 @@ GEM
     yajl-ruby (1.4.3)
     yamllint (0.0.9)
       trollop (~> 2)
-    zeitwerk (2.6.18)
+    zeitwerk (2.7.1)
     zlib (3.1.1)
 
 PLATFORMS
@@ -435,4 +436,4 @@ RUBY VERSION
    ruby 3.3.5p100
 
 BUNDLED WITH
-   2.5.19
+   2.5.22

app/lib/mulukhiya/model/mastodon/account.rb

@@ -37,7 +37,7 @@ def statuses(params = {})
         params[:page] ||= 1
         params[:account_id] = id
         return Postgres.exec(:statuses, params).map do |row|
-          next unless status = Status[row[:id]]
+          next unless status = Status[row[:id].to_s]
           status.to_h.merge(account: {username:, display_name:, acct: acct.to_s})
         end
       end
@@ -79,7 +79,6 @@ def bio
       alias attachments attachment
 
       def admin?
-        return true if user.admin
         return true if roles.any?(&:admin?)
         return false
       end

config/application.yaml

@@ -732,7 +732,7 @@ package:
     - tkoishi@b-shock.co.jp
   license: MIT
   url: https://github.com/pooza/mulukhiya-toot-proxy
-  version: 4.33.2
+  version: 4.33.3
 parser:
   note:
     fields: