fix chat room crash in aim 2.0

mk6i · Sep 4, 2024 · ed705e7 · ed705e7
1 parent 5cc3a60
commit ed705e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/server/oscar/handler/routes.go b/server/oscar/handler/routes.go
@@ -100,11 +100,12 @@ func NewChatRouter(h Handlers) oscar.Router {
 	router.Register(wire.OService, wire.OServiceClientOnline, h.ClientOnline)
 	router.Register(wire.OService, wire.OServiceClientVersions, h.OServiceHandler.ClientVersions)
 	router.Register(wire.OService, wire.OServiceIdleNotification, h.OServiceHandler.IdleNotification)
+	router.Register(wire.OService, wire.OServiceNoop, h.OServiceHandler.Noop)
 	router.Register(wire.OService, wire.OServiceRateParamsQuery, h.OServiceHandler.RateParamsQuery)
 	router.Register(wire.OService, wire.OServiceRateParamsSubAdd, h.OServiceHandler.RateParamsSubAdd)
+	router.Register(wire.OService, wire.OServiceSetPrivacyFlags, h.OServiceHandler.SetPrivacyFlags)
 	router.Register(wire.OService, wire.OServiceSetUserInfoFields, h.OServiceHandler.SetUserInfoFields)
 	router.Register(wire.OService, wire.OServiceUserInfoQuery, h.OServiceHandler.UserInfoQuery)
-	router.Register(wire.OService, wire.OServiceSetPrivacyFlags, h.OServiceHandler.SetPrivacyFlags)
 
 	return router
 }

diff --git a/state/user_store.go b/state/user_store.go
@@ -794,7 +794,7 @@ func (f SQLiteUserStore) ChatRoomByCookie(cookie string) (ChatRoom, error) {
 		&creator,
 	)
 	if errors.Is(err, sql.ErrNoRows) {
-		err = ErrChatRoomNotFound
+		err = fmt.Errorf("%w: %s", ErrChatRoomNotFound, cookie)
 	}
 	chatRoom.creator = NewIdentScreenName(creator)