From 66626510e8115b632fbe5f3a7b09a9836f2aa39a Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Fri, 30 Jan 2015 17:46:41 +0100
Subject: [PATCH] onions and opportunistic ircs

---
 world/default/de/html.textdb  |  2 +-
 world/default/en/html.textdb  |  2 +-
 world/default/it/html.textdb  |  2 +-
 world/net/person.c            | 11 ++++++++++-
 world/net/place/archetype.gen | 11 ++++++++++-
 5 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/world/default/de/html.textdb b/world/default/de/html.textdb
index 4af5112..432a5b2 100644
--- a/world/default/de/html.textdb
+++ b/world/default/de/html.textdb
@@ -440,7 +440,7 @@ _PAGES_help_access
 |Wie sich der <b>psyced</b> als IRC-Server verhält wird in der
 |<a href="http://www.psyced.org/psyc-irc.de.html">Hilfestellung zum
 |IRC-Zugang</a> genauer beschrieben.
-|Eventuell funktioniert dieser <a href="irc://{_VAR_server}">Link</a>.
+|Eventuell funktioniert dieser <a href="ircs://{_VAR_server}">Link</a>.
 |
 |</dd><dt><P><a name="telnet"><B> Telnet </B></a></p></dt><dd>
 |Rudimentär aber immernoch ausreichend: Mit einem telnet-Programm wie
diff --git a/world/default/en/html.textdb b/world/default/en/html.textdb
index 76d0e7a..15519f1 100644
--- a/world/default/en/html.textdb
+++ b/world/default/en/html.textdb
@@ -493,7 +493,7 @@ _PAGES_help_access
 |This server accepts
 |<a target=_top class=top href="http://internet.relay.pages.de/">IRC</a> client
 |protocol on the IRC port 6667.
-|Try this <a href="irc://{_VAR_server}">link</a>.
+|Try this <a href="ircs://{_VAR_server}">link</a>.
 |You shall find <a href="http://www.psyced.org/psyc-irc.en.html"
 |>Getting started using IRC with psyced</a> helpful to understand
 |how different PSYC is from IRC.
diff --git a/world/default/it/html.textdb b/world/default/it/html.textdb
index b711d0b..2e7ddcc 100644
--- a/world/default/it/html.textdb
+++ b/world/default/it/html.textdb
@@ -369,7 +369,7 @@ _PAGES_help_access
 |Wie sich der <b>psyced</b> als IRC-Server verhält wird in der
 |<a href="http://www.psyced.org/psyc-irc.de.html">Hilfestellung zum
 |IRC-Zugang</a> genauer beschrieben.
-|Eventuell funktioniert dieser <a href="irc://{_VAR_server}">Link</a>.
+|Eventuell funktioniert dieser <a href="ircs://{_VAR_server}">Link</a>.
 |
 |</dd><dt><P><a name="telnet"><B> Telnet </B></a></p></dt><dd>
 |Rudimentär aber immernoch ausreichend: Mit einem telnet-Programm wie
diff --git a/world/net/person.c b/world/net/person.c
index 33b0f8c..4154df1 100644
--- a/world/net/person.c
+++ b/world/net/person.c
@@ -299,7 +299,16 @@ qDescription(source, vars, profile, itsme) {
 		     "xmpp:"+ MYLOWERNICK +"@"+ SERVER_HOST +" "+
 #  endif
 # endif
-		     "irc://"+ SERVER_HOST +"/~"+ MYNICK,
+# ifdef ONION_HOST
+		     "irc://"+ ONION_HOST +"/~"+ MYNICK,
+# else
+#  ifdef __TLS__
+		     "ircs://"
+#  else
+		     "irc://"
+#  endif
+		     + SERVER_HOST +"/~"+ MYNICK,
+# endif
 #endif
 #ifdef JABBER_PATH
 		"_identification_scheme_XMPP":
diff --git a/world/net/place/archetype.gen b/world/net/place/archetype.gen
index 825f60a..5daa290 100644
--- a/world/net/place/archetype.gen
+++ b/world/net/place/archetype.gen
@@ -2056,6 +2056,10 @@ showStatus(verbosity, al, person, mc, data, vars) {
 		    	([ "_identification": identification,
 #ifdef IRC_PATH
 			   "_identification_alias":
+# ifdef ONION_HOST
+			     "http://"+ ONION_HOST +"/"+ pathName() +" "+
+			     "irc://"+ ONION_HOST +"/"+ MYNICK +" "+
+# endif
 # if HAS_PORT(HTTP_PORT, HTTP_PATH) || HAS_PORT(HTTPS_PORT, HTTP_PATH)
 #  ifdef PRO_PATH
 			       ((tls_available() && HTTPS_URL) || HTTP_URL)
@@ -2075,7 +2079,12 @@ showStatus(verbosity, al, person, mc, data, vars) {
 			     "xmpp:*"+ MYLOWERNICK +"@"+ SERVER_HOST +" "+
 #  endif
 # endif
-			     "irc://"+ SERVER_HOST +"/"+ MYNICK,
+# ifdef __TLS__
+			     "ircs://"
+# else
+			     "irc://"
+# endif
+				+ SERVER_HOST +"/"+ MYNICK,
 #endif
 #ifdef JABBER_PATH
 			   "_identification_scheme_XMPP":