This commit is contained in:
@@ -159,6 +159,25 @@ class User < ApplicationRecord
|
||||
@display_name ||= ldap_entry[:display_name]
|
||||
end
|
||||
|
||||
def avatar
|
||||
@avatar ||= LdapManager::FetchAvatar.call(cn: cn)
|
||||
end
|
||||
|
||||
def avatar_base64
|
||||
@avatar_base64 ||= begin
|
||||
if avatar.present?
|
||||
Rails.logger.debug { "Avatar data size: #{avatar.size}" }
|
||||
Base64.strict_encode64(avatar)
|
||||
else
|
||||
Rails.logger.error { "Avatar data is empty or nil" }
|
||||
return nil
|
||||
end
|
||||
rescue StandardError => e
|
||||
Rails.logger.error { "Failed to encode avatar: #{e.message}" }
|
||||
nil
|
||||
end
|
||||
end
|
||||
|
||||
def nostr_pubkey
|
||||
@nostr_pubkey ||= ldap_entry[:nostr_key]
|
||||
end
|
||||
@@ -186,10 +205,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
|
||||
|
||||
@@ -10,7 +10,33 @@ module LdapManager
|
||||
filter = Net::LDAP::Filter.eq("cn", @cn)
|
||||
|
||||
entry = client.search(base: treebase, filter: filter, attributes: attributes).first
|
||||
entry.try(:jpegPhoto) ? entry.jpegPhoto.first : nil
|
||||
|
||||
if entry&.jpegPhoto
|
||||
binary_data = entry.jpegPhoto.first # Use first value (binary)
|
||||
Rails.logger.debug { "Fetched jpegPhoto size: #{binary_data.bytesize}" }
|
||||
create_tempfile(binary_data)
|
||||
else
|
||||
Rails.logger.debug { "No jpegPhoto found for cn=#{@cn}, ou=#{@ou}" }
|
||||
nil
|
||||
end
|
||||
end
|
||||
|
||||
def create_tempfile(binary_data)
|
||||
tempfile = Tempfile.new(['image', '.jpg'])
|
||||
tempfile.binmode
|
||||
tempfile.write(binary_data)
|
||||
tempfile.rewind
|
||||
|
||||
Rails.logger.debug { "Storing debug file for cn=#{@cn}, size=#{tempfile.size}" }
|
||||
|
||||
data = tempfile.read
|
||||
|
||||
debug_file_path = "#{Rails.root}/tmp/avatar-fetched.jpg"
|
||||
debug_file = File.open(debug_file_path, 'wb')
|
||||
debug_file.write(data)
|
||||
debug_file.close
|
||||
|
||||
data
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -8,20 +8,30 @@ module LdapManager
|
||||
end
|
||||
|
||||
def call
|
||||
replace_attribute @dn, :jpegPhoto, @img_data
|
||||
Rails.logger.debug { "Storing jpegPhoto for dn=#{@dn}, size=#{@img_data.bytesize}" }
|
||||
result = replace_attribute @dn, :jpegPhoto, @img_data
|
||||
Rails.logger.debug { "LDAP replace_attribute result: #{result}" }
|
||||
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
|
||||
data = processed.read
|
||||
|
||||
debug_file_path = "#{Rails.root}/tmp/avatar-processed.jpg"
|
||||
debug_file = File.open(debug_file_path, 'wb')
|
||||
debug_file.write(data)
|
||||
debug_file.close
|
||||
|
||||
data
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -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">
|
||||
|
||||
Reference in New Issue
Block a user