Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Per-status control for unlisted mode, also federation for unlisted mode

Browse source 
Fix #233, fix #268
This commit is contained in:
Eugen Rochko 2016-11-30 21:32:11 +01:00
parent 1b447c190e
commit 14bd46946d
31 changed files with 175 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/status.rb
View file

@ -5,6 +5,8 @@ class Status < ApplicationRecord
include Streamable
include Cacheable
enum visibility: [:public, :unlisted], _suffix: :visibility
belongs_to :account, inverse_of: :statuses
belongs_to :thread, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :replies
@ -100,6 +102,7 @@ class Status < ApplicationRecord
def as_public_timeline(account = nil)
query = joins('LEFT OUTER JOIN accounts ON statuses.account_id = accounts.id')
.where(visibility: :public)
.where('accounts.silenced = FALSE')
.where('statuses.in_reply_to_id IS NULL')
.where('statuses.reblog_of_id IS NULL')
@ -110,6 +113,7 @@ class Status < ApplicationRecord
def as_tag_timeline(tag, account = nil)
query = tag.statuses
.joins('LEFT OUTER JOIN accounts ON statuses.account_id = accounts.id')
.where(visibility: :public)
.where('accounts.silenced = FALSE')
.where('statuses.in_reply_to_id IS NULL')
.where('statuses.reblog_of_id IS NULL')