zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-24 17:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:neocities/neocities

Browse source
This commit is contained in:
Kyle Drake 2020-04-30 02:27:58 -07:00
commit a546c88bad
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/browse.rb
View file

@ -62,9 +62,8 @@ def browse_sites_dataset
when 'followers' when 'followers'
ds = ds.order :follow_count.desc, :updated_at.desc ds = ds.order :follow_count.desc, :updated_at.desc
when 'supporters' when 'supporters'
ds = ds.exclude plan_type: nil ds = ds.where id: Site.supporter_ids
ds = ds.exclude plan_type: 'free' ds = ds.order :follow_count.desc, :views.desc, :site_updated_at.desc
ds = ds.order :views.desc, :site_updated_at.desc
when 'featured' when 'featured'
ds = ds.exclude featured_at: nil ds = ds.exclude featured_at: nil
ds = ds.order :featured_at.desc ds = ds.order :featured_at.desc

7
models/site.rb
View file

@ -717,7 +717,12 @@ class Site < Sequel::Model
expected_outcodes: [0, 1] expected_outcodes: [0, 1]
) )
output = line.run path: uploaded_file[:tempfile].path begin
output = line.run path: uploaded_file[:tempfile].path
rescue Terrapin::ExitStatusError => e
puts "WARNING: CLAMAV FAILED #{username} #{uploaded_file[:tempfile].path} #{e.message}"
return true
end
return true if output == '' return true if output == ''