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

fix Client.historyStatus

Browse source
This commit is contained in:
Shivaram Lingamneni 2020-02-20 02:06:13 -05:00
parent 8f4c14c783
commit 17a89838b8
3 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
irc/client.go
View file

@ -353,7 +353,7 @@ func (server *Server) AddAlwaysOnClient(account ClientAccount, chnames []string)
}
func (client *Client) resizeHistory(config *Config) {
_, ephemeral := client.historyStatus(config)
_, ephemeral, _ := client.historyStatus(config)
if ephemeral {
client.history.Resize(config.History.ClientLength, config.History.AutoresizeWindow)
} else {
@ -756,7 +756,7 @@ func (session *Session) playResume() {
}
}
}
_, cEphemeral := client.historyStatus(config)
_, cEphemeral, _ := client.historyStatus(config)
if cEphemeral {
lastDiscarded := client.history.LastDiscarded()
if oldestLostMessage.Before(lastDiscarded) {
@ -1543,20 +1543,23 @@ func (client *Client) attemptAutoOper(session *Session) {
}
}
func (client *Client) historyStatus(config *Config) (persistent, ephemeral bool) {
func (client *Client) historyStatus(config *Config) (persistent, ephemeral bool, target string) {
if !config.History.Enabled {
return false, false
return
} else if !config.History.Persistent.Enabled {
return false, true
ephemeral = true
return
}
client.stateMutex.RLock()
alwaysOn := client.alwaysOn
historyStatus := client.accountSettings.DMHistory
target = client.nickCasefolded
client.stateMutex.RUnlock()
if !alwaysOn {
return false, true
ephemeral = true
return
}
historyStatus = historyEnabled(config.History.Persistent.DirectMessages, historyStatus)