localhost_frssoft/bloat
1
0
Fork 0
mirror of https://git.phreedom.club/localhost_frssoft/bloat.git synced 2024-11-22 20:11:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge

Browse source
This commit is contained in:
r 2021-05-30 09:16:06 +00:00
parent 4ab53547a8
commit ecb19c8746
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
service/service.go
View file

@ -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) { 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 { if err != nil {
return return
} }
rCtx := getRendererContext(c) return svc.renderer.Render(c.rctx, c.w, renderer.StatusPopup, status)
return svc.renderer.Render(rCtx, c, renderer.StatusPopup, status)
} }
func (s *service) LikedByPage(c *client, id string) (err error) { func (s *service) LikedByPage(c *client, id string) (err error) {

2
service/transport.go
View file

@ -630,7 +630,7 @@ func NewHandler(s *service, logger *log.Logger, staticDir string) http.Handler {
}, CSRF, JSON) }, CSRF, JSON)
fStatus := handle(func(c *client) error { fStatus := handle(func(c *client) error {
id, _ := mux.Vars(c.Req)["id"] id, _ := mux.Vars(c.r)["id"]
return s.StatusPopup(c, id) return s.StatusPopup(c, id)
}, SESSION, JSON) }, SESSION, JSON)