Merge branch 'master' into master

Author: cwarnermm

site/static/mattermost-openapi-v4.yaml

@@ -1502,9 +1502,9 @@ paths:
     put:
       tags:
         - users
-      summary: Update user active status
+      summary: Activate or deactivate a user
       description: >
-        Update user active or inactive status.
+        Activate or deactivate a user's account. A deactivated user can't log into Mattermost or use it without being reactivated.
 
 
         __Since server version 4.6, users using a SSO provider to login can be activated or deactivated with this endpoint. However, if their activation status in Mattermost does not reflect their status in the SSO provider, the next synchronization or login by that user will reset the activation status to that of their account in the SSO provider. Server versions 4.5 and before do not allow activation or deactivation of SSO users from this endpoint.__
@@ -1533,11 +1533,11 @@ paths:
               properties:
                 active:
                   type: boolean
-        description: Use `true` to set the user active, `false` for inactive
+        description: Use `true` to activate the user or `false` to deactivate them
         required: true
       responses:
         "200":
-          description: User active status update successful
+          description: User activation/deactivation update successful
           content:
             application/json:
               schema:
@@ -8827,6 +8827,43 @@ paths:
           $ref: '#/components/responses/Forbidden'
         "404":
           $ref: '#/components/responses/NotFound'
+  /api/v4/sharedchannels/{channel_id}/remotes:
+    get:
+      tags:
+        - shared channels
+      summary: Get remote clusters for a shared channel
+      description: |
+        Gets the remote clusters information for a shared channel.
+
+        __Minimum server version__: 10.11
+
+        ##### Permissions
+        Must be authenticated and have the `read_channel` permission for the channel.
+      operationId: GetSharedChannelRemotes
+      parameters:
+        - name: channel_id
+          in: path
+          description: Channel GUID
+          required: true
+          schema:
+            type: string
+      responses:
+        "200":
+          description: Remote clusters retrieval successful
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/RemoteClusterInfo'
+        "400":
+          $ref: '#/components/responses/BadRequest'
+        "401":
+          $ref: '#/components/responses/Unauthorized'
+        "403":
+          $ref: '#/components/responses/Forbidden'
+        "404":
+          $ref: '#/components/responses/NotFound'
   /api/v4/channels/{channel_id}/common_teams:
     get:
       tags:
@@ -18628,43 +18665,6 @@ paths:
           $ref: '#/components/responses/Unauthorized'
         "403":
           $ref: '#/components/responses/Forbidden'
-  /api/v4/sharedchannels/{channel_id}/remotes:
-    get:
-      tags:
-        - channels
-      summary: Get remote clusters for a shared channel
-      description: |
-        Gets the remote clusters information for a shared channel.
-
-        __Minimum server version__: 10.10
-
-        ##### Permissions
-        Must be authenticated and have the `read_channel` permission for the channel.
-      operationId: GetSharedChannelRemotes
-      parameters:
-        - name: channel_id
-          in: path
-          description: Channel GUID
-          required: true
-          schema:
-            type: string
-      responses:
-        "200":
-          description: Remote clusters retrieval successful
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/RemoteClusterInfo'
-        "400":
-          $ref: '#/components/responses/BadRequest'
-        "401":
-          $ref: '#/components/responses/Unauthorized'
-        "403":
-          $ref: '#/components/responses/Forbidden'
-        "404":
-          $ref: '#/components/responses/NotFound'
   /api/v4/sharedchannels/users/{user_id}/can_dm/{other_user_id}:
     get:
       tags:
@@ -20801,9 +20801,9 @@ paths:
               subsequent_page:
                 summary: Subsequent page using cursor
                 value:
+                  cursor: MTphYmMxMjM6Y3JlYXRlX2F0OmZhbHNlOmZhbHNlOmFzYzoxNjM1NzI0ODAwMDAwOnBvc3QxMjM
                   channel_id: 4xp9fdt77pncbef59f4k1qe83o
                   per_page: 100
-                  cursor: MTphYmMxMjM6Y3JlYXRlX2F0OmZhbHNlOmZhbHNlOmFzYzoxNjM1NzI0ODAwMDAwOnBvc3QxMjM
               time_range_query:
                 summary: Query with time range starting from specific time
                 value:
@@ -20814,9 +20814,9 @@ paths:
               descending_order:
                 summary: Descending order from recent
                 value:
-                  channel_id: 4xp9fdt77pncbef59f4k1qe83o
                   cursor: ""
                   sort_direction: desc
+                  channel_id: 4xp9fdt77pncbef59f4k1qe83o
                   per_page: 100
       responses:
         "200":
@@ -20847,9 +20847,9 @@ paths:
                   value:
                     posts:
                       post_id_1:
-                        id: post_id_1
                         message: First post
                         create_at: 1635638400000
+                        id: post_id_1
                       post_id_2:
                         id: post_id_2
                         message: Second post
@@ -25734,12 +25734,12 @@ components:
           description: Additional attributes for the property field (options for select fields, visibility, etc.).
           additionalProperties: true
           example:
+            visibility: when_set
+            sortOrder: 1
             options:
               - color: '#ff0000'
                 id: opt1
                 name: High
-            visibility: when_set
-            sortOrder: 1
     PropertyFieldPatch:
       type: object
       properties:
@@ -29575,15 +29575,34 @@ components:
         term:
           type: string
           description: The search term to match against policy names or display names.
-        is_active:
+        type:
+          type: string
+          description: The type of policy (e.g., 'parent' or 'channel').
+        parent_id:
+          type: string
+          description: The ID of the parent policy to search within.
+        ids:
+          type: array
+          items:
+            type: string
+          description: List of policy IDs to filter by.
+        active:
           type: boolean
           description: Filter policies by active status.
-        page:
-          type: integer
-          description: The page number to return.
-        per_page:
+        include_children:
+          type: boolean
+          description: Whether to include child policies in the result.
+        cursor:
+          $ref: '#/components/schemas/AccessControlPolicyCursor'
+        limit:
           type: integer
-          description: The number of policies to return per page.
+          description: The maximum number of policies to return.
+    AccessControlPolicyCursor:
+      type: object
+      properties:
+        id:
+          type: string
+          description: The ID of the policy to start searching after.
     AccessControlPolicyTestResponse:
       type: object
       properties:
@@ -29656,12 +29675,18 @@ components:
         after:
           type: string
           description: The ID of the user to start the test after (for pagination).
+        channelId:
+          type: string
+          description: The channel ID to contextually test the expression against (required for channel admins).
     CELExpression:
       type: object
       properties:
         expression:
           type: string
           description: The CEL expression to visualize.
+        channelId:
+          type: string
+          description: The channel ID to contextually test the expression against (required for channel admins).
     VisualExpression:
       type: object
       properties: