vbatts/microblog.pub
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve actor icons handling and admin

Browse source
This commit is contained in:
Thomas Sileo 2022-06-25 08:23:28 +02:00
parent 951c74c40a
commit f66e3f3995
11 changed files with 172 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/ap_object.py
View file

@ -1,4 +1,3 @@
import base64
import hashlib
from datetime import datetime
from typing import Any
@ -11,6 +10,7 @@ from app import activitypub as ap
from app.actor import LOCAL_ACTOR
from app.actor import Actor
from app.actor import RemoteActor
from app.media import proxied_media_url
from app.utils import opengraph
@ -64,7 +64,7 @@ class Object:
def attachments(self) -> list["Attachment"]:
attachments = []
for obj in self.ap_object.get("attachment", []):
proxied_url = _proxied_url(obj["url"])
proxied_url = proxied_media_url(obj["url"])
attachments.append(
Attachment.parse_obj(
{
@ -82,7 +82,7 @@ class Object:
for link in ap.as_list(self.ap_object.get("url", [])):
if (isinstance(link, dict)) and link.get("type") == "Link":
if link.get("mediaType", "").startswith("video"):
proxied_url = _proxied_url(link["href"])
proxied_url = proxied_media_url(link["href"])
attachments.append(
Attachment(
type="Video",
@ -151,10 +151,6 @@ class BaseModel(pydantic.BaseModel):
alias_generator = _to_camel
def _proxied_url(url: str) -> str:
return "/proxy/media/" + base64.urlsafe_b64encode(url.encode()).decode()
class Attachment(BaseModel):
type: str
media_type: str