X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fobject.ex;h=ff2af4a6fa986cea2d557498ed8c7344e824a87e;hb=a8df7fc69041e8d7a6ed71621159d2f7487e1ce7;hp=a5a1d6a763a94302bb163fdf90de0b2802387fcb;hpb=f23edd2d6b67ee30ccd16b7a27d9e07a9f928574;p=akkoma diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex index a5a1d6a76..ff2af4a6f 100644 --- a/lib/pleroma/object.ex +++ b/lib/pleroma/object.ex @@ -4,36 +4,38 @@ defmodule Pleroma.Object do import Ecto.{Query, Changeset} schema "objects" do - field :data, :map + field(:data, :map) timestamps() end def create(data) do Object.change(%Object{}, %{data: data}) - |> Repo.insert + |> Repo.insert() end def change(struct, params \\ %{}) do - changeset = struct + struct |> cast(params, [:data]) |> validate_required([:data]) |> unique_constraint(:ap_id, name: :objects_unique_apid_index) end def get_by_ap_id(nil), do: nil + def get_by_ap_id(ap_id) do - Repo.one(from object in Object, - where: fragment("(?)->>'id' = ?", object.data, ^ap_id)) + Repo.one(from(object in Object, where: fragment("(?)->>'id' = ?", object.data, ^ap_id))) end def get_cached_by_ap_id(ap_id) do - if Mix.env == :test do + if Mix.env() == :test do get_by_ap_id(ap_id) else key = "object:#{ap_id}" - Cachex.get!(:user_cache, key, fallback: fn(_) -> + + Cachex.fetch!(:user_cache, key, fn _ -> object = get_by_ap_id(ap_id) + if object do {:commit, object} else