Remove explicit MakePayment from SendMessageToGroup
This commit is contained in:
parent
0f09a5ddcf
commit
32c57a07ae
|
@ -493,20 +493,18 @@ func (e *engine) sendMessageToGroup(groupID string, server string, ct []byte, si
|
||||||
if err == nil {
|
if err == nil {
|
||||||
tokenApp, ok := (conn.App()).(*TokenBoardClient)
|
tokenApp, ok := (conn.App()).(*TokenBoardClient)
|
||||||
if ok {
|
if ok {
|
||||||
if spent, numtokens := tokenApp.Post(ct, sig); !spent {
|
if spent, _ := tokenApp.Post(ct, sig); !spent {
|
||||||
// TODO: while this works for the spam guard, it won't work for other forms of payment...
|
// TODO: while this works for the spam guard, it won't work for other forms of payment...
|
||||||
// Make an -inline- payment, this will hold the goroutine
|
// Make an -inline- payment, this will hold the goroutine
|
||||||
if err := tokenApp.MakePayment(); err == nil {
|
if err := tokenApp.MakePayment(); err == nil {
|
||||||
// This really shouldn't fail since we now know we have the required tokens...
|
// This really shouldn't fail since we now know we have the required tokens...
|
||||||
if spent, _ := tokenApp.Post(ct, sig); !spent {
|
if spent, numTokens := tokenApp.Post(ct, sig); !spent {
|
||||||
e.eventManager.Publish(event.NewEvent(event.SendMessageToGroupError, map[event.Field]string{event.GroupID: groupID, event.GroupServer: server, event.Error: err.Error(), event.Signature: base64.StdEncoding.EncodeToString(sig)}))
|
e.eventManager.Publish(event.NewEvent(event.SendMessageToGroupError, map[event.Field]string{event.GroupID: groupID, event.GroupServer: server, event.Error: fmt.Errorf("could not post %v", numTokens).Error(), event.Signature: base64.StdEncoding.EncodeToString(sig)}))
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Broadcast the token error
|
// Broadcast the token error
|
||||||
e.eventManager.Publish(event.NewEvent(event.SendMessageToGroupError, map[event.Field]string{event.GroupID: groupID, event.GroupServer: server, event.Error: err.Error(), event.Signature: base64.StdEncoding.EncodeToString(sig)}))
|
e.eventManager.Publish(event.NewEvent(event.SendMessageToGroupError, map[event.Field]string{event.GroupID: groupID, event.GroupServer: server, event.Error: err.Error(), event.Signature: base64.StdEncoding.EncodeToString(sig)}))
|
||||||
}
|
}
|
||||||
} else if numtokens < 5 {
|
|
||||||
go tokenApp.MakePayment()
|
|
||||||
}
|
}
|
||||||
// regardless we return....
|
// regardless we return....
|
||||||
return
|
return
|
||||||
|
|
Loading…
Reference in New Issue