Skip to content

Commit

Permalink
disable superfeedr subscribe/unsubscribe
Browse files Browse the repository at this point in the history
for #550
  • Loading branch information
snarfed committed Dec 5, 2023
1 parent 8f3b4c1 commit cf17c5c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
3 changes: 3 additions & 0 deletions tests/test_web.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Unit tests for webmention.py."""
import copy
from datetime import timedelta
from unittest import skip
from unittest.mock import ANY, patch

from flask import g, get_flashed_messages
Expand Down Expand Up @@ -513,6 +514,7 @@ def test_get_or_create_scripts_leading_trailing_dots(self, mock_get, mock_post):
self.assert_entities_equal(user, Web.get_by_id('foo.bar'))
self.assertIsNone(Web.get_by_id('..foo.bar.'))

@skip
def test_get_or_create_subscribes_superfeedr(self, mock_get, mock_post):
self.user.obj.mf2 = ACTOR_MF2_REL_FEED_URL
self.user.obj.put()
Expand Down Expand Up @@ -627,6 +629,7 @@ def test_make_task(self, mock_create_task, mock_get, mock_post):

self.assertEqual(NOW, self.user.key.get().last_webmention_in)

@skip
def test_first_webmention_unsubscribe_superfeedr(self, mock_get, mock_post):
self.user.superfeedr_subscribed = NOW
self.user.superfeedr_subscribed_feed = 'http://feed'
Expand Down
7 changes: 4 additions & 3 deletions web.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ def get_or_create(cls, id, **kwargs):
domain = key.id().lower().strip('.')
user = super().get_or_create(domain, **kwargs)

if not user.superfeedr_subscribed and not user.last_webmention_in:
maybe_superfeedr_subscribe(user)
# TODO
# maybe_superfeedr_subscribe(user)

return user

Expand Down Expand Up @@ -576,7 +576,8 @@ def webmention_external():
if request.path == '/webmention': # exclude interactive
user.last_webmention_in = util.now()
user.put()
maybe_superfeedr_unsubscribe(user)
# TODO
# maybe_superfeedr_unsubscribe(user)

return common.create_task('webmention', **request.form)

Expand Down

0 comments on commit cf17c5c

Please sign in to comment.