efim/some-automoderation
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: request context to rooms manager

Browse Source
This commit is contained in:
efim
2023-12-01 04:13:10 +00:00
parent cc33c3f742
commit a502ee72a0
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
routes/login_page.go
View File

@@ -146,7 +146,7 @@ func createRoomHandler(templateFs *embed.FS,
w.WriteHeader(http.StatusBadRequest)
}
roomName := r.PostFormValue("roomName")
_, exists, _ := roomsM.Get(roomName)
_, exists, _ := roomsM.Get(r.Context(), roomName)
if exists {
// TODO return anouther error notice
log.Printf("error, room name occupied %s", roomName)
@@ -171,7 +171,7 @@ func createRoomHandler(templateFs *embed.FS,
AllKnownPeople: map[rooms.PersonId]rooms.Person{
person.Id: person},
}
err = roomsM.Save(newRoom)
err = roomsM.Save(r.Context(), newRoom)
if err != nil {
log.Printf("what am i to do? error saving room %s", err)
// todo return error notice somehow
@@ -205,7 +205,7 @@ func checkRoomName(templateFs *embed.FS,
w.WriteHeader(http.StatusBadRequest)
}
roomName := r.PostFormValue("roomName")
_, isFound, err := roomsM.Get(roomName)
_, isFound, err := roomsM.Get(r.Context(), roomName)
if err != nil {
log.Printf("/login/room-name-check error finding room %s\n", err)
}
@@ -231,7 +231,7 @@ func joinRoomHandler(templateFs *embed.FS,
personPass := r.PostFormValue("personalPassword")
// a) get room data
room, _, err := roomsM.Get(roomName)
room, _, err := roomsM.Get(r.Context(), roomName)
if err != nil {
log.Printf("/login/join error getting room %s", roomName)
w.WriteHeader(http.StatusBadRequest)

2
routes/room_page.go
View File

@@ -223,7 +223,7 @@ func roomPageRoute(
// check session,
session, err := getRequestSession(r, sessionSM)
room, found, err := roomsM.Get(roomName)
room, found, err := roomsM.Get(r.Context(), roomName)
if err != nil || session.RoomId != roomName {
log.Printf("not authed with session %+v | error %s, but for wrong room, trying to access %s", session, err, roomName)
renderLoginPage(w, roomName, found)