fixes and remove sendypy

Author: slaporte

weeklypedia/bake.py

@@ -10,7 +10,7 @@
 from dateutil.parser import parse as parse_date
 from ashes import TemplateNotFound
 
-from mail import Mailinglist, KEY
+from mail import Mailinglist, sendy_send_campaign, KEY
 from fetch import get_latest_data_path
 
 from common import (DATA_BASE_PATH,
@@ -80,9 +80,8 @@ def send(self, list_id, send_key):
         mailinglist.send_next_campaign()
         return 'Success: sent issue %s' % self.lang
 
-    def sendy_send(self, list_id, send_key):
-        sendy = SendyMailinglist()
-        sendy.create_and_send(self.subject, self.read_html(), self_read_text(), list_id)
+    def sendy_send(self, list_id):
+        sendy_send_campaign(self.subject, self.read_text(), self.read_html(), list_id)
         return 'Success: sent issue %s via sendy' % self.lang
 
 

weeklypedia/common.py

@@ -15,29 +15,30 @@
 _CUR_PATH = dirname(os.path.abspath(__file__))
 
 LANG_MAP = json.load(open(pjoin(_CUR_PATH, 'language_codes.json')))
-LOCAL_LANG_MAP = {'en': u'English',
-                  'de': u'Deutsch',
-                  'fr': u'Français',
-                  'ko': u'한국어',
-                  'et': u'Eesti',
-                  'sv': u'Svenska',
-                  'da': u'Dansk',
-                  'it': u'Italiano',
-                  'ca': u'Català',
-                  'es': u'Español',
-                  'fa': u'فارسی',
-                  'ur': u'اردو',
-                  'zh': u'中文',
-                  'kn': u'ಕನ್ನಡ',
-                  'lv': u'Latvian',
-                  'el': u'ελληνική',
-                  'te': u'తెలుగు',
-                  'oc': 'Occitan',
-                  'ru': 'Russian',
-                  'uk': 'Ukrainian'}
+LOCAL_LANG_MAP = {'en': u'English'}
+                  # 'de': u'Deutsch',
+                  # 'fr': u'Français',
+                  # 'ko': u'한국어',
+                  # 'et': u'Eesti',
+                  # 'sv': u'Svenska',
+                  # 'da': u'Dansk',
+                  # 'it': u'Italiano',
+                  # 'ca': u'Català',
+                  # 'es': u'Español',
+                  # 'fa': u'فارسی',
+                  # 'ur': u'اردو',
+                  # 'zh': u'中文',
+                  # 'kn': u'ಕನ್ನಡ',
+                  # 'lv': u'Latvian',
+                  # 'el': u'ελληνική',
+                  # 'te': u'తెలుగు',
+                  # 'oc': 'Occitan',
+                  # 'ru': 'Russian',
+                  # 'uk': 'Ukrainian'}
 SENDKEY = json.load(open(os.path.join(_CUR_PATH, 'secrets.json'))).get('key')
-SUPPORTED_LANGS = ['en', 'de', 'fr', 'ko', 'et', 'sv', 'da', 'it', 'ca', 'es',
-                   'fa', 'zh', 'ur', 'kn', 'lv', 'el', 'te', 'oc', 'ru', 'uk']
+SUPPORTED_LANGS = ['en']
+# 'de', 'fr', 'ko', 'et', 'sv', 'da', 'it', 'ca', 'es',
+#                  'fa', 'zh', 'ur', 'kn', 'lv', 'el', 'te', 'oc', 'ru', 'uk']
 API_BASE_URL = 'http://weeklypedia.toolforge.org/fetch/'
 
 ARCHIVE_BASE_PATH = pjoin(dirname(_CUR_PATH), 'static', 'archive')

weeklypedia/mail.py

@@ -3,6 +3,8 @@
 import os
 import json
 
+import requests
+
 import mailchimp
 
 _CUR_PATH = os.path.dirname(os.path.abspath(__file__))
@@ -12,13 +14,29 @@
     KEY = secrets.get('mc')
     SENDY_KEY = secrets.get('sendy_key')
 
-SENDY_URL 'https://mailer.hatnote.com/sendy'
+SENDY_URL = 'http://mailer.hatnote.com/s/'
 TEST_LIST_ID = "a5ecbc7404"
 DEFAULT_LIST = TEST_LIST_ID
 
 #              'f811608f69'
 
 
+def sendy_send_campaign(subject, text_content, html_content, list_id):
+    url = SENDY_URL + 'api/campaigns/create.php'
+    data = {'from_name': 'Weeklypedia Digest',
+            'from_email': 'weeklypedia@hatnote.com',
+            'reply_to': 'weeklypedia@hatnote.com',
+            'title': subject,
+            'subject': subject,
+            'plain_text': text_content,
+            'html_text': html_content,
+            'list_ids': list_id,
+            'send_campaign': 1,
+            'api_key': SENDY_KEY}
+    resp = requests.post(url, data=data)
+    return resp
+
+
 class Mailinglist(object):
     def __init__(self, key):
         self.client = mailchimp.Mailchimp(key)
@@ -56,30 +74,6 @@ def get_next_campaign(self):
         return campaigns['data'][0]['id']
 
 
-class SendyMailinglist(object):
-    def __init__(self):
-        self.key = key
-        self.client = SendyAPI(host=SENDY_URL,
-                               api_key=SENDY_KEY)
-
-    def create_and_send(self,
-                        subject,
-                        html_content,
-                        text_content,
-                        list_id):
-        resp = client.create_campaign(
-            from_name='Weeklypedia Digest',
-            from_email='weeklypedia@hatnote.com',
-            reply_to='weeklypedia@hatnote.com',
-            title=subject,
-            subject=subject,
-            plain_text=text_content,
-            html_text=html_content,
-            list_ids=list_id,
-            send_campaign=1, # if 0, then it will be saved as a draft. How do you send a draft campaign?
-        )
-        print resp
-
 if __name__ == '__main__':
     mc = Mailinglist(KEY)
     import pdb; pdb.set_trace()

weeklypedia/publish.py

@@ -39,11 +39,6 @@ def send_issue(lang, mailer, is_dev=False):
     return result
 
 
-def send_send_issue(lang, is_dev=False):
-    list_id = SENDY_LIST_ID_MAP[lang]
-    cur_issue = 
-
-
 def get_argparser():
     desc = 'Bake and send Weeklypedia issues. (Please fetch first)'
     prs = ArgumentParser(description=desc)