From 3f6623bf42a4c0e80ca885fdc16a6ac13ab94028 Mon Sep 17 00:00:00 2001
From: Sarah Jamie Lewis <sarah@openprivacy.ca>
Date: Tue, 12 Feb 2019 18:00:05 -0800
Subject: [PATCH] Cutting cruft from import group

---
 event/common.go    |  2 +-
 peer/cwtch_peer.go | 23 +++++++----------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/event/common.go b/event/common.go
index c98bc29..54d1221 100644
--- a/event/common.go
+++ b/event/common.go
@@ -22,7 +22,7 @@ const (
 	// TimestampReceived [eg time.Now().Format(time.RFC3339Nano)]
 	// RemotePeer: [eg "chpr7qm6op5vfcg2pi4vllco3h6aa7exexc4rqwnlupqhoogx2zgd6qd"]
 	// GroupInvite: [eg "torv3....."]
-	NewGroupInvite    = Type("NewGroupInvite")
+	NewGroupInvite = Type("NewGroupInvite")
 
 	SendMessageToGroup    = Type("SendMessagetoGroup")
 	EncryptedGroupMessage = Type("EncryptedGroupMessage")
diff --git a/peer/cwtch_peer.go b/peer/cwtch_peer.go
index 53f4a40..bd8e805 100644
--- a/peer/cwtch_peer.go
+++ b/peer/cwtch_peer.go
@@ -11,9 +11,7 @@ import (
 	"git.openprivacy.ca/openprivacy/libricochet-go/connectivity"
 	"git.openprivacy.ca/openprivacy/libricochet-go/identity"
 	"git.openprivacy.ca/openprivacy/libricochet-go/log"
-	"git.openprivacy.ca/openprivacy/libricochet-go/utils"
 	"github.com/golang/protobuf/proto"
-	"golang.org/x/crypto/ed25519"
 	"strings"
 	"sync"
 	"time"
@@ -114,22 +112,15 @@ func (cp *cwtchPeer) ImportGroup(exportedInvite string) (groupID string, err err
 			cpp := &protocol.CwtchPeerPacket{}
 			err = proto.Unmarshal(data, cpp)
 			if err == nil {
-				pk, err := base64.StdEncoding.DecodeString(exportedInvite[5 : 5+44])
+				jsobj, err := json.Marshal(cpp.GetGroupChatInvite())
 				if err == nil {
-					edpk := ed25519.PublicKey(pk)
-					onion := utils.GetTorV3Hostname(edpk)
-					cp.Profile.AddContact(onion, &model.PublicProfile{Name: "", Ed25519PublicKey: edpk, Trusted: true, Blocked: false, Onion: onion})
-					cp.Profile.ProcessInvite(cpp.GetGroupChatInvite(), onion)
-					jsobj, err := json.Marshal(cpp.GetGroupChatInvite())
-					if err == nil {
-						cp.eventBus.Publish(event.NewEvent(event.NewGroupInvite, map[event.Field]string{
-							event.GroupInvite: string(jsobj),
-						}))
-					} else {
-						log.Errorf("error serializing group: %v", err)
-					}
-					return cpp.GroupChatInvite.GetGroupName(), nil
+					cp.eventBus.Publish(event.NewEvent(event.NewGroupInvite, map[event.Field]string{
+						event.GroupInvite: string(jsobj),
+					}))
+				} else {
+					log.Errorf("error serializing group: %v", err)
 				}
+				return cpp.GroupChatInvite.GetGroupName(), nil
 			}
 		}
 	} else {