From 293b36e3ade5edfab5afe99ba1d6ed843074d7e8 Mon Sep 17 00:00:00 2001
From: Kevin Froman <beardog@firemail.cc>
Date: Sun, 4 Nov 2018 10:06:24 -0600
Subject: [PATCH] mail plugin usable now

---
 onionr/api.py                                 |  2 +-
 onionr/onionrcrypto.py                        |  2 +-
 onionr/onionri2p.py                           | 19 -------------------
 onionr/onionrproofs.py                        |  2 +-
 .../static-data/default-plugins/pms/main.py   |  9 +++------
 5 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 onionr/onionri2p.py

diff --git a/onionr/api.py b/onionr/api.py
index 94c7eeaa..a8a3b29e 100755
--- a/onionr/api.py
+++ b/onionr/api.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Microblogging Platform & Social network
+    Onionr - P2P Anonymous Storage Network
 
     This file handles all incoming http requests to the client, using Flask
 '''
diff --git a/onionr/onionrcrypto.py b/onionr/onionrcrypto.py
index 045bf053..fe13ae01 100644
--- a/onionr/onionrcrypto.py
+++ b/onionr/onionrcrypto.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Microblogging Platform & Social network
+    Onionr - P2P Anonymous Storage Network
 
     This file handles Onionr's cryptography.
 '''
diff --git a/onionr/onionri2p.py b/onionr/onionri2p.py
deleted file mode 100644
index baeb2977..00000000
--- a/onionr/onionri2p.py
+++ /dev/null
@@ -1,19 +0,0 @@
-'''
-    Onionr - P2P Microblogging Platform & Social network
-
-    Funcitons for talking to I2P
-'''
-'''
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-'''
diff --git a/onionr/onionrproofs.py b/onionr/onionrproofs.py
index 9085943f..30ca4b6c 100644
--- a/onionr/onionrproofs.py
+++ b/onionr/onionrproofs.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Microblogging Platform & Social network
+    Onionr - P2P Anonymous Storage Network
 
     Proof of work module
 '''
diff --git a/onionr/static-data/default-plugins/pms/main.py b/onionr/static-data/default-plugins/pms/main.py
index ea2ff988..981979ee 100644
--- a/onionr/static-data/default-plugins/pms/main.py
+++ b/onionr/static-data/default-plugins/pms/main.py
@@ -1,5 +1,5 @@
 '''
-    Onionr - P2P Microblogging Platform & Social network
+    Onionr - P2P Anonymous Storage Network
 
     This default plugin handles private messages in an email like fashion
 '''
@@ -48,15 +48,14 @@ class MailStrings:
         self.mailInstance = mailInstance
 
         self.programTag = 'OnionrMail v%s' % (PLUGIN_VERSION)
-        choices = ['view inbox', 'view sentbox', 'send message', 'help', 'quit']
+        choices = ['view inbox', 'view sentbox', 'send message', 'quit']
         self.mainMenuChoices = choices
         self.mainMenu = '''\n
 -----------------
 1. %s
 2. %s
 3. %s
-4. %s
-5. %s''' % (choices[0], choices[1], choices[2], choices[3], choices[4])
+4. %s''' % (choices[0], choices[1], choices[2], choices[3])
 
 class OnionrMail:
     def __init__(self, pluginapi):
@@ -232,8 +231,6 @@ class OnionrMail:
             elif choice in (self.strings.mainMenuChoices[2], '3'):
                 self.draftMessage()
             elif choice in (self.strings.mainMenuChoices[3], '4'):
-                logger.warn('not implemented yet')
-            elif choice in (self.strings.mainMenuChoices[4], '5'):
                 logger.info('Goodbye.')
                 break
             elif choice == '':