mirror
/
bridgy-fed
kopia lustrzana https://github.com/snarfed/bridgy-fed
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

user page UI redirects warning: show diff of current vs expected 

for #305
pull/321/head
Ryan Barrett 2022-11-27 17:45:16 -08:00
rodzic 85b1a400ff
commit c343164f5b
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6BE31FDF4776E9D4
3 zmienionych plików z 10 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
models.py
Wyświetl plik

@ -1,4 +1,5 @@
"""Datastore model classes."""
import difflib
import logging
import urllib.parse
@ -142,7 +143,8 @@ class User(StringIdModel):
if got in expected:
self.has_redirects = True
else:
self.redirects_error = f'<code>{url}</code> redirects to <code>{got}</code> ; expected <code>{expected[0]}</code>'
diff = '\n'.join(difflib.Differ().compare([got], [expected[0]]))
self.redirects_error = f'Current vs expected:<pre>{diff}</pre>'
except requests.RequestException:
pass

4
static/style.css
Wyświetl plik

@ -463,6 +463,10 @@ a img.shadow:hover
background-color: inherit !important;
}
.warning pre {
text-align: left;
}
.docs {
list-style: none;
}

5
tests/test_models.py
Wyświetl plik

@ -83,8 +83,9 @@ class UserTest(testutil.TestCase):
allow_redirects=False)
no_hcard = requests_response('<html><body></body></html>')
mock_get.side_effect = [half_redir, no_hcard]
check(False, False, None,
'<code>https://y.z/.well-known/webfinger?resource=acct:y.z@y.z</code> redirects to <code>http://localhost/.well-known/webfinger</code> ; expected <code>https://fed.brid.gy/.well-known/webfinger?resource=acct:y.z@y.z</code>')
check(False, False, None, """\
Current vs expected:<pre>- http://localhost/.well-known/webfinger
+ https://fed.brid.gy/.well-known/webfinger?resource=acct:y.z@y.z</pre>""")
# redirect works, non-representative h-card
full_redir = requests_response(