discordbot: deliver discount approvals via bot API so buttons render

Interactive components (the Approve button) are silently dropped by Discord
when posted through a plain incoming webhook, so leadership only saw the embed
text. Switch the discount-approval notification to the bot REST API.

Generalize discordwebhook delivery: queue rows may now target a channel
(POST /channels/{id}/messages, authenticated with the configured bot token)
in addition to a webhook URL, via a new channel_id column and
QueueChannelMessage. Any module or SQL trigger can post to any channel the
bot can access by inserting a row.

Replace the discount bot's Leadership Channel Webhook URL config with a
Leadership Channel ID; the bot token is reused from the Discord bot config.

Author: jveski

e2e/pages_test.go

@@ -980,8 +980,8 @@ func (p *AdminDiscordConfigPage) CheckApprovalBotEnabled() {
 	require.NoError(p.t, err)
 }
 
-func (p *AdminDiscordConfigPage) FillApprovalBotWebhookURL(value string) {
-	err := p.page.Locator("#leadership_channel_webhook_url").Fill(value)
+func (p *AdminDiscordConfigPage) FillLeadershipChannelID(value string) {
+	err := p.page.Locator("#leadership_channel_id").Fill(value)
 	require.NoError(p.t, err)
 }
 
@@ -990,11 +990,11 @@ func (p *AdminDiscordConfigPage) FillApplicationPublicKey(value string) {
 	require.NoError(p.t, err)
 }
 
-func (p *AdminDiscordConfigPage) ExpectHasLeadershipWebhook() {
-	locator := p.page.Locator("#leadership_channel_webhook_url")
-	placeholder, err := locator.GetAttribute("placeholder")
+func (p *AdminDiscordConfigPage) ExpectLeadershipChannelID(value string) {
+	locator := p.page.Locator("#leadership_channel_id")
+	actual, err := locator.InputValue()
 	require.NoError(p.t, err)
-	require.Contains(p.t, placeholder, "secret is set")
+	require.Equal(p.t, value, actual)
 }
 
 func (p *AdminDiscordConfigPage) ExpectApplicationPublicKey(value string) {

e2e/scenarios_test.go

@@ -2729,7 +2729,7 @@ func TestAdmin_DiscordApprovalBotConfig(t *testing.T) {
 	// The approval bot fields render on the Discord page.
 	publicKey := strings.Repeat("ab", 32) // 64 hex chars => 32 bytes
 	configPage.CheckApprovalBotEnabled()
-	configPage.FillApprovalBotWebhookURL("https://discord.com/api/webhooks/leadership/secret")
+	configPage.FillLeadershipChannelID("123456789012345678")
 	configPage.FillApplicationPublicKey(publicKey)
 	configPage.Submit()
 
@@ -2740,20 +2740,20 @@ func TestAdmin_DiscordApprovalBotConfig(t *testing.T) {
 
 	// Verify the values landed in discord_config (not a separate table).
 	var enabled int
-	var webhook, pubKey string
-	err = env.db.QueryRow(`SELECT approval_bot_enabled, leadership_channel_webhook_url, application_public_key FROM discord_config ORDER BY version DESC LIMIT 1`).
-		Scan(&enabled, &webhook, &pubKey)
+	var channelID, pubKey string
+	err = env.db.QueryRow(`SELECT approval_bot_enabled, leadership_channel_id, application_public_key FROM discord_config ORDER BY version DESC LIMIT 1`).
+		Scan(&enabled, &channelID, &pubKey)
 	require.NoError(t, err)
 	assert.Equal(t, 1, enabled)
-	assert.Equal(t, "https://discord.com/api/webhooks/leadership/secret", webhook)
+	assert.Equal(t, "123456789012345678", channelID)
 	assert.Equal(t, publicKey, pubKey)
 
-	// Reload: the webhook is secret (shows placeholder), the public key is not.
+	// Reload: the channel ID and public key are not secret, so both round-trip.
 	configPage.Navigate()
 	err = page.WaitForLoadState()
 	require.NoError(t, err)
 
-	configPage.ExpectHasLeadershipWebhook()
+	configPage.ExpectLeadershipChannelID("123456789012345678")
 	configPage.ExpectApplicationPublicKey(publicKey)
 
 	enabledChecked, err := page.Locator("#approval_bot_enabled").IsChecked()

modules/discord/config.go

@@ -22,9 +22,9 @@ type Config struct {
 	SyncIntervalHours int `json:"sync_interval_hours" config:"label=Full Reconciliation Interval (hours),section=sync,default=24,min=1,max=168,help=How often to fully reconcile all Discord role assignments. Default: 24 hours."`
 
 	// Discount Approval Bot
-	ApprovalBotEnabled          bool   `json:"approval_bot_enabled" config:"label=Enabled,section=approvalbot,help=When on, a member requesting a discount posts a Discord message with an Approve button. Inbound interactions are still verified regardless."`
-	LeadershipChannelWebhookURL string `json:"leadership_channel_webhook_url" config:"label=Leadership Channel Webhook URL,secret,section=approvalbot,help=Create a webhook on the leadership channel (Channel Settings → Integrations → Webhooks → New Webhook) and paste its URL here. Discount requests are posted here for approval."`
-	ApplicationPublicKey        string `json:"application_public_key" config:"label=Application Public Key,section=approvalbot,help=Hex-encoded Ed25519 public key from your Discord application's General Information page. Used to verify inbound button interactions."`
+	ApprovalBotEnabled   bool   `json:"approval_bot_enabled" config:"label=Enabled,section=approvalbot,help=When on, a member requesting a discount posts a Discord message with an Approve button. Inbound interactions are still verified regardless."`
+	LeadershipChannelID  string `json:"leadership_channel_id" config:"label=Leadership Channel ID,section=approvalbot,help=Right-click the leadership channel in Discord (Developer Mode on) and choose Copy Channel ID. Discount requests are posted here by the bot. Requires the Bot Token above."`
+	ApplicationPublicKey string `json:"application_public_key" config:"label=Application Public Key,section=approvalbot,help=Hex-encoded Ed25519 public key from your Discord application's General Information page. Used to verify inbound button interactions."`
 }
 
 // Validate validates the Discord configuration.

modules/discord/config.templ

@@ -18,9 +18,10 @@ templ botSectionDescription() {
 }
 
 templ approvalBotSectionDescription(selfURL string) {
-	The discount approval bot posts a message with an <strong>Approve</strong> button to the leadership channel whenever a member requests a membership discount. To wire it up:
+	The discount approval bot posts a message with an <strong>Approve</strong> button to the leadership channel whenever a member requests a membership discount. The message is sent through the bot using the <strong>Bot Token</strong> configured above, which is what lets Discord render the interactive button. To wire it up:
 	<ol class="mb-0 mt-2">
-		<li>Create a webhook on the leadership channel (Channel Settings → Integrations → Webhooks → New Webhook) and paste its URL into <strong>Leadership Channel Webhook URL</strong>.</li>
+		<li>Make sure the <strong>Bot Token</strong> (Bot Configuration section) is set and the bot has permission to post in the leadership channel.</li>
+		<li>Enable Developer Mode in Discord, right-click the leadership channel, choose <strong>Copy Channel ID</strong>, and paste it into <strong>Leadership Channel ID</strong>.</li>
 		<li>In the <a href="https://discord.com/developers/applications" target="_blank" rel="noopener">Discord Developer Portal</a>, open your application and copy the <strong>Public Key</strong> from General Information into <strong>Application Public Key</strong>.</li>
 		<li>Set the application's <strong>Interactions Endpoint URL</strong> to <code>{ selfURL }/discord/interactions</code>. Enable the bot and save the correct public key first, or Discord's verification ping will fail.</li>
 	</ol>

modules/discord/config_templ.go

@@ -107,6 +107,7 @@ func New(db *sql.DB, self *url.URL, iss *engine.TokenIssuer, eventLogger *engine
 	// Discount approval bot config (merged from the former discordbot config page).
 	db.Exec("ALTER TABLE discord_config ADD COLUMN approval_bot_enabled INTEGER NOT NULL DEFAULT 0")
 	db.Exec("ALTER TABLE discord_config ADD COLUMN leadership_channel_webhook_url TEXT NOT NULL DEFAULT ''")
+	db.Exec("ALTER TABLE discord_config ADD COLUMN leadership_channel_id TEXT NOT NULL DEFAULT ''")
 	db.Exec("ALTER TABLE discord_config ADD COLUMN application_public_key TEXT NOT NULL DEFAULT ''")
 
 	// Migrate legacy trigger_event-based webhooks that used the old member_events trigger.

modules/discord/module.go

@@ -5,7 +5,7 @@ Notifies leadership when a member requests a membership discount and lets any au
 ## Functionality
 
 - AFTER UPDATE OF `discount_status` trigger on `members` enqueues a member ID into `discordbot_discount_request_queue` whenever `discount_status` transitions into `'requested'`. Nothing is enqueued on signup, on unrelated updates, or on the `requested`→`approved` transition.
-- A 15s polling worker drains the queue, builds a rich Discord payload (an embed describing the request plus a single **Approve** button), and forwards it via the `discordwebhook` module's `MessageQueuer` for rate-limited delivery.
+- A 15s polling worker drains the queue, builds a rich Discord payload (an embed describing the request plus a single **Approve** button), and forwards it via the `discordwebhook` module's `MessageQueuer.QueueChannelMessage` for rate-limited delivery. Delivery goes through the **bot REST API** (not an incoming webhook) because Discord only renders interactive components on messages posted by an application/bot.
 - `POST /discord/interactions` receives Discord's signed callbacks. The handler verifies the Ed25519 signature, then atomically runs `UPDATE members SET discount_status='approved' WHERE id=? AND discount_status='requested'`, logs a `DiscountApprovedViaDiscord` audit event, and replies with `UPDATE_MESSAGE` (empty `components`) recording who approved and removing the button. If the request is no longer pending (the member withdrew it, or another leader already approved), it instead shows a "Discount request closed" message and changes nothing.
 - No Conway authentication is required: the route is unauthenticated and identity is established purely by Discord's request signature against the configured `ApplicationPublicKey`.
 
@@ -21,15 +21,16 @@ Notifies leadership when a member requests a membership discount and lets any au
 
 ## Setup
 
-1. Create a Discord application at <https://discord.com/developers/applications>.
-2. Copy the application's **Public Key** (hex) into the Conway admin UI under **Integrations → Discord → Discount Approval Bot → Application Public Key**.
-3. In the leadership channel, create a webhook and copy its URL into **Leadership Channel Webhook URL** (stored as a secret).
-4. In the Discord application's **General Information** page, set **Interactions Endpoint URL** to `https://<your-conway-host>/discord/interactions`. Discord will immediately probe the endpoint with a signed PING; saving succeeds only if signature verification passes.
-5. Toggle **Enabled** on.
+1. Create a Discord application at <https://discord.com/developers/applications>, add a **Bot** to it, and copy the **Bot Token** into the Conway admin UI under **Integrations → Discord → Bot Configuration → Bot Token**.
+2. Invite the bot to your server and give it permission to post in the leadership channel (the bot must be able to send messages there).
+3. Copy the application's **Public Key** (hex) into **Integrations → Discord → Discount Approval Bot → Application Public Key**.
+4. Enable Developer Mode in Discord, right-click the leadership channel, choose **Copy Channel ID**, and paste it into **Leadership Channel ID**.
+5. In the Discord application's **General Information** page, set **Interactions Endpoint URL** to `https://<your-conway-host>/discord/interactions`. Discord will immediately probe the endpoint with a signed PING; saving succeeds only if signature verification passes.
+6. Toggle **Enabled** on.
 
 ## Behavioral details
 
-- The Discord application's bot account does not need to be invited to the server; webhook delivery posts the message, and interaction callbacks are routed by Discord's infrastructure based on the application's configured endpoint URL.
+- Unlike incoming-webhook delivery, the Approve button requires that the message be posted **by the bot**: the bot account must be in the server and able to post in the leadership channel. The notification is sent via `POST /channels/{LeadershipChannelID}/messages` authenticated with the configured **Bot Token**. Interaction callbacks are routed by Discord's infrastructure based on the application's configured endpoint URL.
 - Inbound interactions must be acknowledged within 3 seconds, so the entire happy path (signature verify, DB lookup, UPDATE, response build) runs inline on the request goroutine.
 - Approval is atomic via the `WHERE ... AND discount_status='requested'` clause, so two leaders clicking Approve at once cannot double-approve; the loser sees "Discount request closed".
 - **Family** requests can be approved from Discord like any other tier, but the root-account linkage must still be completed in the admin panel; the request and approval messages call this out.

modules/discordbot/README.md

@@ -7,10 +7,10 @@ import (
 
 // Config controls the Discord discount-approval bot.
 //
-// LeadershipChannelWebhookURL is the Discord webhook URL used to POST a
-// notification when a member requests a membership discount. The message
-// contains an Approve button that any leader in the channel can click to
-// approve the request.
+// LeadershipChannelID is the ID of the Discord channel where a notification is
+// posted when a member requests a membership discount. The message is sent via
+// the Discord bot REST API (authenticated with the configured bot token) so it
+// can carry an Approve button that any leader in the channel can click.
 //
 // ApplicationPublicKey is the hex-encoded Ed25519 public key shown on the
 // Discord application's "General Information" page. Discord signs every
@@ -19,19 +19,20 @@ import (
 //
 // To wire this up in Discord:
 //
-//  1. Create a webhook on the leadership channel (Channel Settings →
-//     Integrations → Webhooks → New Webhook), copy its URL into
-//     LeadershipChannelWebhookURL.
-//  2. In the Discord Developer Portal, open your application and copy the
+//  1. Create a bot for your application, give it permission to post in the
+//     leadership channel, and copy its Bot Token into the Discord bot config.
+//  2. Enable Developer Mode in Discord, right-click the leadership channel,
+//     choose "Copy Channel ID", and paste it into LeadershipChannelID.
+//  3. In the Discord Developer Portal, open your application and copy the
 //     "Public Key" from General Information into ApplicationPublicKey.
-//  3. Set "Interactions Endpoint URL" to
+//  4. Set "Interactions Endpoint URL" to
 //     https://<your-conway-host>/discord/interactions. Discord will PING the
 //     URL and refuse to save unless Conway responds correctly, so make sure
 //     Enabled=true and the public key is correct first.
 type Config struct {
-	Enabled                     bool   `json:"enabled" config:"label=Enabled,help=When on, a member requesting a discount posts a Discord message with an Approve button. Inbound interactions are still verified regardless."`
-	LeadershipChannelWebhookURL string `json:"leadership_channel_webhook_url" config:"label=Leadership Channel Webhook URL,secret,help=Create a webhook on the leadership channel (Channel Settings → Integrations → Webhooks → New Webhook) and paste its URL here. Discount requests are posted here for approval."`
-	ApplicationPublicKey        string `json:"application_public_key" config:"label=Application Public Key,help=Hex-encoded Ed25519 public key from your Discord application's General Information page. Used to verify inbound button interactions."`
+	Enabled              bool   `json:"enabled" config:"label=Enabled,help=When on, a member requesting a discount posts a Discord message with an Approve button. Inbound interactions are still verified regardless."`
+	LeadershipChannelID  string `json:"leadership_channel_id" config:"label=Leadership Channel ID,help=Right-click the leadership channel in Discord (Developer Mode on) and choose Copy Channel ID. Discount requests are posted here by the bot."`
+	ApplicationPublicKey string `json:"application_public_key" config:"label=Application Public Key,help=Hex-encoded Ed25519 public key from your Discord application's General Information page. Used to verify inbound button interactions."`
 }
 
 // Validate ensures the public key is a valid Ed25519 key when set. Other