Skip to content
Snippets Groups Projects
Commit 97de4cf8 authored by Jake Taylor's avatar Jake Taylor
Browse files

merge release

parent f311d2bd
No related branches found
No related tags found
3 merge requests!510Release,!419rewrote the health tracker to both consider if there are waiting rounds and...,!340Project/channels
...@@ -158,7 +158,7 @@ func (c *Channel) Broadcast(payload []byte) ([]byte, error) { ...@@ -158,7 +158,7 @@ func (c *Channel) Broadcast(payload []byte) ([]byte, error) {
return nil, err return nil, err
} }
return json.Marshal(BroadcastReport{ return json.Marshal(BroadcastReport{
RoundURL: getRoundURL(rid), RoundURL: getRoundURL(rid.ID),
RoundsList: makeRoundsList(rid.ID), RoundsList: makeRoundsList(rid.ID),
EphID: eid, EphID: eid,
}) })
...@@ -181,7 +181,7 @@ func (c *Channel) BroadcastAsymmetric(payload, pk []byte) ([]byte, error) { ...@@ -181,7 +181,7 @@ func (c *Channel) BroadcastAsymmetric(payload, pk []byte) ([]byte, error) {
} }
return json.Marshal(BroadcastReport{ return json.Marshal(BroadcastReport{
RoundsList: makeRoundsList(rid.ID), RoundsList: makeRoundsList(rid.ID),
RoundURL: getRoundURL(rid), RoundURL: getRoundURL(rid.ID),
EphID: eid, EphID: eid,
}) })
} }
......
...@@ -271,7 +271,7 @@ func (g *GroupChat) Send(groupId, message []byte, tag string) ([]byte, error) { ...@@ -271,7 +271,7 @@ func (g *GroupChat) Send(groupId, message []byte, tag string) ([]byte, error) {
// Construct send report // Construct send report
sendReport := &GroupSendReport{ sendReport := &GroupSendReport{
RoundURL: getRoundURL(round), RoundURL: getRoundURL(round.ID),
RoundsList: makeRoundsList(round.ID), RoundsList: makeRoundsList(round.ID),
Timestamp: timestamp.UnixNano(), Timestamp: timestamp.UnixNano(),
MessageID: msgID.Bytes(), MessageID: msgID.Bytes(),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment