From 51aff4fe961b05cdcbaaf8c5afe542fcf52a5d2f Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Sun, 26 Jul 2020 02:10:08 +0000
Subject: add imap_url support

public-inbox.org added an IMAP server with AUTH=ANONYMOUS
support, so maybe there'll be more public IMAP deployments
down the line.
---
 .olddoc.yml                | 15 ++++++++++++---
 Documentation/olddoc.5.pod |  2 +-
 lib/olddoc/man2html.rb     |  2 +-
 lib/oldweb/_tail.rhtml     |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.olddoc.yml b/.olddoc.yml
index de9e42a..5ebd09a 100644
--- a/.olddoc.yml
+++ b/.olddoc.yml
@@ -1,9 +1,18 @@
 ---
-cgit_url: https://80x24.org/olddoc.git
+cgit_url:
+- https://80x24.org/olddoc.git
+- https://ou63pmih66umazou.onion/olddoc.git
 git_url: https://80x24.org/olddoc.git
 rdoc_url: https://80x24.org/olddoc/
-ml_url: https://80x24.org/olddoc-public/
-nntp_url: nntp://news.public-inbox.org/inbox.comp.lang.ruby.olddoc
+ml_url:
+- https://80x24.org/olddoc-public/
+- http://ou63pmih66umazou.onion/olddoc-public/
+nntp_url:
+- nntps://news.public-inbox.org/inbox.comp.lang.ruby.olddoc
+- nntp://ou63pmih66umazou.onion/inbox.comp.lang.ruby.olddoc
+imap_url:
+- imaps://news.public-inbox.org/inbox.comp.lang.ruby.olddoc.0
+- imap://ou63pmih66umazou.onion/inbox.comp.lang.ruby.olddoc.0
 merge_html:
   olddoc_1: Documentation/olddoc.1.html
   olddoc_5: Documentation/olddoc.5.html
diff --git a/Documentation/olddoc.5.pod b/Documentation/olddoc.5.pod
index 6e03e3a..994a867 100644
--- a/Documentation/olddoc.5.pod
+++ b/Documentation/olddoc.5.pod
@@ -13,7 +13,7 @@ configuration to deal with.
 
 =head1 KEYS
 
-`rdoc_url`, `cgit_url`, and `nntp_url` should be obvious
+`rdoc_url`, `cgit_url`, `imap_url`, and `nntp_url` should be obvious
 
 `merge_html` is a key-value mapping of (empty) RDoc source files to an
 HTML file that will be merged into RDoc after-the-fact.  It is useful
diff --git a/lib/olddoc/man2html.rb b/lib/olddoc/man2html.rb
index 82254d2..6a5ffab 100644
--- a/lib/olddoc/man2html.rb
+++ b/lib/olddoc/man2html.rb
@@ -9,7 +9,7 @@ require 'optparse'
 
 class Olddoc::Man2HTML # :nodoc:
   SALT = rand
-  LINK_RE = %r{([\('!])?\b((?:ftps?|https?|nntps?|gopher)://
+  LINK_RE = %r{([\('!])?\b((?:ftps?|https?|nntps?|gopher|imaps?)://
      [\@:\w\.-]+(?:/
      (?:[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%]*)
      (?:\?[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%]+)?
diff --git a/lib/oldweb/_tail.rhtml b/lib/oldweb/_tail.rhtml
index e3fada5..7fb4839 100644
--- a/lib/oldweb/_tail.rhtml
+++ b/lib/oldweb/_tail.rhtml
@@ -2,7 +2,7 @@
 public_email = @old_cfg['public_email']
 private_email = @old_cfg['private_email']
 source_code = Array(@old_cfg['source_code']).dup
-archive_urls = Array(@old_cfg['ml_url']) + Array(@old_cfg['nntp_url'])
+archive_urls = Array(@old_cfg.values_at(*%W(ml_url nntp_url imap_url))).flatten
 if url = archive_urls.shift %><hr /><pre>
 mail archives: <a
 href="<%= url %>"><%= url %></a><%
-- 
cgit v1.2.3-24-ge0c7