mirrors/akkoma
1
0
Fork 1
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-10 19:29:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't mess with the cache on metadata update

Browse source
This commit is contained in:
FloatingGhost 2022-11-08 10:39:01 +00:00
parent 7bbaa8f8e0
commit a0b8e3c842
4 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/application.ex
View file

@ -157,7 +157,7 @@ defmodule Pleroma.Application do
build_cachex("failed_proxy_url", limit: 2500), build_cachex("failed_proxy_url", limit: 2500),
build_cachex("banned_urls", default_ttl: :timer.hours(24 * 30), limit: 5_000), build_cachex("banned_urls", default_ttl: :timer.hours(24 * 30), limit: 5_000),
build_cachex("translations", default_ttl: :timer.hours(24 * 30), limit: 2500), build_cachex("translations", default_ttl: :timer.hours(24 * 30), limit: 2500),
build_cachex("instances", default_ttl: :timer.hours(24), limit: 2500) build_cachex("instances", default_ttl: :timer.hours(24), ttl_interval: 1000, limit: 2500)
] ]
end end

21
lib/pleroma/instances/instance.ex
View file

@ -176,17 +176,14 @@ defmodule Pleroma.Instances.Instance do
favicon = scrape_favicon(uri) favicon = scrape_favicon(uri)
nodeinfo = scrape_nodeinfo(uri) nodeinfo = scrape_nodeinfo(uri)
{:ok, instance} = existing_record
existing_record |> changeset(%{
|> changeset(%{ host: host,
host: host, favicon: favicon,
favicon: favicon, nodeinfo: nodeinfo,
nodeinfo: nodeinfo, metadata_updated_at: NaiveDateTime.utc_now()
metadata_updated_at: NaiveDateTime.utc_now() })
}) |> Repo.update()
|> Repo.update()
@cachex.put(:instances_cache, "instances:#{host}", instance)
else else
{:discard, "Does not require update"} {:discard, "Does not require update"}
end end
@ -205,8 +202,6 @@ defmodule Pleroma.Instances.Instance do
metadata_updated_at: NaiveDateTime.utc_now() metadata_updated_at: NaiveDateTime.utc_now()
}) })
|> Repo.insert() |> Repo.insert()
@cachex.put(:instances_cache, "instances:#{host}", instance)
end end
end end

12
test/pleroma/instances/instance_test.exs
View file

@ -136,7 +136,7 @@ defmodule Pleroma.Instances.InstanceTest do
} }
end) end)
assert {:ok, true} == assert {:ok, %Instance{host: "favicon.example.org"}} =
Instance.update_metadata(URI.parse("https://favicon.example.org/")) Instance.update_metadata(URI.parse("https://favicon.example.org/"))
{:ok, instance} = Instance.get_cached_by_url("https://favicon.example.org/") {:ok, instance} = Instance.get_cached_by_url("https://favicon.example.org/")
@ -177,7 +177,7 @@ defmodule Pleroma.Instances.InstanceTest do
} }
end) end)
assert {:ok, true} == assert {:ok, %Instance{host: "long-favicon.example.org"}} =
Instance.update_metadata(URI.parse("https://long-favicon.example.org/")) Instance.update_metadata(URI.parse("https://long-favicon.example.org/"))
{:ok, instance} = Instance.get_cached_by_url("https://long-favicon.example.org/") {:ok, instance} = Instance.get_cached_by_url("https://long-favicon.example.org/")
@ -214,7 +214,7 @@ defmodule Pleroma.Instances.InstanceTest do
end) end)
refute capture_log(fn -> refute capture_log(fn ->
assert {:ok, true} = assert {:ok, %Instance{host: "no-favicon.example.org"}} =
Instance.update_metadata(URI.parse("https://no-favicon.example.org/")) Instance.update_metadata(URI.parse("https://no-favicon.example.org/"))
end) =~ "Instance.update_metadata(\"https://no-favicon.example.org/\") error: " end) =~ "Instance.update_metadata(\"https://no-favicon.example.org/\") error: "
end end
@ -241,7 +241,7 @@ defmodule Pleroma.Instances.InstanceTest do
} }
end) end)
assert {:ok, true} == assert {:ok, %Instance{host: "bad-nodeinfo.example.org"}} =
Instance.update_metadata(URI.parse("https://bad-nodeinfo.example.org/")) Instance.update_metadata(URI.parse("https://bad-nodeinfo.example.org/"))
{:ok, instance} = Instance.get_cached_by_url("https://bad-nodeinfo.example.org/") {:ok, instance} = Instance.get_cached_by_url("https://bad-nodeinfo.example.org/")
@ -277,7 +277,7 @@ defmodule Pleroma.Instances.InstanceTest do
} }
end) end)
assert {:ok, true} == assert {:ok, %Instance{host: "bad-nodeinfo.example.org"}} =
Instance.update_metadata(URI.parse("https://bad-nodeinfo.example.org/")) Instance.update_metadata(URI.parse("https://bad-nodeinfo.example.org/"))
{:ok, instance} = Instance.get_cached_by_url("https://bad-nodeinfo.example.org/") {:ok, instance} = Instance.get_cached_by_url("https://bad-nodeinfo.example.org/")
@ -315,7 +315,7 @@ defmodule Pleroma.Instances.InstanceTest do
} }
end) end)
assert {:ok, true} == assert {:ok, %Instance{host: "bad-nodeinfo.example.org"}} =
Instance.update_metadata(URI.parse("https://bad-nodeinfo.example.org/")) Instance.update_metadata(URI.parse("https://bad-nodeinfo.example.org/"))
{:ok, instance} = Instance.get_cached_by_url("https://bad-nodeinfo.example.org/") {:ok, instance} = Instance.get_cached_by_url("https://bad-nodeinfo.example.org/")

2
test/pleroma/web/admin_api/views/report_view_test.exs
View file

@ -45,7 +45,7 @@ defmodule Pleroma.Web.AdminAPI.ReportViewTest do
ReportView.render("show.json", Report.extract_report_info(activity)) ReportView.render("show.json", Report.extract_report_info(activity))
|> Map.delete(:created_at) |> Map.delete(:created_at)
assert result == expected assert Jason.encode!(result) == Jason.encode!(expected)
end end
test "includes reported statuses" do test "includes reported statuses" do