From d9f9489fa2d49aabafef184d3262ee3b8bbd7fa5 Mon Sep 17 00:00:00 2001
From: erinn <erinn@openprivacy.ca>
Date: Wed, 16 Jun 2021 15:58:54 -0700
Subject: [PATCH 1/3] add group message popup notifications

---
 utils/eventHandler.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utils/eventHandler.go b/utils/eventHandler.go
index 9eb35c1..1cfb710 100644
--- a/utils/eventHandler.go
+++ b/utils/eventHandler.go
@@ -235,6 +235,8 @@ func (eh *EventHandler) handleProfileEvent(ev *EventProfileEnvelope) string {
 	}*/
 
 	case event.NewMessageFromPeer: //event.TimestampReceived, event.RemotePeer, event.Data
+		fallthrough
+	case event.NewMessageFromGroup:
 		// only needs contact nickname and picture, for displaying on popup notifications
 		ev.Event.Data["Nick"] = ph.GetNick(ev.Event.Data["RemotePeer"])
 		ev.Event.Data["Picture"] = ph.GetProfilePic(ev.Event.Data["RemotePeer"])

From 28011ae674aff372f56b6e1c2f03779a20afbd84 Mon Sep 17 00:00:00 2001
From: erinn <erinn@openprivacy.ca>
Date: Wed, 16 Jun 2021 16:45:15 -0700
Subject: [PATCH 2/3] add group message popup notifications

---
 lib.go                | 6 +++---
 utils/eventHandler.go | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib.go b/lib.go
index c2b5952..d384dbc 100644
--- a/lib.go
+++ b/lib.go
@@ -1,6 +1,6 @@
-//package cwtch
+package cwtch
 
-package main
+//package main
 
 import "C"
 import (
@@ -739,4 +739,4 @@ func ShutdownCwtch() {
 }
 
 // Leave as is, needed by ffi
-func main() {}
+//func main() {}
diff --git a/utils/eventHandler.go b/utils/eventHandler.go
index 3157a12..311c00a 100644
--- a/utils/eventHandler.go
+++ b/utils/eventHandler.go
@@ -236,11 +236,13 @@ func (eh *EventHandler) handleProfileEvent(ev *EventProfileEnvelope) string {
 		}*/
 
 	case event.NewMessageFromPeer: //event.TimestampReceived, event.RemotePeer, event.Data
-		fallthrough
-	case event.NewMessageFromGroup:
 		// only needs contact nickname and picture, for displaying on popup notifications
 		ev.Event.Data["Nick"] = ph.GetNick(ev.Event.Data["RemotePeer"])
 		ev.Event.Data["Picture"] = ph.GetProfilePic(ev.Event.Data["RemotePeer"])
+	case event.NewMessageFromGroup:
+		// only needs contact nickname and picture, for displaying on popup notifications
+		ev.Event.Data["Nick"] = ph.GetNick(ev.Event.Data[event.GroupID])
+		ev.Event.Data["Picture"] = ph.GetProfilePic(ev.Event.Data[event.GroupID])
 	case event.PeerAcknowledgement:
 		// No enrichement required
 	case event.PeerCreated:

From 204cc35e0d5dfc3f8d74ab82c592fab218eaed4b Mon Sep 17 00:00:00 2001
From: erinn <erinn@openprivacy.ca>
Date: Wed, 16 Jun 2021 16:46:27 -0700
Subject: [PATCH 3/3] switch-ffi

---
 lib.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib.go b/lib.go
index d384dbc..c2b5952 100644
--- a/lib.go
+++ b/lib.go
@@ -1,6 +1,6 @@
-package cwtch
+//package cwtch
 
-//package main
+package main
 
 import "C"
 import (
@@ -739,4 +739,4 @@ func ShutdownCwtch() {
 }
 
 // Leave as is, needed by ffi
-//func main() {}
+func main() {}