allow processing of multiple ids/tokens

manage_list.py

@@ -42,47 +42,45 @@ def held_list(args):
 
 def held_approve(args):
     client, ml = get_ml(args)
-    held_msg = ml.get_held_message(args.id)
-    held_msg.accept()
+    results = []
+    for id in args.ids:
+        held_msg = ml.get_held_message(id)
+        results.append(held_msg.accept())
+    print json.dumps(results, indent=2)
 
 
 def held_reject(args):
     client, ml = get_ml(args)
-    held_msg = ml.get_held_message(args.id)
-    held_msg.reject()
+    results = []
+    for id in args.ids:
+        held_msg = ml.get_held_message(id)
+        results.append(held_msg.reject())
+    print json.dumps(results, indent=2)
 
 
 def requests_list(args):
     client, ml = get_ml(args)
     requests_data = {}
     for request in ml.requests:
-        requests_data[request['email']] = request
+        requests_data[request['token']] = request
     print json.dumps(requests_data, indent=2)
 
 
 def requests_approve(args):
     client, ml = get_ml(args)
     requests = ml.requests
-    req = None
     for request in requests:
-        if request['token'] == args.token:
-            req = request
-            break
-    if req:
-        response = ml.moderate_request(req['token'], 'accept')
+        if request['token'] in args.tokens:
+            response = ml.moderate_request(request['token'], 'accept')
     print json.dumps(response, indent=2)
 
 
 def requests_reject(args):
     client, ml = get_ml(args)
     requests = ml.requests
-    req = None
     for request in requests:
         if request['token'] == args.token:
-            req = request
-            break
-    if req:
-        response = ml.moderate_request(req['token'], 'reject')
+            response = ml.moderate_request(request['token'], 'reject')
     print json.dumps(response, indent=2)
 
 
@@ -137,10 +135,10 @@ if __name__ == '__main__':
 
     held_approve_parser = held_subparsers.add_parser('approve')
     held_approve_parser.set_defaults(func=held_approve)
-    held_approve_parser.add_argument('--id')
+    held_approve_parser.add_argument('--id', dest='ids', action='append')
     held_reject_parser = held_subparsers.add_parser('reject')
     held_reject_parser.set_defaults(func=held_reject)
-    held_reject_parser.add_argument('--id')
+    held_reject_parser.add_argument('--id', dest='ids', action='append')
 
     requests_parser = subparsers.add_parser('requests')
     requests_subparsers = requests_parser.add_subparsers()
@@ -149,10 +147,10 @@ if __name__ == '__main__':
 
     requests_approve_parser = requests_subparsers.add_parser('approve')
     requests_approve_parser.set_defaults(func=requests_approve)
-    requests_approve_parser.add_argument('--token')
+    requests_approve_parser.add_argument('--token', dest='tokens', action='append')
     requests_reject_parser = requests_subparsers.add_parser('reject')
     requests_reject_parser.set_defaults(func=requests_reject)
-    requests_reject_parser.add_argument('--token')
+    requests_reject_parser.add_argument('--token', dest='tokens', action='append')
 
     args = parser.parse_args()
     args.func(args)