From f9814bf4101beb5087582ef56e66b59dc6322de4 Mon Sep 17 00:00:00 2001 From: diamondburned Date: Thu, 25 Mar 2021 16:32:37 -0700 Subject: [PATCH] bumped cchat --- go.mod | 2 +- go.sum | 6 ++++++ .../session/channel/messenger/memberlister/member.go | 10 +++------- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 449f932..3b918a0 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.14 require ( github.com/diamondburned/arikawa/v2 v2.0.5 - github.com/diamondburned/cchat v0.6.1 + github.com/diamondburned/cchat v0.6.4 github.com/diamondburned/ningen/v2 v2.0.0-20210106052055-9da2a0102d49 github.com/dustin/go-humanize v1.0.0 github.com/go-test/deep v1.0.7 diff --git a/go.sum b/go.sum index 32c23e6..6118851 100644 --- a/go.sum +++ b/go.sum @@ -33,6 +33,12 @@ github.com/diamondburned/cchat v0.6.0 h1:XVql8slOho9FUxuJm/I7/XWr5l1XgxLc5SvcvI+ github.com/diamondburned/cchat v0.6.0/go.mod h1:IlMtF+XIvAJh0GL/2yFdf0/34w+Hdy5A1GgvSwAXtQI= github.com/diamondburned/cchat v0.6.1 h1:BFpY2Nvnut1/X+0dhL8STK80RVmfEJLmf4ppTJX2ADg= github.com/diamondburned/cchat v0.6.1/go.mod h1:IlMtF+XIvAJh0GL/2yFdf0/34w+Hdy5A1GgvSwAXtQI= +github.com/diamondburned/cchat v0.6.2 h1:H0Hyd2irpKlTR03ulm6IMy7RVorPtvQS5X0kTn26Up8= +github.com/diamondburned/cchat v0.6.2/go.mod h1:IlMtF+XIvAJh0GL/2yFdf0/34w+Hdy5A1GgvSwAXtQI= +github.com/diamondburned/cchat v0.6.3 h1:st2RJfjsMFjK94dxetDCUXzf9HXp+RKGstDCb9LtH/8= +github.com/diamondburned/cchat v0.6.3/go.mod h1:IlMtF+XIvAJh0GL/2yFdf0/34w+Hdy5A1GgvSwAXtQI= +github.com/diamondburned/cchat v0.6.4 h1:CFh6eFNE+SQ7IOjb1QDcgTgv/I7W2k6E7d3n8qJ+ZrQ= +github.com/diamondburned/cchat v0.6.4/go.mod h1:IlMtF+XIvAJh0GL/2yFdf0/34w+Hdy5A1GgvSwAXtQI= github.com/diamondburned/ningen/v2 v2.0.0-20210106052055-9da2a0102d49 h1:wfj+fvDJLUC+xkRmVA/ZE9nmeSqFy4fbyIi3hBHgn/U= github.com/diamondburned/ningen/v2 v2.0.0-20210106052055-9da2a0102d49/go.mod h1:WRQCUX/dTH4OPEy3JANLA5D6fbumzp5zk03uSUAZppA= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= diff --git a/internal/discord/session/channel/messenger/memberlister/member.go b/internal/discord/session/channel/messenger/memberlister/member.go index 1dc32ba..da4f194 100644 --- a/internal/discord/session/channel/messenger/memberlister/member.go +++ b/internal/discord/session/channel/messenger/memberlister/member.go @@ -1,7 +1,6 @@ package memberlister import ( - "context" "fmt" "strings" @@ -40,11 +39,10 @@ func (l *Member) ID() cchat.ID { return l.mention.UserID().String() } -func (l *Member) Name(ctx context.Context, labeler cchat.LabelContainer) (func(), error) { - l.mention.Prefetch() +func (l *Member) Name() text.Rich { content := l.mention.DisplayName() - labeler.SetLabel(text.Rich{ + return text.Rich{ Content: content, Segments: []text.Segment{ mention.Segment{ @@ -52,9 +50,7 @@ func (l *Member) Name(ctx context.Context, labeler cchat.LabelContainer) (func() User: &l.mention, }, }, - }) - - return func() {}, nil + } } func (l *Member) Status() cchat.Status {