${options.payload.object.content}
${options.reply_message}
`, + reply_message: `${reply_to_username} ${options.reply_message}`, + in_reply_to: options.payload.object.url + }, function(err, message){ + // console.log(err, message); + }); + }, create_post: function(options, cb){ var bot = this; @@ -86,6 +109,7 @@ else{ post_description = options.description, post_date = moment().format(), post_in_reply_to = options.in_reply_to || null, + reply_message = options.reply_message || null, post_content = options.content || options.url || '', post_attachment = JSON.stringify(options.attachment) || '[]'; @@ -104,7 +128,7 @@ else{ 'type': post_type, 'published': post_date, 'attributedTo': `${bot_url}/bot`, - 'content': post_content, + 'content': reply_message || post_content, 'to': 'https://www.w3.org/ns/activitystreams#Public' }; @@ -122,18 +146,20 @@ else{ } } + if (post_in_reply_to){ + post_object.inReplyTo = post_in_reply_to; + } + var post = { '@context': 'https://www.w3.org/ns/activitystreams', 'id': `${bot_url}/post/${post_id}`, 'type': 'Create', 'actor': `${bot_url}/bot`, 'object': post_object - } - - if (options.post_in_reply_to){ - post.object.inReplyTo = post_in_reply_to; } - + + console.log({post_in_reply_to}); + db.get_followers(function(err, followers){ if (followers){ console.log(`sending update to ${followers.length} follower(s)...`); @@ -179,8 +205,12 @@ else{ }); }, accept: function(payload, cb){ - var bot = this, - guid = crypto.randomBytes(16).toString('hex'); + var bot = this, + guid = crypto.randomBytes(16).toString('hex'); + + db.get_event(payload.id, function(err, data){ + // console.log('get_event', err, data); + bot.sign_and_send({ follower: { @@ -197,7 +227,37 @@ else{ if (cb){ cb(err, payload, data); } + console.log('saving event', payload.id) + db.save_event(payload.id); }); + + }); +// db.get_event(payload.id, function(err, data){ +// console.log('get_event', err, data); + +// if (!err && !data){ +// bot.sign_and_send({ +// follower: { +// url: payload.actor +// }, +// message: { +// '@context': 'https://www.w3.org/ns/activitystreams', +// 'id': `${bot.bot_url}/${guid}`, +// 'type': 'Accept', +// 'actor': `${bot.bot_url}/bot`, +// 'object': payload, +// } +// }, function(err, data){ +// if (cb){ +// cb(err, payload, data); +// } +// console.log('saving event', payload.id) +// db.save_event(payload.id); +// }); +// } else if (!err){ +// console.log('duplicate event'); +// } +// }); }, sign_and_send: function(options, cb){ var bot = this; diff --git a/bot/responses.js b/bot/responses.js new file mode 100644 index 0000000..24b2d8b --- /dev/null +++ b/bot/responses.js @@ -0,0 +1,43 @@ +/* + Here you can modify how the bot responds to messages it receives. +*/ + +module.exports = function(data, callback_function) { +/* + At the end of this function we need to pass an error message and a response text. + Let's set up some default values. +*/ + + var error = null, + response = 'Hello 👋'; + +/* + The data object this function receives looks like this: + + data = { + payload: 'The original data object.', + message_body: 'The content of the message sent to the bot.', + message_from: 'The URL of the message sender.' + } + + message_body and message_from come from the payload object, so we can access them more conveniently. If we need more details, we can get those from the payload object itself. + +*/ + + console.log(`new message from ${data.message_from}:`) + console.log(data.message_body); + +/* + We can modify the response text. +*/ + + if (data.message_body.toLowerCase().indexOf('hello') > -1){ + response = 'Hi 👋'; + } + + /* + Finally, we pass the error and reply message to the callback function that sends it to the author of the message that the bot received and saves it to the post database. + */ + + callback_function(error, response); +}; diff --git a/examples/replies/README.md b/examples/replies/README.md new file mode 100644 index 0000000..78f436c --- /dev/null +++ b/examples/replies/README.md @@ -0,0 +1,15 @@ +**Work in progress** + + + +# Bot replies + +To use bot replies, update `bot/responses.js` with a function that returns a reply message. + + +TODO: + +- correctly dedupe events +- add support for private messages +- send notification when posting reply + diff --git a/examples/replies/bot/bot-replies.js b/examples/replies/bot/bot-replies.js new file mode 100644 index 0000000..24b2d8b --- /dev/null +++ b/examples/replies/bot/bot-replies.js @@ -0,0 +1,43 @@ +/* + Here you can modify how the bot responds to messages it receives. +*/ + +module.exports = function(data, callback_function) { +/* + At the end of this function we need to pass an error message and a response text. + Let's set up some default values. +*/ + + var error = null, + response = 'Hello 👋'; + +/* + The data object this function receives looks like this: + + data = { + payload: 'The original data object.', + message_body: 'The content of the message sent to the bot.', + message_from: 'The URL of the message sender.' + } + + message_body and message_from come from the payload object, so we can access them more conveniently. If we need more details, we can get those from the payload object itself. + +*/ + + console.log(`new message from ${data.message_from}:`) + console.log(data.message_body); + +/* + We can modify the response text. +*/ + + if (data.message_body.toLowerCase().indexOf('hello') > -1){ + response = 'Hi 👋'; + } + + /* + Finally, we pass the error and reply message to the callback function that sends it to the author of the message that the bot received and saves it to the post database. + */ + + callback_function(error, response); +}; diff --git a/helpers/db.js b/helpers/db.js index 4beecd5..d415360 100644 --- a/helpers/db.js +++ b/helpers/db.js @@ -12,6 +12,7 @@ Posts table id INT NOT NULL AUTO_INCREMENT date DATETIME DEFAULT current_timestamp type VARCHAR(255) +in_reply_to TEXT content TEXT attachment TEXT [this is a stringified JSON, see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-attachment] @@ -20,30 +21,39 @@ Followers table url TEXT PRIMARY KEY date DATETIME DEFAULT current_timestamp +Events table + +id TEXT PRIMARY +date DATETIME DEFAULT current_timestamp + + */ module.exports = { init: function(cb){ db.serialize(function(){ /* - TODO: Rewrite this with promises. + TODO: Rewrite this with promises and callback support. */ - db.run('CREATE TABLE IF NOT EXISTS Posts (id INTEGER PRIMARY KEY AUTOINCREMENT, date DATETIME DEFAULT current_timestamp, type VARCHAR(255), content TEXT, attachment TEXT)', function(err, data){ + + db.run('CREATE TABLE IF NOT EXISTS Posts (id INTEGER PRIMARY KEY AUTOINCREMENT, date DATETIME DEFAULT current_timestamp, type VARCHAR(255), in_reply_to TEXT, content TEXT, attachment TEXT)', function(err, data){ + if (err){ + console.log(err); + } + }); + + db.run('CREATE TABLE IF NOT EXISTS Followers (url TEXT PRIMARY KEY, date DATETIME DEFAULT current_timestamp)', function(err, data){ if (err){ console.log(err); } - else{ - db.run('CREATE TABLE IF NOT EXISTS Followers (url TEXT PRIMARY KEY, date DATETIME DEFAULT current_timestamp)', function(err, data){ - // db.run('CREATE TABLE IF NOT EXISTS Followers (id INTEGER PRIMARY KEY AUTOINCREMENT, date DATETIME DEFAULT current_timestamp, url TEXT)', function(err, data){ - if (err){ - console.log(err); - } - else{ - console.log('DB ready...'); - } - }); + }); + + db.run('CREATE TABLE IF NOT EXISTS Events (id TEXT PRIMARY KEY, date DATETIME DEFAULT current_timestamp)', function(err, data){ + if (err){ + console.log(err); } }); + }); }, get_posts: function(options, cb){ @@ -58,10 +68,13 @@ module.exports = { */ db.all('SELECT COUNT(*) AS total_count FROM Posts', function(err, rows) { - var total_count = rows[0].total_count, - total_pages= Math.ceil(total_count/POSTS_PER_PAGE); - + var total_count = 0; + + if (rows){ + total_count = rows[0].total_count; + } + var total_pages = Math.ceil(total_count/POSTS_PER_PAGE); var db_query = `SELECT * from Posts ORDER BY date DESC LIMIT ${POSTS_PER_PAGE} OFFSET ${offset}`; db.all(db_query, function(err, rows) { @@ -71,7 +84,7 @@ module.exports = { page_count: total_pages, posts: rows }; - cb(null, db_return); + cb(err, db_return); } }); @@ -84,7 +97,7 @@ module.exports = { db.all(`SELECT * from Posts WHERE id=${post_id}`, function(err, rows) { if (cb){ var post_data = (rows ? rows[0] : null); - cb(null, post_data); + cb(err, post_data); } }); }); @@ -92,11 +105,12 @@ module.exports = { save_post: function(post_data, cb){ var post_type = post_data.type || 'Note', post_content = post_data.content || '', + in_reply_to = post_data.in_reply_to || '', post_attachment = post_data.attachment.toString() || '[]'; db.serialize(function() { // db.run(`INSERT INTO Posts (type, content, attachment) VALUES ("${post_type}", "${post_content}", "${post_attachment}")`, function(err, data){ - db.run(`INSERT INTO Posts (type, content, attachment) VALUES ('${post_type}', '${post_content}', '${post_attachment}')`, function(err, data){ + db.run(`INSERT INTO Posts (type, content, in_reply_to, attachment) VALUES ('${post_type}', '${post_content}', '${in_reply_to}', '${post_attachment}')`, function(err, data){ if (err){ console.log(err); } @@ -139,11 +153,54 @@ module.exports = { db.all("SELECT * from Followers ORDER BY date DESC", function(err, rows) { if (cb){ - cb(null, rows); + cb(err, rows); + } + }); + }); + }, + save_event: function(event_id, cb){ + db.serialize(function() { + db.run(`INSERT INTO Events (id) VALUES ('${event_id}')`, function(err, data){ + if (err){ + console.log(err); + } + if (cb){ + cb(err, this); + } + }); + }); + }, + get_event: function(event_id, cb){ + var data = []; + db.serialize(function(){ + db.all(`SELECT * from Events WHERE id='${event_id}'`, function(err, rows) { + if (cb){ + var data = (rows ? rows[0] : null); + cb(err, data); } }); }); }, + get_events: function(cb){ + db.serialize(function(){ + db.all('SELECT * FROM Events', function(err, rows) { + if (cb){ + cb(err, rows); + } + }); + }); + }, + get_replies: function(in_reply_to, cb){ + var data = []; + db.serialize(function(){ + db.all(`SELECT * from Posts WHERE in_reply_to='${in_reply_to}'`, function(err, rows) { + if (cb){ + var post_data = (rows ? rows[0] : null); + cb(err, post_data); + } + }); + }); + }, drop_table: function(table, cb){ db.serialize(function(){ if (table && exists) { diff --git a/package.json b/package.json index 80126be..1028890 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,8 @@ "canvas": "^2.0.0-alpha.17", "color-scheme": "^1.0.1", "gifencoder": "^1.1.0", - "neocities": "^0.0.3" + "neocities": "^0.0.3", + "jsdom": "^12.1.0" }, "engines": { "node": "8.x" diff --git a/routes/admin.js b/routes/admin.js index e573ad2..f061f52 100644 --- a/routes/admin.js +++ b/routes/admin.js @@ -3,7 +3,7 @@ var express = require('express'), router = express.Router(), moment = require('moment'), db = require(__dirname + '/../helpers/db.js'), - bot = require(__dirname + '/../bot.js'); + bot = require(__dirname + '/../bot/bot.js'); diff --git a/routes/bot-endpoint.js b/routes/bot-endpoint.js index bc071aa..41b105a 100644 --- a/routes/bot-endpoint.js +++ b/routes/bot-endpoint.js @@ -1,7 +1,7 @@ var express = require('express'), router = express.Router(), grammar = require(__dirname + '/../tracery/tracery.js').grammar, - bot = require(__dirname + '/../bot.js'); + bot = require(__dirname + '/../bot/bot.js'); router.get('/', function (req, res) { var content = grammar.flatten("#origin#"); diff --git a/routes/bot.js b/routes/bot.js index 6b055f0..d4775b6 100644 --- a/routes/bot.js +++ b/routes/bot.js @@ -1,7 +1,7 @@ var fs = require('fs'), url = require('url'), util = require('util'), - bot = require(__dirname + '/../bot.js'); + bot = require(__dirname + '/../bot/bot.js'); var express = require('express'), diff --git a/routes/delete-post.js b/routes/delete-post.js index 99e3021..851d968 100644 --- a/routes/delete-post.js +++ b/routes/delete-post.js @@ -1,7 +1,7 @@ var express = require('express'), router = express.Router(), moment = require('moment'), - bot = require(__dirname + '/../bot.js'), + bot = require(__dirname + '/../bot/bot.js'), db = require(__dirname + '/../helpers/db.js'); router.get('/:id', function(req, res) { diff --git a/routes/inbox.js b/routes/inbox.js index c58da10..e8ba23b 100644 --- a/routes/inbox.js +++ b/routes/inbox.js @@ -2,9 +2,11 @@ var fs = require('fs'), url = require('url'), crypto = require('crypto'), util = require('util'), + jsdom = require('jsdom'), db = require(__dirname + '/../helpers/db.js'), - bot = require(__dirname + '/../bot.js'); + bot = require(__dirname + '/../bot/bot.js'); +const { JSDOM } = jsdom; var express = require('express'), router = express.Router(); @@ -13,7 +15,10 @@ router.post('/', function (req, res) { var url_parts = url.parse(req.url, true), payload = req.body; - console.log('/inbox'); + console.log('/inbox'); + + console.log(payload.id); + /* TODO: Verify the message. */ @@ -21,19 +26,52 @@ router.post('/', function (req, res) { if (payload.type === 'Follow'){ bot.accept(payload, function(err, payload, data){ - db.save_follower(payload, function(err, data){ - console.log(`new follower ${payload.actor} saved`); - }); - + if (!err){ + db.save_follower(payload, function(err, data){ + console.log(`new follower ${payload.actor} saved`); + }); + } res.status(200); }); } else if (payload.type === 'Undo'){ bot.accept(payload, function(err, payload, data){ - db.remove_follower(payload, function(err, data){ - console.log(`removed follower ${payload.actor}`); - }); + if (!err){ + db.remove_follower(payload, function(err, data){ + console.log(`removed follower ${payload.actor}`); + }); + } + res.status(200); + }); + } + else if (payload.type === 'Create'){ + bot.accept(payload, function(err, payload, data){ + if (!err && payload.object && payload.object.content){ + var dom = new JSDOM(`This bot hasn't posted yet.
+ {{/if}} + + {{#each posts}}{{this.content}}
+{{{this.content}}}
{{post.content}}
+{{{post.content}}}
{{/if}} {{#each post.attachment}} @@ -16,9 +16,9 @@ {{/equals}}- Main page + Main page {{#if is_admin}} - Delete + Delete {{/if}}