Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pleroma
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Eugenij
pleroma
Commits
f0d41a3a
Commit
f0d41a3a
authored
7 years ago
by
lain
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' into oauth2
parents
464c33e9
95aa6a3c
Branches
remove-mix-env-from-lib
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/pleroma/web/ostatus/ostatus.ex
+1
-1
1 addition, 1 deletion
lib/pleroma/web/ostatus/ostatus.ex
with
1 addition
and
1 deletion
lib/pleroma/web/ostatus/ostatus.ex
+
1
−
1
View file @
f0d41a3a
...
...
@@ -299,7 +299,7 @@ defmodule Pleroma.Web.OStatus do
end
def
fetch_activity_from_url
(
url
)
do
with
{
:ok
,
activities
}
<-
fetch_activity_from_atom_url
(
url
)
do
with
{
:ok
,
activities
}
when
length
(
activities
)
>
0
<-
fetch_activity_from_atom_url
(
url
)
do
{
:ok
,
activities
}
else
_e
->
with
{
:ok
,
activities
}
<-
fetch_activity_from_html_url
(
url
)
do
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment