diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 1a523ab..2201b03 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -8,7 +8,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- go-version: [1.18]
+ go-version: [1.19]
steps:
- uses: actions/checkout@v3
@@ -17,6 +17,9 @@ jobs:
with:
go-version: ${{ matrix.go-version }}
+ - name: Install libolm
+ run: sudo apt-get install libolm-dev libolm3
+
- name: Install goimports
run: |
go install golang.org/x/tools/cmd/goimports@latest
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index abb3979..0b1d055 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,3 +12,4 @@ repos:
rev: v1.0.0-beta.5
hooks:
- id: go-imports-repo
+ - id: go-vet-repo-mod
diff --git a/database/message.go b/database/message.go
index d051394..7b6d651 100644
--- a/database/message.go
+++ b/database/message.go
@@ -33,7 +33,6 @@ func (mq *MessageQuery) scanAll(rows *sql.Rows, err error) []*Message {
if err != nil {
mq.log.Warnfln("Failed to query many messages: %v", err)
panic(err)
- return nil
} else if rows == nil {
return nil
}
diff --git a/database/userportal.go b/database/userportal.go
index 0eaa0a3..85cba45 100644
--- a/database/userportal.go
+++ b/database/userportal.go
@@ -27,7 +27,6 @@ func (up UserPortal) Scan(l log.Logger, row dbutil.Scannable) *UserPortal {
if err != nil {
l.Errorln("Error scanning user portal:", err)
panic(err)
- return nil
}
up.Timestamp = time.UnixMilli(ts)
return &up
@@ -49,7 +48,6 @@ func (u *User) GetPortals() []UserPortal {
if err != nil {
u.log.Errorln("Failed to get portals:", err)
panic(err)
- return nil
}
return u.scanUserPortals(rows)
}
diff --git a/formatter_tag.go b/formatter_tag.go
index bc26e72..0326d5f 100644
--- a/formatter_tag.go
+++ b/formatter_tag.go
@@ -128,9 +128,9 @@ type astDiscordCustomEmoji struct {
func (n *astDiscordCustomEmoji) String() string {
if n.animated {
- return fmt.Sprintf("", n.name, n.id)
+ return fmt.Sprintf("", n.name, n.id)
}
- return fmt.Sprintf("<%s%s>", n.name, n.id)
+ return fmt.Sprintf("<%s%d>", n.name, n.id)
}
type discordTagParser struct{}
diff --git a/user.go b/user.go
index d587344..2c36db4 100644
--- a/user.go
+++ b/user.go
@@ -644,7 +644,6 @@ func (user *User) handleGuildRoles(guildID string, newRoles []*discordgo.Role) {
if err != nil {
user.log.Errorln("Failed to start transaction for guild role sync:", err)
panic(err)
- return
}
for _, role := range newRoles {
dbRole, changed := user.discordRoleToDB(guildID, role, existingRoleMap[role.ID])