better gmail labels

Author: kmahar

engine/main.py

@@ -1562,6 +1562,18 @@ def update_post_status(user, group_name, post_id, new_status, explanation=None,
 
                 elif new_status == 'R':
                     reason = 'moderator rejected'
+                    try:
+                        mail_service = build_services(admin)['mail']
+                        updated_count = untrash_message(mail_service, p.poster_email, p.subject, rejected=True, tags=tags.split(',') + ['rejected'])
+                        if updated_count > 0:
+                            logging.error("untrashed count: %s" % updated_count)
+                            logging.debug(res)
+                            return res 
+                    except Exception, e:
+                        logging.error(e)
+                        pass
+
+
 
                 tags = [t.tag.name for t in TagThread.objects.filter(thread = p.thread)]
 

gmail_setup/api.py

@@ -5,27 +5,45 @@
 from http_handler.settings import BASE_URL
 from schema.models import CredentialsModel
 
-def untrash_message(service_mail, sender_addr, subject):
+def untrash_message(service_mail, sender_addr, subject, rejected=False, tags=[]):
 
     messages = service_mail.users().messages()
 
-    query = 'subject:%s from:%s in:trash' % (subject.split(' ')[0], sender_addr)
+    query = 'subject:%s from:%s in:trash' % (subject, sender_addr)
     logging.debug("QUERY:", query)
     res1 = messages.list(userId='me', q=query).execute()
     logging.debug("res1:", res1)
     if res1['resultSizeEstimate'] == 0:
         logging.debug("no results")
         return 0
 
+
+    labelsToAdd = []
+    labelService = service_mail.users().labels()
+    userLabels = labelService.list(userId='me').execute()
+    allLabels = list(userLabels['labels'])
+
+    for tag in tags:
+        match = list(filter(lambda label: label["name"].lower() == tag.lower(), allLabels))
+        if len(match) == 0:
+            label = {'name': tag}
+            response = labelService.create(userId='me', body=label).execute()
+            labelsToAdd.append(response['id'])
+        else:
+            labelsToAdd.append(match[0]['id'])
+
     updated_count = 0
     for m in res1['messages']:
         gmail_msg_id = m['id']
         # res2 = messages.untrash(userId='me', id=gmail_msg_id).execute()
         # updated_count += 1
         # logging.debug("res2:", res2)
+        if 'SPAM' not in labelsToAdd and not rejected:
+            labelsToAdd.append('INBOX')
+
         new_labels = {
             'removeLabelIds' : ['TRASH'],
-            'addLabelIds' : ['INBOX']
+            'addLabelIds' : labelsToAdd
         }
         res3 = messages.modify(userId='me', id=gmail_msg_id, body=new_labels).execute()
         updated_count += 1

gmail_setup/views.py

@@ -86,12 +86,15 @@ def auth(request):
         d = json.load(json_data)
         print "DATA:", d
 
+    print "creating flow"
     FLOW = flow_from_clientsecrets(
         CLIENT_SECRETS,
         scope='https://www.googleapis.com/auth/contacts.readonly https://www.googleapis.com/auth/gmail.readonly https://www.googleapis.com/auth/gmail.settings.basic https://www.googleapis.com/auth/gmail.modify',
         redirect_uri=REDIRECT_URI
     )
 
+    print "got flow"
+
     FLOW.params['access_type'] = 'offline'
 
     user = request.user