Minor fixes around images
This commit is contained in:
parent
0b59d0e3b5
commit
84c6478849
|
@ -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,
|
||||||
|
|
|
@ -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),
|
||||||
|
|
Loading…
Reference in New Issue