diff options
author | kaniini <ariadne@dereferenced.org> | 2019-09-26 02:51:54 +0000 |
---|---|---|
committer | kaniini <ariadne@dereferenced.org> | 2019-09-26 02:51:54 +0000 |
commit | 3ff57f1fd3f7529f2c657a3940b1727b8a2df527 (patch) | |
tree | c6bb64699c68818c7570f89d473a052f9b9899af /lib/pleroma/web/common_api/utils.ex | |
parent | beabc49e352c8e1b7a29fe4f529b6c5bc5d078c7 (diff) | |
parent | b5dfe83433e092a007f85ed9c0ffe5a47dbfcccd (diff) | |
download | pleroma-3ff57f1fd3f7529f2c657a3940b1727b8a2df527.tar.gz |
Merge branch 'hex-flake-id' into 'develop'
Replace `Pleroma.FlakeId` with `flake_id` hex package
See merge request pleroma/pleroma!1692
Diffstat (limited to 'lib/pleroma/web/common_api/utils.ex')
-rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 1fb95f4ab..52fbc162b 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -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 |