cchat/cchat-discord
1
0
Fork 0
mirror of https://github.com/diamondburned/cchat-discord.git synced 2025-03-24 19:09:20 +00:00
Code Issues Releases Wiki Activity

fixed empty attachment messages

Browse source
This commit is contained in:
diamondburned 2021-01-06 17:07:29 -08:00
parent 13f87a764b
commit 8edbbcc249
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/discord/message/message.go
View file

@ -288,7 +288,7 @@ func newRegularContent(m discord.Message, s *state.Instance) Message {
segments.ParseWithMessageRich(&content, refContent, &m, s.Cabinet)
content = segments.Ellipsize(content, 100)
content.Content += "\n"
content.Content += ">" + content.Content + "\n"
segutil.Add(&content,
reference.NewMessageSegment(0, len(content.Content)-1, m.ReferencedMessage.ID),

31
internal/segments/md.go
View file

@ -24,12 +24,7 @@ func ParseMessage(m *discord.Message, s store.Cabinet) text.Rich {
}
func ParseMessageRich(rich *text.Rich, m *discord.Message, s store.Cabinet) {
var content = []byte(m.Content)
if len(content) == 0 {
return
}
var node = md.ParseWithMessage(content, s, m, true)
content := []byte(m.Content)
r := renderer.New(content)
r.Buffer.Grow(len(rich.Content))
@ -37,8 +32,13 @@ func ParseMessageRich(rich *text.Rich, m *discord.Message, s store.Cabinet) {
// Register the needed states for some renderers.
r.WithState(m, s)
// Render the main message body.
r.Walk(node)
if len(content) > 0 {
node := md.ParseWithMessage(content, s, m, true)
r.Walk(node)
}
// Render the extra bits.
embed.RenderAttachments(r, m.Attachments)
embed.RenderEmbeds(r, m.Embeds, m, s)
@ -74,16 +74,17 @@ func ParseWithMessageRich(rich *text.Rich, b []byte, m *discord.Message, s store
// Ellipsize caps the length of the rendered text segment to be not longer than
// the given length. The ellipsize will be appended if it is.
func Ellipsize(rich text.Rich, maxLen int) text.Rich {
if maxLen > len(rich.Content) {
maxLen = len(rich.Content) - 1
if maxLen <= 0 {
return text.Rich{}
}
rich.Content += "…"
ellipsize := maxLen < len(rich.Content)
if !ellipsize {
maxLen = len(rich.Content)
}
return Substring(rich, 0, maxLen)
substr := Substring(rich, 0, maxLen)
if ellipsize {
substr.Content += "…"
}
return substr
}
// Substring slices the given rich text.