coop-cloud-chaos-patchs/go-ssb-room
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more consistent type names for handlers

Browse Source
This commit is contained in:
Henry 2021-03-04 12:26:49 +01:00
parent fd5312b04a
commit 9f1fef1916
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/handlers/admin/allow_list.go
View File

@ -14,7 +14,7 @@ import (
weberrors "github.com/ssb-ngi-pointer/go-ssb-room/web/errors"
)
type allowListH struct {
type allowListHandler struct {
r *render.Renderer
al admindb.AllowListService
@ -22,7 +22,7 @@ type allowListH struct {
const redirectToMembers = "/admin/members"
func (h allowListH) add(w http.ResponseWriter, req *http.Request) {
func (h allowListHandler) add(w http.ResponseWriter, req *http.Request) {
if req.Method != "POST" {
// TODO: proper error type
h.r.Error(w, req, http.StatusBadRequest, fmt.Errorf("bad request"))
@ -60,7 +60,7 @@ func (h allowListH) add(w http.ResponseWriter, req *http.Request) {
http.Redirect(w, req, redirectToMembers, http.StatusFound)
}
func (h allowListH) overview(rw http.ResponseWriter, req *http.Request) (interface{}, error) {
func (h allowListHandler) overview(rw http.ResponseWriter, req *http.Request) (interface{}, error) {
lst, err := h.al.List(req.Context())
if err != nil {
return nil, err
@ -83,7 +83,7 @@ func (h allowListH) overview(rw http.ResponseWriter, req *http.Request) (interfa
// TODO: move to render package so that we can decide to not render a page during the controller
var ErrRedirected = errors.New("render: not rendered but redirected")
func (h allowListH) removeConfirm(rw http.ResponseWriter, req *http.Request) (interface{}, error) {
func (h allowListHandler) removeConfirm(rw http.ResponseWriter, req *http.Request) (interface{}, error) {
id, err := strconv.ParseInt(req.URL.Query().Get("id"), 10, 64)
if err != nil {
err = weberrors.ErrBadRequest{Where: "ID", Details: err}
@ -104,7 +104,7 @@ func (h allowListH) removeConfirm(rw http.ResponseWriter, req *http.Request) (in
}, nil
}
func (h allowListH) remove(rw http.ResponseWriter, req *http.Request) {
func (h allowListHandler) remove(rw http.ResponseWriter, req *http.Request) {
err := req.ParseForm()
if err != nil {
err = weberrors.ErrBadRequest{Where: "Form data", Details: err}

4
web/handlers/admin/handler.go
View File

@ -55,7 +55,7 @@ func Handler(
return map[string]interface{}{}, nil
}))
var ah = allowListH{
var ah = allowListHandler{
r: r,
al: al,
}
@ -64,7 +64,7 @@ func Handler(
mux.HandleFunc("/members/remove/confirm", r.HTML("admin/allow-list-remove-confirm.tmpl", ah.removeConfirm))
mux.HandleFunc("/members/remove", ah.remove)
var ih = invitesH{
var ih = invitesHandler{
r: r,
db: is,
}

6
web/handlers/admin/invites.go
View File

@ -11,13 +11,13 @@ import (
"github.com/ssb-ngi-pointer/go-ssb-room/web/user"
)
type invitesH struct {
type invitesHandler struct {
r *render.Renderer
db admindb.InviteService
}
func (h invitesH) overview(rw http.ResponseWriter, req *http.Request) (interface{}, error) {
func (h invitesHandler) overview(rw http.ResponseWriter, req *http.Request) (interface{}, error) {
lst, err := h.db.List(req.Context())
if err != nil {
return nil, err
@ -38,7 +38,7 @@ func (h invitesH) overview(rw http.ResponseWriter, req *http.Request) (interface
return pageData, nil
}
func (h invitesH) create(w http.ResponseWriter, req *http.Request) {
func (h invitesHandler) create(w http.ResponseWriter, req *http.Request) {
if req.Method != "POST" {
// TODO: proper error type
h.r.Error(w, req, http.StatusBadRequest, fmt.Errorf("bad request"))