|
|
@ -825,17 +825,19 @@ public class EntityRule {
|
|
|
|
Address[] from = new InternetAddress[]{new InternetAddress(identity.email, identity.name, StandardCharsets.UTF_8.name())};
|
|
|
|
Address[] from = new InternetAddress[]{new InternetAddress(identity.email, identity.name, StandardCharsets.UTF_8.name())};
|
|
|
|
|
|
|
|
|
|
|
|
// Prevent loop
|
|
|
|
// Prevent loop
|
|
|
|
List<EntityMessage> messages = db.message().getMessagesByThread(
|
|
|
|
if (isReply) {
|
|
|
|
message.account, message.thread, null, null);
|
|
|
|
List<EntityMessage> messages = db.message().getMessagesByThread(
|
|
|
|
for (EntityMessage threaded : messages)
|
|
|
|
message.account, message.thread, null, null);
|
|
|
|
if (!threaded.id.equals(message.id) &&
|
|
|
|
for (EntityMessage threaded : messages)
|
|
|
|
MessageHelper.equal(threaded.from, from)) {
|
|
|
|
if (!threaded.id.equals(message.id) &&
|
|
|
|
EntityLog.log(context, EntityLog.Type.Rules, message,
|
|
|
|
MessageHelper.equal(threaded.from, from)) {
|
|
|
|
"Answer loop" +
|
|
|
|
EntityLog.log(context, EntityLog.Type.Rules, message,
|
|
|
|
" name=" + answer.name +
|
|
|
|
"Answer loop" +
|
|
|
|
" from=" + MessageHelper.formatAddresses(from));
|
|
|
|
" name=" + answer.name +
|
|
|
|
return;
|
|
|
|
" from=" + MessageHelper.formatAddresses(from));
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
EntityMessage reply = new EntityMessage();
|
|
|
|
EntityMessage reply = new EntityMessage();
|
|
|
|
reply.account = message.account;
|
|
|
|
reply.account = message.account;
|
|
|
|