Skip to content

Commit 17e2994

Browse files
committed
always pass a context to NewEnhancedEvent().
1 parent d881e00 commit 17e2994

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

enhanced_event.go

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,13 @@ func NewEnhancedEvent(
4444
}
4545
}
4646

47-
if ctx != nil {
48-
if event.Kind == 0 {
49-
spm, _ := sdk.ParseMetadata(event)
50-
ee.author = spm
51-
} else {
52-
ctx, cancel := context.WithTimeout(ctx, time.Second*3)
53-
defer cancel()
54-
55-
ee.author = sys.FetchProfileMetadata(ctx, event.PubKey)
56-
}
47+
if event.Kind == 0 {
48+
spm, _ := sdk.ParseMetadata(event)
49+
ee.author = spm
50+
} else {
51+
ctx, cancel := context.WithTimeout(ctx, time.Second*3)
52+
defer cancel()
53+
ee.author = sys.FetchProfileMetadata(ctx, event.PubKey)
5754
}
5855

5956
return ee

render_event.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ func renderEvent(w http.ResponseWriter, r *http.Request) {
159159
if data.event.subject != "" {
160160
subscript += " (" + data.event.subject + ")"
161161
}
162+
162163
subscript += " by " + data.event.author.ShortName()
163164
if data.event.isReply() {
164165
subscript += " (reply)"

render_relay.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func renderRelayPage(w http.ResponseWriter, r *http.Request) {
4848
renderableLastNotes := make([]EnhancedEvent, 0, limit)
4949
var lastEventAt *time.Time
5050
for evt := range relayLastNotes(r.Context(), hostname, limit) {
51-
ee := NewEnhancedEvent(nil, evt)
51+
ee := NewEnhancedEvent(r.Context(), evt)
5252
ee.relays = []string{"wss://" + hostname}
5353
renderableLastNotes = append(renderableLastNotes, ee)
5454
if lastEventAt == nil {

0 commit comments

Comments
 (0)