From f326756ecf88085e3c8fd87b1eca3777b6e86320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Fri, 15 Nov 2019 13:13:37 +0100
Subject: [PATCH] add Topic to EnvelopeEvent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 whisperv6/events.go  | 1 +
 whisperv6/whisper.go | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/whisperv6/events.go b/whisperv6/events.go
index b99f580..195435f 100644
--- a/whisperv6/events.go
+++ b/whisperv6/events.go
@@ -38,6 +38,7 @@ const (
 // EnvelopeEvent used for envelopes events.
 type EnvelopeEvent struct {
 	Event EventType
+	Topic TopicType
 	Hash  common.Hash
 	Batch common.Hash
 	Peer  enode.ID
diff --git a/whisperv6/whisper.go b/whisperv6/whisper.go
index 0d7fd15..5ed84a2 100644
--- a/whisperv6/whisper.go
+++ b/whisperv6/whisper.go
@@ -441,6 +441,7 @@ func (whisper *Whisper) RequestHistoricMessagesWithTimeout(peerID []byte, envelo
 	}
 	whisper.envelopeFeed.Send(EnvelopeEvent{
 		Peer:  p.peer.ID(),
+		Topic: envelope.Topic,
 		Hash:  envelope.Hash(),
 		Event: EventMailServerRequestSent,
 	})
@@ -957,6 +958,7 @@ func (whisper *Whisper) runMessageLoop(p *Peer, rw p2p.MsgReadWriter) error {
 
 				whisper.envelopeFeed.Send(EnvelopeEvent{
 					Event: EventEnvelopeReceived,
+					Topic: env.Topic,
 					Hash:  env.Hash(),
 					Peer:  p.peer.ID(),
 				})
@@ -1280,6 +1282,7 @@ func (whisper *Whisper) add(envelope *Envelope, isP2P bool) (bool, error) {
 		if whisper.mailServer != nil {
 			whisper.mailServer.Archive(envelope)
 			whisper.envelopeFeed.Send(EnvelopeEvent{
+				Topic: envelope.Topic,
 				Hash:  envelope.Hash(),
 				Event: EventMailServerEnvelopeArchived,
 			})
@@ -1329,6 +1332,7 @@ func (whisper *Whisper) processQueue() {
 		case e := <-whisper.messageQueue:
 			whisper.filters.NotifyWatchers(e, false)
 			whisper.envelopeFeed.Send(EnvelopeEvent{
+				Topic: e.Topic,
 				Hash:  e.Hash(),
 				Event: EventEnvelopeAvailable,
 			})
@@ -1346,6 +1350,7 @@ func (whisper *Whisper) processP2P() {
 			case *Envelope:
 				whisper.filters.NotifyWatchers(event, true)
 				whisper.envelopeFeed.Send(EnvelopeEvent{
+					Topic: event.Topic,
 					Hash:  event.Hash(),
 					Event: EventEnvelopeAvailable,
 				})