From a760b4d04ffed35ec812e557875282e64993b912 Mon Sep 17 00:00:00 2001
From: Jeff Quast <contact@jeffquast.com>
Date: Wed, 17 Jun 2020 07:41:16 -0400
Subject: [PATCH] fix "irc" module and dependencies for "irc" module

---
 setup.py            |  7 +++++--
 x84/default/main.py | 31 ++++---------------------------
 2 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/setup.py b/setup.py
index 27d17e90..6d2daa33 100755
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@
 
 
 setup(name='x84',
-      version='2.0.16',
+      version='2.0.17',
       description=("Framework for Telnet and SSH BBS or MUD server "
                    "development with example default bbs board"),
       long_description=open(os.path.join(HERE, README)).read(),
@@ -43,7 +43,10 @@
           'blessed>=1.17.8,<2',
           'feedparser>=5.2.1,<6',
           'html2text==2019.8.11',
-          'irc>=16.4,<17',
+          'irc>=11.0.1,<12',
+          'hgtools==8.1.1',
+          'more-itertools>=5,<6',
+          'jaraco.functools==1.20',
           'requests>=2.23.0,<3',
           'sauce>=1.2,<2',
           'six>=1.15.0,<2',
diff --git a/x84/default/main.py b/x84/default/main.py
index e562287d..f86b2e38 100644
--- a/x84/default/main.py
+++ b/x84/default/main.py
@@ -102,7 +102,10 @@ def get_menu_items(session):
     """ Returns list of MenuItem entries. """
     #: A declaration of menu items and their acting gosub script
     menu_items = [
-        # most 'expressive' scripts,
+        # hi :-)
+        #
+        # put your own fun scripts here
+        #
         MenuItem(inp_key=u'irc',
                  text=u'irc chat',
                  script='ircchat',
@@ -111,10 +114,6 @@ def get_menu_items(session):
                  text=u"who's online",
                  script='online',
                  args=(), kwargs={}),
-#        MenuItem(inp_key=u'fb',
-#                 text=u'file browser',
-#                 script='fbrowse',
-#                 args=(), kwargs={}),
         MenuItem(inp_key=u'pe',
                  text=u'profile editor',
                  script='profile',
@@ -136,18 +135,10 @@ def get_menu_items(session):
                  text=u'one-liners',
                  script='ol',
                  args=(), kwargs={}),
-        MenuItem(inp_key=u'tetris',
-                 text=u'tetris game',
-                 script='tetris',
-                 args=(), kwargs={}),
         MenuItem(inp_key=u'vote',
                  text=u'voting booth',
                  script='vote',
                  args=(), kwargs={}),
-        MenuItem(inp_key=u'lc',
-                 text=u'last callers',
-                 script='lc',
-                 args=(), kwargs={}),
         MenuItem(inp_key=u'user',
                  text=u'user list',
                  script='userlist',
@@ -160,20 +151,6 @@ def get_menu_items(session):
                  text=u'system info',
                  script='si',
                  args=(), kwargs={}),
-        MenuItem(inp_key=u'key',
-                 text=u'keyboard test',
-                 script='test_keyboard_keys',
-                 args=(), kwargs={}),
-        MenuItem(inp_key=u'ac',
-                 text=u'adjust charset',
-                 script='charset',
-                 args=(), kwargs={}),
-
-        MenuItem(inp_key=u'msg',
-                 text=u'message area',
-                 script='msgarea',
-                 args=(), kwargs={}),
-
         MenuItem(inp_key=u'g',
                  text=u'logoff system',
                  script='logoff',