Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Implemented issue #1578 - Import emails with same message_id but target was different channels.

Browse source
This commit is contained in:
Martin Edenhofer 2017-10-24 09:00:58 +02:00
parent 340fe10d07
commit f25b822065
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/models/channel/driver/imap.rb
View file

@ -191,7 +191,7 @@ example
next if deleted?(message_meta, count, count_all) next if deleted?(message_meta, count, count_all)
# ignore already imported # ignore already imported
next if already_imported?(message_id, message_meta, count, count_all, keep_on_server) next if already_imported?(message_id, message_meta, count, count_all, keep_on_server, channel)
# delete email from server after article was created # delete email from server after article was created
msg = @imap.fetch(message_id, 'RFC822')[0].attr['RFC822'] msg = @imap.fetch(message_id, 'RFC822')[0].attr['RFC822']
@ -240,7 +240,9 @@ returns
private private
def already_imported?(message_id, message_meta, count, count_all, keep_on_server) # rubocop:disable Metrics/ParameterLists
def already_imported?(message_id, message_meta, count, count_all, keep_on_server, channel)
# rubocop:enable Metrics/ParameterLists
return false if !keep_on_server return false if !keep_on_server
return false if !message_meta.attr return false if !message_meta.attr
return false if !message_meta.attr['ENVELOPE'] return false if !message_meta.attr['ENVELOPE']
@ -249,6 +251,13 @@ returns
local_message_id_md5 = Digest::MD5.hexdigest(local_message_id) local_message_id_md5 = Digest::MD5.hexdigest(local_message_id)
article = Ticket::Article.where(message_id_md5: local_message_id_md5).order('created_at DESC, id DESC').limit(1).first article = Ticket::Article.where(message_id_md5: local_message_id_md5).order('created_at DESC, id DESC').limit(1).first
return false if !article return false if !article
# verify if message is already imported via same channel, if not, import it again
ticket = article.ticket
if ticket && ticket.preferences && ticket.preferences[:channel_id].present? && channel.present?
return false if ticket.preferences[:channel_id] != channel[:id]
end
@imap.store(message_id, '+FLAGS', [:Seen]) @imap.store(message_id, '+FLAGS', [:Seen])
Rails.logger.info " - ignore message #{count}/#{count_all} - because message message id already imported" Rails.logger.info " - ignore message #{count}/#{count_all} - because message message id already imported"
true true