From 908a682fcf3bbc48db75099f636d627616757b24 Mon Sep 17 00:00:00 2001 From: Jesse Hallam Date: Fri, 20 Jul 2018 12:03:08 -0400 Subject: make GetChannelByName take teamId first (#9134) * make GetChannelByName take teamId first I think it is more natural to accept `teamId`, then `channelName`, given the pattern followed by other Plugin API methods and even the SQL Store itself. The App layer seems unusual in accepting `channelName` first. This also re-generates the mocks fixing the parameter order for the recently added `UserStatus` APIs. * add GetChannelByNameForTeamName --- plugin/client_rpc_generated.go | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) (limited to 'plugin/client_rpc_generated.go') diff --git a/plugin/client_rpc_generated.go b/plugin/client_rpc_generated.go index a96ff33e5..9f25e1478 100644 --- a/plugin/client_rpc_generated.go +++ b/plugin/client_rpc_generated.go @@ -1286,8 +1286,8 @@ type Z_GetChannelByNameReturns struct { B *model.AppError } -func (g *apiRPCClient) GetChannelByName(name, teamId string) (*model.Channel, *model.AppError) { - _args := &Z_GetChannelByNameArgs{name, teamId} +func (g *apiRPCClient) GetChannelByName(teamId, name string) (*model.Channel, *model.AppError) { + _args := &Z_GetChannelByNameArgs{teamId, name} _returns := &Z_GetChannelByNameReturns{} if err := g.client.Call("Plugin.GetChannelByName", _args, _returns); err != nil { g.log.Error("RPC call to GetChannelByName API failed.", mlog.Err(err)) @@ -1297,7 +1297,7 @@ func (g *apiRPCClient) GetChannelByName(name, teamId string) (*model.Channel, *m func (s *apiRPCServer) GetChannelByName(args *Z_GetChannelByNameArgs, returns *Z_GetChannelByNameReturns) error { if hook, ok := s.impl.(interface { - GetChannelByName(name, teamId string) (*model.Channel, *model.AppError) + GetChannelByName(teamId, name string) (*model.Channel, *model.AppError) }); ok { returns.A, returns.B = hook.GetChannelByName(args.A, args.B) } else { @@ -1306,6 +1306,36 @@ func (s *apiRPCServer) GetChannelByName(args *Z_GetChannelByNameArgs, returns *Z return nil } +type Z_GetChannelByNameForTeamNameArgs struct { + A string + B string +} + +type Z_GetChannelByNameForTeamNameReturns struct { + A *model.Channel + B *model.AppError +} + +func (g *apiRPCClient) GetChannelByNameForTeamName(teamName, channelName string) (*model.Channel, *model.AppError) { + _args := &Z_GetChannelByNameForTeamNameArgs{teamName, channelName} + _returns := &Z_GetChannelByNameForTeamNameReturns{} + if err := g.client.Call("Plugin.GetChannelByNameForTeamName", _args, _returns); err != nil { + g.log.Error("RPC call to GetChannelByNameForTeamName API failed.", mlog.Err(err)) + } + return _returns.A, _returns.B +} + +func (s *apiRPCServer) GetChannelByNameForTeamName(args *Z_GetChannelByNameForTeamNameArgs, returns *Z_GetChannelByNameForTeamNameReturns) error { + if hook, ok := s.impl.(interface { + GetChannelByNameForTeamName(teamName, channelName string) (*model.Channel, *model.AppError) + }); ok { + returns.A, returns.B = hook.GetChannelByNameForTeamName(args.A, args.B) + } else { + return fmt.Errorf("API GetChannelByNameForTeamName called but not implemented.") + } + return nil +} + type Z_GetDirectChannelArgs struct { A string B string -- cgit v1.2.3-1-g7c22