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

quick hack to support peertube video

Browse source
This commit is contained in:
Chaiwat Suttipongsakul 2019-02-02 23:20:34 +07:00
parent d093d03748
commit 6f44f5cd7d
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app.py
View file

@ -189,7 +189,10 @@ ALLOWED_TAGS = [
def clean_html(html): def clean_html(html):
return bleach.clean(html, tags=ALLOWED_TAGS) try:
return bleach.clean(html, tags=ALLOWED_TAGS)
except:
return ""
_GRIDFS_CACHE: Dict[Tuple[Kind, str, Optional[int]], str] = {} _GRIDFS_CACHE: Dict[Tuple[Kind, str, Optional[int]], str] = {}
@ -282,7 +285,7 @@ def domain(url):
@app.template_filter() @app.template_filter()
def url_or_id(d): def url_or_id(d):
if "url" in d: if ("url" in d) and isinstance(d["url"], str):
return d["url"] return d["url"]
return d["id"] return d["id"]
@ -1524,7 +1527,15 @@ def _user_api_arg(key: str, **kwargs):
def _user_api_get_note(from_outbox: bool = False): def _user_api_get_note(from_outbox: bool = False):
oid = _user_api_arg("id") oid = _user_api_arg("id")
app.logger.info(f"fetching {oid}") app.logger.info(f"fetching {oid}")
note = ap.parse_activity(get_backend().fetch_iri(oid), expected=ActivityType.NOTE) try:
note = ap.parse_activity(get_backend().fetch_iri(oid), expected=ActivityType.NOTE)
except:
try:
note = ap.parse_activity(get_backend().fetch_iri(oid), expected=ActivityType.VIDEO)
except:
raise ActivityNotFoundError(
"Expected Note or Video ActivityType, but got something else"
)
if from_outbox and not note.id.startswith(ID): if from_outbox and not note.id.startswith(ID):
raise NotFromOutboxError( raise NotFromOutboxError(
f"cannot load {note.id}, id must be owned by the server" f"cannot load {note.id}, id must be owned by the server"