Skip to content
Snippets Groups Projects
Commit 3bce7b64 authored by Benjamin Wenger's avatar Benjamin Wenger
Browse files

Merge remote-tracking branch 'origin/project/Channels' into project/Channels

parents a266870f 07b3c7cf
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
...@@ -777,9 +777,9 @@ type EventModel interface { ...@@ -777,9 +777,9 @@ type EventModel interface {
// Sent | 0 // Sent | 0
// Delivered | 1 // Delivered | 1
// Failed | 2 // Failed | 2
ReceiveMessage(channelID []byte, messageID []byte, ReceiveMessage(channelID, messageID []byte,
senderUsername string, text string, timestamp int64, senderUsername, text string,
lease int64, roundId int64, status int64) timestamp, lease, roundId, status int64)
// ReceiveReply is called whenever a message is received which is a reply // ReceiveReply is called whenever a message is received which is a reply
// on a given channel. It may be called multiple times on the same message, // on a given channel. It may be called multiple times on the same message,
...@@ -801,10 +801,9 @@ type EventModel interface { ...@@ -801,10 +801,9 @@ type EventModel interface {
// Sent | 0 // Sent | 0
// Delivered | 1 // Delivered | 1
// Failed | 2 // Failed | 2
ReceiveReply(channelID []byte, messageID []byte, ReceiveReply(channelID, messageID, reactionTo []byte,
reactionTo []byte, senderUsername string, senderUsername, text string,
text string, timestamp int64, lease int64, timestamp, lease, roundId, status int64)
roundId int64, status int64)
// ReceiveReaction is called whenever a reaction to a message is received // ReceiveReaction is called whenever a reaction to a message is received
// on a given channel. It may be called multiple times on the same reaction, // on a given channel. It may be called multiple times on the same reaction,
...@@ -826,10 +825,9 @@ type EventModel interface { ...@@ -826,10 +825,9 @@ type EventModel interface {
// Sent | 0 // Sent | 0
// Delivered | 1 // Delivered | 1
// Failed | 2 // Failed | 2
ReceiveReaction(channelID []byte, messageID []byte, ReceiveReaction(channelID, messageID, reactionTo []byte,
reactionTo []byte, senderUsername string, senderUsername, reaction string,
reaction string, timestamp int64, lease int64, timestamp, lease, roundId, status int64)
roundId int64, status int64)
// UpdateSentStatus is called whenever the sent status of a message // UpdateSentStatus is called whenever the sent status of a message
// has changed. // has changed.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment