zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 01:32:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

stop actions when users are blocked

Browse source
This commit is contained in:
Kyle Drake 2024-05-31 14:36:57 -05:00
parent c0dca503c9
commit 0531a1d85f
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/comment.rb
View file

@ -2,6 +2,7 @@ post '/comment/:comment_id/toggle_like' do |comment_id|
require_login require_login
content_type :json content_type :json
comment = Comment[id: comment_id] comment = Comment[id: comment_id]
return 403 if comment.event.site.is_blocking?(current_site) || current_site.is_blocking?(comment.event.site)
liked_response = comment.toggle_site_like(current_site) ? 'liked' : 'unliked' liked_response = comment.toggle_site_like(current_site) ? 'liked' : 'unliked'
{result: liked_response, comment_like_count: comment.comment_likes_dataset.count, liking_site_names: comment.liking_site_usernames}.to_json {result: liked_response, comment_like_count: comment.comment_likes_dataset.count, liking_site_names: comment.liking_site_usernames}.to_json
end end

13
app/site.rb
View file

@ -1,6 +1,6 @@
get '/site/:username.rss' do |username| get '/site/:username.rss' do |username|
site = Site[username: username] site = Site[username: username]
halt 404 if site.nil? halt 404 if site.nil? || (current_site && site.is_blocking?(current_site))
content_type :xml content_type :xml
site.to_rss site.to_rss
end end
@ -8,7 +8,7 @@ end
get '/site/:username/?' do |username| get '/site/:username/?' do |username|
site = Site[username: username] site = Site[username: username]
# TODO: There should probably be a "this site was deleted" page. # TODO: There should probably be a "this site was deleted" page.
not_found if site.nil? || site.is_banned || site.is_deleted not_found if site.nil? || site.is_banned || site.is_deleted || (current_site && site.is_blocking?(current_site))
redirect '/' if site.is_education redirect '/' if site.is_education
@ -41,7 +41,7 @@ MAX_STAT_POINTS = 30
get '/site/:username/stats' do get '/site/:username/stats' do
@default_stat_points = 7 @default_stat_points = 7
@site = Site[username: params[:username]] @site = Site[username: params[:username]]
not_found if @site.nil? || @site.is_banned || @site.is_deleted not_found if @site.nil? || @site.is_banned || @site.is_deleted || (current_site && @site.is_blocking?(current_site))
@title = "Site stats for #{@site.host}" @title = "Site stats for #{@site.host}"
@ -127,7 +127,7 @@ end
get '/site/:username/follows' do |username| get '/site/:username/follows' do |username|
@title = "Sites #{username} follows" @title = "Sites #{username} follows"
@site = Site[username: username] @site = Site[username: username]
not_found if @site.nil? || @site.is_banned || @site.is_deleted not_found if @site.nil? || @site.is_banned || @site.is_deleted || (current_site && (@site.is_blocking?(current_site) || current_site.is_blocking?(@site)))
@sites = @site.followings.collect {|f| f.site} @sites = @site.followings.collect {|f| f.site}
erb :'site/follows' erb :'site/follows'
end end
@ -135,7 +135,7 @@ end
get '/site/:username/followers' do |username| get '/site/:username/followers' do |username|
@title = "Sites that follow #{username}" @title = "Sites that follow #{username}"
@site = Site[username: username] @site = Site[username: username]
not_found if @site.nil? || @site.is_banned || @site.is_deleted not_found if @site.nil? || @site.is_banned || @site.is_deleted || (current_site && (@site.is_blocking?(current_site) || current_site.is_blocking?(@site)))
@sites = @site.follows.collect {|f| f.actioning_site} @sites = @site.follows.collect {|f| f.actioning_site}
erb :'site/followers' erb :'site/followers'
end end
@ -145,6 +145,8 @@ post '/site/:username/comment' do |username|
site = Site[username: username] site = Site[username: username]
redirect request.referer if current_site && (site.is_blocking?(current_site) || current_site.is_blocking?(site))
last_comment = site.profile_comments_dataset.order(:created_at.desc).first last_comment = site.profile_comments_dataset.order(:created_at.desc).first
if last_comment && last_comment.message == params[:message] && last_comment.created_at > 2.hours.ago if last_comment && last_comment.message == params[:message] && last_comment.created_at > 2.hours.ago
@ -173,6 +175,7 @@ post '/site/:site_id/toggle_follow' do |site_id|
require_login require_login
content_type :json content_type :json
site = Site[id: site_id] site = Site[id: site_id]
return 403 if site.is_blocking?(current_site)
{result: (current_site.toggle_follow(site) ? 'followed' : 'unfollowed')}.to_json {result: (current_site.toggle_follow(site) ? 'followed' : 'unfollowed')}.to_json
end end