mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-12-19 23:10:21 +01:00
feat: #12924, custom user fields for local users now federating out
This commit is contained in:
@@ -17,6 +17,8 @@ const slugify = require('../slugify');
|
|||||||
const translator = require('../translator');
|
const translator = require('../translator');
|
||||||
const utils = require('../utils');
|
const utils = require('../utils');
|
||||||
|
|
||||||
|
const accountHelpers = require('../controllers/accounts/helpers');
|
||||||
|
|
||||||
const activitypub = module.parent.exports;
|
const activitypub = module.parent.exports;
|
||||||
const Mocks = module.exports;
|
const Mocks = module.exports;
|
||||||
|
|
||||||
@@ -160,7 +162,9 @@ Mocks.post = async (objects) => {
|
|||||||
Mocks.actors = {};
|
Mocks.actors = {};
|
||||||
|
|
||||||
Mocks.actors.user = async (uid) => {
|
Mocks.actors.user = async (uid) => {
|
||||||
let { username, userslug, displayname, fullname, joindate, aboutme, picture, 'cover:url': cover } = await user.getUserData(uid);
|
const userData = await user.getUserData(uid);
|
||||||
|
let { username, userslug, displayname, fullname, joindate, aboutme, picture, 'cover:url': cover } = userData;
|
||||||
|
const fields = await accountHelpers.getCustomUserFields(userData);
|
||||||
const publicKey = await activitypub.getPublicKey('uid', uid);
|
const publicKey = await activitypub.getPublicKey('uid', uid);
|
||||||
|
|
||||||
let aboutmeParsed = '';
|
let aboutmeParsed = '';
|
||||||
@@ -188,6 +192,17 @@ Mocks.actors.user = async (uid) => {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const attachment = [];
|
||||||
|
if (fields.length) {
|
||||||
|
fields.forEach(({ name, value }) => {
|
||||||
|
attachment.push({
|
||||||
|
type: 'PropertyValue',
|
||||||
|
name,
|
||||||
|
value,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'@context': [
|
'@context': [
|
||||||
'https://www.w3.org/ns/activitystreams',
|
'https://www.w3.org/ns/activitystreams',
|
||||||
@@ -207,6 +222,7 @@ Mocks.actors.user = async (uid) => {
|
|||||||
icon: picture,
|
icon: picture,
|
||||||
image: cover,
|
image: cover,
|
||||||
published: new Date(joindate).toISOString(),
|
published: new Date(joindate).toISOString(),
|
||||||
|
attachment,
|
||||||
|
|
||||||
publicKey: {
|
publicKey: {
|
||||||
id: `${nconf.get('url')}/uid/${uid}#key`,
|
id: `${nconf.get('url')}/uid/${uid}#key`,
|
||||||
|
|||||||
Reference in New Issue
Block a user