Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
QOTO
qoto
Commits
fe117cf0
Commit
fe117cf0
authored
Oct 22, 2020
by
Jeffrey Phillips Freeman
💥
Browse files
Merge branch 'qoto-fedibird-fixed-2' into qoto-fixed-2
parents
05a918b7
a2c04340
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
app/models/public_feed.rb
app/models/public_feed.rb
+1
-2
No files found.
app/models/public_feed.rb
View file @
fe117cf0
...
...
@@ -19,13 +19,12 @@ class PublicFeed < Feed
# @param [Integer] min_id
# @return [Array<Status>]
def
get
(
limit
,
max_id
=
nil
,
since_id
=
nil
,
min_id
=
nil
)
return
Status
.
none
if
local_only?
&&
!
imast?
scope
=
public_scope
scope
.
merge!
(
without_replies_scope
)
unless
with_replies?
scope
.
merge!
(
without_reblogs_scope
)
unless
with_reblogs?
scope
.
merge!
(
remote_only_scope
)
if
remote_only?
scope
.
merge!
(
local_only_scope
)
if
local_only?
scope
.
merge!
(
domain_only_scope
)
if
domain_only?
scope
.
merge!
(
account_filters_scope
)
if
account?
scope
.
merge!
(
media_only_scope
)
if
media_only?
...
...
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