From 099c798b2bc77fe81191c98ae2c81e9054f8901a Mon Sep 17 00:00:00 2001
From: Their Name <they@example.com>
Date: Sat, 1 Jan 2022 17:11:16 +0000
Subject: [PATCH] fix some 500s

---
 common/management/commands/list_jobs.py | 7 +++++--
 mastodon/api.py                         | 8 +++++---
 users/views.py                          | 2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/common/management/commands/list_jobs.py b/common/management/commands/list_jobs.py
index 76c3165a..e843f527 100644
--- a/common/management/commands/list_jobs.py
+++ b/common/management/commands/list_jobs.py
@@ -17,5 +17,8 @@ class Command(BaseCommand):
         for registry in [queue.started_job_registry, queue.deferred_job_registry, queue.finished_job_registry, queue.failed_job_registry, queue.scheduled_job_registry]:
             self.stdout.write(self.style.SUCCESS(f'Registry {registry}'))
             for job_id in registry.get_job_ids():
-                job = Job.fetch(job_id, connection=redis)
-                print(f'Job {job}')
+                try:
+                    job = Job.fetch(job_id, connection=redis)
+                    pprint.pp(job)
+                except Exception as e:
+                    print(f'Error fetching {job_id}')
diff --git a/mastodon/api.py b/mastodon/api.py
index ef57ce5b..a0956fee 100644
--- a/mastodon/api.py
+++ b/mastodon/api.py
@@ -176,9 +176,11 @@ def random_string_generator(n):
 
 def verify_account(site, token):
     url = 'https://' + site + API_VERIFY_ACCOUNT
-    response = get(url, headers={'User-Agent': 'NeoDB/1.0', 'Authorization': f'Bearer {token}'})
-    return response.status_code, response.json() if response.status_code == 200 else None
-
+    try:
+        response = get(url, headers={'User-Agent': 'NeoDB/1.0', 'Authorization': f'Bearer {token}'})
+        return response.status_code, response.json() if response.status_code == 200 else None
+    except Exception:
+        return -1, None
 
 def get_related_acct_list(site, token, api):
     url = 'https://' + site + api
diff --git a/users/views.py b/users/views.py
index 0147e891..e127f08c 100644
--- a/users/views.py
+++ b/users/views.py
@@ -153,7 +153,7 @@ def connect(request):
 @login_required
 def logout(request):
     if request.method == 'GET':
-        revoke_token(request.user.mastodon_site, request.session['oauth_token'])
+        # revoke_token(request.user.mastodon_site, request.session['oauth_token'])
         auth_logout(request)
         return redirect(reverse("users:login"))
     else: