GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2025-10-09 20:17:27 +02:00
Code Issues Projects Releases Wiki Activity

fix read markers not being reloaded on restart

Browse Source
This commit is contained in:
Shivaram Lingamneni 2022-05-20 01:39:52 -04:00
parent c3d4be45f1
commit 2b86660e5c
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
irc/accounts.go
View File

@ -130,7 +130,8 @@ func (am *AccountManager) createAlwaysOnClients(config *Config) {
am.server.AddAlwaysOnClient( am.server.AddAlwaysOnClient(
account, account,
am.loadChannels(accountName), am.loadChannels(accountName),
am.loadLastSeen(accountName), am.loadTimeMap(keyAccountLastSeen, accountName),
am.loadTimeMap(keyAccountReadMarkers, accountName),
am.loadModes(accountName), am.loadModes(accountName),
am.loadRealname(accountName), am.loadRealname(accountName),
) )
@ -675,8 +676,8 @@ func (am *AccountManager) saveTimeMap(account, key string, timeMap map[string]ti
} }
} }
func (am *AccountManager) loadLastSeen(account string) (lastSeen map[string]time.Time) { func (am *AccountManager) loadTimeMap(baseKey, account string) (lastSeen map[string]time.Time) {
key := fmt.Sprintf(keyAccountLastSeen, account) key := fmt.Sprintf(baseKey, account)
var lsText string var lsText string
am.server.store.Update(func(tx *buntdb.Tx) error { am.server.store.Update(func(tx *buntdb.Tx) error {
lsText, _ = tx.Get(key) lsText, _ = tx.Get(key)

15
irc/client.go
View File

@ -389,7 +389,7 @@ func (server *Server) RunClient(conn IRCConn) {
client.run(session) client.run(session)
} }
func (server *Server) AddAlwaysOnClient(account ClientAccount, channelToStatus map[string]alwaysOnChannelStatus, lastSeen map[string]time.Time, uModes modes.Modes, realname string) { func (server *Server) AddAlwaysOnClient(account ClientAccount, channelToStatus map[string]alwaysOnChannelStatus, lastSeen, readMarkers map[string]time.Time, uModes modes.Modes, realname string) {
now := time.Now().UTC() now := time.Now().UTC()
config := server.Config() config := server.Config()
if lastSeen == nil && account.Settings.AutoreplayMissed { if lastSeen == nil && account.Settings.AutoreplayMissed {
@ -407,12 +407,13 @@ func (server *Server) AddAlwaysOnClient(account ClientAccount, channelToStatus m
} }
client := &Client{ client := &Client{
lastSeen: lastSeen, lastSeen: lastSeen,
lastActive: now, readMarkers: readMarkers,
channels: make(ChannelSet), lastActive: now,
ctime: now, channels: make(ChannelSet),
languages: server.Languages().Default(), ctime: now,
server: server, languages: server.Languages().Default(),
server: server,
username: username, username: username,
cloakedHostname: cloakedHostname, cloakedHostname: cloakedHostname,