{{#if stats}}
diff --git a/design/public/tag.handlebars b/design/public/tag.handlebars
new file mode 100644
index 0000000..0e3bda5
--- /dev/null
+++ b/design/public/tag.handlebars
@@ -0,0 +1,35 @@
+
diff --git a/design/settings.handlebars b/design/settings.handlebars
new file mode 100644
index 0000000..69f6fa3
--- /dev/null
+++ b/design/settings.handlebars
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
{{actor.name}}
+
{{getUsername actor.id}}
+
+
+
+
+
+
+
+ {{#if actor.attachment}}
+
+ {{#each actor.attachment}}
+ -
+ {{this.name}}
+
+ -
+ {{{this.value}}}
+
+ {{/each}}
+
+ {{/if}}
+
+
+
+
+
+
+
diff --git a/index.js b/index.js
index c24f051..841785d 100644
--- a/index.js
+++ b/index.js
@@ -48,11 +48,18 @@ const hbs = create({
if (str && str.includes('image')) return options.fn(this);
},
isEq: (a, b, options) => {
- if (a === b) return options.fn(this);
+ if (typeof options.fn === 'function') {
+ if (a === b) return options.fn(this);
+ } else {
+ return a === b;
+ }
},
or: (a, b, options) => {
return a || b
},
+ expired: (date) => {
+ return moment(date).isBefore(moment())
+ },
timesince: (date) => {
return moment(date).fromNow();
},
@@ -60,6 +67,7 @@ const hbs = create({
return ActivityPub.getUsername(user)
},
stripProtocol: (str) => str.replace(/^https\:\/\//, ''),
+ stripHTML: (str) => str.replace(/(<([^>]+)>)/gi, "")
}
});
@@ -73,7 +81,8 @@ app.use(bodyParser.json({
type: 'application/activity+json'
})); // support json encoded bodies
app.use(bodyParser.json({
- type: 'application/json'
+ type: 'application/json',
+ limit: '32mb' // allow large bodies as attachments are base64 in JSON
})); // support json encoded bodies
app.use(cookieParser())
@@ -155,4 +164,4 @@ ensureAccount(USERNAME, DOMAIN).then((myaccount) => {
http.createServer(app).listen(app.get('port'), function () {
console.log('Express server listening on port ' + app.get('port'));
});
-});
\ No newline at end of file
+});
diff --git a/lib/ActivityPub.js b/lib/ActivityPub.js
index f55d084..d3ebbda 100644
--- a/lib/ActivityPub.js
+++ b/lib/ActivityPub.js
@@ -61,7 +61,7 @@ export class ActivityPubClient {
const actor = await actorQuery.json();
return actor;
} else {
- logger('failed to load actor', actorQuery.status, actorQuery.statusText, await actorQuery.text());
+ //logger('failed to load actor', actorQuery.status, actorQuery.statusText, await actorQuery.text());
throw new Error('failed to load actor');
}
}
@@ -273,6 +273,33 @@ export class ActivityPubClient {
return message;
}
+ /**
+ * Send an outbound update activity to a follower or recipient of a message
+ * @param {*} recipient
+ * @param {*} object
+ * @returns
+ */
+ async sendUpdate(recipient, object) {
+ let message = {
+ '@context': 'https://www.w3.org/ns/activitystreams',
+ 'id': `${ object.id }/activity`,
+ 'published': object.published,
+ 'type': 'Update',
+ 'actor': this.actor.id,
+ 'object': object,
+ "to": object.to,
+ "cc": object.cc,
+ };
+ try {
+ await ActivityPub.send(recipient, message);
+ } catch(err) {
+ // TODO: retry
+ console.error('Failed to deliver outbound message', err);
+ }
+ return message;
+ }
+
+
/**
* Send an outbound create activity to a follower or recipient of a message
@@ -489,7 +516,7 @@ export class ActivityPubClient {
return false;
}
} catch (err) {
- console.error(err);
+ //console.error(err); // any server will get a lot of junk Deletes
return false;
}
}
@@ -498,4 +525,4 @@ export class ActivityPubClient {
}
-export const ActivityPub = new ActivityPubClient();
\ No newline at end of file
+export const ActivityPub = new ActivityPubClient();
diff --git a/lib/UserEvent.js b/lib/UserEvent.js
new file mode 100644
index 0000000..cf5a07d
--- /dev/null
+++ b/lib/UserEvent.js
@@ -0,0 +1,34 @@
+import { once, EventEmitter } from 'events';
+import debug from 'debug';
+
+const logger = debug('ono:event');
+
+/**
+ * UserEvent - a class for handling real-time event updates
+ */
+export class UserEventClient {
+
+ constructor() {
+ this.emitter = new EventEmitter();
+ this.ac = new AbortController();
+ }
+
+ sendEvent(e, data) {
+ logger('SENDING EVENT ' + data);
+ this.emitter.emit('poll', data);
+ }
+
+ abort() {
+ this.ac.abort();
+ this.ac = new AbortController();
+ }
+
+ async waitForEvent() {
+ const [data] = await once(this.emitter, 'poll', { signal: this.ac.signal });
+ logger('RECEIVED EVENT ' + data);
+ }
+
+}
+
+export const UserEvent = new UserEventClient();
+
diff --git a/lib/account.js b/lib/account.js
index c3fff64..1c56879 100644
--- a/lib/account.js
+++ b/lib/account.js
@@ -25,12 +25,19 @@ import {
createFileName,
getFileName,
boostsFile,
- pathToDMs
+ pathToDMs,
+ writeMediaFile,
+ readMediaFile
} from './storage.js';
import {
getActivity,
- createActivity
+ createActivity,
+ deleteActivity,
+ getHashtagsFromNote
} from './notes.js';
+import {
+ UserEvent
+} from '../lib/UserEvent.js';
import debug from 'debug';
import MarkdownIt from 'markdown-it';
@@ -89,6 +96,21 @@ export const addressedOnlyToMe = (activity) => {
return false;
}
+export const deleteObject = async (actor, incomingRequest) => {
+ if (typeof incomingRequest.object !== 'object') {
+ return false;
+ }
+ if (incomingRequest.object.type !== 'Tombstone') {
+ return false;
+ }
+ const note = await getNote(incomingRequest.object.id);
+ if (note.attributedTo != actor.id) { // only allow actor to delete their own Notes
+ return false;
+ }
+
+ deleteActivity(incomingRequest.object.id);
+ return true;
+}
export const acceptDM = (dm, inboxUser) => {
@@ -116,6 +138,19 @@ export const acceptDM = (dm, inboxUser) => {
writeInboxIndex(inboxIndex);
+ if (dm.attributedTo !== ActivityPub.actor.id) {
+ UserEvent.sendEvent('dm');
+ }
+}
+
+export const writeMedia = (attachment) => {
+ logger('write media', attachment.hash, attachment.type);
+ writeMediaFile(attachment.hash, attachment); // store the JSON, so we have the type and data in a single file
+}
+
+export const readMedia = (filename) => {
+ logger('read media', filename);
+ return readMediaFile(filename);
}
export const isMyPost = (activity) => {
@@ -228,6 +263,7 @@ export const addNotification = (notification) => {
notification: notification,
});
writeNotifications(notifications);
+ UserEvent.sendEvent('notification');
}
const writeNotifications = (notifications) => {
@@ -305,6 +341,29 @@ export const getLikes = () => {
return readJSONDictionary(likesFile);
}
+export const recordVote = async(id, name, actor) => {
+ const noteFile = getFileName(id);
+ let note = await getNote(id);
+ note.votersCount++;
+ // TODO: record who voted for what and discount multiple votes
+ // TODO: prevent multiple votes from single actor to oneOf
+ if (note.anyOf) {
+ note.anyOf.forEach((ao) => {
+ if (ao.name === name) {
+ ao.replies.totalItems++;
+ }
+ });
+ }
+ if (note.oneOf) {
+ note.oneOf.forEach((ao) => {
+ if (ao.name === name) {
+ ao.replies.totalItems++;
+ }
+ });
+ }
+ writeJSONDictionary(noteFile, note);
+}
+
export const getNote = async (id) => {
// const postFile = path.resolve('./', pathToPosts, guid + '.json');
const noteFile = getFileName(id);
@@ -320,8 +379,7 @@ export const getNote = async (id) => {
return undefined;
}
-export const sendToFollowers = async (object) => {
-
+export const sendCreateToFollowers = async (object) => {
const followers = await getFollowers();
followers.forEach(async (follower) => {
const account = await fetchUser(follower);
@@ -332,14 +390,33 @@ export const sendToFollowers = async (object) => {
console.error('Failed to deliver outbound post', err);
}
});
-
}
+export const sendUpdateToFollowers = async (object) => {
+ const followers = await getFollowers();
+ followers.forEach(async (follower) => {
+ const account = await fetchUser(follower);
+ try {
+ ActivityPub.sendUpdate(account.actor, object);
+ } catch(err) {
+ // TODO: should retry
+ console.error('Failed to deliver outbound post', err);
+ }
+ });
+}
+
-export const createNote = async (body, cw, inReplyTo, toUser) => {
+export const createNote = async (body, cw, inReplyTo, name, toUser, polldata, attachmentInfo, editOf) => {
const publicAddress = "https://www.w3.org/ns/activitystreams#Public";
let d = new Date();
- const guid = crypto.randomBytes(16).toString('hex');
+ let guid;
+ if (editOf) {
+ // use same guid as post we're updating
+ guid = editOf.replace(`https://${ DOMAIN }/m/`, '');
+ } else {
+ // generate new guid
+ guid = crypto.randomBytes(16).toString('hex');
+ }
let directMessage;
// default to public
@@ -350,6 +427,27 @@ export const createNote = async (body, cw, inReplyTo, toUser) => {
ActivityPub.actor.followers
];
+ let attachment;
+ if (attachmentInfo) {
+ attachment = [
+ {
+ type: 'Document',
+ mediaType: attachmentInfo.type.split('/')[0],
+ url: `https://${ DOMAIN }/media/${attachmentInfo.hash}.${attachmentInfo.type.split('/')[1]}`,
+ name: attachmentInfo.description,
+ focalPoint: attachmentInfo.focalPoint,
+ blurhash: attachmentInfo.blurhash,
+ width: attachmentInfo.width,
+ height: attachmentInfo.height
+ }
+ ];
+ if (attachmentInfo.width) {
+ attachment.width = attachmentInfo.width;
+ }
+ if (attachmentInfo.height) {
+ attachment.height = attachmentInfo.height;
+ }
+ }
// Contains mentions
const tags = [];
@@ -432,14 +530,41 @@ export const createNote = async (body, cw, inReplyTo, toUser) => {
}
}
+ // if it contains hashtags, add them
+ let hashtags = body.match(/#[a-z]+/gi)
+ if (hashtags) {
+ hashtags.forEach((tag) => {
+ tags.push({
+ "type": "Hashtag",
+ "href": `https://${ DOMAIN }/tags/${tag}`,
+ "name": tag
+ });
+ });
+ }
+
+ const mdContent = md.render(processedContent);
- const content = md.render(processedContent);
+ // rewrite links to tags in content
+ let content = mdContent.replace(/#([a-z]+)/gi, '
#$1');
+
+ content = '
' + content + '';
const activityId = `https://${ DOMAIN }/m/${guid}`;
const url = `https://${ DOMAIN }/notes/${guid}`;
const object = {
+ "@context": [
+ "https://www.w3.org/ns/activitystreams", {
+ "ostatus": "http://ostatus.org#",
+ "atomUri": "ostatus:atomUri",
+ "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
+ "conversation": "ostatus:conversation",
+ "sensitive": "as:sensitive",
+ "toot": "http://joinmastodon.org/ns#",
+ "votersCount": "toot:votersCount"
+ }
+ ],
"id": activityId,
- "type": "Note",
+ "type": polldata ? "Question" : "Note",
"summary": cw || null,
"inReplyTo": inReplyTo,
'published': d.toISOString(),
@@ -449,11 +574,11 @@ export const createNote = async (body, cw, inReplyTo, toUser) => {
"to": to,
"cc": cc,
directMessage,
- "sensitive": cw !== null ? true : false,
+ "sensitive": cw ? true : false,
"atomUri": activityId,
"inReplyToAtomUri": null,
"content": content,
- "attachment": [],
+ "attachment": attachment || [],
"tag": tags,
"replies": {
"id": `${activityId}/replies`,
@@ -467,6 +592,30 @@ export const createNote = async (body, cw, inReplyTo, toUser) => {
}
};
+ // construct anyOf/oneOf block in Question
+ if (polldata) { // posting a poll
+ object.endTime = new Date(new Date().getTime() + 1000 * polldata.time).toISOString();
+ object.votersCount = 0;
+ object[polldata.type] = [];
+ polldata.choices.forEach((ch) => {
+ object[polldata.type].push({
+ type: 'Note',
+ name: ch,
+ replies: {
+ type: 'Collection',
+ totalItems: 0
+ }
+ });
+ });
+ }
+
+ if (name) { // voting on a poll
+ object.name = name;
+ }
+ if (editOf) { // editing a post
+ object.updated = d.toISOString();
+ }
+
if (directMessage) {
acceptDM(object, to[0]);
} else {
@@ -478,6 +627,7 @@ export const createNote = async (body, cw, inReplyTo, toUser) => {
actor: object.attributedTo,
published: new Date(object.published).getTime(),
inReplyTo: object.inReplyTo,
+ hashtags: getHashtagsFromNote(object),
});
}
@@ -488,11 +638,19 @@ export const createNote = async (body, cw, inReplyTo, toUser) => {
if (recipient === publicAddress) {
// do nothing
} else if (recipient === ActivityPub.actor.followers) {
- sendToFollowers(object);
+ if (editOf) {
+ sendUpdateToFollowers(object);
+ } else {
+ sendCreateToFollowers(object);
+ }
} else {
// otherwise, send it directly to the person
const account = await fetchUser(recipient);
- ActivityPub.sendCreate(account.actor, object);
+ if (editOf) {
+ ActivityPub.sendUpdate(account.actor, object);
+ } else {
+ ActivityPub.sendCreate(account.actor, object);
+ }
}
})
@@ -610,3 +768,12 @@ export const ensureAccount = async (name, domain) => {
export const getAccount = () => {
return readJSONDictionary(accountFile, {});
}
+
+export const updateAccountActor = (data) => {
+ let account = readJSONDictionary(accountFile, {});
+ Object.keys(data).forEach((k) => {
+ account.actor[k] = data[k];
+ });
+ writeJSONDictionary(accountFile, account);
+}
+
diff --git a/lib/notes.js b/lib/notes.js
index f384214..fb500ca 100644
--- a/lib/notes.js
+++ b/lib/notes.js
@@ -16,6 +16,7 @@ import {
readJSONDictionary,
writeJSONDictionary,
isIndexed,
+ deleteActivityFromIndex,
addActivityToIndex,
addFailureToIndex,
createFileName,
@@ -91,6 +92,14 @@ export const recordUndoLike = (request) => {
}
+export const deleteActivity = (id) => {
+ const noteFile = getFileName(id);
+ if (fs.existsSync(noteFile)) {
+ deleteActivityFromIndex(id);
+ fs.unlinkSync(noteFile);
+ }
+}
+
export const createActivity = (note) => {
const noteFile = createFileName(note);
@@ -262,4 +271,8 @@ export const getActivitySince = async (since, excludeSelf = false) => {
return {
activitystream: res,
}
-}
\ No newline at end of file
+}
+
+export const getHashtagsFromNote = (note) => {
+ return (note.tag && note.tag.length > 0) ? note.tag.filter((t) => t.type === 'Hashtag').map((t) => t.name) : [];
+}
diff --git a/lib/storage.js b/lib/storage.js
index 48a5415..21a16bb 100644
--- a/lib/storage.js
+++ b/lib/storage.js
@@ -5,6 +5,7 @@ import debug from 'debug';
const logger = debug('ono:storage');
import md5 from 'md5';
import dotenv from 'dotenv';
+import { getHashtagsFromNote } from './notes.js';
dotenv.config();
export const dataDir = path.resolve('./', '.data/');
@@ -12,6 +13,7 @@ export const pathToFiles = path.resolve(dataDir, 'activitystream/');
export const pathToPosts = path.resolve(dataDir, 'posts/');
export const pathToUsers = path.resolve(dataDir, 'users/');
export const pathToDMs = path.resolve(dataDir, 'dms/');
+export const pathToMedia = path.resolve(dataDir, 'media/');
export const followersFile = path.resolve(dataDir, 'followers.json');
export const followingFile = path.resolve(dataDir, 'following.json');
@@ -59,8 +61,21 @@ export const addActivityToIndex = (note, type = 'activity') => {
actor: note.attributedTo || note.actor,
published: new Date(note.published).getTime(),
inReplyTo: note.inReplyTo,
+ hashtags: getHashtagsFromNote(note)
});
}
+export const deleteActivityFromIndex = (id, type = 'activity') => {
+ let n = null;
+ for (let i=0;i
{
// // find the item in the index
@@ -199,7 +214,12 @@ const ensureDataFolder = () => {
recursive: true
});
}
-
+ if (!fs.existsSync(path.resolve(pathToMedia))) {
+ logger('mkdir', pathToMedia);
+ fs.mkdirSync(path.resolve(pathToMedia), {
+ recursive: true
+ });
+ }
}
@@ -225,6 +245,26 @@ export const readJSONDictionary = (path, defaultVal = []) => {
}
}
+// data is JSON stringified string containing {type: mimetype, data: base64}
+export const writeMediaFile = (filename, attachment) => {
+ logger('write media', filename);
+ // write just the data part to file called
+ fs.writeFileSync(path.join(pathToMedia, filename + '.' + attachment.type.split('/')[1]), attachment.data);
+ delete attachment.data;
+ // write the remaining metadata to .json
+ fs.writeFileSync(path.join(pathToMedia, filename) + '.json', JSON.stringify(attachment));
+}
+
+// returns JSON stringified string containing {type: mimetype, data: base64}
+export const readMediaFile = (filename) => {
+ logger('read media', filename);
+ // remove any .{ext} from filename
+ let bareFilename = filename.replace(/\..*/, '');
+ let attachment = JSON.parse(fs.readFileSync(path.join(pathToMedia, bareFilename) + '.json'));
+ attachment.data = fs.readFileSync(path.join(pathToMedia, bareFilename + '.' + attachment.type.split('/')[1]));
+ return attachment;
+}
+
export const writeJSONDictionary = (path, data) => {
const now = new Date().getTime();
logger('write cache', path);
@@ -240,4 +280,4 @@ logger('BUILDING INDEX');
ensureDataFolder();
buildIndex().then(() => {
logger('INDEX BUILT!');
-});
\ No newline at end of file
+});
diff --git a/lib/users.js b/lib/users.js
index e5f5bac..d050c77 100644
--- a/lib/users.js
+++ b/lib/users.js
@@ -19,7 +19,7 @@ const fetchUserFromSource = async (username, webId) => {
try {
webfinger = await ActivityPub.webfinger(username);
} catch (err) {
- console.error(err);
+ //console.error(err); // servers receive lots of spam Deletes
return {
actor: {
name: username,
@@ -37,7 +37,7 @@ const fetchUserFromSource = async (username, webId) => {
try {
actor = await ActivityPub.fetchActor(self);
} catch (err) {
- console.error(err);
+ //console.error(err);
return {
actor: {
name: username,
@@ -98,4 +98,4 @@ export const fetchUser = async (user) => {
}
return await fetchUserFromSource(username, skipFinger ? user : null);
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index fea5ed0..9c6c22b 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,11 @@
"md5": "^2.3.0",
"moment": "^2.29.4",
"node-fetch": "^3.3.0",
- "rss-generator": "^0.0.3"
+ "rss-generator": "^0.0.3",
+ "blurhash": "^2.0.4",
+ "@andreekeberg/imagedata": "^1.0.2",
+ "archiver": "^5.3.1",
+ "csv-parse": "^5.3.3"
},
"keywords": [
"fediverse",
diff --git a/public/app.js b/public/app.js
index 57635ad..229c627 100644
--- a/public/app.js
+++ b/public/app.js
@@ -37,7 +37,14 @@ const getCookie = (name) => {
return null;
}
+const beep = () => {
+ console.log("BEEP!");
+ var snd = new Audio('/audio/beep.wav');
+ snd.play();
+}
+
const app = {
+ firstPoll: true,
newPosts: 0,
newNotifications: 0,
latestPost: (date) => {
@@ -58,8 +65,7 @@ const app = {
if (newPosts) {
if (meta.newPosts > 0) {
if (meta.newPosts > app.newPosts) {
- // BEEP!
- console.log('BEEP!');
+ beep();
}
app.newPosts = meta.newPosts;
newPosts.innerHTML = `${meta.newPosts} unread`;
@@ -73,8 +79,7 @@ const app = {
if (newNotifications) {
if (meta.newNotifications > 0) {
if (meta.newNotifications > app.newNotifications) {
- // BEEP!
- console.log('BEEP!');
+ beep();
}
app.newNotifications = meta.newNotifications;
newNotifications.innerHTML = `${meta.newNotifications} new`;
@@ -88,8 +93,7 @@ const app = {
if (newDMs) {
if (meta.newDMs > 0) {
if (meta.newDMs > app.newDMs) {
- // BEEP!
- console.log('BEEP!');
+ beep();
}
app.newDMs = meta.newDMs;
newDMs.innerHTML = `${meta.newDMs} new`;
@@ -102,12 +106,14 @@ const app = {
},
pollForPosts: () => {
- fetch('/private/poll','get').then((json) => {
+ fetch('/private/poll' + (app.firstPoll ? '?nowait=1' : ''),'get').then((json) => {
+ app.firstPoll = false;
const res = JSON.parse(json);
app.alertNewPosts(res);
- setTimeout(() => app.pollForPosts(), 30000); // poll every 5 seconds
+ setTimeout(() => app.pollForPosts(), 1000); // poll every 1 seconds, endpoint will stall until event occurs
}).catch((err) => {
console.error(err);
+ setTimeout(() => app.pollForPosts(), 1000); // poll every 1 seconds, endpoint will stall until event occurs
});
},
toggleBoost: (el, postId) => {
@@ -162,50 +168,166 @@ const app = {
}
return false;
},
+ followuploaded: () => {
+ app.readAttachment('followingupload').then((att) => {
+ const Http = new XMLHttpRequest();
+ const proxyUrl ='/private/importfollowing';
+ Http.open("POST", proxyUrl);
+ Http.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
+ Http.send(JSON.stringify({
+ attachment_following: att,
+ }));
+
+ Http.onreadystatechange = () => {
+ if (Http.readyState == 4 && Http.status == 200) {
+ console.log('posted!');
+ window.location = '/private/settings';
+ } else {
+ console.error('HTTP PROXY CHANGE', Http);
+ }
+ }
+ });
+ return false;
+ },
+ settings: () => {
+ const summary = document.getElementById('summary');
+ let attachment_header;
+ let attachment_avatar;
+
+ app.readAttachment('avatarupload').then((att) => {
+ attachment_avatar = att;
+ return app.readAttachment('headerupload').then((att) => {
+ attachment_header = att;
+
+ const Http = new XMLHttpRequest();
+ const proxyUrl ='/private/settings';
+ Http.open("POST", proxyUrl);
+ Http.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
+ Http.send(JSON.stringify({
+ attachment_avatar: attachment_avatar,
+ attachment_header: attachment_header,
+ account: {
+ actor: {
+ summary: summary.value
+ }
+ }
+ }));
+
+ Http.onreadystatechange = () => {
+ if (Http.readyState == 4 && Http.status == 200) {
+ console.log('posted!');
+ window.location = '/private/settings';
+ } else {
+ console.error('HTTP PROXY CHANGE', Http);
+ }
+ }
+ });
+ });
+ return false;
+ },
+ readAttachment: async (id) => {
+ // read the file into base64, return mimetype and data
+ if (document.getElementById(id)) {
+ const files = document.getElementById(id).files;
+ return new Promise((resolve, reject) => {
+ if (files && files[0]) {
+ let f = files[0]; // only read the first file
+ let reader = new FileReader();
+ reader.onload = (function(theFile) {
+ return function(e) {
+ let base64 = btoa(
+ new Uint8Array(e.target.result)
+ .reduce((data, byte) => data + String.fromCharCode(byte), '')
+ );
+ resolve({type: f.type, data: base64});
+ };
+ })(f);
+ reader.readAsArrayBuffer(f);
+ } else {
+ resolve(null);
+ }
+ });
+ } else {
+ return Promise.resolve(null);
+ }
+ },
+ editPost: (postId) => {
+ window.location = '/private/post?edit=' + encodeURIComponent(postId);
+ },
post: () => {
const post = document.getElementById('post');
const cw = document.getElementById('cw');
const inReplyTo = document.getElementById('inReplyTo');
const to = document.getElementById('to');
+ const editOf = document.getElementById('editOf');
+ const description = document.getElementById('description');
- const Http = new XMLHttpRequest();
- const proxyUrl ='/private/post';
- Http.open("POST", proxyUrl);
- Http.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
- Http.send(JSON.stringify({
- post: post.value,
- cw: cw.value,
- inReplyTo: inReplyTo.value,
- to: to.value,
- }));
+ // get hidden elements for poll choices (replying to poll)
+ const names = Array.from(document.querySelectorAll('input[class="pollchoice"]')).map((item) => {return item.value});
+ // get hidden element for poll designer (sending a new poll)
+ let polldata;
+ if (document.getElementById('polldata') && document.getElementById('polldata').value) {
+ polldata = JSON.parse(document.getElementById('polldata').value);
+ if (polldata.choices.includes(null)) {
+ polldata = null; // invalid options
+ }
+ }
- Http.onreadystatechange = () => {
- if (Http.readyState == 4 && Http.status == 200) {
- console.log('posted!');
+ app.readAttachment('attachment').then((attachment) => {
+ const Http = new XMLHttpRequest();
+ const proxyUrl ='/private/post';
+ Http.open("POST", proxyUrl);
+ Http.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
+ Http.send(JSON.stringify({
+ post: post.value,
+ cw: cw.value,
+ inReplyTo: inReplyTo.value,
+ to: to.value,
+ attachment: attachment,
+ description: description ? description.value : '',
+ names: names, // list of things being voted for
+ polldata: polldata, // poll being created by user
+ editOf: editOf ? editOf.value : null
+ }));
- // prepend the new post
- const newHtml = Http.responseText;
- const el = document.getElementById('home_stream') || document.getElementById('inbox_stream');
+ Http.onreadystatechange = () => {
+ if (Http.readyState == 4 && Http.status == 200) {
+ console.log('posted!');
- if (!el) {
- window.location = '/private/';
- }
+ // prepend the new post
+ const newHtml = Http.responseText;
+ const el = document.getElementById('home_stream') || document.getElementById('inbox_stream');
- // todo: ideally this would come back with all the html it needs
- el.innerHTML = newHtml + el.innerHTML;
+ if (!el) {
+ window.location = '/private/';
+ }
- // reset the inputs to blank
- post.value = '';
- cw.value = '';
- } else {
- console.error('HTTP PROXY CHANGE', Http);
+ // todo: ideally this would come back with all the html it needs
+ el.innerHTML = newHtml + el.innerHTML;
+
+ // reset the inputs to blank
+ post.value = '';
+ cw.value = '';
+ } else {
+ console.error('HTTP PROXY CHANGE', Http);
+ }
}
- }
+ });
return false;
},
replyTo: (activityId, mention) => {
-
- window.location = '/private/post?inReplyTo=' + activityId;
+ // get poll form response
+ let pollChoices = [];
+ Array.from(document.getElementById(activityId).getElementsByTagName('input')).forEach((inp) => {
+ if (inp.checked) {
+ pollChoices.push(inp.value);
+ }
+ });
+ if (pollChoices.length > 0) {
+ window.location = '/private/post?inReplyTo=' + activityId + '&names=' + encodeURIComponent(JSON.stringify(pollChoices));;
+ } else {
+ window.location = '/private/post?inReplyTo=' + activityId;
+ }
return;
const inReplyTo = document.getElementById('inReplyTo');
@@ -265,4 +387,4 @@ const app = {
}
return false;
}
-}
\ No newline at end of file
+}
diff --git a/public/audio/beep.wav b/public/audio/beep.wav
new file mode 100644
index 0000000..e83a142
Binary files /dev/null and b/public/audio/beep.wav differ
diff --git a/public/css/secret.css b/public/css/secret.css
index ece664a..02002a5 100644
--- a/public/css/secret.css
+++ b/public/css/secret.css
@@ -9,6 +9,7 @@
--shade: rgba(0,0,0,0.25);
--highlight: rgba(255,255,255,0.25);
--accent: rgb(250, 4, 197);
+ --border-radius: 8px;
}
body {
@@ -192,6 +193,7 @@ a { color: var(--link); }
max-width: 40rem;
text-overflow: ellipsis;
overflow-x: hidden;
+ border-radius: var(--border-radius) var(--border-radius) 0px 0px;
}
header {
@@ -199,6 +201,7 @@ header {
font-weight: bold;
padding: 1rem;
background: var(--separator);
+ border-radius: var(--border-radius) var(--border-radius) 0px 0px;
}
header.back {
@@ -328,6 +331,11 @@ header a {
width: 50px;
}
+.mini-avatar {
+ height: 25px;
+ width: 25px;
+}
+
.activity footer {
display: flex;
flex-direction: row;
@@ -403,9 +411,22 @@ input#cw {
border: none;
border-radius: 5px;
float: right;
+}
+
+#save {
+ padding: 0.1rem 1rem;
+ background: #0cc13f;
+ color: var(--text);
+ border: none;
+ border-radius: 5px;
+ float: right;
+}
+.settingsbutton {
+ float: right;
}
+
.content .tools { flex-grow: 1; }
.content .tools div { display: inline-block; }
.content .tools button { font-size: 1rem; background: none; border: none; }
@@ -483,6 +504,7 @@ button.bigfollow.active .inactive { display: none; }
.states .box {
/* padding: 1rem; */
background: var(--tertiary);
+ border-radius: var(--border-radius) var(--border-radius) 0px 0px;
}
.states .box a {
@@ -561,6 +583,7 @@ button.bigfollow.active .inactive { display: none; }
flex-direction: column-reverse;
display: flex;
overflow-y: auto;
+ border: 1px solid var(--secondary);
}
.inbox .message {
@@ -602,6 +625,7 @@ button.bigfollow.active .inactive { display: none; }
.feeds {
flex-shrink: 1;
background: var(--tertiary);
+ border-radius: var(--border-radius) var(--border-radius) 0px 0px;
}
.feeds.inbox_visible {
@@ -610,7 +634,7 @@ button.bigfollow.active .inactive { display: none; }
@media screen and (min-width: 900px) {
.feeds {
- width: 300px;
+ width: 600px;
}
.feeds.inbox_visible {
diff --git a/routes/admin.js b/routes/admin.js
index 167bb0e..fdc0095 100644
--- a/routes/admin.js
+++ b/routes/admin.js
@@ -6,6 +6,7 @@ import {
import express from 'express';
export const router = express.Router();
import debug from 'debug';
+import { createHash } from 'crypto';
import {
getFollowers,
getFollowing,
@@ -20,7 +21,9 @@ import {
isFollowing,
getInboxIndex,
getInbox,
- writeInboxIndex
+ writeInboxIndex,
+ writeMedia,
+ updateAccountActor
} from '../lib/account.js';
import {
fetchUser
@@ -31,6 +34,18 @@ import {
import {
ActivityPub
} from '../lib/ActivityPub.js';
+import {
+ UserEvent
+} from '../lib/UserEvent.js';
+import { encode as blurhashEncode } from 'blurhash';
+import { getSync as imageDataGetSync } from '@andreekeberg/imagedata'
+const {
+ USERNAME,
+ DOMAIN
+} = process.env;
+import archiver from 'archiver';
+import { parse as csvparse } from 'csv-parse';
+
const logger = debug('ono:admin');
router.get('/index', async (req, res) => {
@@ -38,16 +53,26 @@ router.get('/index', async (req, res) => {
});
router.get('/poll', async (req, res) => {
-
+ if (!req.query.nowait) {
+ req.on('close', function (err){
+ UserEvent.abort();
+ return;
+ });
+ try {
+ await UserEvent.waitForEvent();
+ } catch(e) {
+ // we got aborted
+ }
+ }
const sincePosts = new Date(req.cookies.latestPost).getTime();
- const sinceNotifications = parseInt(req.cookies.latestNotification);
+ const sinceNotifications = parseInt(req.cookies.latestNotification);//.filter((n) => {n.});
+ // notification mechanism used to indicate there are unread posts, but they shouldn't appear in notifications tab
const notifications = getNotifications().filter((n) => n.time > sinceNotifications);
const inboxIndex = getInboxIndex();
const unreadDM = Object.keys(inboxIndex).filter((k) => {
return !inboxIndex[k].lastRead || inboxIndex[k].lastRead < inboxIndex[k].latest;
})?.length || 0;
-
const {
activitystream
} = await getActivitySince(sincePosts, true);
@@ -120,7 +145,6 @@ router.get('/following', async (req, res) => {
followers = followers.filter((f) => f !== undefined);
-
if (req.query.json) {
res.json(notes);
} else {
@@ -150,6 +174,8 @@ router.get('/', async (req, res) => {
next
} = await getActivityStream(10, offset);
+
+
const notes = await Promise.all(activitystream.map(async (n) => {
// handle boosted posts
if (n.note.type === 'Announce') {
@@ -179,10 +205,25 @@ router.get('/', async (req, res) => {
return n;
}));
+ // de-dupe notes by id, else will get two on edits
+ const uniqueIds = new Set();
+ const uniqueNotes = notes.filter(element => {
+ try {
+ const isDuplicate = uniqueIds.has(element.note.id);
+ uniqueIds.add(element.note.id);
+ if (!isDuplicate) {
+ return true;
+ }
+ return false;
+ } catch (err) {
+ console.log(err);
+ return true;
+ }
+ });
+
if (req.query.json) {
- res.json(notes);
+ res.json(uniqueNotes);
} else {
-
// set auth cookie
res.cookie('token', ActivityPub.account.apikey, {maxAge: (7*24*60*60*1000)});
@@ -190,7 +231,7 @@ router.get('/', async (req, res) => {
layout: 'private',
me: ActivityPub.actor,
next: next,
- activitystream: notes,
+ activitystream: uniqueNotes,
followers: followers,
following: following,
followersCount: followers.length,
@@ -209,7 +250,7 @@ router.get('/notifications', async (req, res) => {
// TODO: check if user is in following list
actor.isFollowing = isFollowing(actor.id);
- if (notification.notification.type === 'Like' || notification.notification.type === 'Announce') {
+ if (notification.notification.type === 'Like' || notification.notification.type === 'Announce' || notification.notification.type === 'Vote') {
note = await getNote(notification.notification.object);
}
if (notification.notification.type === 'Reply') {
@@ -240,10 +281,36 @@ router.get('/notifications', async (req, res) => {
}
}));
+ let following = await Promise.all(getFollowing().map(async (f) => {
+ const acct = await fetchUser(f.actorId);
+ if (acct ?.actor?.id) {
+ acct.actor.isFollowing = true; // duh
+ return acct.actor;
+ }
+ return undefined;
+ }));
+
+ following = following.filter((f) => f !== undefined);
+
+ let followers = await Promise.all(getFollowers().map(async (f) => {
+ const acct = await fetchUser(f);
+ if (acct?.actor?.id) {
+ acct.actor.isFollowing = following.some((p) => p.id === f);
+ return acct.actor;
+ }
+ return undefined;
+ }));
+
+ followers = followers.filter((f) => f !== undefined);
+
res.render('notifications', {
layout: 'private',
me: ActivityPub.actor,
- notifications: notifications.filter((n)=>n!==null).reverse()
+ notifications: notifications.filter((n)=>n!==null).reverse(),
+ followers: followers,
+ following: following,
+ followersCount: followers.length,
+ followingCount: following.length
});
});
@@ -303,12 +370,21 @@ router.get('/dms/:handle?', async (req, res) => {
}
});
+ const inboxesWithAccounts = await Promise.all(inboxes.map(async (inbox) => {
+ return {
+ id: inbox.id,
+ unread: inbox.unread,
+ lastRead: inbox.lastRead,
+ latest: inbox.latest,
+ ... await fetchUser(inbox.id)
+ };
+ }));
res.render('dms', {
layout: 'private',
me: ActivityPub.actor,
lastIncoming: lastIncoming ? lastIncoming.id : null,
- inboxes,
+ inboxesWithAccounts,
inbox,
recipient,
error
@@ -319,20 +395,32 @@ router.get('/post', async(req, res) => {
const to = req.query.to;
const inReplyTo = req.query.inReplyTo;
+ let names = [];
let op;
let actor;
+ let prev;
if (inReplyTo) {
op = await getActivity(inReplyTo);
const account = await fetchUser(op.attributedTo);
actor = account.actor;
}
+ if (req.query.names) {
+ names = JSON.parse(req.query.names);
+ }
+
+ if (req.query.edit) {
+ prev = await getNote(req.query.edit);
+ }
+
res.status(200).render('partials/composer', {
to,
inReplyTo,
actor,
- originalPost: op,
+ originalPost: op, // original post being replied to
+ prev: prev, // previous version we posted, now editing
me: req.app.get('account').actor,
+ names: names,
layout: 'private'
});
@@ -341,7 +429,35 @@ router.get('/post', async(req, res) => {
router.post('/post', async (req, res) => {
// TODO: this is probably supposed to be a post to /api/outbox
- const post = await createNote(req.body.post, req.body.cw, req.body.inReplyTo, req.body.to);
+ let attachment;
+
+ if (req.body.attachment) {
+ // convert attachment.data to raw buffer
+ attachment = calculateAttachmentHashAndData(req.body.attachment);
+ attachment.description = req.body.description || '';
+
+ if (attachment.type.split('/')[0] == 'image') {
+ // calculate dimensions and blurhash
+ let imageData = imageDataGetSync(attachment.data);
+ attachment.focalPoint = '0.0,0.0';
+ attachment.width = imageData.width;
+ attachment.height = imageData.height;
+ attachment.blurhash = blurhashEncode(imageData.data, imageData.width, imageData.height, 4, 4);
+ }
+
+ writeMedia(attachment);
+ }
+
+ let post;
+ if (req.body.names && req.body.names.length > 0) {
+ // send multiple notes, one for each choice made in poll
+ for (const name of req.body.names) {
+ post = await createNote(req.body.post, req.body.cw, req.body.inReplyTo, name, req.body.to, null, attachment, req.body.editOf);
+ }
+ } else {
+ post = await createNote(req.body.post, req.body.cw, req.body.inReplyTo, null, req.body.to, req.body.polldata, attachment, req.body.editOf);
+ }
+
if (post.directMessage === true) {
// return html partial of the new post for insertion in the feed
res.status(200).render('partials/dm', {
@@ -545,4 +661,141 @@ router.post('/boost', async (req, res) => {
});
}
writeBoosts(boosts);
-});
\ No newline at end of file
+});
+
+router.get('/settings', async (req, res) => {
+ res.render('settings', {
+ layout: 'private',
+ actor: ActivityPub.actor,
+ me: ActivityPub.actor
+ });
+});
+
+function calculateAttachmentHashAndData(att) {
+ let attachment = {
+ type: att.type,
+ data: Buffer.from(att.data, 'base64'),
+ };
+ attachment.hash = createHash('md5').update(att.data).digest("hex");
+ return attachment;
+}
+
+router.post('/settings', async (req, res) => {
+ if (req.body.attachment_avatar || req.body.attachment_header) {
+ if (!req.body.account) { // ensure account gets updated as we're changing the urls
+ req.body.account = {};
+ }
+ if (!req.body.account.actor) {
+ req.body.account.actor = {};
+ }
+ }
+ if (req.body.attachment_avatar) {
+ let att = calculateAttachmentHashAndData(req.body.attachment_avatar);
+ writeMedia(att);
+ req.body.account.actor.icon = {
+ type: 'Image',
+ mediaType: att.type,
+ url: `https://${ DOMAIN }/media/${att.hash}.${att.type.split('/')[1]}`
+ };
+ }
+ if (req.body.attachment_header) {
+ let att = calculateAttachmentHashAndData(req.body.attachment_header);
+ writeMedia(att);
+ req.body.account.actor.image = {
+ type: 'Image',
+ mediaType: att.type,
+ url: `https://${ DOMAIN }/media/${att.hash}.${att.type.split('/')[1]}`
+ };
+ }
+ if (req.body.account && req.body.account.actor) {
+ await updateAccountActor(req.body.account.actor);
+ }
+ res.status(200).send();
+});
+
+router.get('/exportdata', async(req, res) => {
+ res.set('Content-Type', 'application/zip');
+ res.attachment(new Date().toJSON().slice(0,10) + '.zip');
+
+ const archive = archiver('zip', {
+ zlib: { level: 9 }
+ });
+ archive.on('warning', function(err) {
+ console.log(err);
+ });
+ archive.on('error', function(err) {
+ res.status(500).send(err);
+ });
+ archive.pipe(res);
+
+ archive.directory('.data', 'data');
+ archive.finalize();
+});
+
+router.get('/exportfollowing', async(req, res) => {
+ res.set('Content-Type', 'text/csv');
+ res.attachment('following_' + (new Date().toJSON().slice(0,10)) + '.csv');
+
+ let following = await Promise.all(getFollowing().map(async (f) => {
+ return f.actorId;
+ }));
+
+ console.log(following);
+ let csv = following.map((f) => {
+ return JSON.stringify(f) + ',true'; // escape it
+ }).join('\n');
+
+ res.status(200).send(csv);
+});
+
+router.post('/importfollowing', async (req, res) => {
+ if (req.body.attachment_following) {
+ let att = calculateAttachmentHashAndData(req.body.attachment_following);
+ console.log(att);
+ console.log(att.data.toString());
+
+ const records = [];
+ const parser = csvparse({
+ delimiter: ','
+ });
+ parser.on('readable', function() {
+ let record;
+ while ((record = parser.read()) !== null) {
+ records.push(record);
+ }
+ });
+ parser.on('error', function(err) {
+ console.error(err.message);
+ res.status(400).send(err);
+ });
+ parser.on('end', function() {
+ Promise.all(records.map(async (rec) => {
+ let id = rec[0];
+ if (!isFollowing(id)) {
+ const {
+ actor
+ } = await fetchUser(id);
+ if (actor) {
+ console.log('following ' + id + ' ...');
+ return ActivityPub.sendFollow(actor);
+ } else {
+ console.log('failed to fetchUser for ' + id);
+ return Promise.resolve();
+ }
+ } else {
+ console.log('already following ' + id);
+ return Promise.resolve();
+ }
+ })).then(() => {
+ res.status(200).send();
+ }).catch((err) => {
+ res.status(500).send(err);
+ });
+ });
+ parser.write(att.data.toString());
+ parser.end();
+ } else {
+ res.status(400).send();
+ }
+});
+
diff --git a/routes/inbox.js b/routes/inbox.js
index 8cea8a4..7ea1ef9 100644
--- a/routes/inbox.js
+++ b/routes/inbox.js
@@ -16,7 +16,10 @@ import {
isMyPost,
isBlocked,
addressedOnlyToMe,
- isMention
+ getNote,
+ isMention,
+ recordVote,
+ deleteObject
} from '../lib/account.js';
import {
createActivity,
@@ -29,21 +32,16 @@ import debug from 'debug';
import {
isIndexed
} from '../lib/storage.js';
+import {
+ UserEvent
+} from '../lib/UserEvent.js';
const logger = debug('ono:inbox');
-
-
router.post('/', async (req, res) => {
const incomingRequest = req.body;
if (incomingRequest) {
- // TODO: handle this better
- // should remove post/user if found
- if (incomingRequest.type === 'Delete') {
- return res.status(200).send();
- }
-
if (isBlocked(incomingRequest.actor)) {
return res.status(403).send('');
}
@@ -55,6 +53,14 @@ router.post('/', async (req, res) => {
// FIRST, validate the actor
if (ActivityPub.validateSignature(actor, req)) {
switch (incomingRequest.type) {
+ case 'Delete':
+ logger('Delete request');
+ try {
+ await deleteObject(actor, incomingRequest);
+ ActivityPub.sendAccept(actor, incomingRequest);
+ } catch(err) {
+ }
+ break;
case 'Follow':
logger('Incoming follow request');
addFollower(incomingRequest);
@@ -126,17 +132,33 @@ router.post('/', async (req, res) => {
// - a post that is from someone you follow, but is a reply to a post from someone you do not follow (should be ignored?)
// - a mention from a following (notification and feed)
// - a mention from a stranger (notification only)
+ if (!incomingRequest.object.published) { // If published datestamp is missing, add one
+ incomingRequest.object.published = (new Date()).toISOString();
+ }
+
if (incomingRequest.object.directMessage == true || addressedOnlyToMe(incomingRequest)) {
await acceptDM(incomingRequest.object, incomingRequest.object.attributedTo)
} else if (isReplyToMyPost(incomingRequest.object)) {
// TODO: What about replies to replies? should we traverse up a bit?
if (!isIndexed(incomingRequest.object.id)) {
- await createActivity(incomingRequest.object);
- addNotification({
- type: 'Reply',
- actor: incomingRequest.object.attributedTo,
- object: incomingRequest.object.id
- });
+ // check if this is a vote on a Question we asked
+ let originalPost = await getNote(incomingRequest.object.inReplyTo);
+ if (originalPost.type === 'Question') {
+ await recordVote(incomingRequest.object.inReplyTo, incomingRequest.object.name, incomingRequest.actor);
+ addNotification({
+ type: 'Vote',
+ actor: incomingRequest.object.attributedTo,
+ object: incomingRequest.object.inReplyTo
+ });
+
+ } else {
+ await createActivity(incomingRequest.object);
+ addNotification({
+ type: 'Reply',
+ actor: incomingRequest.object.attributedTo,
+ object: incomingRequest.object.id
+ });
+ }
} else {
logger('already created reply');
}
@@ -154,6 +176,7 @@ router.post('/', async (req, res) => {
} else if (!incomingRequest.object.inReplyTo) {
// this is a NEW post - most likely from a follower
await createActivity(incomingRequest.object);
+ UserEvent.sendEvent('msg');
} else {
// this is a reply
// from a following
@@ -180,4 +203,4 @@ router.post('/', async (req, res) => {
logger('Unknown request format:', incomingRequest);
}
return res.status(200).send();
-});
\ No newline at end of file
+});
diff --git a/routes/notes.js b/routes/notes.js
index 87881f4..b83e502 100644
--- a/routes/notes.js
+++ b/routes/notes.js
@@ -15,15 +15,19 @@ router.get('/:guid', async (req, res) => {
if (!guid) {
return res.status(400).send('Bad request.');
} else {
- const note = await getNote(`https://${ DOMAIN }/m/${ guid }`);
- if (note === undefined) {
- return res.status(404).send(`No record found for ${guid}.`);
- } else {
- if (req.headers.accept?.includes('application/ld+json; profile="https://www.w3.org/ns/activitystreams"')) {
- res.json(note);
+ try {
+ const note = await getNote(`https://${ DOMAIN }/m/${ guid }`);
+ if (note === undefined) {
+ return res.status(404).send(`No record found for ${guid}.`);
} else {
- res.redirect(note.url);
+ if (req.headers.accept?.includes('application/ld+json; profile="https://www.w3.org/ns/activitystreams"')) {
+ res.json(note);
+ } else {
+ res.redirect(note.url);
+ }
}
+ } catch(err) {
+ res.status(404).send();
}
}
-});
\ No newline at end of file
+});
diff --git a/routes/public.js b/routes/public.js
index 842aff3..8aabe7a 100644
--- a/routes/public.js
+++ b/routes/public.js
@@ -9,7 +9,8 @@ import {
getNote,
isMyPost,
getAccount,
- getOutboxPosts
+ getOutboxPosts,
+ readMedia
} from '../lib/account.js';
import {
getActivity,
@@ -143,36 +144,74 @@ router.get('/feed', async (req, res) => {
router.get('/notes/:guid', async (req, res) => {
let guid = req.params.guid;
-
if (!guid) {
return res.status(400).send('Bad request.');
} else {
const actor = ActivityPub.actor;
- const note = await getNote(`https://${ DOMAIN }/m/${ guid }`);
- if (note === undefined) {
- return res.status(404).send(`No record found for ${guid}.`);
- } else {
-
- const notes = await unrollThread(note.id);
- notes.sort((a, b) => {
- const ad = new Date(a.note.published).getTime();
- const bd = new Date(b.note.published).getTime();
- if (ad > bd) {
- return 1;
- } else if (ad < bd) {
- return -1;
+ try {
+ const note = await getNote(`https://${ DOMAIN }/m/${ guid }`);
+ if (note === undefined) {
+ return res.status(404).send(`No record found for ${guid}.`);
} else {
- return 0;
+ if (req.accepts('application/activity+json') && !req.accepts('*/*')) { // non-browser client
+ res.setHeader('Content-Type', 'application/activity+json');
+ res.status(200).send(note);
+ } else {
+ const notes = await unrollThread(note.id);
+ notes.sort((a, b) => {
+ const ad = new Date(a.note.published).getTime();
+ const bd = new Date(b.note.published).getTime();
+ if (ad > bd) {
+ return 1;
+ } else if (ad < bd) {
+ return -1;
+ } else {
+ return 0;
+ }
+ });
+ res.render('public/note', {
+ me: ActivityPub.actor,
+ actor: actor,
+ activitystream: notes,
+ layout: 'public',
+ domain: DOMAIN,
+ user: USERNAME
+ });
+ }
}
- });
- res.render('public/note', {
- me: ActivityPub.actor,
- actor: actor,
- activitystream: notes,
- layout: 'public',
- domain: DOMAIN,
- user: USERNAME
- });
+ } catch(err) {
+ res.status(404).send();
}
}
-});
\ No newline at end of file
+});
+
+router.get('/tags/:tag', async (req, res) => {
+ // all posts referencing tag by the owner user
+ const noteIds = INDEX.filter((i) => (i.actor === ActivityPub.actor.id) && i.hashtags.includes('#' + req.params.tag));
+ // get full posts
+ const posts = await Promise.all(noteIds.map(async (p) => {
+ return await getNote(p.id);
+ }));
+
+ res.render('public/tag', {
+ tag: req.params.tag,
+ layout: 'public',
+ me: ActivityPub.actor,
+ actor: ActivityPub.actor,
+ domain: DOMAIN,
+ user: USERNAME,
+ notes: posts
+ });
+});
+
+router.get('/media/:id', async (req, res) => {
+ let attachment = readMedia(req.params.id);
+ if (attachment) {
+ res.setHeader('Content-Type', attachment.type);
+ let data = Buffer.from(attachment.data, 'base64');
+ res.status(200).send(data);
+ } else {
+ res.status(404).send();
+ }
+});
+
+ {{#if mini}}
+