Updated Cwtch Refactor

@@ -12,2 +13,4 @@
 	golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect
 )
+
+replace cwtch.im/cwtch => /home/sarah/workspace/src/cwtch.im/cwtch

@@ -615,2 +520,2 @@
-					}))
-				}
+		messages, err := profile.GetMostRecentMessages(conversationID, 0, messageIndex, 1)
+		if err == nil && len(messages) == 1 {

@@ -650,0 +556,4 @@
+					if message.ID == id {
+						time, _ := time.Parse(time.RFC3339Nano, messages[0].Attr[constants2.AttrSentTimestamp])
+						msg := model.Message{
+							Message:      messages[0].Body,

@@ -277,1 +272,4 @@
 			}
+
+			lastMessage, _ := profile.GetMostRecentMessages(conversationID, 0, 0, 1)
+			ev.Event.Data["unread"] = strconv.Itoa(1) // we've just created this contact so by definition this must be 1...

@@ -511,4 +466,0 @@
-	RejectInvite(C.GoStringN(profilePtr, profileLen), C.GoStringN(handlePtr, handleLen))
-}
-
-// RejectInvite rejects a group invite

@@ -252,4 +254,0 @@
-		contactList := application.GetPeer(profileOnion).GetContacts()
-		for _, handle := range contactList {
-			totalMessages := application.GetPeer(profileOnion).GetContact(handle).Timeline.Len() + len(application.GetPeer(profileOnion).GetContact(handle).UnacknowledgedMessages)
-			eventHandler.Push(event.NewEvent(event.MessageCounterResync, map[event.Field]string{

@@ -269,1 +256,4 @@
+		for _, conversation := range conversations {
+			if (conversation.IsGroup() && groupHandler != nil) || conversation.IsServer() == false {
+				totalMessages, _ := profile.GetChannelMessageCount(conversation.ID, 0)
 				eventHandler.Push(event.NewEvent(event.MessageCounterResync, map[event.Field]string{

@@ -647,3 +550,1 @@
-			indexedMessages, err = timeline.GetMessagesByHash(contentHash)
-			if err != nil {
-				indexedMessages = []model.LocallyIndexedMessage{}
+		id, err := profile.GetChannelMessageByContentHash(handle, 0, contentHash)

@@ -63,3 +64,2 @@
 		return eh.handleAppBusEvent(&e)
-	case ev := <-eh.profileEvents:
-		return eh.handleProfileEvent(&ev)
+	default:

@@ -243,3 +236,3 @@
-		ph := NewPeerHelper(peer)
+		profile := eh.app.GetPeer(ev.Profile)
 		log.Debugf("New Profile Event to Handle: %v", ev)
 		switch ev.Event.EventType {

@@ -265,0 +246,4 @@
+				// TODO This Conversation May Not Exist Yet...But we are not in charge of creating it...
+				log.Errorf("todo wait for contact to be added before processing this event...")
+			}
+			ev.Event.Data["Nick"], _ = ci.GetAttribute(attr.PublicScope, attr.ProfileZone, constants.Name)

@@ -269,1 +254,3 @@
-			peer.SetGroupAttribute(ev.Event.Data[event.GroupID], attr.GetLocalScope(constants2.Archived), event.False)
+			ci, err := profile.FetchConversationInfo(ev.Event.Data["RemotePeer"])
+			if ci != nil && err == nil {
+				ev.Event.Data["Nick"], _ = ci.GetAttribute(attr.PublicScope, attr.ProfileZone, constants.Name)

@@ -265,0 +264,4 @@
+			var exists bool
+			ev.Event.Data["Nick"], exists = ci.GetAttribute(attr.LocalScope, attr.ProfileZone, constants.Name)
+			if !exists {
+				ev.Event.Data["Nick"], _ = ci.GetAttribute(attr.PublicScope, attr.ProfileZone, constants.Name)

@@ -270,0 +275,4 @@
+				var exists bool
+				ev.Event.Data["Nick"], exists = ci.GetAttribute(attr.LocalScope, attr.ProfileZone, constants.Name)
+				if !exists {
+					ev.Event.Data["Nick"], _ = ci.GetAttribute(attr.PublicScope, attr.ProfileZone, constants.Name)