Merge branch 'master' of github.com:lowercasename/gathio into newmaster

1 files changed, 56 insertions, 56 deletions

diff --git a/routes.js b/routes.js
index f5ec0b3..8e480e6 100755
--- a/routes.js
+++ b/routes.js
@@ -27,6 +27,7 @@ const request = require('request');
 const domain = require('./config/domain.js').domain;
 const contactEmail = require('./config/domain.js').email;
 const siteName = require('./config/domain.js').sitename
+const siteLogo = require('./config/domain.js').logo_url;
 const ap = require('./activitypub.js');
 
 // Extra marked renderer (used to render plaintext event description for page metadata)
@@ -671,7 +672,7 @@ router.post('/newevent', async (req, res) => {
 			addToLog("createEvent", "success", "Event " + eventID + "created");
 			// Send email with edit link
 			if (sendEmails) {
-        req.app.get('hbsInstance').renderView('./views/emails/createevent.handlebars', {eventID, editToken, siteName, domain, cache: true, layout: 'email.handlebars'}, function(err, html) {
+        req.app.get('hbsInstance').renderView('./views/emails/createevent.handlebars', {eventID, editToken, siteName, siteLogo, domain, cache: true, layout: 'email.handlebars'}, function(err, html) {
           const msg = {
             to: req.body.creatorEmail,
             from: {
@@ -698,12 +699,10 @@ router.post('/newevent', async (req, res) => {
 router.post('/importevent', (req, res) => {
 	let eventID = shortid.generate();
 	let editToken = randomstring.generate();
-	if (req.files && Object.keys(req.files).length != 0) {
-		importediCalObject = ical.parseICS(req.files.icsImportControl.data.toString('utf8'));
-		for (var key in importediCalObject) {
-    		importedEventData = importediCalObject[key];
-		}
-		console.log(importedEventData)
+	if (req.files && Object.keys(req.files).length !== 0) {
+		let iCalObject = ical.parseICS(req.files.icsImportControl.data.toString('utf8'));
+		let importedEventData = iCalObject[Object.keys(iCalObject)];
+
 		let creatorEmail;
 		if (req.body.creatorEmail) {
 			creatorEmail = req.body.creatorEmail
@@ -712,7 +711,7 @@ router.post('/importevent', (req, res) => {
 		} else {
 			res.status(500).send("Please supply an email address on the previous page.");
 		}
-		
+
 		const event = new Event({
 			id: eventID,
 			type: 'public',
@@ -739,24 +738,24 @@ router.post('/importevent', (req, res) => {
 				addToLog("createEvent", "success", "Event " + eventID + " created");
 				// Send email with edit link
 				if (sendEmails) {
-          req.app.get('hbsInstance').renderView('./views/emails/createevent.handlebars', {eventID, editToken, siteName, domain, cache: true, layout: 'email.handlebars'}, function(err, html) {
-            const msg = {
-              to: req.body.creatorEmail,
-              from: {
-                name: siteName,
-                email: contactEmail,
-              },
-              subject: `${siteName}: ${req.body.eventName}`,
-              html,
-            };
-            sgMail.send(msg).catch(e => {
-              console.error(e.toString());
-              res.status(500).end();
-            });
-          });
+					req.app.get('hbsInstance').renderView('./views/emails/createevent.handlebars', {eventID, editToken, siteName, siteLogo, domain, cache: true, layout: 'email.handlebars'}, function(err, html) {
+						const msg = {
+						to: req.body.creatorEmail,
+						from: {
+							name: siteName,
+							email: contactEmail,
+						},
+						subject: `${siteName}: ${importedEventData.summary}`,
+						html,
+						};
+						sgMail.send(msg).catch(e => {
+						console.error(e.toString());
+						res.status(500).end();
+						});
+					});
 				}
 				res.writeHead(302, {
-				'Location': '/' + eventID + '?e=' + editToken
+					'Location': '/' + eventID + '?e=' + editToken
 				});
 				res.end();
 			})
@@ -799,7 +798,7 @@ router.post('/neweventgroup', (req, res) => {
 			addToLog("createEventGroup", "success", "Event group " + eventGroupID + " created");
 			// Send email with edit link
 			if (sendEmails) {
-        req.app.get('hbsInstance').renderView('./views/emails/createeventgroup.handlebars', {eventGroupID, editToken, siteName, domain, cache: true, layout: 'email.handlebars'}, function(err, html) {
+        req.app.get('hbsInstance').renderView('./views/emails/createeventgroup.handlebars', {eventGroupID, editToken, siteName, siteLogo, domain, cache: true, layout: 'email.handlebars'}, function(err, html) {
           const msg = {
             to: req.body.creatorEmail,
             from: {
@@ -953,7 +952,7 @@ router.post('/editevent/:eventID/:editToken', (req, res) => {
 						let attendeeEmails = ids;
 						if (!error && attendeeEmails !== ""){
 							console.log("Sending emails to: " + attendeeEmails);
-              req.app.get('hbsInstance').renderView('./views/emails/editevent.handlebars', {diffText, eventID: req.params.eventID, siteName, domain, cache: true, layout: 'email.handlebars'}, function(err, html) {
+              req.app.get('hbsInstance').renderView('./views/emails/editevent.handlebars', {diffText, eventID: req.params.eventID, siteName, siteLogo, domain, cache: true, layout: 'email.handlebars'}, function(err, html) {
                 const msg = {
                   to: attendeeEmails,
                   from: {
@@ -1093,6 +1092,7 @@ router.post('/deleteevent/:eventID/:editToken', (req, res) => {
 				eventImage = event.image;
 			}
 
+<<<<<<< HEAD
       // broadcast a Delete profile message to all followers so that at least Mastodon servers will delete their local profile information
       const guidUpdateObject = crypto.randomBytes(16).toString('hex');
       const jsonUpdateObject = JSON.parse(event.activityPubActor);
@@ -1123,33 +1123,33 @@ router.post('/deleteevent/:eventID/:editToken', (req, res) => {
         })
         .catch((err) => { res.send('Sorry! Something went wrong (error deleting): ' + err); addToLog("deleteEvent", "error", "Attempt to delete event " + req.params.eventID + " failed with error: " + err);});
       });
-        // send emails here otherwise they don't exist lol
-        if (sendEmails) {
-          Event.findOne({id: req.params.eventID}).distinct('attendees.email', function(error, ids) {
-            let attendeeEmails = ids;
-            if (!error){
-              console.log("Sending emails to: " + attendeeEmails);
-              req.app.get('hbsInstance').renderView('./views/emails/deleteevent.handlebars', {siteName, domain, eventName: event.name, cache: true, layout: 'email.handlebars'}, function(err, html) {
-                const msg = {
-                  to: attendeeEmails,
-                  from: {
-                    name: siteName,
-                    email: contactEmail,
-                  },
-                  subject: `${siteName}: ${event.name} was deleted`,
-                  html,
-                };
-                sgMail.sendMultiple(msg).catch(e => {
-                  console.error(e.toString());
-                  res.status(500).end();
-                });
+			// Send emails here otherwise they don't exist lol
+			if (sendEmails) {
+				Event.findOne({id: req.params.eventID}).distinct('attendees.email', function(error, ids) {
+					attendeeEmails = ids;
+					if (!error){
+						console.log("Sending emails to: " + attendeeEmails);
+            req.app.get('hbsInstance').renderView('./views/emails/deleteevent.handlebars', {siteName, siteLogo, domain, eventName: event.name, cache: true, layout: 'email.handlebars'}, function(err, html) {
+              const msg = {
+                to: attendeeEmails,
+                from: {
+                  name: siteName,
+                  email: contactEmail,
+                },
+                subject: `${siteName}: ${event.name} was deleted`,
+                html,
+              };
+              sgMail.sendMultiple(msg).catch(e => {
+                console.error(e.toString());
+                res.status(500).end();
               });
+            });
             }
-            else {
-              console.log("Nothing to send!");
-            }
-          });
-        }
+          else {
+            console.log("Nothing to send!");
+          }
+        });
+      }
 		}
 		else {
 			// Token doesn't match
@@ -1233,7 +1233,7 @@ router.post('/attendevent/:eventID', (req, res) => {
 			addToLog("addEventAttendee", "success", "Attendee added to event " + req.params.eventID);
 			if (sendEmails) {
 				if (req.body.attendeeEmail){
-          req.app.get('hbsInstance').renderView('./views/emails/addeventattendee.handlebars', {eventID: req.params.eventID, siteName, domain, cache: true, layout: 'email.handlebars'}, function(err, html) {
+          req.app.get('hbsInstance').renderView('./views/emails/addeventattendee.handlebars', {eventID: req.params.eventID, siteName, siteLogo, domain, cache: true, layout: 'email.handlebars'}, function(err, html) {
             const msg = {
               to: req.body.attendeeEmail,
               from: {
@@ -1269,7 +1269,7 @@ router.post('/unattendevent/:eventID', (req, res) => {
 		addToLog("unattendEvent", "success", "Attendee removed self from event " + req.params.eventID);
 		if (sendEmails) {
 			if (req.body.attendeeEmail){
-        req.app.get('hbsInstance').renderView('./views/emails/unattendevent.handlebars', {eventID: req.params.eventID, siteName, domain, cache: true, layout: 'email.handlebars'}, function(err, html) { const msg = {
+        req.app.get('hbsInstance').renderView('./views/emails/unattendevent.handlebars', {eventID: req.params.eventID, siteName, siteLogo, domain, cache: true, layout: 'email.handlebars'}, function(err, html) { const msg = {
             to: req.body.attendeeEmail,
             from: {
               name: siteName,
@@ -1349,7 +1349,7 @@ router.post('/removeattendee/:eventID/:attendeeID', (req, res) => {
 		if (sendEmails) {
       // currently this is never called because we don't have the email address
 			if (req.body.attendeeEmail){
-        req.app.get('hbsInstance').renderView('./views/emails/removeeventattendee.handlebars', {eventName: req.params.eventName, siteName, domain, cache: true, layout: 'email.handlebars'}, function(err, html) { const msg = {
+        req.app.get('hbsInstance').renderView('./views/emails/removeeventattendee.handlebars', {eventName: req.params.eventName, siteName, siteLogo, domain, cache: true, layout: 'email.handlebars'}, function(err, html) { const msg = {
             to: req.body.attendeeEmail,
             from: {
               name: siteName,
@@ -1409,7 +1409,7 @@ router.post('/post/comment/:eventID', (req, res) => {
 				let attendeeEmails = ids;
 					if (!error){
 						console.log("Sending emails to: " + attendeeEmails);
-            req.app.get('hbsInstance').renderView('./views/emails/addeventcomment.handlebars', {siteName, domain, eventID: req.params.eventID, commentAuthor: req.body.commentAuthor, cache: true, layout: 'email.handlebars'}, function(err, html) {
+            req.app.get('hbsInstance').renderView('./views/emails/addeventcomment.handlebars', {siteName, siteLogo, domain, eventID: req.params.eventID, commentAuthor: req.body.commentAuthor, cache: true, layout: 'email.handlebars'}, function(err, html) {
               const msg = {
                 to: attendeeEmails,
                 from: {
@@ -1473,7 +1473,7 @@ router.post('/post/reply/:eventID/:commentID', (req, res) => {
 						let attendeeEmails = ids;
 						if (!error){
 							console.log("Sending emails to: " + attendeeEmails);
-              req.app.get('hbsInstance').renderView('./views/emails/addeventcomment.handlebars', {siteName, domain, eventID: req.params.eventID, commentAuthor: req.body.replyAuthor, cache: true, layout: 'email.handlebars'}, function(err, html) {
+              req.app.get('hbsInstance').renderView('./views/emails/addeventcomment.handlebars', {siteName, siteLogo, domain, eventID: req.params.eventID, commentAuthor: req.body.replyAuthor, cache: true, layout: 'email.handlebars'}, function(err, html) {
                 const msg = {
                   to: attendeeEmails,
                   from: {