projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
HTML-sanitize usernames before emojifying.
[akkoma]
/
lib
/
pleroma
/
activity.ex
diff --git
a/lib/pleroma/activity.ex
b/lib/pleroma/activity.ex
index c7502981e31be64eac7e478750537dc772280ea4..bed96861f893043f8651401fb6cc268aa91c2d5a 100644
(file)
--- a/
lib/pleroma/activity.ex
+++ b/
lib/pleroma/activity.ex
@@
-72,8
+72,14
@@
defmodule Pleroma.Activity do
)
end
)
end
- def get_create_activity_by_object_ap_id(ap_id) do
+ def get_create_activity_by_object_ap_id(ap_id)
when is_binary(ap_id)
do
create_activity_by_object_id_query([ap_id])
|> Repo.one()
end
create_activity_by_object_id_query([ap_id])
|> Repo.one()
end
+
+ def get_create_activity_by_object_ap_id(_), do: nil
+
+ def normalize(obj) when is_map(obj), do: Activity.get_by_ap_id(obj["id"])
+ def normalize(ap_id) when is_binary(ap_id), do: Activity.get_by_ap_id(ap_id)
+ def normalize(_), do: nil
end
end