diff --git a/brutaldon/views.py b/brutaldon/views.py index 9ff30da..0b01c31 100644 --- a/brutaldon/views.py +++ b/brutaldon/views.py @@ -710,31 +710,23 @@ def same_username(account, acct, username): myhost = account.username.split("@",1)[1] if acct == user and host == myhost: return True return False - +from pprint import pprint @br_login_required def user(request, username, prev=None, next=None): try: account, mastodon = get_usercontext(request) except NotLoggedInException: return redirect(about) - user_dict = [] + user_dict = None + print("username",username) for dict in mastodon.account_search(username): - if same_username(account, dict.acct ,username): continue - - try: - user_dict = [ - dict - - if ( - (dict.acct == username) - or ( - dict.acct == username.split("@")[0] - and - ) - ) - ][0] - except (IndexError, AttributeError) as e: - raise Http404(_("The user %s could not be found. %s") % (username, e)) + pprint(("check", dict)) + raise SystemExit(23) + if not same_username(account, dict.acct, username): continue + user_dict = dict + break + else: + raise Http404(_("The user %s could not be found.") % username) data = mastodon.account_statuses(user_dict.id, max_id=next, min_id=prev) relationship = mastodon.account_relationships(user_dict.id)[0] notifications = _notes_count(account, mastodon)