[refactor] rename API add_msg to msg_add

To have consistency with all API calls related to messages and start all
of them with msg_*

3 files changed, 6 insertions, 6 deletions

diff --git a/src/leap/bitmask/cli/mail.py b/src/leap/bitmask/cli/mail.py
index 0e8b6584..bb880e7b 100644
--- a/src/leap/bitmask/cli/mail.py
+++ b/src/leap/bitmask/cli/mail.py
@@ -35,7 +35,7 @@ SUBCOMMANDS:
    disable              Stop service
    status               Display status about service
    get_token            Returns token for the mail service
-   add_msg              Add a msg file to a mailbox
+   msg_add              Add a msg file to a mailbox
 
 '''.format(name=command.appname)
 
@@ -75,7 +75,7 @@ SUBCOMMANDS:
 
         return self._send(command.default_printer)
 
-    def add_msg(self, raw_args):
+    def msg_add(self, raw_args):
         parser = argparse.ArgumentParser(
             description='Bitmask email status',
             prog='%s %s %s' % tuple(sys.argv[:3]))
@@ -99,7 +99,7 @@ SUBCOMMANDS:
         with open(subargs.file[0], 'r') as msgfile:
             rawmsg = msgfile.read()
 
-        self.data += ['add_msg', userid, mailbox, rawmsg]
+        self.data += ['msg_add', userid, mailbox, rawmsg]
 
         return self._send(command.default_printer)
 
diff --git a/src/leap/bitmask/core/dispatcher.py b/src/leap/bitmask/core/dispatcher.py
index f2b3e8ca..e97e6c0b 100644
--- a/src/leap/bitmask/core/dispatcher.py
+++ b/src/leap/bitmask/core/dispatcher.py
@@ -297,7 +297,7 @@ class MailCmd(SubCommand):
         return d
 
     @register_method('dict')
-    def do_ADD_MSG(self, mail, *parts, **kw):
+    def do_MSG_ADD(self, mail, *parts, **kw):
         try:
             userid = parts[2]
             mailbox = parts[3]
@@ -305,7 +305,7 @@ class MailCmd(SubCommand):
         except IndexError:
             raise DispatchError(
                 'wrong number of arguments: expected 3, got none')
-        d = mail.do_add_msg(userid, msg, mailbox)
+        d = mail.do_msg_add(userid, msg, mailbox)
         return d
 
 
diff --git a/src/leap/bitmask/core/mail_services.py b/src/leap/bitmask/core/mail_services.py
index 23105c7a..ac5000fa 100644
--- a/src/leap/bitmask/core/mail_services.py
+++ b/src/leap/bitmask/core/mail_services.py
@@ -625,7 +625,7 @@ class StandardMailService(service.MultiService, HookableService):
         token = self._service_tokens.get(userid)
         return {'user': userid, 'token': token}
 
-    def do_add_msg(self, userid, raw_msg, mailbox=None):
+    def do_msg_add(self, userid, raw_msg, mailbox=None):
         if not mailbox:
             mailbox = INBOX_NAME