From 6c3b2af9ac2d9b301138a3272390eff1f725fd68 Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Sun, 10 May 2009 11:04:53 +0200
Subject: [PATCH] who knows.. maybe less code means more predictable code  ;)

---
 CHANGESTODO                   | 6 ++++++
 world/net/place/archetype.gen | 2 +-
 world/net/usercmd.i           | 5 +++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGESTODO b/CHANGESTODO
index b2e1949..3086062 100644
--- a/CHANGESTODO
+++ b/CHANGESTODO
@@ -340,6 +340,12 @@ WINDOWS DISTRIBUTION
 ? how can we compile SRV into erq.exe? do we care?
 ? which open source installer for win to use?
 ? what to do about psyconf.. include perl or re-implement psyconf for win?
+
+TWITTER
++ resolve redirect-urls before forwarding to subscriptions, that means,
+  calling http/fetch on http://tr.im/whatever urls until it no longer
+  returns a 30x redirection code. [improves privacy btw, since all those
+  redirect services log your access for the one who installs them]
 ________________________________________________________________________
 == OTHER MAJOR TODOS ===================================================
 ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
diff --git a/world/net/place/archetype.gen b/world/net/place/archetype.gen
index d2be82b..6f00948 100644
--- a/world/net/place/archetype.gen
+++ b/world/net/place/archetype.gen
@@ -1312,7 +1312,7 @@ msg(source, mc, data, mapping vars) {
 		if (isValidRelay(source)
 		    || isValidRelay(vars["_source_relay"])
 		    || isValidRelay(vars["_context"])) {
-			P1(("yes. cast & out.\n"))
+			P1(("yes. cast & out: %O in %O\n", source, ME))
 			return castPresence(source, mc, data, vars,
 			    // don't broadcast the user's presence
 			    !neu || v("_filter_presence"));
diff --git a/world/net/usercmd.i b/world/net/usercmd.i
index 5511631..c90d962 100644
--- a/world/net/usercmd.i
+++ b/world/net/usercmd.i
@@ -1895,6 +1895,7 @@ motto(t) {
 }
 
 private talk(to, handleAliases) {
+	// check if we are already in a query with this person.. here?
 	if (to) {
 		string tn;
 		// looking for a bug.. intermediate hack here..
@@ -3426,6 +3427,7 @@ teleport(where, mcv, quiet, stay, morevars) {
 	}
 	unless(mcv) mcv = "";
 	if (place && member(places, place)) {
+#ifndef EXPERIMENTAL // ALTE_SCHULE
 		if (place == where) {
                         P3(("teleport: %O is already in %O\n", ME, place))
                         // why error.. this should be a _warning !!
@@ -3438,6 +3440,7 @@ teleport(where, mcv, quiet, stay, morevars) {
                         // here's a kludge to not return in that case:
 			unless (morevars) return;
 		}
+#endif
                 if (NICKPLACE) {
                     vSet("lastplace", NICKPLACE);
                     unless (stay) {
@@ -3463,8 +3466,10 @@ teleport(where, mcv, quiet, stay, morevars) {
 	if (places[where]) {
 		place = where;
                 vSet("place", objectp(where) ? where->qName() : where);
+#ifndef EXPERIMENTAL // ALTE_SCHULE
 		unless(quiet) showRoom();
 		return place;
+#endif
 	}
 	return placeRequest(where,
 #ifdef SPEC