Store avatars as binary instead of base64
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2024-01-24 15:56:34 +03:00
parent 6d7d722c5d
commit 9e2210c45b
5 changed files with 35 additions and 24 deletions

View File

@@ -159,6 +159,15 @@ class User < ApplicationRecord
@display_name ||= ldap_entry[:display_name]
end
def avatar
@avatar ||= LdapManager::FetchAvatar.call(cn: cn)
end
def avatar_base64
return nil if avatar.nil?
@avatar_base64 ||= Base64.strict_encode64(avatar)
end
def nostr_pubkey
@nostr_pubkey ||= ldap_entry[:nostr_key]
end
@@ -186,10 +195,6 @@ class User < ApplicationRecord
ZBase32.encode(Digest::SHA1.digest(cn))
end
def avatar
@avatar_base64 ||= LdapManager::FetchAvatar.call(cn: cn)
end
def services_enabled
ldap_entry[:services_enabled] || []
end

View File

@@ -5,12 +5,12 @@ module LdapManager
end
def call
treebase = ldap_config["base"]
treebase = ldap_config["base"]
attributes = %w{ jpegPhoto }
filter = Net::LDAP::Filter.eq("cn", @cn)
filter = Net::LDAP::Filter.eq("cn", @cn)
entry = client.search(base: treebase, filter: filter, attributes: attributes).first
entry.try(:jpegPhoto) ? entry.jpegPhoto.first : nil
entry&.jpegPhoto ? entry.jpegPhoto.first : nil
end
end
end

View File

@@ -8,20 +8,20 @@ module LdapManager
end
def call
replace_attribute @dn, :jpegPhoto, @img_data
result = replace_attribute @dn, :jpegPhoto, @img_data
result
end
private
def process(file)
processed = ImageProcessing::Vips
.resize_to_fill(512, 512)
.resize_to_fill(256, 256)
.source(file)
.convert("jpeg")
.saver(strip: true)
.call
Base64.strict_encode64 processed.read
processed.read
end
end
end

View File

@@ -20,7 +20,7 @@
</button>
</p>
<p class="text-sm text-gray-500">
Your user address for Chat and Lightning Network.
Your account's address on the Internet
</p>
</div>
<%= form_for(@user, url: setting_path(:profile), html: { :method => :put }) do |f| %>
@@ -40,9 +40,10 @@
Default profile picture
</p>
<div class="flex items-center gap-6">
<% if current_user.avatar.present? %>
<% unless current_user.avatar.nil? %>
<p class="flex-none">
<%= image_tag "data:image/jpeg;base64,#{current_user.avatar}", class: "h-24 w-24 rounded-lg" %>
<%= image_tag "data:image/jpeg;base64,#{current_user.avatar_base64}",
class: "h-24 w-24 rounded-lg" %>
</p>
<% end %>
<div class="grow">