Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
pleroma
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alibek Omarov
pleroma
Commits
cb125850
Commit
cb125850
authored
Apr 24, 2020
by
lain
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Announcements: Prevent race condition.
parent
2430b9bf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
0 deletions
+28
-0
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/activity_pub.ex
+1
-0
test/web/common_api/common_api_test.exs
test/web/common_api/common_api_test.exs
+27
-0
No files found.
lib/pleroma/web/activity_pub/activity_pub.ex
View file @
cb125850
...
...
@@ -438,6 +438,7 @@ def announce(
defp
do_announce
(
user
,
object
,
activity_id
,
local
,
public
)
do
with
true
<-
is_announceable?
(
object
,
user
,
public
),
object
<-
Object
.
get_by_id
(
object
.
id
),
announce_data
<-
make_announce_data
(
user
,
object
,
activity_id
,
public
),
{
:ok
,
activity
}
<-
insert
(
announce_data
,
local
),
{
:ok
,
object
}
<-
add_announce_to_object
(
activity
,
object
),
...
...
test/web/common_api/common_api_test.exs
View file @
cb125850
...
...
@@ -48,6 +48,33 @@ test "favoriting race condition" do
assert
object
.
data
[
"like_count"
]
==
20
end
test
"repeating race condition"
do
user
=
insert
(
:user
)
users_serial
=
insert_list
(
10
,
:user
)
users
=
insert_list
(
10
,
:user
)
{
:ok
,
activity
}
=
CommonAPI
.
post
(
user
,
%{
"status"
=>
"."
})
users_serial
|>
Enum
.
map
(
fn
user
->
CommonAPI
.
repeat
(
activity
.
id
,
user
)
end
)
object
=
Object
.
get_by_ap_id
(
activity
.
data
[
"object"
])
assert
object
.
data
[
"announcement_count"
]
==
10
users
|>
Enum
.
map
(
fn
user
->
Task
.
async
(
fn
->
CommonAPI
.
repeat
(
activity
.
id
,
user
)
end
)
end
)
|>
Enum
.
map
(
&
Task
.
await
/
1
)
object
=
Object
.
get_by_ap_id
(
activity
.
data
[
"object"
])
assert
object
.
data
[
"announcement_count"
]
==
20
end
test
"when replying to a conversation / participation, it will set the correct context id even if no explicit reply_to is given"
do
user
=
insert
(
:user
)
{
:ok
,
activity
}
=
CommonAPI
.
post
(
user
,
%{
"status"
=>
"."
,
"visibility"
=>
"direct"
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment