mirror of
https://github.com/jointakahe/takahe.git
synced 2024-11-25 08:41:00 +00:00
Remove identity avatar fetching
This commit is contained in:
parent
0dca7eae5f
commit
c3a60bbf13
2 changed files with 0 additions and 27 deletions
|
@ -1,6 +1,5 @@
|
|||
import os
|
||||
import secrets
|
||||
import urllib.parse
|
||||
from typing import TYPE_CHECKING
|
||||
|
||||
from django.utils import timezone
|
||||
|
@ -18,16 +17,6 @@ def upload_namer(prefix, instance, filename):
|
|||
By default, obscures the original name with a random UUID.
|
||||
"""
|
||||
_, old_extension = os.path.splitext(filename)
|
||||
|
||||
if prefix == "profile_images":
|
||||
# If we're saving images for an Identity, we name predictably as
|
||||
# avatar images are not considered "secret", and otherwise we'll waste
|
||||
# space.
|
||||
handle_safe = urllib.parse.quote(instance.handle)
|
||||
return (
|
||||
f"{prefix}/{handle_safe[:2]}/{handle_safe[:4]}/{handle_safe}{old_extension}"
|
||||
)
|
||||
|
||||
new_filename = secrets.token_urlsafe(20)
|
||||
now = timezone.now()
|
||||
return f"{prefix}/{now.year}/{now.month}/{now.day}/{new_filename}{old_extension}"
|
||||
|
|
|
@ -5,14 +5,12 @@ from urllib.parse import urlparse
|
|||
import httpx
|
||||
import urlman
|
||||
from asgiref.sync import async_to_sync, sync_to_async
|
||||
from django.conf import settings
|
||||
from django.db import IntegrityError, models
|
||||
from django.template.defaultfilters import linebreaks_filter
|
||||
from django.utils import timezone
|
||||
from django.utils.functional import lazy
|
||||
|
||||
from core.exceptions import ActorMismatchError
|
||||
from core.files import get_remote_file
|
||||
from core.html import sanitize_post, strip_html
|
||||
from core.ld import (
|
||||
canonicalise,
|
||||
|
@ -50,20 +48,6 @@ class IdentityStates(StateGraph):
|
|||
return cls.updated
|
||||
# Run the actor fetch and progress to updated if it succeeds
|
||||
if await identity.fetch_actor():
|
||||
# Also stash their icon if we can
|
||||
if identity.icon_uri:
|
||||
try:
|
||||
file, mimetype = await get_remote_file(
|
||||
identity.icon_uri,
|
||||
timeout=settings.SETUP.REMOTE_TIMEOUT,
|
||||
max_size=settings.SETUP.AVATAR_MAX_IMAGE_FILESIZE_KB * 1024,
|
||||
)
|
||||
except httpx.RequestError:
|
||||
# We've still got enough info to consider ourselves updated
|
||||
return cls.updated
|
||||
if file:
|
||||
identity.icon = file
|
||||
await sync_to_async(identity.save)()
|
||||
return cls.updated
|
||||
|
||||
@classmethod
|
||||
|
|
Loading…
Reference in a new issue