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

Some hardening and Note import improvements for diff systems

This commit is contained in:
Bryan Ashby 2023-02-04 14:19:29 -07:00
parent 21fb688bf6
commit a24ec5fd67
No known key found for this signature in database
GPG Key ID: C2C1B501E4EFD994
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
core/activitypub/note.js
View File

@ -171,7 +171,12 @@ module.exports = class Note extends ActivityPubObject {
message.areaTag = options.areaTag || Message.WellKnownAreaTags.Private; message.areaTag = options.areaTag || Message.WellKnownAreaTags.Private;
// :TODO: it would be better to do some basic HTML to ANSI or pipe codes perhaps // :TODO: it would be better to do some basic HTML to ANSI or pipe codes perhaps
message.message = htmlToMessageBody(this.content); message.message = htmlToMessageBody(
// try to handle various implementations
// - https://docs.joinmastodon.org/spec/activitypub/#payloads
// - https://indieweb.org/post-type-discovery#Algorithm
this.content || this.name || this.summary
);
message.subject = this._getSubject(message); message.subject = this._getSubject(message);
// List all attachments // List all attachments
@ -179,19 +184,13 @@ module.exports = class Note extends ActivityPubObject {
let attachmentInfoLines = ['--[Attachments]--']; let attachmentInfoLines = ['--[Attachments]--'];
// https://socialhub.activitypub.rocks/t/representing-images/624 // https://socialhub.activitypub.rocks/t/representing-images/624
this.attachment.forEach(att => { this.attachment.forEach(att => {
switch (att.mediaType) { const type = att.mediaType.substring(0, att.mediaType.indexOf('/'));
case 'image/avif': switch (type) {
case 'image/apng': case 'image':
case 'image/png':
case 'image/x-png':
case 'image/jpeg':
case 'image/gif':
case 'image/svg+xml':
case 'image/webp':
{ {
let imgInfo; let imgInfo;
if (att.height && att.width) { if (att.height && att.width) {
imgInfo = `Image (${att.width} x ${att.height})`; imgInfo = `Image (${att.width}x${att.height})`;
} else { } else {
imgInfo = 'Image'; imgInfo = 'Image';
} }
@ -199,7 +198,13 @@ module.exports = class Note extends ActivityPubObject {
} }
break; break;
// :TODO: video case 'audio':
attachmentInfoLines.push('Audio');
break;
case 'video':
attachmentInfoLines.push('Video');
break;
default: default:
attachmentInfoLines.push(att.mediaType); attachmentInfoLines.push(att.mediaType);
@ -273,7 +278,11 @@ module.exports = class Note extends ActivityPubObject {
_getSubject(message) { _getSubject(message) {
if (this.summary) { if (this.summary) {
return this.summary; return this.summary.trim();
}
if (this.name) {
return this.name.trim();
} }
// //