MM-29703 Mark threads as read when channels are marked (#15994)
Co-authored-by: Jesús Espino <jespinog@gmail.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
1729239385
Коммит
fe352ab57f
@@ -71,13 +71,13 @@ func (_m *LdapInterface) DoLogin(id string, password string) (*model.User, *mode
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// FirstLoginSync provides a mock function with given fields: userID, userAuthService, userAuthData, email
|
||||
func (_m *LdapInterface) FirstLoginSync(userID string, userAuthService string, userAuthData string, email string) *model.AppError {
|
||||
ret := _m.Called(userID, userAuthService, userAuthData, email)
|
||||
// FirstLoginSync provides a mock function with given fields: user, userAuthService, userAuthData, email
|
||||
func (_m *LdapInterface) FirstLoginSync(user *model.User, userAuthService string, userAuthData string, email string) *model.AppError {
|
||||
ret := _m.Called(user, userAuthService, userAuthData, email)
|
||||
|
||||
var r0 *model.AppError
|
||||
if rf, ok := ret.Get(0).(func(string, string, string, string) *model.AppError); ok {
|
||||
r0 = rf(userID, userAuthService, userAuthData, email)
|
||||
if rf, ok := ret.Get(0).(func(*model.User, string, string, string) *model.AppError); ok {
|
||||
r0 = rf(user, userAuthService, userAuthData, email)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).(*model.AppError)
|
||||
|
||||
@@ -17,7 +17,7 @@ type OauthProvider struct {
|
||||
}
|
||||
|
||||
// GetUserFromJson provides a mock function with given fields: data
|
||||
func (_m *OauthProvider) GetUserFromJson(data io.Reader) *model.User {
|
||||
func (_m *OauthProvider) GetUserFromJson(data io.Reader) (*model.User, error) {
|
||||
ret := _m.Called(data)
|
||||
|
||||
var r0 *model.User
|
||||
@@ -29,5 +29,12 @@ func (_m *OauthProvider) GetUserFromJson(data io.Reader) *model.User {
|
||||
}
|
||||
}
|
||||
|
||||
return r0
|
||||
var r1 error
|
||||
if rf, ok := ret.Get(1).(func(io.Reader) error); ok {
|
||||
r1 = rf(data)
|
||||
} else {
|
||||
r1 = ret.Error(1)
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user