diff --git a/.beads/last-touched b/.beads/last-touched index 7097e0d..dcd4101 100644 --- a/.beads/last-touched +++ b/.beads/last-touched @@ -1 +1 @@ -ops-jrz1-zr0q +ops-jrz1-6hu4 diff --git a/docs/worklogs/2026-01-20-musiclink-bot-integration.org b/docs/worklogs/2026-01-20-musiclink-bot-integration.org index c7bd981..1283d8f 100644 --- a/docs/worklogs/2026-01-20-musiclink-bot-integration.org +++ b/docs/worklogs/2026-01-20-musiclink-bot-integration.org @@ -75,8 +75,9 @@ sudo -u postgres psql mautrix_slack -c 'SELECT id, mxid, name FROM portal;' - Conscious pivot from a blocked path (Matterbridge Slack) to a viable one (Matrix mediation). * Next Steps -- [ ] User to invite =@musiclink:clarun.xyz= to the =#music= Matrix room. -- [ ] Verify message flow: Slack -> Matrix -> MusicLink. -- [ ] Enable outbound posting (=gateway.out=) once processing logic is verified. +- [X] User invited =@musiclink:clarun.xyz= to the bot testing room =!whU7Geg7JPrBL5wHcW:clarun.xyz=. +- [X] Verified bot joined successfully (requires manual invite or admin status). +- [X] Enabled outbound posting (=gateway.inout=) for the testing room. +- [ ] Verify message flow: Slack -> Matrix -> MusicLink -> Matrix -> Slack. - [ ] Resolve git access issue for the musiclink flake input. - [ ] Close beads task =ops-jrz1-k3e0= (AGENTS.md review). diff --git a/flake.lock b/flake.lock index a68d6b5..abe5911 100644 --- a/flake.lock +++ b/flake.lock @@ -39,6 +39,27 @@ "type": "github" } }, + "musiclink": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils" + }, + "locked": { + "lastModified": 1768952774, + "narHash": "sha256-g+DH3mTdJyBlQTBplTaCyEfVM44+XV9/YPoIFOfMB9E=", + "ref": "refs/heads/main", + "rev": "e5957cf182934c5b076c862afea9257b6c35d532", + "revCount": 4, + "type": "git", + "url": "ssh://forgejo@git.clarun.xyz/dan/musiclink.git" + }, + "original": { + "type": "git", + "url": "ssh://forgejo@git.clarun.xyz/dan/musiclink.git" + } + }, "nixpkgs": { "locked": { "lastModified": 1751274312, @@ -95,6 +116,7 @@ "root": { "inputs": { "beads": "beads", + "musiclink": "musiclink", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "opencode": "opencode", @@ -135,6 +157,39 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "utils": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index e7aa8d6..ef7d532 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,7 @@ }; musiclink = { - url = "git+file:///home/dan/proj/musiclink"; + url = "git+ssh://forgejo@git.clarun.xyz/dan/musiclink.git"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/modules/musiclink.nix b/modules/musiclink.nix index 507bb95..ef95e9a 100644 --- a/modules/musiclink.nix +++ b/modules/musiclink.nix @@ -81,10 +81,10 @@ enable = true [[gateway.inout]] account = "api.local" -# Read-only from Slack (via Matrix bridge) - DO NOT POST BACK -[[gateway.in]] +# Read/Write for bot testing room +[[gateway.inout]] account = "matrix.clarun" -channel = "!6wiPLmomcgAoELWta1:clarun.xyz" +channel = "!whU7Geg7JPrBL5wHcW:clarun.xyz" EOF '';