diff --git a/duniter4j-es-gchange/src/main/java/org/duniter/elasticsearch/gchange/service/CommentService.java b/duniter4j-es-gchange/src/main/java/org/duniter/elasticsearch/gchange/service/CommentService.java index d581326209dd8070674fc1e46d0b0cc8fd840f61..9d0f60e23ffd98406fef93b4ad8a8b8170e8f41c 100644 --- a/duniter4j-es-gchange/src/main/java/org/duniter/elasticsearch/gchange/service/CommentService.java +++ b/duniter4j-es-gchange/src/main/java/org/duniter/elasticsearch/gchange/service/CommentService.java @@ -169,8 +169,10 @@ public class CommentService extends AbstractService { UserEvent.newBuilder(UserEvent.EventType.INFO, GchangeEventCodes.NEW_COMMENT.name()) .setMessage( isNewComment ? I18n.n("duniter.market.event.newComment") : I18n.n("duniter.market.event.updateComment"), + issuer, issuerTitle != null ? issuerTitle : issuer.substring(0, 8), - recordTitle) + recordTitle + ) .setRecipient(recordIssuer) .setReference(index, recordType, recordId) .setReferenceAnchor(commentId) diff --git a/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/service/BlockchainUserEventService.java b/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/service/BlockchainUserEventService.java index 56674f082e126c232db31f0d3d07f9491062b094..690a76bce948fb867562e2ffa1af324b45a6273d 100644 --- a/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/service/BlockchainUserEventService.java +++ b/duniter4j-es-user/src/main/java/org/duniter/elasticsearch/user/service/BlockchainUserEventService.java @@ -212,7 +212,7 @@ public class BlockchainUserEventService extends AbstractService implements Chang if (parts.length >= 3 && parts[2].startsWith("SIG(")) { String receiver = parts[2].substring(4, parts[2].length() - 1); if (!senders.contains(receiver) && !receivers.contains(receiver)) { - notifyUserEvent(block, receiver, UserEventCodes.TX_RECEIVED, I18n.n("duniter.user.event.tx.received"), senderNames, sendersPubkeys); + notifyUserEvent(block, receiver, UserEventCodes.TX_RECEIVED, I18n.n("duniter.user.event.tx.received"), sendersPubkeys, senderNames); receivers.add(receiver); } } @@ -223,7 +223,7 @@ public class BlockchainUserEventService extends AbstractService implements Chang String receiverNames = getNamesFromPubkeys(receivers, true); String receiverPubkeys = joinPubkeys(receivers, false); for (String sender : senders) { - notifyUserEvent(block, sender, UserEventCodes.TX_SENT, I18n.n("duniter.user.event.tx.sent"), receiverNames, receiverPubkeys); + notifyUserEvent(block, sender, UserEventCodes.TX_SENT, I18n.n("duniter.user.event.tx.sent"), receiverPubkeys, receiverNames); } } diff --git a/duniter4j-es-user/src/main/misc/curl_test.sh b/duniter4j-es-user/src/main/misc/curl_test.sh index b7acc655246345f881ddc7057eaf9c527a2614b8..439419ccb733359b388c9e50a757456d4df2d427 100755 --- a/duniter4j-es-user/src/main/misc/curl_test.sh +++ b/duniter4j-es-user/src/main/misc/curl_test.sh @@ -4,8 +4,9 @@ curl -XPOST "http://127.0.0.1:9200/user/event/_count?pretty" -d' { query: { bool: { - filter: [ - {term: {recipient: "5ocqzyDMMWf1V8bsoNhWb1iNwax1e9M7VTUN6navs8of"}} + must: [ + {term: {recipient: "5ocqzyDMMWf1V8bsoNhWb1iNwax1e9M7VTUN6navs8of"}}, + {range: {time: {gt: 0}}} ], must_not: {terms: { "code": ["TX_SENT"]}} } diff --git a/duniter4j-es-user/src/main/resources/i18n/duniter4j-es-user_fr_FR.properties b/duniter4j-es-user/src/main/resources/i18n/duniter4j-es-user_fr_FR.properties index be08e46fca2fadf30534855569db23e859f98626..03e86fc3ccb28cef89307ea245e4c383f9dbdd68 100644 --- a/duniter4j-es-user/src/main/resources/i18n/duniter4j-es-user_fr_FR.properties +++ b/duniter4j-es-user/src/main/resources/i18n/duniter4j-es-user_fr_FR.properties @@ -1,12 +1,12 @@ -duniter.event.NODE_BMA_DOWN=Noeud Duniter [%s\:%s] non joignable, depuis le noeud ES API [%s]. Dernière connexion à %d. Indexation de blockchain en attente. -duniter.event.NODE_BMA_UP=Noeud Duniter [%s\:%s] à nouveau accessible. -duniter.event.NODE_STARTED=Noeud ES API démarré sur le cluster Duniter [%s] +duniter.event.NODE_BMA_DOWN=Noeud Duniter [%1$s\:%2$s] non joignable, depuis le noeud ES API [%3$s]. Dernière connexion à %4$d. Indexation de blockchain en attente. +duniter.event.NODE_BMA_UP=Noeud Duniter [%1$s\:%2$s] à nouveau accessible. +duniter.event.NODE_STARTED=Noeud ES API démarré sur le cluster Duniter [%1$s] duniter.user.event.ms.active=Votre adhésion comme membre a bien été renouvellée duniter.user.event.ms.join=Vous êtes maintenant membre de la monnaie duniter.user.event.ms.leave=Votre adhésion comme membre à expirée -duniter.user.event.tx.received=Vous avez recu un paiement de %s -duniter.user.event.tx.sent=Votre paiement à %s a bien été executé +duniter.user.event.tx.received=Vous avez recu un paiement de %2$s +duniter.user.event.tx.sent=Votre paiement à %2$s a bien été executé duniter4j.event.subject.ERROR=%s Message d'erreur duniter4j.event.subject.INFO=%s Message d'information duniter4j.event.subject.WARN=%s Message d'avertissement -duniter4j.ws.user.open=Utilisateur [%s] connecté id\=[%s] sur la locale [%s] +duniter4j.ws.user.open=Utilisateur [%1$s] connecté id\=[%2$s] sur la locale [%3$s]