chore: include avatar rendering into wakapi itself

config.default.yml

@@ -23,7 +23,8 @@ app:
 
   # url template for user avatar images (to be used with services like gravatar or dicebear)
   # available variable placeholders are: username, username_hash, email, email_hash
-  avatar_url_template: https://avatars.dicebear.com/api/pixel-art-neutral/{username_hash}.svg
+  # defaults to wakapi's internal avatar rendering powered by https://codeberg.org/Codeberg/avatars
+  avatar_url_template: api/avatar/{username_hash}.svg
 
 db:
   host:                               # leave blank when using sqlite3

config/config.go

@@ -69,7 +69,7 @@ type appConfig struct {
 	ImportBatchSize   int                          `yaml:"import_batch_size" default:"50" env:"WAKAPI_IMPORT_BATCH_SIZE"`
 	InactiveDays      int                          `yaml:"inactive_days" default:"7" env:"WAKAPI_INACTIVE_DAYS"`
 	CountCacheTTLMin  int                          `yaml:"count_cache_ttl_min" default:"30" env:"WAKAPI_COUNT_CACHE_TTL_MIN"`
-	AvatarURLTemplate string                       `yaml:"avatar_url_template" default:"https://avatars.dicebear.com/api/pixel-art-neutral/{username_hash}.svg"`
+	AvatarURLTemplate string                       `yaml:"avatar_url_template" default:"api/avatar/{username_hash}.svg"`
 	CustomLanguages   map[string]string            `yaml:"custom_languages"`
 	Colors            map[string]map[string]string `yaml:"-"`
 }

go.mod

@@ -3,6 +3,7 @@ module github.com/muety/wakapi
 go 1.16
 
 require (
+	codeberg.org/Codeberg/avatars v0.0.0-20211228163022-8da63012fe69
 	github.com/BurntSushi/toml v0.4.1 // indirect
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
 	github.com/emersion/go-sasl v0.0.0-20211008083017-0b9dcfb154ac

go.sum

@@ -1,3 +1,5 @@
+codeberg.org/Codeberg/avatars v0.0.0-20211228163022-8da63012fe69 h1:/XvI42KX57UTpeIOIt7IfM+pmEFTL8FGtiIUGcGDOIU=
+codeberg.org/Codeberg/avatars v0.0.0-20211228163022-8da63012fe69/go.mod h1:ML/htpPRb3+owhkm4+qG2ZrXnk5WXaQLASOZ5GLCPi8=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw=

main.go

@@ -180,6 +180,7 @@ func main() {
 	summaryApiHandler := api.NewSummaryApiHandler(userService, summaryService)
 	metricsHandler := api.NewMetricsHandler(userService, summaryService, heartbeatService, keyValueService)
 	diagnosticsHandler := api.NewDiagnosticsApiHandler(userService, diagnosticsService)
+	avatarHandler := api.NewAvatarHandler()
 
 	// Compat Handlers
 	wakatimeV1StatusBarHandler := wtV1Routes.NewStatusBarHandler(userService, summaryService)
@@ -237,6 +238,7 @@ func main() {
 	heartbeatApiHandler.RegisterRoutes(apiRouter)
 	metricsHandler.RegisterRoutes(apiRouter)
 	diagnosticsHandler.RegisterRoutes(apiRouter)
+	avatarHandler.RegisterRoutes(apiRouter)
 	wakatimeV1StatusBarHandler.RegisterRoutes(apiRouter)
 	wakatimeV1AllHandler.RegisterRoutes(apiRouter)
 	wakatimeV1SummariesHandler.RegisterRoutes(apiRouter)

routes/api/avatar.go

@@ -0,0 +1,35 @@
+package api
+
+import (
+	"codeberg.org/Codeberg/avatars"
+	"github.com/gorilla/mux"
+	conf "github.com/muety/wakapi/config"
+	"net/http"
+)
+
+type AvatarHandler struct {
+	config *conf.Config
+}
+
+func NewAvatarHandler() *AvatarHandler {
+	return &AvatarHandler{config: conf.Get()}
+}
+
+func (h *AvatarHandler) RegisterRoutes(router *mux.Router) {
+	r := router.PathPrefix("/avatar/{hash}.svg").Subrouter()
+	r.Path("").Methods(http.MethodGet).HandlerFunc(h.Get)
+}
+
+func (h *AvatarHandler) Get(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+
+	if vars["hash"] == "" {
+		w.WriteHeader(http.StatusNotFound)
+		w.Write([]byte{})
+		return
+	}
+
+	w.Header().Set("Content-Type", "image/svg+xml")
+	w.WriteHeader(http.StatusOK)
+	w.Write([]byte(avatars.MakeMaleAvatar(vars["hash"])))
+}

routes/login.go

@@ -299,12 +299,11 @@ func (h *LoginHandler) PostResetPassword(w http.ResponseWriter, r *http.Request)
 
 func (h *LoginHandler) buildViewModel(r *http.Request) *view.LoginViewModel {
 	numUsers, _ := h.userSrvc.Count()
-	allowSignup := h.config.Security.AllowSignup
 
 	return &view.LoginViewModel{
 		Success:     r.URL.Query().Get("success"),
 		Error:       r.URL.Query().Get("error"),
 		TotalUsers:  int(numUsers),
-		AllowSignup: allowSignup,
+		AllowSignup: h.config.IsDev() || h.config.Security.AllowSignup,
 	}
 }

version.txt

@@ -1 +1 @@
-2.2.0
+2.2.1

views/login.tpl.html

@@ -31,13 +31,13 @@
                     Forgot password?
                 </a>
                 <div class="flex space-x-2">
-                    {{ if eq .AllowSignup true }}
+                    {{ if .AllowSignup }}
                     <a href="signup">
                         <button type="button" class="btn-default">Sign up</button>
                     </a>
                     {{ else }}
-                    <a  title="The administrator of this instance has disabled sign up.">
-                        <button type="button" class="btn-disabled" disabled > Sign up </button>
+                    <a title="The administrator of this instance has disabled sign up.">
+                        <button type="button" class="btn-disabled" disabled> Sign up </button>
                     </a>
                     {{ end }}
                     <button type="submit" class="btn-primary">Log in</button>

views/signup.tpl.html

@@ -83,7 +83,7 @@
                 <a href="login">
                     <button type="button" class="btn-default">Log in</button>
                 </a>
-                {{ if eq .AllowSignup true }}
+                {{ if .AllowSignup }}
                 <button type="submit" class="btn-primary">
                     Create Account
                 </button>