mirror of
https://github.com/neocities/neocities.git
synced 2025-04-25 01:32:36 +02:00
No more SEO spam from report tool that does not require login
This commit is contained in:
parent
02cea425e9
commit
e44e4ffcb7
2 changed files with 27 additions and 12 deletions
|
@ -115,6 +115,11 @@ post '/site/:username/report' do |username|
|
||||||
|
|
||||||
redirect request.referer if site.nil?
|
redirect request.referer if site.nil?
|
||||||
|
|
||||||
|
if !recaptcha_valid?
|
||||||
|
flash[:error] = 'Captcha was not filled out (or was filled out incorrectly)'
|
||||||
|
redirect request.referer
|
||||||
|
end
|
||||||
|
|
||||||
report = Report.new site_id: site.id, type: params[:type], comments: params[:comments]
|
report = Report.new site_id: site.id, type: params[:type], comments: params[:comments]
|
||||||
|
|
||||||
if current_site
|
if current_site
|
||||||
|
@ -133,6 +138,8 @@ post '/site/:username/report' do |username|
|
||||||
body: "Reported by #{report.reporting_site_id ? report.reporting_site.username : report.ip}: #{report.comments}"
|
body: "Reported by #{report.reporting_site_id ? report.reporting_site.username : report.ip}: #{report.comments}"
|
||||||
})
|
})
|
||||||
|
|
||||||
|
flash[:success] = "Thank you for the report, we will look into it."
|
||||||
|
|
||||||
redirect request.referer
|
redirect request.referer
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -35,13 +35,13 @@
|
||||||
|
|
||||||
<% if current_site && current_site != site %>
|
<% if current_site && current_site != site %>
|
||||||
<% is_following = current_site.is_following?(site) %>
|
<% is_following = current_site.is_following?(site) %>
|
||||||
|
|
||||||
<a id="followLink" href="#" onclick="Site.toggleFollow(<%= site.id %>, '<%= csrf_token %>'); return false" class="btn-Action <%= is_following ? 'is-following' : '' %>">
|
<a id="followLink" href="#" onclick="Site.toggleFollow(<%= site.id %>, '<%= csrf_token %>'); return false" class="btn-Action <%= is_following ? 'is-following' : '' %>">
|
||||||
<span class="unfollow"><i class="fa fa-times"></i>Unfollow</span>
|
<span class="unfollow"><i class="fa fa-times"></i>Unfollow</span>
|
||||||
<span class="following"><i class="fa fa-check"></i>Following</span>
|
<span class="following"><i class="fa fa-check"></i>Following</span>
|
||||||
<span class="follow"><i class="fa fa-plus"></i>Follow</span>
|
<span class="follow"><i class="fa fa-plus"></i>Follow</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<!-- <a href="#" class="btn-Action tip"><span>Tip</span></a> -->
|
<!-- <a href="#" class="btn-Action tip"><span>Tip</span></a> -->
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
|
@ -60,8 +60,8 @@
|
||||||
<div class="post-comment">
|
<div class="post-comment">
|
||||||
<form method="POST" action="/site/<%= site.username %>/comment">
|
<form method="POST" action="/site/<%= site.username %>/comment">
|
||||||
<input name="csrf_token" type="hidden" value="<%= csrf_token %>">
|
<input name="csrf_token" type="hidden" value="<%= csrf_token %>">
|
||||||
<input name="message"
|
<input name="message"
|
||||||
type="text"
|
type="text"
|
||||||
placeholder="Post a message..."
|
placeholder="Post a message..."
|
||||||
autocomplete="off"
|
autocomplete="off"
|
||||||
maxlength="<%= Site::MAX_COMMENT_SIZE %>"
|
maxlength="<%= Site::MAX_COMMENT_SIZE %>"
|
||||||
|
@ -71,7 +71,7 @@
|
||||||
<% unless current_site.commenting_allowed? %>disabled<% end %>
|
<% unless current_site.commenting_allowed? %>disabled<% end %>
|
||||||
>Post</button>
|
>Post</button>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<% unless current_site.commenting_allowed? %>
|
<% unless current_site.commenting_allowed? %>
|
||||||
<p class="comment-policy">
|
<p class="comment-policy">
|
||||||
To prevent spam, you cannot comment until you have updated your site <strong><%= Site::COMMENTING_ALLOWED_UPDATED_COUNT %> times</strong> (on <%= Site::COMMENTING_ALLOWED_UPDATED_COUNT %> separate days), and your account is one week old. While waiting, now is a great time to <a href="/dashboard">start building your awesome site!</a>
|
To prevent spam, you cannot comment until you have updated your site <strong><%= Site::COMMENTING_ALLOWED_UPDATED_COUNT %> times</strong> (on <%= Site::COMMENTING_ALLOWED_UPDATED_COUNT %> separate days), and your account is one week old. While waiting, now is a great time to <a href="/dashboard">start building your awesome site!</a>
|
||||||
|
@ -117,11 +117,14 @@
|
||||||
|
|
||||||
<% if site != current_site %>
|
<% if site != current_site %>
|
||||||
<div class="report">
|
<div class="report">
|
||||||
<a href="#report" data-toggle="modal">Report</a> |
|
<a href="#report" data-toggle="modal">Report</a>
|
||||||
<% if current_site && current_site.is_blocking?(site) %>
|
<% if signed_in? %>
|
||||||
<a href="#">Unblock</a>
|
|
|
||||||
<% else %>
|
<% if current_site && current_site.is_blocking?(site) %>
|
||||||
<a href="#block" data-toggle="modal">Block</a>
|
<a href="#">Unblock</a>
|
||||||
|
<% else %>
|
||||||
|
<a href="#block" data-toggle="modal">Block</a>
|
||||||
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
@ -148,8 +151,13 @@
|
||||||
<option value="other">Other</option>
|
<option value="other">Other</option>
|
||||||
</select>
|
</select>
|
||||||
</p>
|
</p>
|
||||||
<p>Comments:</p>
|
<p>Please describe the problem:</p>
|
||||||
<textarea name="comments" type="text" style="width: 400px; margin-bottom: 20px;"></textarea>
|
<textarea name="comments" type="text" style="width: 400px; margin-bottom: 20px;"></textarea>
|
||||||
|
|
||||||
|
<p>Please fill out the captcha so we know you're not a robot:</p>
|
||||||
|
<div class="recaptcha" style="margin-bottom: 20px">
|
||||||
|
<%== recaptcha_tag :challenge, ssl: request.ssl? %>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button>
|
<button class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button>
|
||||||
|
@ -182,4 +190,4 @@
|
||||||
<button type="submit" class="btn-Action">Block Site</button>
|
<button type="submit" class="btn-Action">Block Site</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Add table
Reference in a new issue