Merge branch 'master' into develop

install/package.json

@@ -107,10 +107,10 @@
         "nodebb-plugin-spam-be-gone": "2.3.2",
         "nodebb-plugin-web-push": "0.7.4",
         "nodebb-rewards-essentials": "1.0.2",
-        "nodebb-theme-harmony": "2.1.12",
+        "nodebb-theme-harmony": "2.1.13",
         "nodebb-theme-lavender": "7.1.19",
-        "nodebb-theme-peace": "2.2.42",
+        "nodebb-theme-peace": "2.2.43",
-        "nodebb-theme-persona": "14.1.11",
+        "nodebb-theme-persona": "14.1.12",
         "nodebb-widget-essentials": "7.0.38",
         "nodemailer": "7.0.3",
         "nprogress": "0.2.0",

public/openapi/components/schemas/PostsObject.yaml

@@ -2,4 +2,15 @@ PostsObject:
   description: One of the objects in the array returned from `Posts.getPostSummaryByPids`
   type: array
   items:
-    $ref: ./PostObject.yaml#/PostObject
+    allOf:
+      - $ref: ./PostObject.yaml#/PostObject
+      - type: object
+        description: Optional properties that may or may not be present (except for `pid`, which is always present, and is only here as a hack to pass validation)
+        properties:
+          pid:
+            type: number
+            description: A post identifier
+          attachments:
+            type: array
+        required:
+          - pid

src/views/admin/partials/manage_user_groups.tpl

@@ -4,7 +4,7 @@
     <div class="group-area">
         {{{ each users.groups }}}
         <div class="group-card float-start m-1" data-group-name="{users.groups.nameEscaped}">
-            <a href="{config.relative_path}/admin/manage/groups/{users.groups.nameEncoded}"><span class="badge p-2" style="color:{users.groups.textColor}; background-color: {users.groups.labelColor};">{{{ if users.groups.icon }}}<i class="fa {users.groups.icon}"></i> {{{ end }}}{users.groups.displayName} <i class="ms-2 remove-group-icon fa fa-times" role="button"></i></span></a>
+            <a href="{config.relative_path}/admin/manage/groups/{users.groups.slug}"><span class="badge p-2" style="color:{users.groups.textColor}; background-color: {users.groups.labelColor};">{{{ if users.groups.icon }}}<i class="fa {users.groups.icon}"></i> {{{ end }}}{users.groups.displayName} <i class="ms-2 remove-group-icon fa fa-times" role="button"></i></span></a>
         </div>
         {{{ end }}}
     </div>