Etherpad-Plugins/ep_email_notifications
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some fixes

Browse source
This commit is contained in:
John McLear 2013-01-31 02:31:59 +00:00
parent 44b2ba3da7
commit 1e0c0bd586
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
handleMessage.js
View file

@ -96,11 +96,12 @@ exports.setAuthorEmailRegistered = function(email, authorId, padId){
timestamp: timestamp
};
console.debug("registered", registered, " to ", padId);
console.warn("WTF");
// Here we have to basically hack a new value into the database, this isn't clean or polite.
db.get("emailSubscription:" + padId, function(err, value){ // get the current value
if(!value){value = {};} // if an emailSubscription doesnt exist yet for this padId don't panic
value[email] = registered; // add the registered values to the object
console.warn("written to database");
db.set("emailSubscription:" + padId, value); // stick it in the database
});

12
update.js
View file

@ -13,7 +13,7 @@ var staleTime = 30000; // How stale(milliseconds) does a pad need to be before n
var timers = {};
var fromName = "Etherpad";
var fromEmail = "pad@etherpad.org";
var urlToPads = "http://beta.etherpad.org/p/";
var urlToPads = "http://beta.etherpad.org/p/"; // The URL to your pads note the trailing /
var server = email.server.connect({
host: "127.0.0.1",
@ -39,12 +39,14 @@ exports.padUpdate = function (hook_name, _pad) {
};
exports.notifyBegin = function(padId){
console.warn("Getting "+padId);
db.get("emailSubscription:" + padId, function(err, recipients){ // get everyone we need to email
console.warn(recipients);
async.forEach(Object.keys(recipients), function(recipient, cb){
console.debug("Emailing "+recipient +" about a new begin update");
console.warn("Emailing "+recipient +" about a new begin update");
server.send({
text: "Your pad at "+urlToPads+"/p/"+padId +" is being edited, we're just emailing you let you know :)",
text: "Your pad at "+urlToPads+padId +" is being edited, we're just emailing you let you know :)",
from: fromName+ "<"+fromEmail+">",
to: recipient,
subject: "Someone begin editing "+padId
@ -67,10 +69,10 @@ exports.notifyEnd = function(padId){
console.debug("Emailing "+recipient +" about a new begin update");
server.send({
text: "Your pad at "+urlToPads+"/p/"+padId +" has finished being edited, we're just emailing you let you know :) The changes look like this:" + changesToPad,
text: "Your pad at "+urlToPads+padId +" has finished being edited, we're just emailing you let you know :) The changes look like this:" + changesToPad,
from: fromName+ "<"+fromEmail+">",
to: recipient,
subject: "Someone begin editing "+padId
subject: "Someone finished editing "+padId
}, function(err, message) { console.log(err || message); });
cb(); // finish each user