nginxは諦めてsinatraで返す

sue445 · Nov 25, 2023 · 1a2f8d8 · 1a2f8d8
1 parent 212ea6c
commit 1a2f8d8
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 36 deletions.
diff --git a/infra/nginx/sites-enabled/isupipe.conf b/infra/nginx/sites-enabled/isupipe.conf
@@ -42,24 +42,24 @@ server {
     try_files $uri /index.html;
   }
 
-  location ~ /api/user/(?<username>[^/]+)/icon {
-    alias /home/isucon/webapp/img/icons/;
-    default_type image/jpeg;
+  # location ~ /api/user/(?<username>[^/]+)/icon {
+  #   alias /home/isucon/webapp/img/icons/;
+  #   default_type image/jpeg;
+  #
+  #   error_page 404 /home/isucon/webapp/img/NoImage.jpg;
+  #
+  #
+  #   if (!-f /home/isucon/webapp/img/icons/$username.jpg) {
+  #     return 404;
+  #   }
+  #
+  #   try_files /home/isucon/webapp/img/icons/$username.jpg =404;
+  # }
 
-    error_page 404 /home/isucon/webapp/img/NoImage.jpg;
-
-
-    if (!-f /home/isucon/webapp/img/icons/$username.jpg) {
-      return 404;
-    }
-
-    try_files /home/isucon/webapp/img/icons/$username.jpg =404;
-  }
-
-  location = /home/isucon/webapp/img/NoImage.jpg {
-    internal;
-    root /; # 画像のパスの基準となるディレクトリを指定
-  }
+  # location = /home/isucon/webapp/img/NoImage.jpg {
+  #   internal;
+  #   root /; # 画像のパスの基準となるディレクトリを指定
+  # }
 
   location /api {
     proxy_set_header Host $host;

diff --git a/ruby/app.rb b/ruby/app.rb
@@ -759,24 +759,31 @@ def fill_user_response(tx, user_model)
     BCRYPT_DEFAULT_COST = 4
     FALLBACK_IMAGE = '../img/NoImage.jpg'
 
-    # get '/api/user/:username/icon' do
-    #   username = params[:username]
-    #
-    #   image = db_transaction do |tx|
-    #     user = tx.xquery('SELECT * FROM users WHERE name = ?', username).first
-    #     unless user
-    #       raise HttpError.new(404, 'not found user that has the given username')
-    #     end
-    #     tx.xquery('SELECT image FROM icons WHERE user_id = ?', user.fetch(:id)).first
-    #   end
-    #
-    #   content_type 'image/jpeg'
-    #   if image
-    #     image[:image]
-    #   else
-    #     send_file FALLBACK_IMAGE
-    #   end
-    # end
+    get '/api/user/:username/icon' do
+      username = params[:username]
+
+      # image = db_transaction do |tx|
+      #   user = tx.xquery('SELECT * FROM users WHERE name = ?', username).first
+      #   unless user
+      #     raise HttpError.new(404, 'not found user that has the given username')
+      #   end
+      #   tx.xquery('SELECT image FROM icons WHERE user_id = ?', user.fetch(:id)).first
+      # end
+      #
+      # content_type 'image/jpeg'
+      # if image
+      #   image[:image]
+      # else
+      #   send_file FALLBACK_IMAGE
+      # end
+
+      content_type 'image/jpeg'
+      if File.exist?("#{ICONS_DIR}/#{username}.jpg")
+        send_file "#{ICONS_DIR}/#{username}.jpg"
+      else
+        send_file FALLBACK_IMAGE
+      end
+    end
 
     PostIconRequest = Data.define(:image)
 
@@ -802,7 +809,6 @@ def fill_user_response(tx, user_model)
 
         # iconsにも保存する
         user = tx.xquery("SELECT name FROM users WHERE id = ?", user_id).first
-        raise "WIP: #{ICONS_DIR}/#{user[:name]}.jpg"
 
         File.open("#{ICONS_DIR}/#{user[:name]}.jpg", 'wb') do |f|
           f.write(image)