Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

The mailfrom method's arguments restored. #59

Merged
merged 1 commit into from
Aug 22, 2023
Merged

The mailfrom method's arguments restored. #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions lib/net/smtp.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,8 @@ def any_require_smtputf8(addresses)
def send_message(msgstr, from_addr, *to_addrs)
to_addrs.flatten!
raise IOError, 'closed session' unless @socket
mailfrom from_addr, any_require_smtputf8(to_addrs)
from_addr = Address.new(from_addr, 'SMTPUTF8') if any_require_smtputf8(to_addrs) && capable?('SMTPUTF8')
mailfrom from_addr
rcptto_list(to_addrs) {data msgstr}
end

Expand Down Expand Up @@ -823,7 +824,8 @@ def send_message(msgstr, from_addr, *to_addrs)
def open_message_stream(from_addr, *to_addrs, &block) # :yield: stream
to_addrs.flatten!
raise IOError, 'closed session' unless @socket
mailfrom from_addr, any_require_smtputf8(to_addrs)
from_addr = Address.new(from_addr, 'SMTPUTF8') if any_require_smtputf8(to_addrs) && capable?('SMTPUTF8')
mailfrom from_addr
rcptto_list(to_addrs) {data(&block)}
end

Expand Down Expand Up @@ -890,8 +892,8 @@ def ehlo(domain)
end

# +from_addr+ is +String+ or +Net::SMTP::Address+
def mailfrom(from_addr, require_smtputf8 = false)
addr = if require_smtputf8 || requires_smtputf8(from_addr)
def mailfrom(from_addr)
addr = if requires_smtputf8(from_addr)
raise SMTPUTF8RequiredError, "Message requires SMTPUTF8 but server does not support that" unless capable? "SMTPUTF8"
Address.new(from_addr, "SMTPUTF8")
else
Expand Down Expand Up @@ -1128,7 +1130,7 @@ def initialize(address, *args, **kw_args)
@address = address
@parameters = []
end
@parameters = (parameters + args + [kw_args]).map{|param| Array(param)}.flatten(1).map{|param| Array(param).compact.join('=')}
@parameters = (parameters + args + [kw_args]).map{|param| Array(param)}.flatten(1).map{|param| Array(param).compact.join('=')}.uniq
end

def to_s
Expand Down