core: Minor fixes for inbound contact requests

core/contactlist.go

@@ -22,8 +22,9 @@ type ContactList struct {
 
 func LoadContactList(core *Ricochet) (*ContactList, error) {
 	list := &ContactList{
-		core:   core,
-		events: utils.CreatePublisher(),
+		core:            core,
+		events:          utils.CreatePublisher(),
+		inboundRequests: make(map[string]*InboundContactRequest),
 	}
 
 	config := core.Config.OpenRead()
@@ -46,7 +47,6 @@ func LoadContactList(core *Ricochet) (*ContactList, error) {
 		list.contacts[id] = contact
 	}
 
-	// XXX Requests aren't implemented
 	return list, nil
 }
 

core/inboundcontactrequest.go

@@ -82,6 +82,18 @@ func (cr *InboundContactRequest) Update(nickname, message string) {
 	}
 }
 
+func (cr *InboundContactRequest) SetNickname(nickname string) error {
+	cr.mutex.Lock()
+	defer cr.mutex.Unlock()
+
+	if IsNicknameAcceptable(nickname) {
+		cr.data.FromNickname = nickname
+	} else {
+		return errors.New("Invalid nickname")
+	}
+	return nil
+}
+
 func (cr *InboundContactRequest) Accept() (*Contact, error) {
 	cr.mutex.Lock()
 	defer cr.mutex.Unlock()

core/rpcserver.go

@@ -159,6 +159,11 @@ func (s *RpcServer) AcceptInboundRequest(ctx context.Context, req *ricochet.Cont
 	if request == nil {
 		return nil, errors.New("Request does not exist")
 	}
+	if len(req.FromNickname) > 0 {
+		if err := request.SetNickname(req.FromNickname); err != nil {
+			return nil, err
+		}
+	}
 	contact, err := request.Accept()
 	if err != nil {
 		return nil, err