Update requrements.txt to work with GCC 7

With GCC 7 uWSG doesn't compile, a newer version of it does but
this then needs a newer version of other modules. This combination
works at least for me nicely.

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 = [],

requirements.txt

@@ -1,6 +1,6 @@
 asyncio-redis==0.14.2
-beautifulsoup4==4.4.1
-bleach==1.4.3
+beautifulsoup4==4.6.0
+bleach==2.0.0
 blinker==1.4
 certifi==2015.04.28  # rq.filter: <=2015.04.28
 cffi==1.6.0
@@ -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
@@ -31,7 +31,8 @@ rq==0.5.6
 sgmllib3k==1.0.0
 six==1.10.0
 SQLAlchemy==1.0.13
-uWSGI==2.0.12  # rq.filter: <=2.0.12
+uWSGI==2.0.15
 websockets==3.1
 Werkzeug==0.11.9
 wheel==0.29.0
+raven==6.1.0

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'])

vacuum.sql

@@ -0,0 +1,9 @@
+DELETE FROM entry
+USING (
+  SELECT
+    id,
+    ROW_NUMBER() OVER (PARTITION BY feed_id ORDER BY retrieved DESC) AS row
+  FROM entry
+) AS numbered
+WHERE entry.id = numbered.id
+  AND (row > 2000 OR retrieved < CURRENT_DATE - INTERVAL '365 days');

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)

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 = [],

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
 
@@ -526,6 +533,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,

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>

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 %}/>

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', []) %}
 

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.

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')