Skip to content
Snippets Groups Projects
Commit 334bd4ee authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

- User Event : add not truncate pubkeys in message params

parent 4834ebcb
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
......@@ -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);
}
}
......
......@@ -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"]}}
}
......
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]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment