diff --git a/server/channels/store/searchlayer/user_layer.go b/server/channels/store/searchlayer/user_layer.go index 2534b05af3..0557d1f2f6 100644 --- a/server/channels/store/searchlayer/user_layer.go +++ b/server/channels/store/searchlayer/user_layer.go @@ -115,17 +115,17 @@ func (s *SearchUserStore) autocompleteUsersInChannelByEngine(engine searchengine return nil, err } - uchan := make(chan store.StoreResult, 1) + uchan := make(chan store.GenericStoreResult[[]*model.User], 1) go func() { users, nErr := s.UserStore.GetProfileByIds(context.Background(), uchanIds, nil, false) - uchan <- store.StoreResult{Data: users, NErr: nErr} + uchan <- store.GenericStoreResult[[]*model.User]{Data: users, NErr: nErr} close(uchan) }() - nuchan := make(chan store.StoreResult, 1) + nuchan := make(chan store.GenericStoreResult[[]*model.User], 1) go func() { users, nErr := s.UserStore.GetProfileByIds(context.Background(), nuchanIds, nil, false) - nuchan <- store.StoreResult{Data: users, NErr: nErr} + nuchan <- store.GenericStoreResult[[]*model.User]{Data: users, NErr: nErr} close(nuchan) }() @@ -135,15 +135,13 @@ func (s *SearchUserStore) autocompleteUsersInChannelByEngine(engine searchengine if result.NErr != nil { return nil, errors.Wrap(result.NErr, "failed to get user profiles by ids") } - inUsers := result.Data.([]*model.User) - autocomplete.InChannel = inUsers + autocomplete.InChannel = result.Data result = <-nuchan if result.NErr != nil { return nil, errors.Wrap(result.NErr, "failed to get user profiles by ids") } - outUsers := result.Data.([]*model.User) - autocomplete.OutOfChannel = outUsers + autocomplete.OutOfChannel = result.Data return autocomplete, nil }