Autisticats/mautrix-discord
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lint

Browse Source
This commit is contained in:
Skip R
2025-12-11 19:55:00 -08:00
parent ab82f8b131
commit 60171b4fca
7 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/connector/attachments.go
View File

@@ -27,8 +27,9 @@ import (
"strconv" "strconv"
"github.com/bwmarrin/discordgo" "github.com/bwmarrin/discordgo"
"go.mau.fi/mautrix-discord/pkg/attachment"
"maunium.net/go/mautrix/bridgev2" "maunium.net/go/mautrix/bridgev2"
"go.mau.fi/mautrix-discord/pkg/attachment"
) )
func downloadDiscordAttachment(cli *http.Client, url string, maxSize int64) ([]byte, error) { func downloadDiscordAttachment(cli *http.Client, url string, maxSize int64) ([]byte, error) {

9
pkg/connector/client.go
View File

@@ -27,12 +27,13 @@ import (
"github.com/bwmarrin/discordgo" "github.com/bwmarrin/discordgo"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"go.mau.fi/mautrix-discord/pkg/discordid"
"go.mau.fi/mautrix-discord/pkg/msgconv"
"maunium.net/go/mautrix/bridgev2" "maunium.net/go/mautrix/bridgev2"
"maunium.net/go/mautrix/bridgev2/database" "maunium.net/go/mautrix/bridgev2/database"
"maunium.net/go/mautrix/bridgev2/networkid" "maunium.net/go/mautrix/bridgev2/networkid"
"maunium.net/go/mautrix/bridgev2/status" "maunium.net/go/mautrix/bridgev2/status"
"go.mau.fi/mautrix-discord/pkg/discordid"
"go.mau.fi/mautrix-discord/pkg/msgconv"
) )
type DiscordClient struct { type DiscordClient struct {
@@ -109,9 +110,7 @@ func (cl *DiscordClient) connect(ctx context.Context) error {
log := zerolog.Ctx(ctx) log := zerolog.Ctx(ctx)
log.Info().Msg("Opening session") log.Info().Msg("Opening session")
cl.Session.EventHandler = func(event any) { cl.Session.EventHandler = cl.handleDiscordEventSync
go cl.handleDiscordEvent(event)
}
err := cl.Session.Open() err := cl.Session.Open()
for attempts := 0; errors.Is(err, discordgo.ErrImmediateDisconnect) && attempts < 2; attempts += 1 { for attempts := 0; errors.Is(err, discordgo.ErrImmediateDisconnect) && attempts < 2; attempts += 1 {

3
pkg/connector/connector.go
View File

@@ -19,8 +19,9 @@ package connector
import ( import (
"context" "context"
"go.mau.fi/mautrix-discord/pkg/msgconv"
"maunium.net/go/mautrix/bridgev2" "maunium.net/go/mautrix/bridgev2"
"go.mau.fi/mautrix-discord/pkg/msgconv"
) )
type DiscordConnector struct { type DiscordConnector struct {

3
pkg/msgconv/embed.go
View File

@@ -37,7 +37,8 @@ const discordLinkPattern = `https?://[^<\p{Zs}\x{feff}]*[^"'),.:;\]\p{Zs}\x{feff
// don't contain < or whitespace anywhere, and don't end with "'),.:;] // don't contain < or whitespace anywhere, and don't end with "'),.:;]
// //
// Zero-width whitespace is mostly in the Format category and is allowed, except \uFEFF isn't for some reason // Zero-width whitespace is mostly in the Format category and is allowed, except \uFEFF isn't for some reason
var discordLinkRegex = regexp.MustCompile(discordLinkPattern) // FIXME(skip): This will be unused until we port `escapeDiscordMarkdown`.
// var discordLinkRegex = regexp.MustCompile(discordLinkPattern)
var discordLinkRegexFull = regexp.MustCompile("^" + discordLinkPattern + "$") var discordLinkRegexFull = regexp.MustCompile("^" + discordLinkPattern + "$")
func isActuallyLinkPreview(embed *discordgo.MessageEmbed) bool { func isActuallyLinkPreview(embed *discordgo.MessageEmbed) bool {

3
pkg/msgconv/formatter_tag.go
View File

@@ -31,10 +31,11 @@ import (
"github.com/yuin/goldmark/renderer" "github.com/yuin/goldmark/renderer"
"github.com/yuin/goldmark/text" "github.com/yuin/goldmark/text"
"github.com/yuin/goldmark/util" "github.com/yuin/goldmark/util"
"go.mau.fi/mautrix-discord/pkg/discordid"
"maunium.net/go/mautrix/bridgev2" "maunium.net/go/mautrix/bridgev2"
"maunium.net/go/mautrix/bridgev2/networkid" "maunium.net/go/mautrix/bridgev2/networkid"
"maunium.net/go/mautrix/id" "maunium.net/go/mautrix/id"
"go.mau.fi/mautrix-discord/pkg/discordid"
) )
type astDiscordTag struct { type astDiscordTag struct {

5
pkg/msgconv/from-discord.go
View File

@@ -26,12 +26,13 @@ import (
"github.com/bwmarrin/discordgo" "github.com/bwmarrin/discordgo"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"go.mau.fi/mautrix-discord/pkg/attachment"
"go.mau.fi/mautrix-discord/pkg/discordid"
"maunium.net/go/mautrix/bridgev2" "maunium.net/go/mautrix/bridgev2"
"maunium.net/go/mautrix/bridgev2/networkid" "maunium.net/go/mautrix/bridgev2/networkid"
"maunium.net/go/mautrix/event" "maunium.net/go/mautrix/event"
"maunium.net/go/mautrix/format" "maunium.net/go/mautrix/format"
"go.mau.fi/mautrix-discord/pkg/attachment"
"go.mau.fi/mautrix-discord/pkg/discordid"
) )
func (mc *MessageConverter) ToMatrix( func (mc *MessageConverter) ToMatrix(

3
pkg/msgconv/msgconv.go
View File

@@ -19,8 +19,9 @@ package msgconv
import ( import (
"context" "context"
"go.mau.fi/mautrix-discord/pkg/attachment"
"maunium.net/go/mautrix/bridgev2" "maunium.net/go/mautrix/bridgev2"
"go.mau.fi/mautrix-discord/pkg/attachment"
) )
type MessageConverter struct { type MessageConverter struct {