Explorar o código

exclude mocks from code cov

Mike %!s(int64=2) %!d(string=hai) anos
pai
achega
feecbae944

+ 15 - 15
.mockery.yaml

@@ -7,48 +7,48 @@ packages:
     interfaces:
     interfaces:
       BuddyHandler:
       BuddyHandler:
         config:
         config:
-          filename: "buddy_mock.go"
+          filename: "buddy_mock_test.go"
       ChatHandler:
       ChatHandler:
         config:
         config:
-          filename: "chat_mock.go"
+          filename: "chat_mock_test.go"
       ChatNavHandler:
       ChatNavHandler:
         config:
         config:
-          filename: "chat_nav_mock.go"
+          filename: "chat_nav_mock_test.go"
       FeedbagHandler:
       FeedbagHandler:
         config:
         config:
-          filename: "feedbag_mock.go"
+          filename: "feedbag_mock_test.go"
       ICBMHandler:
       ICBMHandler:
         config:
         config:
-          filename: "icbm_mock.go"
+          filename: "icbm_mock_test.go"
       LocateHandler:
       LocateHandler:
         config:
         config:
-          filename: "locate_mock.go"
+          filename: "locate_mock_test.go"
       OServiceHandler:
       OServiceHandler:
         config:
         config:
-          filename: "oservice_mock.go"
+          filename: "oservice_mock_test.go"
       OServiceBOSHandler:
       OServiceBOSHandler:
         config:
         config:
-          filename: "oservice_bos_mock.go"
+          filename: "oservice_bos_mock_test.go"
       OServiceChatHandler:
       OServiceChatHandler:
         config:
         config:
-          filename: "oservice_chat_mock.go"
+          filename: "oservice_chat_mock_test.go"
   github.com/mkaminski/goaim/handler:
   github.com/mkaminski/goaim/handler:
     interfaces:
     interfaces:
       FeedbagManager:
       FeedbagManager:
         config:
         config:
-          filename: "feedbag_manager_mock.go"
+          filename: "feedbag_manager_mock_test.go"
       UserManager:
       UserManager:
         config:
         config:
-          filename: "user_manager_manager_mock.go"
+          filename: "user_manager_manager_mock_test.go"
       ProfileManager:
       ProfileManager:
         config:
         config:
-          filename: "profile_manager_mock.go"
+          filename: "profile_manager_mock_test.go"
       SessionManager:
       SessionManager:
         config:
         config:
-          filename: "session_manager_mock.go"
+          filename: "session_manager_mock_test.go"
       MessageRelayer:
       MessageRelayer:
         config:
         config:
-          filename: "session_message_relayer.go"
+          filename: "message_relayer_mock_test.go"
       ChatMessageRelayer:
       ChatMessageRelayer:
         config:
         config:
-          filename: "session_chat_message_relayer.go"
+          filename: "chat_message_relayer_mock_test.go"

+ 1 - 9
handler/session_chat_message_relayer.go → handler/chat_message_relayer_mock_test.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.38.0. DO NOT EDIT.
+// Code generated by mockery v2.35.2. DO NOT EDIT.
 
 
 package handler
 package handler
 
 
@@ -98,10 +98,6 @@ func (_c *mockChatMessageRelayer_BroadcastToScreenNames_Call) RunAndReturn(run f
 func (_m *mockChatMessageRelayer) Participants() []*state.Session {
 func (_m *mockChatMessageRelayer) Participants() []*state.Session {
 	ret := _m.Called()
 	ret := _m.Called()
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for Participants")
-	}
-
 	var r0 []*state.Session
 	var r0 []*state.Session
 	if rf, ok := ret.Get(0).(func() []*state.Session); ok {
 	if rf, ok := ret.Get(0).(func() []*state.Session); ok {
 		r0 = rf()
 		r0 = rf()
@@ -145,10 +141,6 @@ func (_c *mockChatMessageRelayer_Participants_Call) RunAndReturn(run func() []*s
 func (_m *mockChatMessageRelayer) RetrieveByScreenName(screenName string) *state.Session {
 func (_m *mockChatMessageRelayer) RetrieveByScreenName(screenName string) *state.Session {
 	ret := _m.Called(screenName)
 	ret := _m.Called(screenName)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for RetrieveByScreenName")
-	}
-
 	var r0 *state.Session
 	var r0 *state.Session
 	if rf, ok := ret.Get(0).(func(string) *state.Session); ok {
 	if rf, ok := ret.Get(0).(func(string) *state.Session); ok {
 		r0 = rf(screenName)
 		r0 = rf(screenName)

+ 1 - 29
handler/feedbag_manager_mock.go → handler/feedbag_manager_mock_test.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.38.0. DO NOT EDIT.
+// Code generated by mockery v2.35.2. DO NOT EDIT.
 
 
 package handler
 package handler
 
 
@@ -28,10 +28,6 @@ func (_m *mockFeedbagManager) EXPECT() *mockFeedbagManager_Expecter {
 func (_m *mockFeedbagManager) Blocked(screenName1 string, screenName2 string) (state.BlockedState, error) {
 func (_m *mockFeedbagManager) Blocked(screenName1 string, screenName2 string) (state.BlockedState, error) {
 	ret := _m.Called(screenName1, screenName2)
 	ret := _m.Called(screenName1, screenName2)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for Blocked")
-	}
-
 	var r0 state.BlockedState
 	var r0 state.BlockedState
 	var r1 error
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (state.BlockedState, error)); ok {
 	if rf, ok := ret.Get(0).(func(string, string) (state.BlockedState, error)); ok {
@@ -85,10 +81,6 @@ func (_c *mockFeedbagManager_Blocked_Call) RunAndReturn(run func(string, string)
 func (_m *mockFeedbagManager) Buddies(screenName string) ([]string, error) {
 func (_m *mockFeedbagManager) Buddies(screenName string) ([]string, error) {
 	ret := _m.Called(screenName)
 	ret := _m.Called(screenName)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for Buddies")
-	}
-
 	var r0 []string
 	var r0 []string
 	var r1 error
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]string, error)); ok {
 	if rf, ok := ret.Get(0).(func(string) ([]string, error)); ok {
@@ -143,10 +135,6 @@ func (_c *mockFeedbagManager_Buddies_Call) RunAndReturn(run func(string) ([]stri
 func (_m *mockFeedbagManager) Delete(screenName string, items []oscar.FeedbagItem) error {
 func (_m *mockFeedbagManager) Delete(screenName string, items []oscar.FeedbagItem) error {
 	ret := _m.Called(screenName, items)
 	ret := _m.Called(screenName, items)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for Delete")
-	}
-
 	var r0 error
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, []oscar.FeedbagItem) error); ok {
 	if rf, ok := ret.Get(0).(func(string, []oscar.FeedbagItem) error); ok {
 		r0 = rf(screenName, items)
 		r0 = rf(screenName, items)
@@ -190,10 +178,6 @@ func (_c *mockFeedbagManager_Delete_Call) RunAndReturn(run func(string, []oscar.
 func (_m *mockFeedbagManager) InterestedUsers(screenName string) ([]string, error) {
 func (_m *mockFeedbagManager) InterestedUsers(screenName string) ([]string, error) {
 	ret := _m.Called(screenName)
 	ret := _m.Called(screenName)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for InterestedUsers")
-	}
-
 	var r0 []string
 	var r0 []string
 	var r1 error
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]string, error)); ok {
 	if rf, ok := ret.Get(0).(func(string) ([]string, error)); ok {
@@ -248,10 +232,6 @@ func (_c *mockFeedbagManager_InterestedUsers_Call) RunAndReturn(run func(string)
 func (_m *mockFeedbagManager) LastModified(screenName string) (time.Time, error) {
 func (_m *mockFeedbagManager) LastModified(screenName string) (time.Time, error) {
 	ret := _m.Called(screenName)
 	ret := _m.Called(screenName)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for LastModified")
-	}
-
 	var r0 time.Time
 	var r0 time.Time
 	var r1 error
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (time.Time, error)); ok {
 	if rf, ok := ret.Get(0).(func(string) (time.Time, error)); ok {
@@ -304,10 +284,6 @@ func (_c *mockFeedbagManager_LastModified_Call) RunAndReturn(run func(string) (t
 func (_m *mockFeedbagManager) Retrieve(screenName string) ([]oscar.FeedbagItem, error) {
 func (_m *mockFeedbagManager) Retrieve(screenName string) ([]oscar.FeedbagItem, error) {
 	ret := _m.Called(screenName)
 	ret := _m.Called(screenName)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for Retrieve")
-	}
-
 	var r0 []oscar.FeedbagItem
 	var r0 []oscar.FeedbagItem
 	var r1 error
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]oscar.FeedbagItem, error)); ok {
 	if rf, ok := ret.Get(0).(func(string) ([]oscar.FeedbagItem, error)); ok {
@@ -362,10 +338,6 @@ func (_c *mockFeedbagManager_Retrieve_Call) RunAndReturn(run func(string) ([]osc
 func (_m *mockFeedbagManager) Upsert(screenName string, items []oscar.FeedbagItem) error {
 func (_m *mockFeedbagManager) Upsert(screenName string, items []oscar.FeedbagItem) error {
 	ret := _m.Called(screenName, items)
 	ret := _m.Called(screenName, items)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for Upsert")
-	}
-
 	var r0 error
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, []oscar.FeedbagItem) error); ok {
 	if rf, ok := ret.Get(0).(func(string, []oscar.FeedbagItem) error); ok {
 		r0 = rf(screenName, items)
 		r0 = rf(screenName, items)

+ 1 - 5
handler/session_message_relayer.go → handler/message_relayer_mock_test.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.38.0. DO NOT EDIT.
+// Code generated by mockery v2.35.2. DO NOT EDIT.
 
 
 package handler
 package handler
 
 
@@ -63,10 +63,6 @@ func (_c *mockMessageRelayer_BroadcastToScreenNames_Call) RunAndReturn(run func(
 func (_m *mockMessageRelayer) RetrieveByScreenName(screenName string) *state.Session {
 func (_m *mockMessageRelayer) RetrieveByScreenName(screenName string) *state.Session {
 	ret := _m.Called(screenName)
 	ret := _m.Called(screenName)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for RetrieveByScreenName")
-	}
-
 	var r0 *state.Session
 	var r0 *state.Session
 	if rf, ok := ret.Get(0).(func(string) *state.Session); ok {
 	if rf, ok := ret.Get(0).(func(string) *state.Session); ok {
 		r0 = rf(screenName)
 		r0 = rf(screenName)

+ 1 - 9
handler/profile_manager_mock.go → handler/profile_manager_mock_test.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.38.0. DO NOT EDIT.
+// Code generated by mockery v2.35.2. DO NOT EDIT.
 
 
 package handler
 package handler
 
 
@@ -21,10 +21,6 @@ func (_m *mockProfileManager) EXPECT() *mockProfileManager_Expecter {
 func (_m *mockProfileManager) RetrieveProfile(screenName string) (string, error) {
 func (_m *mockProfileManager) RetrieveProfile(screenName string) (string, error) {
 	ret := _m.Called(screenName)
 	ret := _m.Called(screenName)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for RetrieveProfile")
-	}
-
 	var r0 string
 	var r0 string
 	var r1 error
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (string, error)); ok {
 	if rf, ok := ret.Get(0).(func(string) (string, error)); ok {
@@ -77,10 +73,6 @@ func (_c *mockProfileManager_RetrieveProfile_Call) RunAndReturn(run func(string)
 func (_m *mockProfileManager) UpsertProfile(screenName string, body string) error {
 func (_m *mockProfileManager) UpsertProfile(screenName string, body string) error {
 	ret := _m.Called(screenName, body)
 	ret := _m.Called(screenName, body)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for UpsertProfile")
-	}
-
 	var r0 error
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string) error); ok {
 	if rf, ok := ret.Get(0).(func(string, string) error); ok {
 		r0 = rf(screenName, body)
 		r0 = rf(screenName, body)

+ 1 - 13
handler/session_manager_mock.go → handler/session_manager_mock_test.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.38.0. DO NOT EDIT.
+// Code generated by mockery v2.35.2. DO NOT EDIT.
 
 
 package handler
 package handler
 
 
@@ -24,10 +24,6 @@ func (_m *mockSessionManager) EXPECT() *mockSessionManager_Expecter {
 func (_m *mockSessionManager) Empty() bool {
 func (_m *mockSessionManager) Empty() bool {
 	ret := _m.Called()
 	ret := _m.Called()
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for Empty")
-	}
-
 	var r0 bool
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
 		r0 = rf()
@@ -69,10 +65,6 @@ func (_c *mockSessionManager_Empty_Call) RunAndReturn(run func() bool) *mockSess
 func (_m *mockSessionManager) NewSessionWithSN(sessID string, screenName string) *state.Session {
 func (_m *mockSessionManager) NewSessionWithSN(sessID string, screenName string) *state.Session {
 	ret := _m.Called(sessID, screenName)
 	ret := _m.Called(sessID, screenName)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for NewSessionWithSN")
-	}
-
 	var r0 *state.Session
 	var r0 *state.Session
 	if rf, ok := ret.Get(0).(func(string, string) *state.Session); ok {
 	if rf, ok := ret.Get(0).(func(string, string) *state.Session); ok {
 		r0 = rf(sessID, screenName)
 		r0 = rf(sessID, screenName)
@@ -151,10 +143,6 @@ func (_c *mockSessionManager_Remove_Call) RunAndReturn(run func(*state.Session))
 func (_m *mockSessionManager) Retrieve(ID string) (*state.Session, bool) {
 func (_m *mockSessionManager) Retrieve(ID string) (*state.Session, bool) {
 	ret := _m.Called(ID)
 	ret := _m.Called(ID)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for Retrieve")
-	}
-
 	var r0 *state.Session
 	var r0 *state.Session
 	var r1 bool
 	var r1 bool
 	if rf, ok := ret.Get(0).(func(string) (*state.Session, bool)); ok {
 	if rf, ok := ret.Get(0).(func(string) (*state.Session, bool)); ok {

+ 1 - 9
handler/user_manager_manager_mock.go → handler/user_manager_manager_mock_test.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.38.0. DO NOT EDIT.
+// Code generated by mockery v2.35.2. DO NOT EDIT.
 
 
 package handler
 package handler
 
 
@@ -24,10 +24,6 @@ func (_m *mockUserManager) EXPECT() *mockUserManager_Expecter {
 func (_m *mockUserManager) GetUser(screenName string) (*state.User, error) {
 func (_m *mockUserManager) GetUser(screenName string) (*state.User, error) {
 	ret := _m.Called(screenName)
 	ret := _m.Called(screenName)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for GetUser")
-	}
-
 	var r0 *state.User
 	var r0 *state.User
 	var r1 error
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (*state.User, error)); ok {
 	if rf, ok := ret.Get(0).(func(string) (*state.User, error)); ok {
@@ -82,10 +78,6 @@ func (_c *mockUserManager_GetUser_Call) RunAndReturn(run func(string) (*state.Us
 func (_m *mockUserManager) UpsertUser(u state.User) error {
 func (_m *mockUserManager) UpsertUser(u state.User) error {
 	ret := _m.Called(u)
 	ret := _m.Called(u)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for UpsertUser")
-	}
-
 	var r0 error
 	var r0 error
 	if rf, ok := ret.Get(0).(func(state.User) error); ok {
 	if rf, ok := ret.Get(0).(func(state.User) error); ok {
 		r0 = rf(u)
 		r0 = rf(u)

+ 1 - 5
server/buddy_mock.go → server/buddy_mock_test.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.38.0. DO NOT EDIT.
+// Code generated by mockery v2.35.2. DO NOT EDIT.
 
 
 package server
 package server
 
 
@@ -26,10 +26,6 @@ func (_m *mockBuddyHandler) EXPECT() *mockBuddyHandler_Expecter {
 func (_m *mockBuddyHandler) RightsQueryHandler(ctx context.Context, inFrame oscar.SNACFrame) oscar.SNACMessage {
 func (_m *mockBuddyHandler) RightsQueryHandler(ctx context.Context, inFrame oscar.SNACFrame) oscar.SNACMessage {
 	ret := _m.Called(ctx, inFrame)
 	ret := _m.Called(ctx, inFrame)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for RightsQueryHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame) oscar.SNACMessage); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame) oscar.SNACMessage); ok {
 		r0 = rf(ctx, inFrame)
 		r0 = rf(ctx, inFrame)

+ 1 - 5
server/chat_mock.go → server/chat_mock_test.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.38.0. DO NOT EDIT.
+// Code generated by mockery v2.35.2. DO NOT EDIT.
 
 
 package server
 package server
 
 
@@ -28,10 +28,6 @@ func (_m *mockChatHandler) EXPECT() *mockChatHandler_Expecter {
 func (_m *mockChatHandler) ChannelMsgToHostHandler(ctx context.Context, sess *state.Session, chatID string, inFrame oscar.SNACFrame, inBody oscar.SNAC_0x0E_0x05_ChatChannelMsgToHost) (*oscar.SNACMessage, error) {
 func (_m *mockChatHandler) ChannelMsgToHostHandler(ctx context.Context, sess *state.Session, chatID string, inFrame oscar.SNACFrame, inBody oscar.SNAC_0x0E_0x05_ChatChannelMsgToHost) (*oscar.SNACMessage, error) {
 	ret := _m.Called(ctx, sess, chatID, inFrame, inBody)
 	ret := _m.Called(ctx, sess, chatID, inFrame, inBody)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for ChannelMsgToHostHandler")
-	}
-
 	var r0 *oscar.SNACMessage
 	var r0 *oscar.SNACMessage
 	var r1 error
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, string, oscar.SNACFrame, oscar.SNAC_0x0E_0x05_ChatChannelMsgToHost) (*oscar.SNACMessage, error)); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, string, oscar.SNACFrame, oscar.SNAC_0x0E_0x05_ChatChannelMsgToHost) (*oscar.SNACMessage, error)); ok {

+ 1 - 13
server/chat_nav_mock.go → server/chat_nav_mock_test.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.38.0. DO NOT EDIT.
+// Code generated by mockery v2.35.2. DO NOT EDIT.
 
 
 package server
 package server
 
 
@@ -28,10 +28,6 @@ func (_m *mockChatNavHandler) EXPECT() *mockChatNavHandler_Expecter {
 func (_m *mockChatNavHandler) CreateRoomHandler(ctx context.Context, sess *state.Session, inFrame oscar.SNACFrame, inBody oscar.SNAC_0x0E_0x02_ChatRoomInfoUpdate) (oscar.SNACMessage, error) {
 func (_m *mockChatNavHandler) CreateRoomHandler(ctx context.Context, sess *state.Session, inFrame oscar.SNACFrame, inBody oscar.SNAC_0x0E_0x02_ChatRoomInfoUpdate) (oscar.SNACMessage, error) {
 	ret := _m.Called(ctx, sess, inFrame, inBody)
 	ret := _m.Called(ctx, sess, inFrame, inBody)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for CreateRoomHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	var r1 error
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x0E_0x02_ChatRoomInfoUpdate) (oscar.SNACMessage, error)); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x0E_0x02_ChatRoomInfoUpdate) (oscar.SNACMessage, error)); ok {
@@ -87,10 +83,6 @@ func (_c *mockChatNavHandler_CreateRoomHandler_Call) RunAndReturn(run func(conte
 func (_m *mockChatNavHandler) RequestChatRightsHandler(ctx context.Context, inFrame oscar.SNACFrame) oscar.SNACMessage {
 func (_m *mockChatNavHandler) RequestChatRightsHandler(ctx context.Context, inFrame oscar.SNACFrame) oscar.SNACMessage {
 	ret := _m.Called(ctx, inFrame)
 	ret := _m.Called(ctx, inFrame)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for RequestChatRightsHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame) oscar.SNACMessage); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame) oscar.SNACMessage); ok {
 		r0 = rf(ctx, inFrame)
 		r0 = rf(ctx, inFrame)
@@ -134,10 +126,6 @@ func (_c *mockChatNavHandler_RequestChatRightsHandler_Call) RunAndReturn(run fun
 func (_m *mockChatNavHandler) RequestRoomInfoHandler(ctx context.Context, inFrame oscar.SNACFrame, inBody oscar.SNAC_0x0D_0x04_ChatNavRequestRoomInfo) (oscar.SNACMessage, error) {
 func (_m *mockChatNavHandler) RequestRoomInfoHandler(ctx context.Context, inFrame oscar.SNACFrame, inBody oscar.SNAC_0x0D_0x04_ChatNavRequestRoomInfo) (oscar.SNACMessage, error) {
 	ret := _m.Called(ctx, inFrame, inBody)
 	ret := _m.Called(ctx, inFrame, inBody)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for RequestRoomInfoHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	var r1 error
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame, oscar.SNAC_0x0D_0x04_ChatNavRequestRoomInfo) (oscar.SNACMessage, error)); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame, oscar.SNAC_0x0D_0x04_ChatNavRequestRoomInfo) (oscar.SNACMessage, error)); ok {

+ 1 - 25
server/feedbag_mock.go → server/feedbag_mock_test.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.38.0. DO NOT EDIT.
+// Code generated by mockery v2.35.2. DO NOT EDIT.
 
 
 package server
 package server
 
 
@@ -28,10 +28,6 @@ func (_m *mockFeedbagHandler) EXPECT() *mockFeedbagHandler_Expecter {
 func (_m *mockFeedbagHandler) DeleteItemHandler(ctx context.Context, sess *state.Session, inFrame oscar.SNACFrame, inBody oscar.SNAC_0x13_0x0A_FeedbagDeleteItem) (oscar.SNACMessage, error) {
 func (_m *mockFeedbagHandler) DeleteItemHandler(ctx context.Context, sess *state.Session, inFrame oscar.SNACFrame, inBody oscar.SNAC_0x13_0x0A_FeedbagDeleteItem) (oscar.SNACMessage, error) {
 	ret := _m.Called(ctx, sess, inFrame, inBody)
 	ret := _m.Called(ctx, sess, inFrame, inBody)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for DeleteItemHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	var r1 error
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x13_0x0A_FeedbagDeleteItem) (oscar.SNACMessage, error)); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x13_0x0A_FeedbagDeleteItem) (oscar.SNACMessage, error)); ok {
@@ -87,10 +83,6 @@ func (_c *mockFeedbagHandler_DeleteItemHandler_Call) RunAndReturn(run func(conte
 func (_m *mockFeedbagHandler) InsertItemHandler(ctx context.Context, sess *state.Session, inFrame oscar.SNACFrame, inBody oscar.SNAC_0x13_0x08_FeedbagInsertItem) (oscar.SNACMessage, error) {
 func (_m *mockFeedbagHandler) InsertItemHandler(ctx context.Context, sess *state.Session, inFrame oscar.SNACFrame, inBody oscar.SNAC_0x13_0x08_FeedbagInsertItem) (oscar.SNACMessage, error) {
 	ret := _m.Called(ctx, sess, inFrame, inBody)
 	ret := _m.Called(ctx, sess, inFrame, inBody)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for InsertItemHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	var r1 error
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x13_0x08_FeedbagInsertItem) (oscar.SNACMessage, error)); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x13_0x08_FeedbagInsertItem) (oscar.SNACMessage, error)); ok {
@@ -146,10 +138,6 @@ func (_c *mockFeedbagHandler_InsertItemHandler_Call) RunAndReturn(run func(conte
 func (_m *mockFeedbagHandler) QueryHandler(ctx context.Context, sess *state.Session, inFrame oscar.SNACFrame) (oscar.SNACMessage, error) {
 func (_m *mockFeedbagHandler) QueryHandler(ctx context.Context, sess *state.Session, inFrame oscar.SNACFrame) (oscar.SNACMessage, error) {
 	ret := _m.Called(ctx, sess, inFrame)
 	ret := _m.Called(ctx, sess, inFrame)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for QueryHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	var r1 error
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame) (oscar.SNACMessage, error)); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame) (oscar.SNACMessage, error)); ok {
@@ -204,10 +192,6 @@ func (_c *mockFeedbagHandler_QueryHandler_Call) RunAndReturn(run func(context.Co
 func (_m *mockFeedbagHandler) QueryIfModifiedHandler(ctx context.Context, sess *state.Session, inFrame oscar.SNACFrame, inBody oscar.SNAC_0x13_0x05_FeedbagQueryIfModified) (oscar.SNACMessage, error) {
 func (_m *mockFeedbagHandler) QueryIfModifiedHandler(ctx context.Context, sess *state.Session, inFrame oscar.SNACFrame, inBody oscar.SNAC_0x13_0x05_FeedbagQueryIfModified) (oscar.SNACMessage, error) {
 	ret := _m.Called(ctx, sess, inFrame, inBody)
 	ret := _m.Called(ctx, sess, inFrame, inBody)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for QueryIfModifiedHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	var r1 error
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x13_0x05_FeedbagQueryIfModified) (oscar.SNACMessage, error)); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x13_0x05_FeedbagQueryIfModified) (oscar.SNACMessage, error)); ok {
@@ -263,10 +247,6 @@ func (_c *mockFeedbagHandler_QueryIfModifiedHandler_Call) RunAndReturn(run func(
 func (_m *mockFeedbagHandler) RightsQueryHandler(ctx context.Context, inFrame oscar.SNACFrame) oscar.SNACMessage {
 func (_m *mockFeedbagHandler) RightsQueryHandler(ctx context.Context, inFrame oscar.SNACFrame) oscar.SNACMessage {
 	ret := _m.Called(ctx, inFrame)
 	ret := _m.Called(ctx, inFrame)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for RightsQueryHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame) oscar.SNACMessage); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame) oscar.SNACMessage); ok {
 		r0 = rf(ctx, inFrame)
 		r0 = rf(ctx, inFrame)
@@ -345,10 +325,6 @@ func (_c *mockFeedbagHandler_StartClusterHandler_Call) RunAndReturn(run func(con
 func (_m *mockFeedbagHandler) UpdateItemHandler(ctx context.Context, sess *state.Session, inFrame oscar.SNACFrame, inBody oscar.SNAC_0x13_0x09_FeedbagUpdateItem) (oscar.SNACMessage, error) {
 func (_m *mockFeedbagHandler) UpdateItemHandler(ctx context.Context, sess *state.Session, inFrame oscar.SNACFrame, inBody oscar.SNAC_0x13_0x09_FeedbagUpdateItem) (oscar.SNACMessage, error) {
 	ret := _m.Called(ctx, sess, inFrame, inBody)
 	ret := _m.Called(ctx, sess, inFrame, inBody)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for UpdateItemHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	var r1 error
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x13_0x09_FeedbagUpdateItem) (oscar.SNACMessage, error)); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x13_0x09_FeedbagUpdateItem) (oscar.SNACMessage, error)); ok {

+ 1 - 17
server/icbm_mock.go → server/icbm_mock_test.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.38.0. DO NOT EDIT.
+// Code generated by mockery v2.35.2. DO NOT EDIT.
 
 
 package server
 package server
 
 
@@ -28,10 +28,6 @@ func (_m *mockICBMHandler) EXPECT() *mockICBMHandler_Expecter {
 func (_m *mockICBMHandler) ChannelMsgToHostHandler(ctx context.Context, sess *state.Session, inFrame oscar.SNACFrame, inBody oscar.SNAC_0x04_0x06_ICBMChannelMsgToHost) (*oscar.SNACMessage, error) {
 func (_m *mockICBMHandler) ChannelMsgToHostHandler(ctx context.Context, sess *state.Session, inFrame oscar.SNACFrame, inBody oscar.SNAC_0x04_0x06_ICBMChannelMsgToHost) (*oscar.SNACMessage, error) {
 	ret := _m.Called(ctx, sess, inFrame, inBody)
 	ret := _m.Called(ctx, sess, inFrame, inBody)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for ChannelMsgToHostHandler")
-	}
-
 	var r0 *oscar.SNACMessage
 	var r0 *oscar.SNACMessage
 	var r1 error
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x04_0x06_ICBMChannelMsgToHost) (*oscar.SNACMessage, error)); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x04_0x06_ICBMChannelMsgToHost) (*oscar.SNACMessage, error)); ok {
@@ -89,10 +85,6 @@ func (_c *mockICBMHandler_ChannelMsgToHostHandler_Call) RunAndReturn(run func(co
 func (_m *mockICBMHandler) ClientEventHandler(ctx context.Context, sess *state.Session, inFrame oscar.SNACFrame, inBody oscar.SNAC_0x04_0x14_ICBMClientEvent) error {
 func (_m *mockICBMHandler) ClientEventHandler(ctx context.Context, sess *state.Session, inFrame oscar.SNACFrame, inBody oscar.SNAC_0x04_0x14_ICBMClientEvent) error {
 	ret := _m.Called(ctx, sess, inFrame, inBody)
 	ret := _m.Called(ctx, sess, inFrame, inBody)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for ClientEventHandler")
-	}
-
 	var r0 error
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x04_0x14_ICBMClientEvent) error); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x04_0x14_ICBMClientEvent) error); ok {
 		r0 = rf(ctx, sess, inFrame, inBody)
 		r0 = rf(ctx, sess, inFrame, inBody)
@@ -138,10 +130,6 @@ func (_c *mockICBMHandler_ClientEventHandler_Call) RunAndReturn(run func(context
 func (_m *mockICBMHandler) EvilRequestHandler(ctx context.Context, sess *state.Session, inFrame oscar.SNACFrame, inBody oscar.SNAC_0x04_0x08_ICBMEvilRequest) (oscar.SNACMessage, error) {
 func (_m *mockICBMHandler) EvilRequestHandler(ctx context.Context, sess *state.Session, inFrame oscar.SNACFrame, inBody oscar.SNAC_0x04_0x08_ICBMEvilRequest) (oscar.SNACMessage, error) {
 	ret := _m.Called(ctx, sess, inFrame, inBody)
 	ret := _m.Called(ctx, sess, inFrame, inBody)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for EvilRequestHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	var r1 error
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x04_0x08_ICBMEvilRequest) (oscar.SNACMessage, error)); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x04_0x08_ICBMEvilRequest) (oscar.SNACMessage, error)); ok {
@@ -197,10 +185,6 @@ func (_c *mockICBMHandler_EvilRequestHandler_Call) RunAndReturn(run func(context
 func (_m *mockICBMHandler) ParameterQueryHandler(ctx context.Context, inFrame oscar.SNACFrame) oscar.SNACMessage {
 func (_m *mockICBMHandler) ParameterQueryHandler(ctx context.Context, inFrame oscar.SNACFrame) oscar.SNACMessage {
 	ret := _m.Called(ctx, inFrame)
 	ret := _m.Called(ctx, inFrame)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for ParameterQueryHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame) oscar.SNACMessage); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame) oscar.SNACMessage); ok {
 		r0 = rf(ctx, inFrame)
 		r0 = rf(ctx, inFrame)

+ 1 - 21
server/locate_mock.go → server/locate_mock_test.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.38.0. DO NOT EDIT.
+// Code generated by mockery v2.35.2. DO NOT EDIT.
 
 
 package server
 package server
 
 
@@ -28,10 +28,6 @@ func (_m *mockLocateHandler) EXPECT() *mockLocateHandler_Expecter {
 func (_m *mockLocateHandler) RightsQueryHandler(ctx context.Context, inFrame oscar.SNACFrame) oscar.SNACMessage {
 func (_m *mockLocateHandler) RightsQueryHandler(ctx context.Context, inFrame oscar.SNACFrame) oscar.SNACMessage {
 	ret := _m.Called(ctx, inFrame)
 	ret := _m.Called(ctx, inFrame)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for RightsQueryHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame) oscar.SNACMessage); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame) oscar.SNACMessage); ok {
 		r0 = rf(ctx, inFrame)
 		r0 = rf(ctx, inFrame)
@@ -75,10 +71,6 @@ func (_c *mockLocateHandler_RightsQueryHandler_Call) RunAndReturn(run func(conte
 func (_m *mockLocateHandler) SetDirInfoHandler(ctx context.Context, frame oscar.SNACFrame) oscar.SNACMessage {
 func (_m *mockLocateHandler) SetDirInfoHandler(ctx context.Context, frame oscar.SNACFrame) oscar.SNACMessage {
 	ret := _m.Called(ctx, frame)
 	ret := _m.Called(ctx, frame)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for SetDirInfoHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame) oscar.SNACMessage); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame) oscar.SNACMessage); ok {
 		r0 = rf(ctx, frame)
 		r0 = rf(ctx, frame)
@@ -122,10 +114,6 @@ func (_c *mockLocateHandler_SetDirInfoHandler_Call) RunAndReturn(run func(contex
 func (_m *mockLocateHandler) SetInfoHandler(ctx context.Context, sess *state.Session, inBody oscar.SNAC_0x02_0x04_LocateSetInfo) error {
 func (_m *mockLocateHandler) SetInfoHandler(ctx context.Context, sess *state.Session, inBody oscar.SNAC_0x02_0x04_LocateSetInfo) error {
 	ret := _m.Called(ctx, sess, inBody)
 	ret := _m.Called(ctx, sess, inBody)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for SetInfoHandler")
-	}
-
 	var r0 error
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNAC_0x02_0x04_LocateSetInfo) error); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNAC_0x02_0x04_LocateSetInfo) error); ok {
 		r0 = rf(ctx, sess, inBody)
 		r0 = rf(ctx, sess, inBody)
@@ -170,10 +158,6 @@ func (_c *mockLocateHandler_SetInfoHandler_Call) RunAndReturn(run func(context.C
 func (_m *mockLocateHandler) SetKeywordInfoHandler(ctx context.Context, inFrame oscar.SNACFrame) oscar.SNACMessage {
 func (_m *mockLocateHandler) SetKeywordInfoHandler(ctx context.Context, inFrame oscar.SNACFrame) oscar.SNACMessage {
 	ret := _m.Called(ctx, inFrame)
 	ret := _m.Called(ctx, inFrame)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for SetKeywordInfoHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame) oscar.SNACMessage); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame) oscar.SNACMessage); ok {
 		r0 = rf(ctx, inFrame)
 		r0 = rf(ctx, inFrame)
@@ -217,10 +201,6 @@ func (_c *mockLocateHandler_SetKeywordInfoHandler_Call) RunAndReturn(run func(co
 func (_m *mockLocateHandler) UserInfoQuery2Handler(ctx context.Context, sess *state.Session, inFrame oscar.SNACFrame, inBody oscar.SNAC_0x02_0x15_LocateUserInfoQuery2) (oscar.SNACMessage, error) {
 func (_m *mockLocateHandler) UserInfoQuery2Handler(ctx context.Context, sess *state.Session, inFrame oscar.SNACFrame, inBody oscar.SNAC_0x02_0x15_LocateUserInfoQuery2) (oscar.SNACMessage, error) {
 	ret := _m.Called(ctx, sess, inFrame, inBody)
 	ret := _m.Called(ctx, sess, inFrame, inBody)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for UserInfoQuery2Handler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	var r1 error
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x02_0x15_LocateUserInfoQuery2) (oscar.SNACMessage, error)); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x02_0x15_LocateUserInfoQuery2) (oscar.SNACMessage, error)); ok {

+ 1 - 33
server/oservice_bos_mock.go → server/oservice_bos_mock_test.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.38.0. DO NOT EDIT.
+// Code generated by mockery v2.35.2. DO NOT EDIT.
 
 
 package server
 package server
 
 
@@ -28,10 +28,6 @@ func (_m *mockOServiceBOSHandler) EXPECT() *mockOServiceBOSHandler_Expecter {
 func (_m *mockOServiceBOSHandler) ClientOnlineHandler(ctx context.Context, bodyIn oscar.SNAC_0x01_0x02_OServiceClientOnline, sess *state.Session) error {
 func (_m *mockOServiceBOSHandler) ClientOnlineHandler(ctx context.Context, bodyIn oscar.SNAC_0x01_0x02_OServiceClientOnline, sess *state.Session) error {
 	ret := _m.Called(ctx, bodyIn, sess)
 	ret := _m.Called(ctx, bodyIn, sess)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for ClientOnlineHandler")
-	}
-
 	var r0 error
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNAC_0x01_0x02_OServiceClientOnline, *state.Session) error); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNAC_0x01_0x02_OServiceClientOnline, *state.Session) error); ok {
 		r0 = rf(ctx, bodyIn, sess)
 		r0 = rf(ctx, bodyIn, sess)
@@ -76,10 +72,6 @@ func (_c *mockOServiceBOSHandler_ClientOnlineHandler_Call) RunAndReturn(run func
 func (_m *mockOServiceBOSHandler) ClientVersionsHandler(ctx context.Context, frame oscar.SNACFrame, bodyIn oscar.SNAC_0x01_0x17_OServiceClientVersions) oscar.SNACMessage {
 func (_m *mockOServiceBOSHandler) ClientVersionsHandler(ctx context.Context, frame oscar.SNACFrame, bodyIn oscar.SNAC_0x01_0x17_OServiceClientVersions) oscar.SNACMessage {
 	ret := _m.Called(ctx, frame, bodyIn)
 	ret := _m.Called(ctx, frame, bodyIn)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for ClientVersionsHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame, oscar.SNAC_0x01_0x17_OServiceClientVersions) oscar.SNACMessage); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame, oscar.SNAC_0x01_0x17_OServiceClientVersions) oscar.SNACMessage); ok {
 		r0 = rf(ctx, frame, bodyIn)
 		r0 = rf(ctx, frame, bodyIn)
@@ -124,10 +116,6 @@ func (_c *mockOServiceBOSHandler_ClientVersionsHandler_Call) RunAndReturn(run fu
 func (_m *mockOServiceBOSHandler) IdleNotificationHandler(ctx context.Context, sess *state.Session, bodyIn oscar.SNAC_0x01_0x11_OServiceIdleNotification) error {
 func (_m *mockOServiceBOSHandler) IdleNotificationHandler(ctx context.Context, sess *state.Session, bodyIn oscar.SNAC_0x01_0x11_OServiceIdleNotification) error {
 	ret := _m.Called(ctx, sess, bodyIn)
 	ret := _m.Called(ctx, sess, bodyIn)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for IdleNotificationHandler")
-	}
-
 	var r0 error
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNAC_0x01_0x11_OServiceIdleNotification) error); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNAC_0x01_0x11_OServiceIdleNotification) error); ok {
 		r0 = rf(ctx, sess, bodyIn)
 		r0 = rf(ctx, sess, bodyIn)
@@ -172,10 +160,6 @@ func (_c *mockOServiceBOSHandler_IdleNotificationHandler_Call) RunAndReturn(run
 func (_m *mockOServiceBOSHandler) RateParamsQueryHandler(ctx context.Context, frame oscar.SNACFrame) oscar.SNACMessage {
 func (_m *mockOServiceBOSHandler) RateParamsQueryHandler(ctx context.Context, frame oscar.SNACFrame) oscar.SNACMessage {
 	ret := _m.Called(ctx, frame)
 	ret := _m.Called(ctx, frame)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for RateParamsQueryHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame) oscar.SNACMessage); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame) oscar.SNACMessage); ok {
 		r0 = rf(ctx, frame)
 		r0 = rf(ctx, frame)
@@ -253,10 +237,6 @@ func (_c *mockOServiceBOSHandler_RateParamsSubAddHandler_Call) RunAndReturn(run
 func (_m *mockOServiceBOSHandler) ServiceRequestHandler(ctx context.Context, sess *state.Session, frame oscar.SNACFrame, bodyIn oscar.SNAC_0x01_0x04_OServiceServiceRequest) (oscar.SNACMessage, error) {
 func (_m *mockOServiceBOSHandler) ServiceRequestHandler(ctx context.Context, sess *state.Session, frame oscar.SNACFrame, bodyIn oscar.SNAC_0x01_0x04_OServiceServiceRequest) (oscar.SNACMessage, error) {
 	ret := _m.Called(ctx, sess, frame, bodyIn)
 	ret := _m.Called(ctx, sess, frame, bodyIn)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for ServiceRequestHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	var r1 error
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x01_0x04_OServiceServiceRequest) (oscar.SNACMessage, error)); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x01_0x04_OServiceServiceRequest) (oscar.SNACMessage, error)); ok {
@@ -312,10 +292,6 @@ func (_c *mockOServiceBOSHandler_ServiceRequestHandler_Call) RunAndReturn(run fu
 func (_m *mockOServiceBOSHandler) SetUserInfoFieldsHandler(ctx context.Context, sess *state.Session, frame oscar.SNACFrame, bodyIn oscar.SNAC_0x01_0x1E_OServiceSetUserInfoFields) (oscar.SNACMessage, error) {
 func (_m *mockOServiceBOSHandler) SetUserInfoFieldsHandler(ctx context.Context, sess *state.Session, frame oscar.SNACFrame, bodyIn oscar.SNAC_0x01_0x1E_OServiceSetUserInfoFields) (oscar.SNACMessage, error) {
 	ret := _m.Called(ctx, sess, frame, bodyIn)
 	ret := _m.Called(ctx, sess, frame, bodyIn)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for SetUserInfoFieldsHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	var r1 error
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x01_0x1E_OServiceSetUserInfoFields) (oscar.SNACMessage, error)); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x01_0x1E_OServiceSetUserInfoFields) (oscar.SNACMessage, error)); ok {
@@ -371,10 +347,6 @@ func (_c *mockOServiceBOSHandler_SetUserInfoFieldsHandler_Call) RunAndReturn(run
 func (_m *mockOServiceBOSHandler) UserInfoQueryHandler(ctx context.Context, sess *state.Session, frame oscar.SNACFrame) oscar.SNACMessage {
 func (_m *mockOServiceBOSHandler) UserInfoQueryHandler(ctx context.Context, sess *state.Session, frame oscar.SNACFrame) oscar.SNACMessage {
 	ret := _m.Called(ctx, sess, frame)
 	ret := _m.Called(ctx, sess, frame)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for UserInfoQueryHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame) oscar.SNACMessage); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame) oscar.SNACMessage); ok {
 		r0 = rf(ctx, sess, frame)
 		r0 = rf(ctx, sess, frame)
@@ -419,10 +391,6 @@ func (_c *mockOServiceBOSHandler_UserInfoQueryHandler_Call) RunAndReturn(run fun
 func (_m *mockOServiceBOSHandler) WriteOServiceHostOnline() oscar.SNACMessage {
 func (_m *mockOServiceBOSHandler) WriteOServiceHostOnline() oscar.SNACMessage {
 	ret := _m.Called()
 	ret := _m.Called()
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for WriteOServiceHostOnline")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	if rf, ok := ret.Get(0).(func() oscar.SNACMessage); ok {
 	if rf, ok := ret.Get(0).(func() oscar.SNACMessage); ok {
 		r0 = rf()
 		r0 = rf()

+ 1 - 29
server/oservice_chat_mock.go → server/oservice_chat_mock_test.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.38.0. DO NOT EDIT.
+// Code generated by mockery v2.35.2. DO NOT EDIT.
 
 
 package server
 package server
 
 
@@ -28,10 +28,6 @@ func (_m *mockOServiceChatHandler) EXPECT() *mockOServiceChatHandler_Expecter {
 func (_m *mockOServiceChatHandler) ClientOnlineHandler(ctx context.Context, sess *state.Session, chatID string) error {
 func (_m *mockOServiceChatHandler) ClientOnlineHandler(ctx context.Context, sess *state.Session, chatID string) error {
 	ret := _m.Called(ctx, sess, chatID)
 	ret := _m.Called(ctx, sess, chatID)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for ClientOnlineHandler")
-	}
-
 	var r0 error
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, string) error); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, string) error); ok {
 		r0 = rf(ctx, sess, chatID)
 		r0 = rf(ctx, sess, chatID)
@@ -76,10 +72,6 @@ func (_c *mockOServiceChatHandler_ClientOnlineHandler_Call) RunAndReturn(run fun
 func (_m *mockOServiceChatHandler) ClientVersionsHandler(ctx context.Context, frame oscar.SNACFrame, bodyIn oscar.SNAC_0x01_0x17_OServiceClientVersions) oscar.SNACMessage {
 func (_m *mockOServiceChatHandler) ClientVersionsHandler(ctx context.Context, frame oscar.SNACFrame, bodyIn oscar.SNAC_0x01_0x17_OServiceClientVersions) oscar.SNACMessage {
 	ret := _m.Called(ctx, frame, bodyIn)
 	ret := _m.Called(ctx, frame, bodyIn)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for ClientVersionsHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame, oscar.SNAC_0x01_0x17_OServiceClientVersions) oscar.SNACMessage); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame, oscar.SNAC_0x01_0x17_OServiceClientVersions) oscar.SNACMessage); ok {
 		r0 = rf(ctx, frame, bodyIn)
 		r0 = rf(ctx, frame, bodyIn)
@@ -124,10 +116,6 @@ func (_c *mockOServiceChatHandler_ClientVersionsHandler_Call) RunAndReturn(run f
 func (_m *mockOServiceChatHandler) IdleNotificationHandler(ctx context.Context, sess *state.Session, bodyIn oscar.SNAC_0x01_0x11_OServiceIdleNotification) error {
 func (_m *mockOServiceChatHandler) IdleNotificationHandler(ctx context.Context, sess *state.Session, bodyIn oscar.SNAC_0x01_0x11_OServiceIdleNotification) error {
 	ret := _m.Called(ctx, sess, bodyIn)
 	ret := _m.Called(ctx, sess, bodyIn)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for IdleNotificationHandler")
-	}
-
 	var r0 error
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNAC_0x01_0x11_OServiceIdleNotification) error); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNAC_0x01_0x11_OServiceIdleNotification) error); ok {
 		r0 = rf(ctx, sess, bodyIn)
 		r0 = rf(ctx, sess, bodyIn)
@@ -172,10 +160,6 @@ func (_c *mockOServiceChatHandler_IdleNotificationHandler_Call) RunAndReturn(run
 func (_m *mockOServiceChatHandler) RateParamsQueryHandler(ctx context.Context, frame oscar.SNACFrame) oscar.SNACMessage {
 func (_m *mockOServiceChatHandler) RateParamsQueryHandler(ctx context.Context, frame oscar.SNACFrame) oscar.SNACMessage {
 	ret := _m.Called(ctx, frame)
 	ret := _m.Called(ctx, frame)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for RateParamsQueryHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame) oscar.SNACMessage); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame) oscar.SNACMessage); ok {
 		r0 = rf(ctx, frame)
 		r0 = rf(ctx, frame)
@@ -253,10 +237,6 @@ func (_c *mockOServiceChatHandler_RateParamsSubAddHandler_Call) RunAndReturn(run
 func (_m *mockOServiceChatHandler) SetUserInfoFieldsHandler(ctx context.Context, sess *state.Session, frame oscar.SNACFrame, bodyIn oscar.SNAC_0x01_0x1E_OServiceSetUserInfoFields) (oscar.SNACMessage, error) {
 func (_m *mockOServiceChatHandler) SetUserInfoFieldsHandler(ctx context.Context, sess *state.Session, frame oscar.SNACFrame, bodyIn oscar.SNAC_0x01_0x1E_OServiceSetUserInfoFields) (oscar.SNACMessage, error) {
 	ret := _m.Called(ctx, sess, frame, bodyIn)
 	ret := _m.Called(ctx, sess, frame, bodyIn)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for SetUserInfoFieldsHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	var r1 error
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x01_0x1E_OServiceSetUserInfoFields) (oscar.SNACMessage, error)); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x01_0x1E_OServiceSetUserInfoFields) (oscar.SNACMessage, error)); ok {
@@ -312,10 +292,6 @@ func (_c *mockOServiceChatHandler_SetUserInfoFieldsHandler_Call) RunAndReturn(ru
 func (_m *mockOServiceChatHandler) UserInfoQueryHandler(ctx context.Context, sess *state.Session, frame oscar.SNACFrame) oscar.SNACMessage {
 func (_m *mockOServiceChatHandler) UserInfoQueryHandler(ctx context.Context, sess *state.Session, frame oscar.SNACFrame) oscar.SNACMessage {
 	ret := _m.Called(ctx, sess, frame)
 	ret := _m.Called(ctx, sess, frame)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for UserInfoQueryHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame) oscar.SNACMessage); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame) oscar.SNACMessage); ok {
 		r0 = rf(ctx, sess, frame)
 		r0 = rf(ctx, sess, frame)
@@ -360,10 +336,6 @@ func (_c *mockOServiceChatHandler_UserInfoQueryHandler_Call) RunAndReturn(run fu
 func (_m *mockOServiceChatHandler) WriteOServiceHostOnline() oscar.SNACMessage {
 func (_m *mockOServiceChatHandler) WriteOServiceHostOnline() oscar.SNACMessage {
 	ret := _m.Called()
 	ret := _m.Called()
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for WriteOServiceHostOnline")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	if rf, ok := ret.Get(0).(func() oscar.SNACMessage); ok {
 	if rf, ok := ret.Get(0).(func() oscar.SNACMessage); ok {
 		r0 = rf()
 		r0 = rf()

+ 1 - 21
server/oservice_mock.go → server/oservice_mock_test.go

@@ -1,4 +1,4 @@
-// Code generated by mockery v2.38.0. DO NOT EDIT.
+// Code generated by mockery v2.35.2. DO NOT EDIT.
 
 
 package server
 package server
 
 
@@ -28,10 +28,6 @@ func (_m *mockOServiceHandler) EXPECT() *mockOServiceHandler_Expecter {
 func (_m *mockOServiceHandler) ClientVersionsHandler(ctx context.Context, frame oscar.SNACFrame, bodyIn oscar.SNAC_0x01_0x17_OServiceClientVersions) oscar.SNACMessage {
 func (_m *mockOServiceHandler) ClientVersionsHandler(ctx context.Context, frame oscar.SNACFrame, bodyIn oscar.SNAC_0x01_0x17_OServiceClientVersions) oscar.SNACMessage {
 	ret := _m.Called(ctx, frame, bodyIn)
 	ret := _m.Called(ctx, frame, bodyIn)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for ClientVersionsHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame, oscar.SNAC_0x01_0x17_OServiceClientVersions) oscar.SNACMessage); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame, oscar.SNAC_0x01_0x17_OServiceClientVersions) oscar.SNACMessage); ok {
 		r0 = rf(ctx, frame, bodyIn)
 		r0 = rf(ctx, frame, bodyIn)
@@ -76,10 +72,6 @@ func (_c *mockOServiceHandler_ClientVersionsHandler_Call) RunAndReturn(run func(
 func (_m *mockOServiceHandler) IdleNotificationHandler(ctx context.Context, sess *state.Session, bodyIn oscar.SNAC_0x01_0x11_OServiceIdleNotification) error {
 func (_m *mockOServiceHandler) IdleNotificationHandler(ctx context.Context, sess *state.Session, bodyIn oscar.SNAC_0x01_0x11_OServiceIdleNotification) error {
 	ret := _m.Called(ctx, sess, bodyIn)
 	ret := _m.Called(ctx, sess, bodyIn)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for IdleNotificationHandler")
-	}
-
 	var r0 error
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNAC_0x01_0x11_OServiceIdleNotification) error); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNAC_0x01_0x11_OServiceIdleNotification) error); ok {
 		r0 = rf(ctx, sess, bodyIn)
 		r0 = rf(ctx, sess, bodyIn)
@@ -124,10 +116,6 @@ func (_c *mockOServiceHandler_IdleNotificationHandler_Call) RunAndReturn(run fun
 func (_m *mockOServiceHandler) RateParamsQueryHandler(ctx context.Context, frame oscar.SNACFrame) oscar.SNACMessage {
 func (_m *mockOServiceHandler) RateParamsQueryHandler(ctx context.Context, frame oscar.SNACFrame) oscar.SNACMessage {
 	ret := _m.Called(ctx, frame)
 	ret := _m.Called(ctx, frame)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for RateParamsQueryHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame) oscar.SNACMessage); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, oscar.SNACFrame) oscar.SNACMessage); ok {
 		r0 = rf(ctx, frame)
 		r0 = rf(ctx, frame)
@@ -205,10 +193,6 @@ func (_c *mockOServiceHandler_RateParamsSubAddHandler_Call) RunAndReturn(run fun
 func (_m *mockOServiceHandler) SetUserInfoFieldsHandler(ctx context.Context, sess *state.Session, frame oscar.SNACFrame, bodyIn oscar.SNAC_0x01_0x1E_OServiceSetUserInfoFields) (oscar.SNACMessage, error) {
 func (_m *mockOServiceHandler) SetUserInfoFieldsHandler(ctx context.Context, sess *state.Session, frame oscar.SNACFrame, bodyIn oscar.SNAC_0x01_0x1E_OServiceSetUserInfoFields) (oscar.SNACMessage, error) {
 	ret := _m.Called(ctx, sess, frame, bodyIn)
 	ret := _m.Called(ctx, sess, frame, bodyIn)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for SetUserInfoFieldsHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	var r1 error
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x01_0x1E_OServiceSetUserInfoFields) (oscar.SNACMessage, error)); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame, oscar.SNAC_0x01_0x1E_OServiceSetUserInfoFields) (oscar.SNACMessage, error)); ok {
@@ -264,10 +248,6 @@ func (_c *mockOServiceHandler_SetUserInfoFieldsHandler_Call) RunAndReturn(run fu
 func (_m *mockOServiceHandler) UserInfoQueryHandler(ctx context.Context, sess *state.Session, frame oscar.SNACFrame) oscar.SNACMessage {
 func (_m *mockOServiceHandler) UserInfoQueryHandler(ctx context.Context, sess *state.Session, frame oscar.SNACFrame) oscar.SNACMessage {
 	ret := _m.Called(ctx, sess, frame)
 	ret := _m.Called(ctx, sess, frame)
 
 
-	if len(ret) == 0 {
-		panic("no return value specified for UserInfoQueryHandler")
-	}
-
 	var r0 oscar.SNACMessage
 	var r0 oscar.SNACMessage
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame) oscar.SNACMessage); ok {
 	if rf, ok := ret.Get(0).(func(context.Context, *state.Session, oscar.SNACFrame) oscar.SNACMessage); ok {
 		r0 = rf(ctx, sess, frame)
 		r0 = rf(ctx, sess, frame)