hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'hex-flake-id' into 'develop'

Browse source 
Replace `Pleroma.FlakeId` with `flake_id` hex package

See merge request pleroma/pleroma!1692
This commit is contained in:
kaniini 2019-09-26 02:51:54 +00:00
commit 3ff57f1fd3
25 changed files with 35 additions and 262 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/common_api/utils.ex
View file

@ -26,7 +26,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
# This is a hack for twidere.
def get_by_id_or_ap_id(id) do
activity =
with true <- Pleroma.FlakeId.is_flake_id?(id),
with true <- FlakeId.flake_id?(id),
%Activity{} = activity <- Activity.get_by_id_with_object(id) do
activity
else