refactor #8

oddlid · 2026-01-19T09:48:11Z

oddlid commented

2026-01-19 09:48:11 +00:00

Here I've done some of the things I mentioned. I've mixed styles a bit, like some places (getInput) I check even fmt.F*f for errors, while other places I don't, so you can see what you prefer.
This first draft is just to see if you like this way of doing it, and to agree on a way forward.

Closes #7

Here I've done some of the things I mentioned. I've mixed styles a bit, like some places (getInput) I check even fmt.F*f for errors, while other places I don't, so you can see what you prefer. This first draft is just to see if you like this way of doing it, and to agree on a way forward. Closes #7

oddlid added 2 commits

2026-01-19 09:48:11 +00:00

Added nix flake for dev shell ec993e78e5

WIP: First sketch of refactoring cmd/sensebot

Build docker on push / docker (pull_request) Has been skipped

Details

ab0109fd92

- Use one top level context for signalling
- Split up in smaller functions
- Return errors instead of panicking

nex reviewed

2026-01-19 15:58:21 +00:00

cmd/sensebot/login.go Outdated

					
				@ -0,0 +60,4 @@

					resp, err := mxClient.Login(

						ctx,

						&mautrix.ReqLogin{

							Type:     "m.login.password", // TODO: make constants for all JSON keys used?

Actually I think mautrix.AuthTypePassword already exists

Actually I think `mautrix.AuthTypePassword` already exists

it does!

[it does!](https://pkg.go.dev/maunium.net/go/mautrix#AuthType)

👍 1

nex reviewed

2026-01-19 15:59:23 +00:00

cmd/sensebot/login_test.go Outdated

					
				@ -0,0 +135,4 @@

						content: make([]byte, len(prompt)),

					}

					res, err := login(context.TODO(), &in, &out)

context.TODO() instead of t.Context()?

`context.TODO()` instead of `t.Context()`?

Ah, nice! It's so "new" in Go that I wasn't aware of it. Sure will change!

❤️ 1

Oh huh, it was added in Go 1.24, i didn't even realise it was that new 😅

Last I worked with Golang (1.5y ago), we were still on 1.21, so that's why it was "new" to me :P

nex reviewed

2026-01-19 16:01:51 +00:00

cmd/sensebot/run.go

					
				@ -0,0 +129,4 @@

					log.Warn().Msg("Received shutdown signal")

					log.Info().Msg("Waiting for tasks to finish...")

					wg.Wait()

this wg.Wait() has haunted me since it was added, since I didn't understand contexts at the time and I'm pretty sure has been the source of deadlocks during shutdown before. Up to you if you want to investigate the sanity of it in this PR, but if not I'll probably see if I can yank it later.

this `wg.Wait()` has haunted me since it was added, since I didn't understand contexts at the time and I'm pretty sure has been the source of deadlocks during shutdown before. Up to you if you want to investigate the sanity of it in this PR, but if not I'll probably see if I can yank it later.

I haven't actually run this yet, I've just changed stuff to a pattern I know usually works well. Since there's now only one top level context getting passed around, which will get cancelled on the given signals, this should work. But sure, it needs to be properly tested.

I haven't actually run this yet, I've just changed stuff to a pattern I know usually works well. Since there's now only one top level context getting passed around, which will get cancelled on the given signals, this *should* work. But sure, it needs to be properly tested.

oddlid added 1 commit

2026-01-20 13:44:45 +00:00

Merge generateConfig and login

Build docker on push / docker (pull_request) Has been skipped

Details

78dd6b4bba

oddlid added 1 commit

2026-01-21 11:26:10 +00:00

Some more tests

Build docker on push / docker (pull_request) Has been skipped

Details

ecfd5c14a8

oddlid added 1 commit

2026-01-22 13:20:29 +00:00

Contexts and linter complaints

Build docker on push / docker (pull_request) Has been skipped

Details

04a6fcd889

oddlid added 1 commit

2026-01-23 11:26:07 +00:00

Reuse code

Build docker on push / docker (pull_request) Has been skipped

Details

bb7ba7ba23

- Put common errors/constants/functions in the types package
- Fix most remaining linter complaints
- More context checks (eg. fail fast if cancelled)

nex added 1 commit

2026-01-23 15:23:50 +00:00

Merge branch 'dev' into refactor

Build docker on push / docker (pull_request) Has been skipped

Details

1ec3ecba48

# Conflicts:
#	pkg/sensebot/commands/cmd_get_membership_history.go
#	pkg/sensebot/commands/cmd_management.go
#	pkg/sensebot/commands/cmd_room_info.go
#	pkg/sensebot/commands/cmd_servers.go
#	pkg/statestore/statestore.go
#	pkg/tables/table.go

nex added 1 commit

2026-01-23 15:29:16 +00:00

Resolve remaining lint complaints

Build docker on push / docker (pull_request) Has been skipped

Details

0a39c8fa89

oddlid force-pushed refactor from 0a39c8fa89

Build docker on push / docker (pull_request) Has been skipped

Details

to ee1a65d3ac

Build docker on push / docker (pull_request) Has been skipped

Details

2026-01-27 10:09:53 +00:00

Compare

oddlid added 1 commit

2026-01-30 13:24:38 +00:00

Create wrapper for fmt print/scan

Build docker on push / docker (pull_request) Has been skipped

Details

307fe40263

Replacing direct calls to fmt.Fprintf/Fscanf with a wrapper that ignores
errors from these calls, but is still safe to use, and will not crash
with nil pointers.

oddlid added 1 commit

2026-02-07 21:02:03 +00:00

First steps in removing the embedded context in CommandContext

Build docker on push / docker (pull_request) Has been skipped

Details

a6cbbeae8a

oddlid added 1 commit

2026-02-08 15:23:06 +00:00

Preparing FmtWrapper for move to separate package

Build docker on push / docker (pull_request) Has been skipped

Details

d016dfd4e9

oddlid added 1 commit

2026-02-09 14:20:26 +00:00

Moved embedded context out of CommandContext

Build docker on push / docker (pull_request) Has been skipped

Details

2b1e1e386c

oddlid added 1 commit

2026-02-09 15:44:24 +00:00

Changed commandRegistry.Register to return an error and moved panics to

Build docker on push / docker (pull_request) Has been skipped

Details

82b5d25f74

the call sites

oddlid added 1 commit

2026-02-09 17:09:21 +00:00

Made functions and variables private, where possible

Build docker on push / docker (pull_request) Has been skipped

Details

0a6caf3fb3

oddlid added 1 commit

2026-02-15 11:22:46 +00:00

Replace repeated calls to zerolog.Ctx with local cached instance where

Build docker on push / docker (pull_request) Has been skipped

Details

b1e28d55f3

it makes sense

oddlid added 1 commit

2026-02-15 15:25:59 +00:00

Made some functions private, and commented out unused code

Build docker on push / docker (pull_request) Has been skipped

Details

e37db138f8

nex added 1 commit

2026-02-15 16:27:38 +00:00

Merge branch 'dev' into refactor

Build docker on push / docker (pull_request) Has been skipped

Details

bb4d5b3986

# Conflicts:
#	pkg/sensebot/client/client.go
#	pkg/sensebot/client/commandregistry.go
#	pkg/sensebot/commands/cmd_room_info.go
#	pkg/sensebot/commands/cmd_servers.go
#	pkg/statestore/statestore.go

oddlid added 1 commit

2026-02-16 16:04:38 +00:00

Reverted a merge glitch, and added a Wait method to Paginator

Build docker on push / docker (pull_request) Has been skipped

Details

cb88ef40fc

oddlid added 1 commit

2026-02-16 16:55:08 +00:00

Updated paginator

Build docker on push / docker (pull_request) Has been skipped

Details

Build docker on push / docker (push) Failing after 9s

Details

8d73bf2d89

- Made fields private
- Added nil checks to public methods

nex changed title from ~~WIP: refactor~~ to refactor

2026-02-27 13:19:19 +00:00

nex manually merged commit 8d73bf2d89 into dev

2026-02-27 13:19:31 +00:00

Sign in to join this conversation.

No reviewers

No labels

No milestone

No project

No assignees

2 participants

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

nex/sensebot-go!8

Rows
Columns