From e05e33f14b00e868dc2dd67fefa4b09e8bb04426 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Mon, 24 Oct 2016 18:55:36 +0100
Subject: [PATCH 01/10] Swap indiwebcam.comp references for indieweb.org (#62)

---
 frontend/indieconfig.js                         | 2 +-
 setup.py                                        | 2 +-
 woodwind/static/indieconfig.js                  | 2 +-
 woodwind/templates/base.jinja2                  | 6 +++---
 woodwind/templates/settings.jinja2              | 4 ++--
 woodwind/templates/settings_indie_config.jinja2 | 2 +-
 woodwind/templates/settings_micropub.jinja2     | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/indieconfig.js b/frontend/indieconfig.js
index dedce86..ab6372c 100644
--- a/frontend/indieconfig.js
+++ b/frontend/indieconfig.js
@@ -5,7 +5,7 @@ window.loadIndieConfig = (function () {
   // Indie-Config Loading script
   // by Pelle Wessman, voxpelli.com
   // MIT-licensed
-  // http://indiewebcamp.com/indie-config
+  // https://indieweb.org/indie-config
 
   var config, configFrame, configTimeout,
     callbacks = [],
diff --git a/setup.py b/setup.py
index 11432e2..2c7ed2f 100644
--- a/setup.py
+++ b/setup.py
@@ -7,5 +7,5 @@ setup(name='Woodwind',
       description='Stream-style indieweb reader',
       author='Kyle Mahan',
       author_email='kyle@kylewm.com',
-      url='https://indiewebcamp.com/Woodwind',
+      url='https://indieweb.org/Woodwind',
       packages=['woodwind'])
diff --git a/woodwind/static/indieconfig.js b/woodwind/static/indieconfig.js
index dedce86..ab6372c 100644
--- a/woodwind/static/indieconfig.js
+++ b/woodwind/static/indieconfig.js
@@ -5,7 +5,7 @@ window.loadIndieConfig = (function () {
   // Indie-Config Loading script
   // by Pelle Wessman, voxpelli.com
   // MIT-licensed
-  // http://indiewebcamp.com/indie-config
+  // https://indieweb.org/indie-config
 
   var config, configFrame, configTimeout,
     callbacks = [],
diff --git a/woodwind/templates/base.jinja2 b/woodwind/templates/base.jinja2
index 1a14162..6ae6ec1 100644
--- a/woodwind/templates/base.jinja2
+++ b/woodwind/templates/base.jinja2
@@ -10,7 +10,7 @@
 
   <link rel="stylesheet" href="{{ url_for('static', filename='style.css', version='2016-03-08') }}"/>
   <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css"/>
-  
+
   <link rel="manifest" href="/manifest.json"/>
 
   <script src="/node_modules/jquery/dist/jquery.js"></script>
@@ -62,7 +62,7 @@
           <input type="hidden" name="next" placeholder="{{ request.path }}" />
           <button style="text-align: right;" type="submit">Login</button>
         </form>
-        Your Woodwind account is tied to your personal domain name. Check out IndieWebCamp's <a href="http://indiewebcamp.com/Getting_Started" target="_blank">Getting Started</a> page for details.
+        Your Woodwind account is tied to your personal domain name. Check out the IndieWeb's <a href="https://indieweb.org/Getting_Started" target="_blank">Getting Started</a> page for details.
       {% endif %}
 
     {% endblock login %}
@@ -77,7 +77,7 @@
   {% block foot %}{% endblock %}
 
   <div class="footer">
-    Woodwind is <a href="https://github.com/kylewm/woodwind">on GitHub</a>. Have any problems? File an issue or come chat in <code>#indiewebcamp</code> on Freenode IRC.
+    Woodwind is <a href="https://github.com/kylewm/woodwind">on GitHub</a>. Have any problems? File an issue or come chat in <code>#indieweb</code> on Freenode IRC.
   </div>
 
   <script>
diff --git a/woodwind/templates/settings.jinja2 b/woodwind/templates/settings.jinja2
index 19747cd..1887579 100644
--- a/woodwind/templates/settings.jinja2
+++ b/woodwind/templates/settings.jinja2
@@ -7,12 +7,12 @@
       <p>
         <input type="radio" id="reply-method-micropub" name="reply-method" value="micropub" {% if reply_method == 'micropub' %}checked{% endif %}/>
         <label for="reply-method-micropub">Micropub.</label>
-        Each post will have Like, Repost, and Reply buttons that will post content to your site directly via micropub. See <a href="https://indiewebcamp.com/Micropub">Micropub</a> for details.
+        Each post will have Like, Repost, and Reply buttons that will post content to your site directly via micropub. See <a href="https://indieweb.org/Micropub">Micropub</a> for details.
       </p>
       <p>
         <input type="radio" id="reply-method-indie-config" name="reply-method" value="indie-config" {% if reply_method == 'indie-config' %}checked{% endif %}/>
         <label for="reply-method-indie-config">Indie-config.</label>
-        Clicking an indie-action link will invoke your <code>web+action</code> handler if registered. See <a href="https://indiewebcamp.com/indie-config">indie-config</a> for details.
+        Clicking an indie-action link will invoke your <code>web+action</code> handler if registered. See <a href="https://indieweb.org/indie-config">indie-config</a> for details.
       </p>
       <p>
         <input type="radio" id="reply-method-action-urls" name="reply-method" value="action-urls" {% if reply_method == 'action-urls' %}checked{% endif %}/>
diff --git a/woodwind/templates/settings_indie_config.jinja2 b/woodwind/templates/settings_indie_config.jinja2
index 7649123..32c2ed4 100644
--- a/woodwind/templates/settings_indie_config.jinja2
+++ b/woodwind/templates/settings_indie_config.jinja2
@@ -5,7 +5,7 @@
       <!-- reply via indie-config -->
       <h2>Indie-Config</h2>
       <p>
-        Clicking an indie-action link will invoke your <code>web+action</code> handler if registered. See <a href="https://indiewebcamp.com/indie-config">indie-config</a> for details.
+        Clicking an indie-action link will invoke your <code>web+action</code> handler if registered. See <a href="https://indieweb.org/indie-config">indie-config</a> for details.
       </p>
       {% set selectedActions = settings.get('indie-config-actions', []) %}
 
diff --git a/woodwind/templates/settings_micropub.jinja2 b/woodwind/templates/settings_micropub.jinja2
index 232ad87..bd2ed22 100644
--- a/woodwind/templates/settings_micropub.jinja2
+++ b/woodwind/templates/settings_micropub.jinja2
@@ -4,7 +4,7 @@
     <!-- reply via micropub -->
     <h2>Micropub</h2>
     <p>
-      Each post will have Like, Repost, and Reply buttons that will post content to your site directly via micropub. See <a href="https://indiewebcamp.com/Micropub">Micropub</a> for details.
+      Each post will have Like, Repost, and Reply buttons that will post content to your site directly via micropub. See <a href="https://indieweb.org/Micropub">Micropub</a> for details.
     </p>
     <p>
       Configure micropub credentials.

From 9de0892cfc9eeb5a80118e0f86678d55b600367e Mon Sep 17 00:00:00 2001
From: Marty McGuire <schmartissimo@gmail.com>
Date: Tue, 29 Nov 2016 16:27:21 -0500
Subject: [PATCH 02/10] Add missing paren in views.py (#63)

---
 woodwind/views.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/woodwind/views.py b/woodwind/views.py
index 17484f1..5cdab70 100644
--- a/woodwind/views.py
+++ b/woodwind/views.py
@@ -381,8 +381,7 @@ def update_micropub_syndicate_to():
         flask_login.current_user.set_setting('syndicate-to', syndicate_tos)
         db.session.commit()
     except ValueError as e:
-        flask.flash('Could not parse syndicate-to response: {}'.format(e)
-
+        flask.flash('Could not parse syndicate-to response: {}'.format(e))
 
 
 @views.route('/deauthorize')

From dcf195d2c1a7f2a27cfbbc7240b929c16701aa74 Mon Sep 17 00:00:00 2001
From: Kyle Mahan <kyle.mahan@medium.com>
Date: Sun, 5 Mar 2017 14:52:50 -0800
Subject: [PATCH 03/10] add sql script to remove old entries from feeds

---
 vacuum.sql | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 vacuum.sql

diff --git a/vacuum.sql b/vacuum.sql
new file mode 100644
index 0000000..2440f77
--- /dev/null
+++ b/vacuum.sql
@@ -0,0 +1,10 @@
+DELETE FROM entry
+USING (
+  SELECT
+    id,
+    retrieved,
+    ROW_NUMBER() OVER (PARTITION BY feed_id ORDER BY retrieved DESC) AS row
+  FROM entry
+) AS numbered
+WHERE entry.id = numbered.id
+  AND (numbered.row > 2000 OR numbered.retrieved < CURRENT_DATE - INTERVAL '365 days')

From 28c1ab50589a11ac73e0a744e91342ed22c59832 Mon Sep 17 00:00:00 2001
From: Kyle Mahan <kyle.mahan@medium.com>
Date: Sun, 5 Mar 2017 15:05:46 -0800
Subject: [PATCH 04/10] simplify vacuum script a little

---
 vacuum.sql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/vacuum.sql b/vacuum.sql
index 2440f77..55f5a28 100644
--- a/vacuum.sql
+++ b/vacuum.sql
@@ -2,9 +2,8 @@ DELETE FROM entry
 USING (
   SELECT
     id,
-    retrieved,
     ROW_NUMBER() OVER (PARTITION BY feed_id ORDER BY retrieved DESC) AS row
   FROM entry
 ) AS numbered
 WHERE entry.id = numbered.id
-  AND (numbered.row > 2000 OR numbered.retrieved < CURRENT_DATE - INTERVAL '365 days')
+  AND (row > 2000 OR retrieved < CURRENT_DATE - INTERVAL '365 days')

From 2e53fd95278dd79cd3be75769e09d12ced3fca5e Mon Sep 17 00:00:00 2001
From: Kyle Mahan <kyle@kylewm.com>
Date: Mon, 6 Mar 2017 04:41:38 +0000
Subject: [PATCH 05/10] add semicolon to sql file

---
 vacuum.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vacuum.sql b/vacuum.sql
index 55f5a28..841fe1f 100644
--- a/vacuum.sql
+++ b/vacuum.sql
@@ -6,4 +6,4 @@ USING (
   FROM entry
 ) AS numbered
 WHERE entry.id = numbered.id
-  AND (row > 2000 OR retrieved < CURRENT_DATE - INTERVAL '365 days')
+  AND (row > 2000 OR retrieved < CURRENT_DATE - INTERVAL '365 days');

From 56927d422419de25387e2d8b7416765c0e6e9f98 Mon Sep 17 00:00:00 2001
From: Kyle Mahan <kyle.mahan@medium.com>
Date: Sun, 28 May 2017 12:08:21 -0700
Subject: [PATCH 06/10] limit author properties to the SQL column widths

---
 woodwind/tasks.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/woodwind/tasks.py b/woodwind/tasks.py
index fdaeaa5..ae4911d 100644
--- a/woodwind/tasks.py
+++ b/woodwind/tasks.py
@@ -526,6 +526,13 @@ def hentry_to_entry(hentry, feed, backfill, now):
     author_photo = author.get('photo')
     author_url = author.get('url')
 
+    if author_name and len(author_name) > Entry.author_name.property.columns[0].type.length:
+        author_name = None
+    if author_photo and len(author_photo) > Entry.author_photo.property.columns[0].type.length:
+        author_photo = None
+    if author_url and len(author_url) > Entry.author_url.property.columns[0].type.length:
+        author_url = None
+
     entry = Entry(
         uid=uid,
         retrieved=retrieved,

From 9e60633973136662698a937d2f83c456f8ccb3eb Mon Sep 17 00:00:00 2001
From: Kyle Mahan <kyle@kylewm.com>
Date: Sun, 28 May 2017 19:18:21 +0000
Subject: [PATCH 07/10] catch errors parsing dates

---
 woodwind/tasks.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/woodwind/tasks.py b/woodwind/tasks.py
index fdaeaa5..4995f00 100644
--- a/woodwind/tasks.py
+++ b/woodwind/tasks.py
@@ -397,14 +397,21 @@ def process_xml_feed_for_new_entries(feed, content, backfill, now):
             continue
 
         if 'updated_parsed' in p_entry and p_entry.updated_parsed:
-            updated = datetime.datetime.fromtimestamp(
-                time.mktime(p_entry.updated_parsed))
+            try:
+                updated = datetime.datetime.fromtimestamp(
+                    time.mktime(p_entry.updated_parsed))
+            except:
+                current_app.logger.debug('mktime failed with updated timestamp: %v', p_entry.updated_parsed)
         else:
             updated = None
 
         if 'published_parsed' in p_entry and p_entry.published_parsed:
-            published = datetime.datetime.fromtimestamp(
-                time.mktime(p_entry.published_parsed))
+            try:
+                published = datetime.datetime.fromtimestamp(
+                    time.mktime(p_entry.published_parsed))
+            except:
+                current_app.logger.debug('mktime failed with published timestamp: %v', p_entry.published_parsed)
+                published = updated
         else:
             published = updated
 

From 32b15054986a3bd38f526e9136e306fbd78a5efd Mon Sep 17 00:00:00 2001
From: Kyle Mahan <kyle.mahan@medium.com>
Date: Tue, 20 Jun 2017 07:54:29 -0700
Subject: [PATCH 08/10] upgrade bs4 and html5lib

---
 requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 16fedde..4ab5d4a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 asyncio-redis==0.14.2
-beautifulsoup4==4.4.1
+beautifulsoup4==4.6.0
 bleach==1.4.3
 blinker==1.4
 certifi==2015.04.28  # rq.filter: <=2015.04.28
@@ -12,7 +12,7 @@ Flask-DebugToolbar==0.10.0
 Flask-Login==0.3.2
 Flask-Micropub==0.2.6
 Flask-SQLAlchemy==2.1
-html5lib==0.9999999
+html5lib==0.999999999
 idna==2.1
 itsdangerous==0.24
 Jinja2==2.8

From 0d16b1ef8892278d86083e4b9f3ee63e4f704a84 Mon Sep 17 00:00:00 2001
From: Kyle Mahan <kyle@kylewm.com>
Date: Mon, 26 Jun 2017 06:02:47 +0000
Subject: [PATCH 09/10] use sentry for error monitoring

---
 woodwind/app.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/woodwind/app.py b/woodwind/app.py
index 4e12cb8..a0b8e4d 100644
--- a/woodwind/app.py
+++ b/woodwind/app.py
@@ -1,3 +1,4 @@
+from raven.contrib.flask import Sentry
 from woodwind import extensions
 from woodwind.api import api
 from woodwind.push import push
@@ -20,6 +21,8 @@ Message:
 %(message)s
 '''
 
+sentry = Sentry()
+
 
 def create_app(config_path='../woodwind.cfg'):
     app = flask.Flask('woodwind')
@@ -38,6 +41,8 @@ def configure_logging(app):
 
     app.logger.setLevel(logging.DEBUG)
 
+    sentry.init_app(app, dsn=app.config.get('SENTRY_DSN'), logging=True, level=logging.WARNING)
+
     handler = logging.StreamHandler(sys.stdout)
     formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
     handler.setFormatter(formatter)

From 951ae1424875571a2fbafd9d13bf051702a2e561 Mon Sep 17 00:00:00 2001
From: Jeena <hello@jeena.net>
Date: Thu, 13 Jul 2017 18:07:10 +0200
Subject: [PATCH 10/10] Add OPML export of subscriptions

It's nice to be able to export all your subscriptions if you want to
move to a different reader. This patch adds a link to the subscription
page where one can download the subscription list as OPML which is
the standard way of importing/exporting between feed readers.
---
 woodwind/templates/subscriptions.jinja2   |  1 +
 woodwind/templates/subscriptions_opml.xml | 10 ++++++++++
 woodwind/views.py                         | 18 +++++++++++++++++-
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 woodwind/templates/subscriptions_opml.xml

diff --git a/woodwind/templates/subscriptions.jinja2 b/woodwind/templates/subscriptions.jinja2
index 3a1abc2..74c583d 100644
--- a/woodwind/templates/subscriptions.jinja2
+++ b/woodwind/templates/subscriptions.jinja2
@@ -19,6 +19,7 @@
 
     <form action="{{ url_for('.update_all') }}" method="POST">
       <button type="submit">Poll All</button>
+      <a href="{{ url_for('.subscriptions_opml')}}">Export as OPML</a>
     </form>
   </article>
 
diff --git a/woodwind/templates/subscriptions_opml.xml b/woodwind/templates/subscriptions_opml.xml
new file mode 100644
index 0000000..70ed840
--- /dev/null
+++ b/woodwind/templates/subscriptions_opml.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<opml version="2.0">
+  <body>
+    <outline text="Subscriptions" title="Woodwind">
+    {% for s in subscriptions %}
+      <outline xmlUrl="{{ s.feed.feed }}" />
+    {% endfor %}
+    </outline>
+  </body>
+</opml>
diff --git a/woodwind/views.py b/woodwind/views.py
index 5cdab70..57b80ee 100644
--- a/woodwind/views.py
+++ b/woodwind/views.py
@@ -55,7 +55,8 @@ def index():
             .join(Subscription.user)\
             .filter(User.id == flask_login.current_user.id)\
             .filter(db.or_(Entry.deleted == None,
-                           Entry.deleted >= now))
+                           Entry.deleted >= now))\
+            .order_by(Entry.published.desc())
 
         if 'entry' in flask.request.args:
             entry_url = flask.request.args.get('entry')
@@ -126,6 +127,21 @@ def subscriptions():
                                  subscriptions=subscs)
 
 
+@views.route('/subscriptions_opml.xml')
+@flask_login.login_required
+def subscriptions_opml():
+    subscs = Subscription\
+             .query\
+             .filter_by(user_id=flask_login.current_user.id)\
+             .options(sqlalchemy.orm.subqueryload(Subscription.feed))\
+             .order_by(db.func.lower(Subscription.name))\
+             .all()
+    template = flask.render_template('subscriptions_opml.xml',
+                                 subscriptions=subscs)
+    response = flask.make_response(template)
+    response.headers['Content-Type'] = 'application/xml'
+    return response
+
 @views.route('/settings', methods=['GET', 'POST'])
 @flask_login.login_required
 def settings():