Old chat tweaks.

git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3360 ed5197a5-7fde-0310-b194-c3ffbd925b24

packages/cory/chat/chat.js

@@ -328,6 +328,7 @@ function getConversation(session, conversationName) {
 }
 
 async function printToConversation(conversation, message, notify) {
+	print(message);
 	if (conversation == gCurrentConversation) {
 		if (message.action == "message") {
 			await printMessage(message.message);
@@ -409,26 +410,26 @@ function niceTime(lastTime, thisTime) {
 async function formatMessage(message) {
 	var result;
 	if (typeof message == "string") {
-		for (let i = 0; i < message.length; i++) {
-			if (message.charCodeAt(i) >= 128 /*&& message.charCodeAt(i) < 256*/) {
-				message = message.substring(0, i) + "?" + message.substring(i + 1);
+		for (let i = message.length - 1; i >= 0; i--) {
+			if (message.charCodeAt(i) >= 128 || message.charCodeAt(i) < 32) {
+				message = message.substring(0, i) + "\\" + message.charCodeAt(i).toString() + message.substring(i + 1);
 			}
 		}
 		result = [];
 		var regex = /(\w+:\/*\S+?)(?=(?:[\.!?])?(?:$|\s))/gi;
 		var match;
 		var lastIndex = 0;
-		let libunfurl;
+//		let libunfurl;
 		while ((match = regex.exec(message)) !== null) {
-			if (!libunfurl) {
-				libunfurl = await core.getService("libunfurl", "libunfurl");
-			}
+//			if (!libunfurl) {
+//				libunfurl = await core.getService("libunfurl", "libunfurl");
+//			}
 			result.push({class: "base1", value: message.substring(lastIndex, match.index)});
-			if (!libunfurl) {
+//			if (!libunfurl) {
 				result.push({href: match[0]});
-			} else {
-				result.push(await libunfurl.postMessage(match[0]));
-			}
+//			} else {
+//				result.push(await libunfurl.postMessage(match[0]));
+//			}
 			lastIndex = regex.lastIndex;
 		}
 		result.push({class: "base1", value: message.substring(lastIndex)});

packages/cory/libhttp/libhttp.js

@@ -5,12 +5,14 @@
 function parseUrl(url) {
 	// XXX: Hack.
 	var match = url.match(new RegExp("(\\w+)://([^/]+)?(.*)"));
-	return {
-		protocol: match[1],
-		host: match[2],
-		path: match[3],
-		port: match[1] == "http" ? 80 : 443,
-	};
+	if (match) {
+		return {
+			protocol: match[1],
+			host: match[2],
+			path: match[3],
+			port: match[1] == "http" ? 80 : 443,
+		};
+	}
 }
 
 function parseResponse(data) {
@@ -37,6 +39,9 @@ function get(url) {
 	return new Promise(async function(resolve, reject) {
 		try {
 			let parsed = parseUrl(url);
+			if (!parsed) {
+				throw new Error("Failed to parse: " + url);
+			}
 			let buffer = "";
 
 			let socket = await network.newConnection();

packages/cory/libirc/libirc.js

@@ -172,6 +172,7 @@ class IrcService {
 		this._send("QUIT");
 		this._socket.close();
 		this._service.notifyStateChanged("disconnected");
+		exit(0);
 	}
 };
 

packages/cory/libunfurl/libunfurl.js

@@ -65,13 +65,10 @@ core.register("onMessage", async function(sender, message) {
 	if (gCache[message] && new Date().valueOf() < gCache[message].expires) {
 		result = gCache[message].result;
 	} else {
-		if (gCache[message]) {
-			print("Didn't use", gCache[message]);
-		}
 		try {
 			result = await unfurl(message);
 		} catch (error) {
-			result = [message, "(error retrieving: ", error, ")"];
+			result = [{href: message}, " (error retrieving: ", error, ")"];
 		}
 		gCache[message] = {
 			expires: new Date().valueOf() + 7 * 24 * 60 * 60 * 1000,