moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '459-activitypub-integration' of ssh://numinibsd/git/base/enigma-bbs into 459-activitypub-integration

This commit is contained in:
Bryan Ashby 2023-04-10 13:18:19 -06:00
parent 5e4c94210a 84c6478849
commit 7499ffb56b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/activitypub/actor.js
View File

@ -98,7 +98,8 @@ module.exports = class Actor extends ActivityPubObject {
const url = userSettings[t]; const url = userSettings[t];
if (url) { if (url) {
const fn = paths.basename(url); const fn = paths.basename(url);
const mt = mimeTypes.contentType(fn); const mt =
mimeTypes.contentType(fn) || mimeTypes.contentType('dummy.png');
if (mt) { if (mt) {
o[t] = { o[t] = {
mediaType: mt, mediaType: mt,

6
core/activitypub/util.js
View File

@ -16,7 +16,7 @@ const fs = require('graceful-fs');
const paths = require('path'); const paths = require('path');
const moment = require('moment'); const moment = require('moment');
const { encode, decode } = require('html-entities'); const { encode, decode } = require('html-entities');
const { isString } = require('lodash'); const { isString, get } = require('lodash');
const { stripHtml } = require('string-strip-html'); const { stripHtml } = require('string-strip-html');
exports.getActorId = o => o.actor?.id || o.actor; exports.getActorId = o => o.actor?.id || o.actor;
@ -152,8 +152,8 @@ function getUserProfileTemplatedBody(
OUTBOX: userAsActor.outbox, OUTBOX: userAsActor.outbox,
FOLLOWERS: userAsActor.followers, FOLLOWERS: userAsActor.followers,
FOLLOWING: userAsActor.following, FOLLOWING: userAsActor.following,
USER_ICON: userAsActor.icon.url, USER_ICON: get(userAsActor, 'icon.url', ''),
USER_IMAGE: userAsActor.image.url, USER_IMAGE: get(userAsActor, 'image.url', ''),
PREFERRED_USERNAME: userAsActor.preferredUsername, PREFERRED_USERNAME: userAsActor.preferredUsername,
NAME: userAsActor.name, NAME: userAsActor.name,
SEX: user.getProperty(UserProps.Sex), SEX: user.getProperty(UserProps.Sex),