GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-26 22:09:24 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #510 from slingamn/issue404.4

Browse Source 
fix #404
This commit is contained in:
Daniel Oaks 2019-05-22 15:37:55 +10:00 committed by GitHub
commit c34c257b7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
irc/accounts.go
View File

@ -1108,6 +1108,10 @@ func (am *AccountManager) VHostReject(account string, reason string) (result VHo
func (am *AccountManager) VHostSetEnabled(client *Client, enabled bool) (result VHostInfo, err error) { func (am *AccountManager) VHostSetEnabled(client *Client, enabled bool) (result VHostInfo, err error) {
munger := func(input VHostInfo) (output VHostInfo, err error) { munger := func(input VHostInfo) (output VHostInfo, err error) {
if input.ApprovedVHost == "" {
err = errNoVhost
return
}
output = input output = input
output.Enabled = enabled output.Enabled = enabled
return return

1
irc/errors.go
View File

@ -44,6 +44,7 @@ var (
errFeatureDisabled = errors.New(`That feature is disabled`) errFeatureDisabled = errors.New(`That feature is disabled`)
errBanned = errors.New("IP or nickmask banned") errBanned = errors.New("IP or nickmask banned")
errInvalidParams = utils.ErrInvalidParams errInvalidParams = utils.ErrInvalidParams
errNoVhost = errors.New(`You do not have an approved vhost`)
) )
// Socket Errors // Socket Errors

4
irc/hostserv.go
View File

@ -154,7 +154,9 @@ func hsOnOffHandler(server *Server, client *Client, command string, params []str
} }
_, err := server.accounts.VHostSetEnabled(client, enable) _, err := server.accounts.VHostSetEnabled(client, enable)
if err != nil { if err == errNoVhost {
hsNotice(rb, client.t(err.Error()))
} else if err != nil {
hsNotice(rb, client.t("An error occurred")) hsNotice(rb, client.t("An error occurred"))
} else if enable { } else if enable {
hsNotice(rb, client.t("Successfully enabled your vhost")) hsNotice(rb, client.t("Successfully enabled your vhost"))