localhost_frssoft/bloat
1
0
Fork 0
mirror of https://gitea.phreedom.club/localhost_frssoft/bloat.git synced 2025-06-28 13:54:18 +00:00
Code Issues Projects Releases Wiki Activity

Add fluoridated reply to popup

Browse source
This commit is contained in:
r 2020-11-09 12:10:29 +00:00
parent 3a3a8672ba
commit c3f39210d8
8 changed files with 128 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
service/auth.go
View file

@ -107,6 +107,14 @@ func (s *as) ServeThreadPage(c *model.Client, id string, reply bool) (err error)
return s.Service.ServeThreadPage(c, id, reply)
}
func (s *as) ServeStatusPopup(c *model.Client, id string) (err error) {
err = s.authenticateClient(c)
if err != nil {
return
}
return s.Service.ServeStatusPopup(c, id)
}
func (s *as) ServeLikedByPage(c *model.Client, id string) (err error) {
err = s.authenticateClient(c)
if err != nil {

8
service/logging.go
View file

@ -67,6 +67,14 @@ func (s *ls) ServeThreadPage(c *model.Client, id string,
return s.Service.ServeThreadPage(c, id, reply)
}
func (s *ls) ServeStatusPopup(c *model.Client, id string) (err error) {
defer func(begin time.Time) {
s.logger.Printf("method=%v, id=%v, took=%v, err=%v\n",
"ServeStatusPopup", id, time.Since(begin), err)
}(time.Now())
return s.Service.ServeStatusPopup(c, id)
}
func (s *ls) ServeLikedByPage(c *model.Client, id string) (err error) {
defer func(begin time.Time) {
s.logger.Printf("method=%v, id=%v, took=%v, err=%v\n",

10
service/service.go
View file

@ -28,6 +28,7 @@ type Service interface {
ServeTimelinePage(c *model.Client, tType string, maxID string,
minID string) (err error)
ServeThreadPage(c *model.Client, id string, reply bool) (err error)
ServeStatusPopup(c *model.Client, id string) (err error)
ServeLikedByPage(c *model.Client, id string) (err error)
ServeRetweetedByPage(c *model.Client, id string) (err error)
ServeNotificationPage(c *model.Client, maxID string, minID string) (err error)
@ -365,6 +366,15 @@ func (svc *service) ServeThreadPage(c *model.Client, id string, reply bool) (err
return svc.renderer.Render(rCtx, c.Writer, renderer.ThreadPage, data)
}
func (svc *service) ServeStatusPopup(c *model.Client, id string) (err error) {
status, err := c.GetStatus(ctx, id)
if err != nil {
return
}
rCtx := getRendererContext(c)
return svc.renderer.Render(rCtx, c.Writer, renderer.StatusPopup, status)
}
func (svc *service) ServeLikedByPage(c *model.Client, id string) (err error) {
likers, err := c.GetFavouritedBy(ctx, id, nil)
if err != nil {

13
service/transport.go
View file

@ -62,6 +62,7 @@ func serveJson(w io.Writer, data interface{}) (err error) {
func serveJsonError(w http.ResponseWriter, err error) {
var d = make(map[string]interface{})
d["error"] = err.Error()
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusInternalServerError)
json.NewEncoder(w).Encode(d)
return
@ -796,6 +797,17 @@ func NewHandler(s Service, staticDir string) http.Handler {
}
}
statusPopup := func(w http.ResponseWriter, req *http.Request) {
c := newClient(w, req, "")
id, _ := mux.Vars(req)["id"]
err := s.ServeStatusPopup(c, id)
if err != nil {
serveJsonError(w, err)
return
}
}
r.HandleFunc("/", rootPage).Methods(http.MethodGet)
r.HandleFunc("/nav", navPage).Methods(http.MethodGet)
r.HandleFunc("/signin", signinPage).Methods(http.MethodGet)
@ -840,6 +852,7 @@ func NewHandler(s Service, staticDir string) http.Handler {
r.HandleFunc("/fluoride/unlike/{id}", fUnlike).Methods(http.MethodPost)
r.HandleFunc("/fluoride/retweet/{id}", fRetweet).Methods(http.MethodPost)
r.HandleFunc("/fluoride/unretweet/{id}", fUnretweet).Methods(http.MethodPost)
r.HandleFunc("/fluoride/status/{id}", statusPopup).Methods(http.MethodGet)
r.PathPrefix("/static").Handler(http.StripPrefix("/static",
http.FileServer(http.Dir(staticDir))))