From efb68501b9e1e7316a8103eb7e64578305faaf77 Mon Sep 17 00:00:00 2001
From: Jared Mahotiere <jmahotie@purdue.edu>
Date: Mon, 23 Feb 2026 13:18:35 -0500
Subject: [PATCH] chore: fix lint formatting after conflict resolution

---
 pkg/channels/slack.go      | 16 +---------------
 pkg/channels/slack_test.go |  5 +++--
 pkg/config/config.go       |  1 +
 pkg/cron/service.go        |  1 +
 pkg/cron/service_test.go   |  9 ++++++++-
 pkg/utils/file.go          |  4 ++--
 6 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/pkg/channels/slack.go b/pkg/channels/slack.go
index 7e34d3eb5..5df62896e 100644
--- a/pkg/channels/slack.go
+++ b/pkg/channels/slack.go
@@ -307,13 +307,6 @@ func (c *SlackChannel) handleAppMention(ev *slackevents.AppMentionEvent) {
 	if ev.User == c.botUserID {
 		return
 	}
-	if !c.IsAllowed(ev.User) {
-		logger.DebugCF("slack", "App mention rejected by allowlist", map[string]interface{}{
-			"user_id": ev.User,
-		})
-		return
-	}
-
 	if !c.IsAllowed(ev.User) {
 		logger.DebugCF("slack", "Mention rejected by allowlist", map[string]any{
 			"user_id": ev.User,
@@ -380,16 +373,9 @@ func (c *SlackChannel) handleSlashCommand(event socketmode.Event) {
 		c.socketClient.Ack(*event.Request)
 	}
 
-	if !c.IsAllowed(cmd.UserID) {
-		logger.DebugCF("slack", "Slash command rejected by allowlist", map[string]any{
-			"user_id": cmd.UserID,
-		})
-		return
-	}
-
 	senderID := cmd.UserID
 	if !c.IsAllowed(senderID) {
-		logger.DebugCF("slack", "Slash command rejected by allowlist", map[string]interface{}{
+		logger.DebugCF("slack", "Slash command rejected by allowlist", map[string]any{
 			"user_id": senderID,
 			"command": cmd.Command,
 		})
diff --git a/pkg/channels/slack_test.go b/pkg/channels/slack_test.go
index 5775f1544..36da6adfe 100644
--- a/pkg/channels/slack_test.go
+++ b/pkg/channels/slack_test.go
@@ -5,11 +5,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/sipeed/picoclaw/pkg/bus"
-	"github.com/sipeed/picoclaw/pkg/config"
 	"github.com/slack-go/slack"
 	"github.com/slack-go/slack/slackevents"
 	"github.com/slack-go/slack/socketmode"
+
+	"github.com/sipeed/picoclaw/pkg/bus"
+	"github.com/sipeed/picoclaw/pkg/config"
 )
 
 func TestParseSlackChatID(t *testing.T) {
diff --git a/pkg/config/config.go b/pkg/config/config.go
index f4becfa71..ff8f3a1b8 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -8,6 +8,7 @@ import (
 	"sync/atomic"
 
 	"github.com/caarlos0/env/v11"
+
 	"github.com/sipeed/picoclaw/pkg/utils"
 )
 
diff --git a/pkg/cron/service.go b/pkg/cron/service.go
index 1787a15c4..98a39efd4 100644
--- a/pkg/cron/service.go
+++ b/pkg/cron/service.go
@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/adhocore/gronx"
+
 	"github.com/sipeed/picoclaw/pkg/utils"
 )
 
diff --git a/pkg/cron/service_test.go b/pkg/cron/service_test.go
index e02ce42f5..be1997b29 100644
--- a/pkg/cron/service_test.go
+++ b/pkg/cron/service_test.go
@@ -47,7 +47,14 @@ func TestSaveStoreFixesExistingFilePermissions(t *testing.T) {
 	}
 
 	cs := NewCronService(storePath, nil)
-	if _, err := cs.AddJob("perm-test", CronSchedule{Kind: "every", EveryMS: int64Ptr(60000)}, "hello", true, "cli", "direct"); err != nil {
+	if _, err := cs.AddJob(
+		"perm-test",
+		CronSchedule{Kind: "every", EveryMS: int64Ptr(60000)},
+		"hello",
+		true,
+		"cli",
+		"direct",
+	); err != nil {
 		t.Fatalf("AddJob failed: %v", err)
 	}
 
diff --git a/pkg/utils/file.go b/pkg/utils/file.go
index b43e891b3..8849c7f64 100644
--- a/pkg/utils/file.go
+++ b/pkg/utils/file.go
@@ -4,8 +4,8 @@ import "os"
 
 // WritePrivateFile writes data and enforces 0600 permissions for both new and existing files.
 func WritePrivateFile(path string, data []byte) error {
-	if err := os.WriteFile(path, data, 0600); err != nil {
+	if err := os.WriteFile(path, data, 0o600); err != nil {
 		return err
 	}
-	return os.Chmod(path, 0600)
+	return os.Chmod(path, 0o600)
 }