yves/meowlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Refactor structs with some getters/setters - Peers part
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
ycc
2024-02-07 16:08:24 +01:00
parent f8a1cb6f68
commit 93e972900f
11 changed files with 260 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/identity.go
View File

@ -22,7 +22,7 @@ type Identity struct {
Status string `json:"status,omitempty"`
Peers PeerList `json:"peers,omitempty"`
Devices PeerList `json:"devices,omitempty"`
HiddenPeers [][]byte `json:"hiddend_peers,omitempty"`
HiddenPeers [][]byte `json:"hidden_peers,omitempty"`
Device meowlib.KeyPair `json:"device,omitempty"`
KnownServers ServerList `json:"known_servers,omitempty"`
MessageServers ServerList `json:"message_servers,omitempty"`
@ -61,7 +61,7 @@ func (id *Identity) InvitePeer(MyName string, ContactName string, MessageServerI
}
}
for _, i := range MessageServerIdxs {
srv := &id.MessageServers.Servers[i].ServerData
srv := id.MessageServers.Servers[i].GetServerCard()
peer.MyContact.PullServers = append(peer.MyContact.PullServers, srv)
}
peer.MyContact.Name = MyName
@ -97,8 +97,8 @@ func (id *Identity) AnswerInvitation(MyName string, ContactName string, MessageS
}
peer.Contact = *ReceivedContact
for _, i := range MessageServerIdxs {
srv := id.MessageServers.Servers[i].ServerData
peer.MyContact.PullServers = append(peer.MyContact.PullServers, &srv)
srv := id.MessageServers.Servers[i].GetServerCard()
peer.MyContact.PullServers = append(peer.MyContact.PullServers, srv)
}
peer.MyContact.Name = MyName
peer.MyContact.ContactPublicKey = peer.MyIdentity.Public
@ -226,7 +226,7 @@ func (id *Identity) GetRequestJobs() []*RequestsJob {
for _, server := range id.MessageServers.Servers {
var rj RequestsJob
rj.Server = server
srvs[server.ServerData.GetUid()] = &rj
srvs[server.GetServerCard().GetUid()] = &rj
}
// add ids to the map
for _, peer := range id.Peers {