External/ergo
1
0
Fork 1
mirror of https://github.com/ergochat/ergo.git synced 2025-12-20 02:00:11 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Split modes into a subpackage (this is painful, but will force us to simplify and improve the API for interacting with modes)

Browse source
This commit is contained in:
Daniel Oaks 2018-02-03 20:21:32 +10:00
parent 9f71d9ce12
commit 3634d0601e
12 changed files with 541 additions and 517 deletions
Download patch file Download diff file Expand all files Collapse all files

13
irc/getters.go
View file

@ -3,7 +3,10 @@
package irc
import "github.com/oragono/oragono/irc/isupport"
import (
"github.com/oragono/oragono/irc/isupport"
"github.com/oragono/oragono/irc/modes"
)
func (server *Server) ISupport() *isupport.List {
server.configurableStateMutex.RLock()
@ -41,7 +44,7 @@ func (server *Server) WebIRCConfig() []webircConfig {
return server.webirc
}
func (server *Server) DefaultChannelModes() Modes {
func (server *Server) DefaultChannelModes() modes.Modes {
server.configurableStateMutex.RLock()
defer server.configurableStateMutex.RUnlock()
return server.defaultChannelModes
@ -107,7 +110,7 @@ func (client *Client) AccountName() string {
return client.account.Name
}
func (client *Client) HasMode(mode Mode) bool {
func (client *Client) HasMode(mode modes.Mode) bool {
client.stateMutex.RLock()
defer client.stateMutex.RUnlock()
return client.flags[mode]
@ -180,7 +183,7 @@ func (channel *Channel) setKey(key string) {
channel.stateMutex.Unlock()
}
func (channel *Channel) HasMode(mode Mode) bool {
func (channel *Channel) HasMode(mode modes.Mode) bool {
channel.stateMutex.RLock()
defer channel.stateMutex.RUnlock()
return channel.flags[mode]
@ -193,7 +196,7 @@ func (channel *Channel) Founder() string {
}
// set a channel mode, return whether it was already set
func (channel *Channel) setMode(mode Mode, enable bool) (already bool) {
func (channel *Channel) setMode(mode modes.Mode, enable bool) (already bool) {
channel.stateMutex.Lock()
already = (channel.flags[mode] == enable)
if !already {