From ecb19c874640e6cd792cac8f3276b9bdfbbe88a6 Mon Sep 17 00:00:00 2001
From: r <r@freesoftwareextremist.com>
Date: Sun, 30 May 2021 09:16:06 +0000
Subject: Fix merge
---
service/service.go | 5 ++---
service/transport.go | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
(limited to 'service')
diff --git a/service/service.go b/service/service.go
index 084993c..c098c76 100644
--- a/service/service.go
+++ b/service/service.go
@@ -322,12 +322,11 @@ func (s *service) ThreadPage(c *client, id string, reply bool) (err error) {
}
func (svc *service) StatusPopup(c *client, id string) (err error) {
- status, err := c.GetStatus(ctx, id)
+ status, err := c.GetStatus(c.ctx, id)
if err != nil {
return
}
- rCtx := getRendererContext(c)
- return svc.renderer.Render(rCtx, c, renderer.StatusPopup, status)
+ return svc.renderer.Render(c.rctx, c.w, renderer.StatusPopup, status)
}
func (s *service) LikedByPage(c *client, id string) (err error) {
diff --git a/service/transport.go b/service/transport.go
index ed083b6..da09557 100644
--- a/service/transport.go
+++ b/service/transport.go
@@ -630,7 +630,7 @@ func NewHandler(s *service, logger *log.Logger, staticDir string) http.Handler {
}, CSRF, JSON)
fStatus := handle(func(c *client) error {
- id, _ := mux.Vars(c.Req)["id"]
+ id, _ := mux.Vars(c.r)["id"]
return s.StatusPopup(c, id)
}, SESSION, JSON)
--
cgit v1.2.3