diff --git a/public/openapi/components/schemas/UserObject.yaml b/public/openapi/components/schemas/UserObject.yaml index 835b0a415e..5dc0da6bf4 100644 --- a/public/openapi/components/schemas/UserObject.yaml +++ b/public/openapi/components/schemas/UserObject.yaml @@ -16,12 +16,6 @@ UserObject: type: string description: An URL-safe variant of the username (i.e. lower-cased, spaces removed, etc.) example: dragon-fruit - remoteUrl: - type: string - description: | - URL to the remote user's original profile. - This value is present only if the requested user is not local to the forum. - nullable: true email: type: string description: Email address associated with the user account @@ -219,12 +213,6 @@ UserObjectFull: type: string description: An URL-safe variant of the username (i.e. lower-cased, spaces removed, etc.) example: dragon-fruit - remoteUrl: - type: string - description: | - URL to the remote user's original profile. - This value is present only if the requested user is not local to the forum. - nullable: true email: type: string description: Email address associated with the user account diff --git a/public/openapi/write/topics/tid/move.yaml b/public/openapi/write/topics/tid/move.yaml index 6c8dedc11a..a31f75c847 100644 --- a/public/openapi/write/topics/tid/move.yaml +++ b/public/openapi/write/topics/tid/move.yaml @@ -3,7 +3,7 @@ put: - topics summary: move topic to another category description: | - This operation moved a topic from one category to another. + This operation moves a topic from one category to another. **Note**: This is a privileged call and can only be executed by administrators, global moderators, or the moderator for the category of the passed-in topic. parameters: @@ -14,6 +14,16 @@ put: required: true description: a valid topic id example: 1 + requestBody: + required: true + content: + application/json: + schema: + type: object + properties: + cid: + type: number + example: -1 responses: '200': description: Topic successfully moved diff --git a/src/user/data.js b/src/user/data.js index a5058b3283..cd2326281d 100644 --- a/src/user/data.js +++ b/src/user/data.js @@ -235,9 +235,10 @@ module.exports = function (User) { user.username = validator.escape(user.username ? user.username.toString() : ''); } - if (user.hasOwnProperty('url') && !requestedFields.includes('url')) { - // works around renderOverride supplying `url` to templates + // works around renderOverride supplying `url` to templates + if (user.url) { user.remoteUrl = user.url; + } else { delete user.url; }