This commit is contained in:
Andreas Bielawski 2016-07-03 01:20:04 +02:00
parent 52cbd768f0
commit 2053f0b3a5
2 changed files with 32 additions and 17 deletions

View File

@ -27,14 +27,19 @@ function bindings:request(method, parameters, file)
parameters[k] = tostring(v) parameters[k] = tostring(v)
end end
if file and next(file) ~= nil then if file and next(file) ~= nil then
local file_type, file_name = next(file) local file_type, file_name = next(file)
local file_file = io.open(file_name, 'r') if string.match(file_name, '/tmp/') then
local file_data = { local file_file = io.open(file_name, 'r')
filename = file_name, local file_data = {
filename = file_name,
data = file_file:read('*a') data = file_file:read('*a')
} }
file_file:close() file_file:close()
parameters[file_type] = file_data parameters[file_type] = file_data
else
local file_type, file_name = next(file)
parameters[file_type] = file_name
end
end end
if next(parameters) == nil then if next(parameters) == nil then
parameters = {''} parameters = {''}

View File

@ -59,8 +59,10 @@ function utilities:send_photo(chat_id, file, text, reply_to_message_id, reply_ma
reply_to_message_id = reply_to_message_id, reply_to_message_id = reply_to_message_id,
reply_markup = reply_markup reply_markup = reply_markup
}, {photo = file} ) }, {photo = file} )
os.remove(file) if string.match(file, '/tmp/') then
print("Deleted: "..file) os.remove(file)
print("Deleted: "..file)
end
return output return output
end end
@ -73,8 +75,10 @@ function utilities:send_audio(chat_id, file, reply_to_message_id, duration, perf
title = title or nil, title = title or nil,
reply_to_message_id = reply_to_message_id reply_to_message_id = reply_to_message_id
}, {audio = file} ) }, {audio = file} )
os.remove(file) if string.match(file, '/tmp/') then
print("Deleted: "..file) os.remove(file)
print("Deleted: "..file)
end
return output return output
end end
@ -86,8 +90,10 @@ function utilities:send_document(chat_id, file, text, reply_to_message_id, reply
reply_to_message_id = reply_to_message_id, reply_to_message_id = reply_to_message_id,
reply_markup = reply_markup reply_markup = reply_markup
}, {document = file} ) }, {document = file} )
os.remove(file) if string.match(file, '/tmp/') then
print("Deleted: "..file) os.remove(file)
print("Deleted: "..file)
end
return output return output
end end
@ -101,8 +107,10 @@ function utilities:send_video(chat_id, file, text, reply_to_message_id, duration
height = height or nil, height = height or nil,
reply_to_message_id = reply_to_message_id reply_to_message_id = reply_to_message_id
}, {video = file} ) }, {video = file} )
os.remove(file) if string.match(file, '/tmp/') then
print("Deleted: "..file) os.remove(file)
print("Deleted: "..file)
end
return output return output
end end
@ -114,8 +122,10 @@ function utilities:send_voice(chat_id, file, text, reply_to_message_id, duration
duration = duration or nil, duration = duration or nil,
reply_to_message_id = reply_to_message_id reply_to_message_id = reply_to_message_id
}, {voice = file} ) }, {voice = file} )
os.remove(file) if string.match(file, '/tmp/') then
print("Deleted: "..file) os.remove(file)
print("Deleted: "..file)
end
return output return output
end end