CEF/ergo
1
0
Fork 0
forked from External/ergo
Code Pull requests Activity

disallow TAKE and REQUEST while under a FORBID

Browse source
This commit is contained in:
Shivaram Lingamneni 2020-02-01 23:51:29 -05:00
parent e1f56aaee3
commit 5426c9fdc0
3 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
irc/accounts.go
View file

@ -1183,6 +1183,10 @@ func (am *AccountManager) VHostSet(account string, vhost string) (result VHostIn
func (am *AccountManager) VHostRequest(account string, vhost string, cooldown time.Duration) (result VHostInfo, err error) {
munger := func(input VHostInfo) (output VHostInfo, err error) {
output = input
if input.Forbidden {
err = errVhostsForbidden
return
}
// you can update your existing request, but if you were approved or rejected,
// you can't spam a new request
if output.RequestedVHost == "" {
@ -1204,7 +1208,10 @@ func (am *AccountManager) VHostRequest(account string, vhost string, cooldown ti
func (am *AccountManager) VHostTake(account string, vhost string, cooldown time.Duration) (result VHostInfo, err error) {
munger := func(input VHostInfo) (output VHostInfo, err error) {
output = input
if input.Forbidden {
err = errVhostsForbidden
return
}
// if you have a request pending, you can cancel it using take;
// otherwise, you're subject to the same throttling as if you were making a request
if output.RequestedVHost == "" {