document Owen's nsfw:// handler for firefox

[irc.git] / servus.html

diff --git a/servus.html b/servus.html
index 61fae3a508f2ed93a84cb48814d9498ac26ab27f..5088b2c2a2a5180bb8dccc157aabe90ab7d111a5 100644 (file)
--- a/servus.html
+++ b/servus.html
@@ -25,7 +25,7 @@ span.code {font-family: courier, monospace}
 class="code">#chiark</span>. This page documents the available
 commands. You can get a copy of the source code by running <span
 class="code">git-clone <a
 class="code">#chiark</span>. This page documents the available
 commands. You can get a copy of the source code by running <span
 class="code">git-clone <a

-href="http://www.pick.ucam.org/~matthew/irc/.git">http://www.pick.ucam.org/~matthew/irc/.git</a></span></p>
+href="http://www.chiark.greenend.org.uk/~matthewv/irc/.git">http://www.chiark.greenend.org.uk/~matthewv/irc/.git</a></span></p>

 
 <h2>Invocation</h2>
 <p>Servus may be invoked in-channel using either <span
 
 <h2>Invocation</h2>
 <p>Servus may be invoked in-channel using either <span


@@ -56,6 +56,7 @@ class="code">~command</span>. Alternatively, you may pass commands by
 <li><a href="#say">say</a></li>
 <li><a href="#slash">slash</a></li>
 <li><a href="#trout">trout</a></li>
 <li><a href="#say">say</a></li>
 <li><a href="#slash">slash</a></li>
 <li><a href="#trout">trout</a></li>

+<li><a href="#twit">twit</a></li>

 <li><a href="#units">units</a></li>
 <li><a href="#url">url</a></li>
 </ul>
 <li><a href="#units">units</a></li>
 <li><a href="#url">url</a></li>
 </ul>


@@ -99,7 +100,7 @@ of Servus stating who invoked it by adding "(but nick is their secret
 admirer)" to the end of the flirt. Further suggestions for flirts
 should be submitted by email; a list of current flirts may be found
 online at <a
 admirer)" to the end of the flirt. Further suggestions for flirts
 should be submitted by email; a list of current flirts may be found
 online at <a

-href="flirts">http://www.pick.ucam.org/~matthew/irc/flirts</a>.</p>
+href="flirts">http://www.chiark.greenend.org.uk/~matthewv/irc/flirts</a>.</p>

 
 <h3><a name="google">google</a></h3>
 <p>This command returns (either on-channel or by <span
 
 <h3><a name="google">google</a></h3>
 <p>This command returns (either on-channel or by <span


@@ -180,13 +181,13 @@ in output to the channel of the form:<br />
 class="code">slash target1 / target2 </span><br /> Servus picks a slash at random
 from the slashes list (<span
 class="code">/home/matthew/programming/irc/bot/slashes</span> on rapun),
 class="code">slash target1 / target2 </span><br /> Servus picks a slash at random
 from the slashes list (<span
 class="code">/home/matthew/programming/irc/bot/slashes</span> on rapun),

-and substitutes "target1" for the first "%s" and "target2 for the
+and substitutes "target1" for the first "%s" and "target2" for the

 second "%s" in the slash line. If this command
 is invoked by <span class="code">/msg</span>, there is a 10% chance
 of Servus stating who invoked it by adding "(while nick watches)" to
 the end of the slash. Further suggestions for slashes should be
 submitted by email; a list of current slashes may be found online at <a
 second "%s" in the slash line. If this command
 is invoked by <span class="code">/msg</span>, there is a 10% chance
 of Servus stating who invoked it by adding "(while nick watches)" to
 the end of the slash. Further suggestions for slashes should be
 submitted by email; a list of current slashes may be found online at <a

-href="slashes">http://www.pick.ucam.org/~matthew/irc/slashes</a>.</p>
+href="slashes">http://www.chiark.greenend.org.uk/~matthewv/irc/slashes</a>.</p>

 
 <h3><a name="trout">trout</a></h3>
 <p>The syntax is:<br /> <span
 
 <h3><a name="trout">trout</a></h3>
 <p>The syntax is:<br /> <span


@@ -198,7 +199,13 @@ is invoked by <span class="code">/msg</span>, there is a 10% chance
 of Servus stating who invoked it by adding "(at the instigation of
 nick)" to the end of the trout. Further suggestions for trouts should
 be submitted by email; a list of current trouts may be found online at
 of Servus stating who invoked it by adding "(at the instigation of
 nick)" to the end of the trout. Further suggestions for trouts should
 be submitted by email; a list of current trouts may be found online at

-<a href="trouts">http://www.pick.ucam.org/~matthew/irc/trouts</a>.</p>
+<a href="trouts">http://www.chiark.greenend.org.uk/~matthewv/irc/trouts</a>.</p>
+
+<h3><a name="twit">twit</a></h3>
+<p>The syntax is:<br /><span
+class="code">twit twitter-url</span><br /> Servus returns (either on-channel or by <span
+class="code">/msg</span>) the content
+of the tweet and the twitter user who posted it.</p>

 
 <h3><a name="units">units</a></h3>
 <p>The syntax is:<br /> <span
 
 <h3><a name="units">units</a></h3>
 <p>The syntax is:<br /> <span


@@ -220,12 +227,19 @@ your behalf). The syntax is:<br />
 Servus will either paste the URL into channel, or <span
 class="code">/msg</span> you to tell you it was a duplicate. Although
 you can use this command in-channel (and get a response by <span
 Servus will either paste the URL into channel, or <span
 class="code">/msg</span> you to tell you it was a duplicate. Although
 you can use this command in-channel (and get a response by <span

-class="code">/msg </span>), this is discouraged.</p>
+class="code">/msg </span>), this is discouraged. Servus also
+understands <span class="code">nsfw://</span>
+and <span class="code">nsfws://</span> URLs, and knows they are an
+obfuscation of the relevant <span class="code">http://</span>
+or <span class="code">https://</span> URL for URLs that are not
+work-safe. You can make your firefox understand <span
+class="code">nsfw://</span> URLS by visiting <a
+href="http://www.chiark.greenend.org.uk/~owend/nsfw.html">http://www.chiark.greenend.org.uk/~owend/nsfw.html</a>.</p>

 
 <hr />
 <address>
 
 <hr />
 <address>

-  <a href="mailto:matthew@sel.cam.ac.uk">Matthew Vernon</a><br />
-  Cambridge, England
+  <a href="mailto:matthewv@chiark.greenend.org.uk">Matthew Vernon</a><br />
+  Coventry, England

 </address>
  <p>
 <a href="http://validator.w3.org/check/referer"><img
 </address>
  <p>
 <a href="http://validator.w3.org/check/referer"><img