diff --git a/woodwind/models.py b/woodwind/models.py index a74ebb8..a4511af 100644 --- a/woodwind/models.py +++ b/woodwind/models.py @@ -19,12 +19,15 @@ class User(db.Model): settings = db.Column(JSON) # Flask-Login integration + @property def is_authenticated(self): return True + @property def is_active(self): return True + @property def is_anonymous(self): return False @@ -101,7 +104,7 @@ class Subscription(db.Model): tags = db.Column(db.String(256)) # exclude from the front page exclude = db.Column(db.Boolean, default=False) - + user = db.relationship(User, backref='subscriptions') feed = db.relationship(Feed, backref='subscriptions') diff --git a/woodwind/templates/base.jinja2 b/woodwind/templates/base.jinja2 index 0019b50..af3bba3 100644 --- a/woodwind/templates/base.jinja2 +++ b/woodwind/templates/base.jinja2 @@ -20,7 +20,7 @@
- {% if current_user.is_authenticated() %} + {% if current_user.is_authenticated %}
@@ -54,7 +54,7 @@
{{ message }}
{% endfor %} - {% if not current_user.is_authenticated() %} + {% if not current_user.is_authenticated %}
diff --git a/woodwind/templates/feed.jinja2 b/woodwind/templates/feed.jinja2 index ab9262a..8affef6 100644 --- a/woodwind/templates/feed.jinja2 +++ b/woodwind/templates/feed.jinja2 @@ -15,7 +15,7 @@ {% endblock head %} {% block header %} - {% if current_user.is_authenticated() %} + {% if current_user.is_authenticated %}
diff --git a/woodwind/templates/subscriptions.jinja2 b/woodwind/templates/subscriptions.jinja2 index e0ce57c..e6dd9e3 100644 --- a/woodwind/templates/subscriptions.jinja2 +++ b/woodwind/templates/subscriptions.jinja2 @@ -5,7 +5,7 @@ {% endblock head %} {% block header %} - {% if current_user.is_authenticated() %} + {% if current_user.is_authenticated %}
@@ -40,7 +40,7 @@ diff --git a/woodwind/views.py b/woodwind/views.py index 3291733..62259d1 100644 --- a/woodwind/views.py +++ b/woodwind/views.py @@ -34,7 +34,7 @@ def index(): solo = False all_tags = set() - if flask_login.current_user.is_authenticated(): + if flask_login.current_user.is_authenticated: for subsc in flask_login.current_user.subscriptions: if subsc.tags: all_tags.update(subsc.tags.split()) @@ -322,7 +322,7 @@ def update_micropub_syndicate_to(): resp, resp.text) return - flask.current_app.logger.debug('response from micropub endpoint: {}, {}', + flask.current_app.logger.debug('syndicate-to response: {}, {}', resp, resp.text) content_type = resp.headers['content-type']