Skip to content

Commit

Permalink
Suppress embeds when sending messages
Browse files Browse the repository at this point in the history
  • Loading branch information
belak committed Feb 9, 2024
1 parent 17c0f96 commit 5973adc
Show file tree
Hide file tree
Showing 3 changed files with 2,304 additions and 65 deletions.
20 changes: 16 additions & 4 deletions backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -428,21 +428,33 @@ func (b *Backend) handleIngest(ctx context.Context) {
} else {
b.logger.Warn().Err(err).Msg("Tried to send message to unknown channel")
}
_, err = b.discord.ChannelMessageSend(v.SendMessage.ChannelId, msgText)
_, err = b.discord.ChannelMessageSendComplex(v.SendMessage.ChannelId, &discordgo.MessageSend{
Content: msgText,
Flags: discordgo.MessageFlagsSuppressEmbeds,
})
case *pb.ChatRequest_SendPrivateMessage:
// TODO: this might not work
_, err = b.discord.ChannelMessageSend(v.SendPrivateMessage.UserId, v.SendPrivateMessage.Text)
_, err = b.discord.ChannelMessageSendComplex(v.SendPrivateMessage.UserId, &discordgo.MessageSend{
Content: v.SendPrivateMessage.Text,
Flags: discordgo.MessageFlagsSuppressEmbeds,
})
case *pb.ChatRequest_PerformAction:
msgText := v.PerformAction.Text
if c, err := b.discord.State.Channel(v.PerformAction.ChannelId); err == nil {
msgText = b.getReplacer(c.GuildID).Replace(msgText)
} else {
b.logger.Warn().Err(err).Msg("Tried to send message to unknown channel")
}
_, err = b.discord.ChannelMessageSend(v.PerformAction.ChannelId, "_"+msgText+"_")
_, err = b.discord.ChannelMessageSendComplex(v.PerformAction.ChannelId, &discordgo.MessageSend{
Content: "_"+msgText+"_",
Flags: discordgo.MessageFlagsSuppressEmbeds,
})
case *pb.ChatRequest_PerformPrivateAction:
// TODO: this might not work
_, err = b.discord.ChannelMessageSend(v.PerformPrivateAction.UserId, "_"+v.PerformPrivateAction.Text+"_")
_, err = b.discord.ChannelMessageSendComplex(v.PerformPrivateAction.UserId, &discordgo.MessageSend{
Content: "_"+v.PerformPrivateAction.Text+"_",
Flags: discordgo.MessageFlagsSuppressEmbeds,
})
case *pb.ChatRequest_JoinChannel:
err = errors.New("unimplemented for discord")
case *pb.ChatRequest_LeaveChannel:
Expand Down
22 changes: 9 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@ module github.com/seabird-chat/seabird-discord-backend
go 1.14

require (
github.com/bwmarrin/discordgo v0.23.2
github.com/google/go-cmp v0.5.4 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/joho/godotenv v1.3.0
github.com/mattn/go-isatty v0.0.12
github.com/rs/zerolog v1.20.0
github.com/bwmarrin/discordgo v0.27.2-0.20240202235938-7f80bc797881
github.com/gorilla/websocket v1.5.1 // indirect
github.com/joho/godotenv v1.5.1
github.com/mattn/go-isatty v0.0.20
github.com/rs/zerolog v1.32.0
github.com/seabird-chat/seabird-go v0.4.0
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect
golang.org/x/text v0.3.5 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/genproto v0.0.0-20210204154452-deb828366460 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sync v0.6.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014 // indirect
google.golang.org/grpc v1.61.0 // indirect
)
Loading

0 comments on commit 5973adc

Please sign in to comment.