Update team methods [ci skip]zj-command-failure

2 files changed, 18 insertions, 8 deletions

diff --git a/lib/mattermost/command.rb b/lib/mattermost/command.rb
index 6a696201bee..b6446935eb6 100644
--- a/lib/mattermost/command.rb
+++ b/lib/mattermost/command.rb
@@ -1,7 +1,7 @@
 module Mattermost
   class Command < Session
     def self.all(team_id)
-      get("/api/v3/teams/#{team_id}/commands/list_team_commands")
+      get("/teams/#{team_id}/commands/list_team_commands").parsed_response
     end
 
     # params should be a hash, which supplies _at least_:
@@ -16,10 +16,13 @@ module Mattermost
         description: 'Perform common operations on GitLab',
         display_name: 'GitLab',
         method: 'P',
-        user_name: 'GitLab'
+        user_name: 'GitLab',
+        trigger: 'gitlab',
       }.merge(params)
 
-      post( "/api/v3/teams/#{team_id}/commands/create", command.to_json).parsed_response['token']
+      response = post( "/teams/#{team_id}/commands/create", body: command.to_json)
+
+      response.parsed_response['token']
     end
   end
 end
diff --git a/lib/mattermost/team.rb b/lib/mattermost/team.rb
index 06e57a21e2e..54d029cb022 100644
--- a/lib/mattermost/team.rb
+++ b/lib/mattermost/team.rb
@@ -1,10 +1,17 @@
 module Mattermost
   class Team < Session
-    # After normalization this returns an array of hashes
-    #
-    # [{"id"=>"paf573pj9t81urupw3fanozeda", "display_name"=>"my team", <snip>}]
-    def self.all
-      get('/api/v3/teams/all').parsed_response.values
+    def self.team_admin
+      body = get('/users/initial_load').parsed_response
+
+      return [] unless body['team_members']
+
+      team_ids = body['team_members'].map do |team|
+        team['team_id'] if team['roles'].split.include?('team_admin')
+      end.compact
+
+      body['teams'].select do |team|
+        team_ids.include?(team['id'])
+      end
     end
   end
 end