From a89fa97aabcbd84ed3701b210310517f2147c713 Mon Sep 17 00:00:00 2001
From: Maki <mxmcube@gmail.com>
Date: Mon, 8 Apr 2019 16:41:17 -0700
Subject: [PATCH] Updates

---
 app.js         | 11 +++++++++--
 settings.js    | 11 ++++++-----
 snaps.js       | 18 ++++++++++--------
 tests/snaps.js | 24 ++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 15 deletions(-)
 create mode 100644 tests/snaps.js

diff --git a/app.js b/app.js
index 9388af0..3753a80 100644
--- a/app.js
+++ b/app.js
@@ -21,7 +21,7 @@ bot.on("ready", function() {
 	// Object.keys(guilds).forEach(key=>{
 	// 	console.log("\t"+guilds[key].name+" ("+guilds[key].id+")");
 	// }); console.log("");
-	let guild = bot.guilds.get("250331140991221760");
+	let guild = bot.guilds.get(global.settings.server);
 	if (guild) {
 		global.log("Server found: "+guild.name+" ("+guild.id+")");
 	} else {
@@ -29,6 +29,13 @@ bot.on("ready", function() {
 		process.exit(1);
 	}
 
+	// bot.guilds.get("563485021722247179").channels.get("563485021722247183").fetchMessage("564261084865888257").then(msg=>{
+	// 	let emoji = msg.reactions.array()[0].emoji;
+	// 	console.log(emoji)
+	// 	msg.react(emoji).then(()=>console("Reacted!")).catch(err=>console.log);
+		
+	// });
+
 	// attach events
 	events.on("canny.newPost", post=>{
 		let chanID = global.settings.canny.channels[post.board.urlName];
@@ -92,4 +99,4 @@ bot.on("ready", function() {
 	snaps.listenOnNewSnaps(events); // hifi.newSnap
 });
 
-bot.login(global.settings.token);
\ No newline at end of file
+bot.login(global.settings.token);
diff --git a/settings.js b/settings.js
index 154e512..31adebb 100644
--- a/settings.js
+++ b/settings.js
@@ -1,4 +1,5 @@
 module.exports = {
+	server: "563485021722247179",
 	token: require("fs").readFileSync("./token.txt", "utf8"),
 	mins: {
 		canny: 10,
@@ -9,13 +10,13 @@ module.exports = {
 		//url: "https://i-have-no-company.canny.io",
 		icon: "https://canny.io/images/cc546bc6e9e4c267452a433b426f6644.jpg",
 		channels: {
-			"bugs": "433315408532078622", // bugs
-			"feature-requests": "433324910035730432", // feedback
-			"this-is-my-board": "553016215036100637", // bot playground
+			"bugs": "563489724451520543", // bugs
+			"feature-requests": "563495843605381142", // feedback
+			//"this-is-my-board": "", // bot playground
 		},
 	},
 	snaps: {
 		//channel: "553016215036100637", // bot playground
-		channel: "433028340736196608", // media
+		channel: "563497640667512834", // media
 	},
-};
\ No newline at end of file
+};
diff --git a/snaps.js b/snaps.js
index 0a8df4f..1bdef2a 100644
--- a/snaps.js
+++ b/snaps.js
@@ -1,6 +1,6 @@
 var request = require("request");
 
-module.exports = function(url) {
+module.exports = function() {
 	this.getLatestSnaps = ()=>new Promise((resolve,reject)=>{
 		request("https://metaverse.highfidelity.com/api/v1/user_stories?include_actions=snapshot&per_page=10", (err,res,body)=>{
 			if (err) return reject(err);
@@ -13,15 +13,19 @@ module.exports = function(url) {
 		});
 	});
 
+	var defaultAvatar = "https://metaverse.highfidelity.com/assets/users/hero-default-user-d5a4727d1ad1fb9d9cd26383e26e2697dfd9f4d2f3f81da86c4990771ca8810d.png";
 	this.getAvatarUrl = (username)=>new Promise((resolve,reject)=>{
 		request("https://metaverse.highfidelity.com/users/"+username, (err,res,body)=>{
-			if (err) return reject(undefined);
+			if (err) return resolve(defaultAvatar);
 			let avatarUrl = (/<img class=['"]users-img['"] src="(.*?)[?'"]/gi.exec(body));
-			if (avatarUrl==null) reject(undefined);
+			
+			if (avatarUrl==null) return resolve(defaultAvatar);
+			if (avatarUrl[1]==undefined) return resolve(defaultAvatar);
 
 			avatarUrl = avatarUrl[1];
-			if (avatarUrl.substring(0,8)=="/assets/") avatarUrl = "https://metaverse.highfidelity.com"+avatarUrl;
-			return resolve(avatarUrl[1]);
+			if (avatarUrl.substring(0,8)=="/assets/") return resolve(defaultAvatar);
+
+			return resolve(avatarUrl);
 		});
 	});
 
@@ -36,9 +40,7 @@ module.exports = function(url) {
 
 					if (dontEmit) return;
 
-					let avatarUrl = undefined;
-					try { avatarUrl = await this.getAvatarUrl(snap.username); }
-					catch(err) { avatarUrl = "https://metaverse.highfidelity.com/assets/users/hero-default-user-d5a4727d1ad1fb9d9cd26383e26e2697dfd9f4d2f3f81da86c4990771ca8810d.png"; }
+					let avatarUrl = await this.getAvatarUrl(snap.username);
 
 					events.emit("hifi.newSnap", {
 						id: snap.id,
diff --git a/tests/snaps.js b/tests/snaps.js
new file mode 100644
index 0000000..5609fc9
--- /dev/null
+++ b/tests/snaps.js
@@ -0,0 +1,24 @@
+var snaps = new (require("../snaps.js"))();
+
+(async ()=>{
+
+	let avatarUrl;
+	let latestSnaps;
+
+	// with image
+	avatarUrl = await snaps.getAvatarUrl("Maki");
+	console.log("Maki: "+avatarUrl);
+
+	// default image
+	avatarUrl = await snaps.getAvatarUrl("billmar");
+	console.log("billmar: "+avatarUrl);
+
+	// no user
+	avatarUrl = await snaps.getAvatarUrl("aksjdklasd");
+	console.log("aksjdklasd: "+avatarUrl);
+
+	// latest snap
+	latestSnaps = await snaps.getLatestSnaps();
+	console.log(latestSnaps.user_stories[0]);
+
+})();
\ No newline at end of file