squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a migration wiping user info of users that don't have any mutes

Browse Source 
And introduce safe_jsonb_set
This commit is contained in:
rinpatch 2019-10-18 14:11:30 +03:00
parent c00797d08e
commit a1c4a5d7cf
6 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mix/tasks/pleroma/database.ex
View File

@ -54,7 +54,7 @@ defmodule Mix.Tasks.Pleroma.Database do
Logger.info("Removing embedded objects") Logger.info("Removing embedded objects")
Repo.query!( Repo.query!(
"update activities set data = jsonb_set(data, '{object}'::text[], data->'object'->'id') where data->'object'->>'id' is not null;", "update activities set data = safe_jsonb_set(data, '{object}'::text[], data->'object'->'id') where data->'object'->>'id' is not null;",
[], [],
timeout: :infinity timeout: :infinity
) )
@ -152,7 +152,7 @@ defmodule Mix.Tasks.Pleroma.Database do
set: [ set: [
data: data:
fragment( fragment(
"jsonb_set(?, '{likes}', '[]'::jsonb, true)", "safe_jsonb_set(?, '{likes}', '[]'::jsonb, true)",
object.data object.data
) )
] ]

4
lib/pleroma/object.ex
View File

@ -181,7 +181,7 @@ defmodule Pleroma.Object do
data: data:
fragment( fragment(
""" """
jsonb_set(?, '{repliesCount}', safe_jsonb_set(?, '{repliesCount}',
(coalesce((?->>'repliesCount')::int, 0) + 1)::varchar::jsonb, true) (coalesce((?->>'repliesCount')::int, 0) + 1)::varchar::jsonb, true)
""", """,
o.data, o.data,
@ -204,7 +204,7 @@ defmodule Pleroma.Object do
data: data:
fragment( fragment(
""" """
jsonb_set(?, '{repliesCount}', safe_jsonb_set(?, '{repliesCount}',
(greatest(0, (?->>'repliesCount')::int - 1))::varchar::jsonb, true) (greatest(0, (?->>'repliesCount')::int - 1))::varchar::jsonb, true)
""", """,
o.data, o.data,

6
lib/pleroma/user.ex
View File

@ -718,7 +718,7 @@ defmodule Pleroma.User do
set: [ set: [
info: info:
fragment( fragment(
"jsonb_set(?, '{note_count}', ((?->>'note_count')::int + 1)::varchar::jsonb, true)", "safe_jsonb_set(?, '{note_count}', ((?->>'note_count')::int + 1)::varchar::jsonb, true)",
u.info, u.info,
u.info u.info
) )
@ -739,7 +739,7 @@ defmodule Pleroma.User do
set: [ set: [
info: info:
fragment( fragment(
"jsonb_set(?, '{note_count}', (greatest(0, (?->>'note_count')::int - 1))::varchar::jsonb, true)", "safe_jsonb_set(?, '{note_count}', (greatest(0, (?->>'note_count')::int - 1))::varchar::jsonb, true)",
u.info, u.info,
u.info u.info
) )
@ -812,7 +812,7 @@ defmodule Pleroma.User do
set: [ set: [
info: info:
fragment( fragment(
"jsonb_set(?, '{follower_count}', ?::varchar::jsonb, true)", "safe_jsonb_set(?, '{follower_count}', ?::varchar::jsonb, true)",
u.info, u.info,
s.count s.count
) )

2
lib/pleroma/web/activity_pub/utils.ex
View File

@ -349,7 +349,7 @@ defmodule Pleroma.Web.ActivityPub.Utils do
try do try do
Ecto.Adapters.SQL.query!( Ecto.Adapters.SQL.query!(
Repo, Repo,
"UPDATE activities SET data = jsonb_set(data, '{state}', $1) WHERE data->>'type' = 'Follow' AND data->>'actor' = $2 AND data->>'object' = $3 AND data->>'state' = 'pending'", "UPDATE activities SET data = safe_jsonb_set(data, '{state}', $1) WHERE data->>'type' = 'Follow' AND data->>'actor' = $2 AND data->>'object' = $3 AND data->>'state' = 'pending'",
[state, actor, object] [state, actor, object]
) )

22
priv/repo/migrations/20190711042021_create_safe_jsonb_set.exs Normal file
View File

@ -0,0 +1,22 @@
defmodule Pleroma.Repo.Migrations.CreateSafeJsonbSet do
use Ecto.Migration
alias Pleroma.User
def change do
execute("""
create or replace function safe_jsonb_set(target jsonb, path text[], new_value jsonb, create_missing boolean default true) returns jsonb as $$
declare
result jsonb;
begin
result := jsonb_set(target, path, coalesce(new_value, 'null'::jsonb), create_missing);
if result is NULL then
raise 'jsonb_set tried to wipe the object, please report this incindent to Pleroma bug tracker. https://git.pleroma.social/pleroma/pleroma/issues/new';
return target;
else
return result;
end if;
end;
$$ language plpgsql;
""")
end
end

2
priv/repo/migrations/20190711042024_copy_muted_to_muted_notifications.exs
View File

@ -3,6 +3,6 @@ defmodule Pleroma.Repo.Migrations.CopyMutedToMutedNotifications do
alias Pleroma.User alias Pleroma.User
def change do def change do
execute("update users set info = jsonb_set(info, '{muted_notifications}', info->'mutes', true) where local = true") execute("update users set info = safe_jsonb_set(info, '{muted_notifications}', info->'mutes', true) where local = true")
end end
end end