This reverts commit 77d42568f9.
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
e1b13c10fc
Коммит
ff383990f8
@@ -229,12 +229,6 @@ type API interface {
|
||||
// Minimum server version: 5.2
|
||||
UpdateUserStatus(userID, status string) (*model.Status, *model.AppError)
|
||||
|
||||
// SetUserStatusTimedDND will set a user's status to dnd for given time until the user,
|
||||
// or another integration/plugin, sets it back to online.
|
||||
// @tag User
|
||||
// Minimum server version: 5.35
|
||||
SetUserStatusTimedDND(userId string, endtime int64) (*model.Status, *model.AppError)
|
||||
|
||||
// UpdateUserActive deactivates or reactivates an user.
|
||||
//
|
||||
// @tag User
|
||||
|
||||
@@ -266,13 +266,6 @@ func (api *apiTimerLayer) UpdateUserStatus(userID, status string) (*model.Status
|
||||
return _returnsA, _returnsB
|
||||
}
|
||||
|
||||
func (api *apiTimerLayer) SetUserStatusTimedDND(userId string, endtime int64) (*model.Status, *model.AppError) {
|
||||
startTime := timePkg.Now()
|
||||
_returnsA, _returnsB := api.apiImpl.SetUserStatusTimedDND(userId, endtime)
|
||||
api.recordTime(startTime, "SetUserStatusTimedDND", _returnsB == nil)
|
||||
return _returnsA, _returnsB
|
||||
}
|
||||
|
||||
func (api *apiTimerLayer) UpdateUserActive(userID string, active bool) *model.AppError {
|
||||
startTime := timePkg.Now()
|
||||
_returnsA := api.apiImpl.UpdateUserActive(userID, active)
|
||||
|
||||
@@ -1509,36 +1509,6 @@ func (s *apiRPCServer) UpdateUserStatus(args *Z_UpdateUserStatusArgs, returns *Z
|
||||
return nil
|
||||
}
|
||||
|
||||
type Z_SetUserStatusTimedDNDArgs struct {
|
||||
A string
|
||||
B int64
|
||||
}
|
||||
|
||||
type Z_SetUserStatusTimedDNDReturns struct {
|
||||
A *model.Status
|
||||
B *model.AppError
|
||||
}
|
||||
|
||||
func (g *apiRPCClient) SetUserStatusTimedDND(userId string, endtime int64) (*model.Status, *model.AppError) {
|
||||
_args := &Z_SetUserStatusTimedDNDArgs{userId, endtime}
|
||||
_returns := &Z_SetUserStatusTimedDNDReturns{}
|
||||
if err := g.client.Call("Plugin.SetUserStatusTimedDND", _args, _returns); err != nil {
|
||||
log.Printf("RPC call to SetUserStatusTimedDND API failed: %s", err.Error())
|
||||
}
|
||||
return _returns.A, _returns.B
|
||||
}
|
||||
|
||||
func (s *apiRPCServer) SetUserStatusTimedDND(args *Z_SetUserStatusTimedDNDArgs, returns *Z_SetUserStatusTimedDNDReturns) error {
|
||||
if hook, ok := s.impl.(interface {
|
||||
SetUserStatusTimedDND(userId string, endtime int64) (*model.Status, *model.AppError)
|
||||
}); ok {
|
||||
returns.A, returns.B = hook.SetUserStatusTimedDND(args.A, args.B)
|
||||
} else {
|
||||
return encodableError(fmt.Errorf("API SetUserStatusTimedDND called but not implemented."))
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type Z_UpdateUserActiveArgs struct {
|
||||
A string
|
||||
B bool
|
||||
|
||||
@@ -3057,31 +3057,6 @@ func (_m *API) SetTeamIcon(teamID string, data []byte) *model.AppError {
|
||||
return r0
|
||||
}
|
||||
|
||||
// SetUserStatusTimedDND provides a mock function with given fields: userId, endtime
|
||||
func (_m *API) SetUserStatusTimedDND(userId string, endtime int64) (*model.Status, *model.AppError) {
|
||||
ret := _m.Called(userId, endtime)
|
||||
|
||||
var r0 *model.Status
|
||||
if rf, ok := ret.Get(0).(func(string, int64) *model.Status); ok {
|
||||
r0 = rf(userId, endtime)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).(*model.Status)
|
||||
}
|
||||
}
|
||||
|
||||
var r1 *model.AppError
|
||||
if rf, ok := ret.Get(1).(func(string, int64) *model.AppError); ok {
|
||||
r1 = rf(userId, endtime)
|
||||
} else {
|
||||
if ret.Get(1) != nil {
|
||||
r1 = ret.Get(1).(*model.AppError)
|
||||
}
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// UnregisterCommand provides a mock function with given fields: teamID, trigger
|
||||
func (_m *API) UnregisterCommand(teamID string, trigger string) error {
|
||||
ret := _m.Called(teamID, trigger)
|
||||
|
||||
Ссылка в новой задаче
Block a user