Teajey
/
lishwist
1
0
Fork 0
Code Issues 10 Pull Requests Projects Releases Wiki Activity

Compare commits

base: Teajey:24697f40dd427e48d05a1c32c75c75781ba70d41
Branches Tags
Teajey:main
Teajey:gitea-24
Teajey:post-core-sep-fixes
Teajey:core-separation
Teajey:2024-12-29-fixes
Teajey:tokyo-wellington-changes
Teajey:5-simplify-routes
Teajey:response-middleware-1
..
compare: Teajey:7147a4378d9bbd6c024012a8d7397f150f54903b
Branches Tags
Teajey:main
Teajey:gitea-24
Teajey:post-core-sep-fixes
Teajey:core-separation
Teajey:2024-12-29-fixes
Teajey:tokyo-wellington-changes
Teajey:5-simplify-routes
Teajey:response-middleware-1

No commits in common. "24697f40dd427e48d05a1c32c75c75781ba70d41" and "7147a4378d9bbd6c024012a8d7397f150f54903b" have entirely different histories.
24697f40dd ... 7147a4378d

3 changed files with 3 additions and 21 deletions
Show Stats Expand all files Collapse all files

2
core/api.snap.txt
View File

@ -29,8 +29,6 @@ func (*Admin) ListUsers() ([]User, error)
func (a *Admin) RemoveUserFromGroup(userId, groupId string) error func (a *Admin) RemoveUserFromGroup(userId, groupId string) error
func (u *Admin) RenameUser(userReference string, displayName string) error
func (u *Admin) UserSetLive(userReference string, setting bool) error func (u *Admin) UserSetLive(userReference string, setting bool) error
type ErrorInvalidCredentials error type ErrorInvalidCredentials error

11
core/user.go
View File

@ -160,15 +160,6 @@ func (u *Admin) UserSetLive(userReference string, setting bool) error {
if err != nil { if err != nil {
return err return err
} }
return err // u.IsLive = setting
}
func (u *Admin) RenameUser(userReference string, displayName string) error {
name := normalize.Name(displayName)
query := "UPDATE user SET name = ?, display_name = ? WHERE reference = ?"
_, err := db.Connection.Exec(query, name, displayName, userReference)
if err != nil {
return err
}
return err return err
} }

11
http/routing/users.go
View File

@ -67,18 +67,11 @@ func UserPost(app *lishwist.Session, h http.Header, r *http.Request) rsvp.Respon
intent := r.Form.Get("intent") intent := r.Form.Get("intent")
switch intent { if intent != "" {
case "delete": err = admin.UserSetLive(reference, intent != "delete")
err = admin.UserSetLive(reference, false)
if err != nil { if err != nil {
return response.Error(http.StatusInternalServerError, "Failed to delete user: %s", err) return response.Error(http.StatusInternalServerError, "Failed to delete user: %s", err)
} }
case "rename":
name := r.Form.Get("display_name")
err = admin.RenameUser(reference, name)
if err != nil {
return response.Error(http.StatusInternalServerError, "Failed to rename user: %s", err)
}
} }
return response.Data("", user) return response.Data("", user)