Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spam2 minor bug fixes #8352

Merged
merged 2 commits into from
Aug 25, 2020
Merged

Spam2 minor bug fixes #8352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f33d87c
minor bugs fixes
keshavsethi Aug 25, 2020
d863652
spam2 minor errors
keshavsethi Aug 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/spam2_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def _spam_queue

def _spam_users
if logged_in_as(%w(moderator admin))
@users = User.paginate(page: params[:page], per_page: params[:pagination])
@users = User.paginate(page: params[:page], per_page: params[:pagination]).order('created_at DESC')
@users = case params[:type]
when 'banned'
@users.where('rusers.status = 0')
Expand Down
17 changes: 8 additions & 9 deletions app/views/spam2/_insights.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,39 @@
<div class="card-body">
<a class="card-title text-secondary h5 font-weight-bold" href="/spam2/filter/unmoderated/30"> <i class="fa fa-circle text-primary"></i> Unmoderated</a>
<ul class="list-group list-group-flush text-secondary mt-3">
<li class="list-group-item"><%= Node.where(status: 4, created: (Time.now - 1.month)..Time.now).size%> Nodes</li>
<li class="list-group-item"><%= Comment.where(status: 4, timestamp: (Time.now - 1.month)..Time.now).size %> Comments</li>
<li class="list-group-item"><span data-toggle="tooltip" data-placement="top" title="Unmoderated Nodes"><%= Node.where(status: 4).size%></span></li>
<li class="list-group-item"><span data-toggle="tooltip" data-placement="top" title="Unmoderated Comments"><%= Comment.where(status: 4).size %></span></li>
</ul>
</div>
</div>
<div class="card">
<div class="card-body">
<a class="card-title h5 text-secondary font-weight-bold" href="/spam2/filter/spammed/30"> <i class="fa fa-ban text-danger"></i> Spammed</a>
<ul class="list-group list-group-flush text-secondary mt-3">
<li class="list-group-item"><%= Node.where(status: 0, created: (Time.now - 1.month)..Time.now).size%> Nodes</li>
<li class="list-group-item"><%= Comment.where(status: 0, timestamp: (Time.now - 1.month)..Time.now).size %> Comments</li>
<li class="list-group-item"><span data-toggle="tooltip" data-placement="top" title="Spammed Nodes"><%= Node.where(status: 0).size%></span></li>
<li class="list-group-item"><span data-toggle="tooltip" data-placement="top" title="Spammed Comments"><%= Comment.where(status: 0).size %></span></li>
</ul>
</div>
</div>
<div class="card">
<div class="card-body">
<a class="card-title h5 text-secondary font-weight-bold" href="/spam2/flags/filter/all/30"> <i class="fa fa-flag text-warning"></i> Flagged</a>
<ul class="list-group list-group-flush text-secondary mt-3">
<li class="list-group-item"><%= Node.where('flag > ?', 0).where(created: (Time.now - 1.month)..Time.now).size%> Nodes</li>
<li class="list-group-item"><%= Comment.where('flag > ?', 0).where(timestamp: (Time.now - 1.month)..Time.now).size %> Comments</li>
<li class="list-group-item"><span data-toggle="tooltip" data-placement="top" title="Flagged Nodes"><%= Node.where('flag > ?', 0).size%></span></li>
<li class="list-group-item"><span data-toggle="tooltip" data-placement="top" title="Spammed Comments"><%= Comment.where('flag > ?', 0).size %></span></li>
</ul>
</div>
</div>
<div class="card">
<div class="card-body">
<a class="card-title h5 text-secondary font-weight-bold" href="/spam2/filter/published/30"> <i class="fa fa-check text-success"></i> Published</a>
<ul class="list-group list-group-flush text-secondary mt-3">
<li class="list-group-item"><%= Node.where(status: 1, created: (Time.now - 1.month)..Time.now).size%> Nodes</li>
<li class="list-group-item"><%= Comment.where(status: 1, timestamp: (Time.now - 1.month)..Time.now).count %> Comments</li>
<li class="list-group-item"><span data-toggle="tooltip" data-placement="top" title="Published Nodes"><%= Node.where(status: 1).size%></span></li>
<li class="list-group-item"><span data-toggle="tooltip" data-placement="top" title="Published Comments"><%= Comment.where(status: 1).count %></span></li>
</ul>
</div>
</div>
</div>
<p class="text-secondary">* The above stats are for past month</p>
<div class="card w-100 mt-2 border-0">
<div class="card-body">
<h4 class="card-title my-3 text-secondary font-weight-bold"> <i class="fa fa-line-chart text-primary"></i> Moderation graph</h4>
Expand Down
25 changes: 16 additions & 9 deletions app/views/spam2/_spam.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,22 @@
<a class="dropdown-item <% if params[:action] == "_spam_insights" %> active <% end %>" href="/spam2/insights"><i class="drop fa fa-line-chart text-primary"></i> Insights </a>
<div class="dropdown-divider"></div>
<h6 class="dropdown-header">Spam Moderation</h6>
<a class="dropdown-item <% unless params[:action] =="_spam_comments" ||params[:action] =="_spam_queue" || params[:action] =="_spam_insights"|| params[:action] =="_spam_revisions" || params[:action] =="_spam_flags" || params[:type] == "wiki" || params[:action] == "_spam_users"%> active <% end %>" href="/spam2/filter/all/30"><i class="drop fa fa-address-book text-primary"></i> Moderation</a>
<a class="dropdown-item <% if params[:type] == "wiki" %> active <% end %>" id="wiki_drop" href="/spam2/filter/wiki/30" ><i class="drop fa fa-book text-primary"></i> Wiki</a>
<a class="dropdown-item <% if params[:action] == "_spam_queue" %> active <% end %>" href="/spam2/queue/filter/everything" ><i class="drop fa fa-clock text-primary"></i> Queue</a>
<a class="dropdown-item <% if params[:action] == "_spam_revisions" %> active <% end %>" href="/spam2/revisions"><i class="drop fa fa-list text-primary"></i> Revision</a>
<a class="dropdown-item <% if params[:action] == "_spam_comments" %> active <% end %>" href="/spam2/comments/filter/all/30" ><i class="drop fa fa-comment text-primary"></i> Comments</a>
<a class="dropdown-item <% if params[:action] == "_spam_flags" %> active <% end %>" href="/spam2/flags/filter/all/30" ><i class="drop fa fa-flag text-primary"></i> Flag </a>
<a class="dropdown-item <% if params[:action] == "_spam_users" %> active <% end %>" href="/spam2/users/filter/all/30"><i class="drop fa fa-user text-primary"></i> User moderation</a>
<a class="drop_click dropdown-item <% unless params[:action] =="_spam_comments" ||params[:action] =="_spam_queue" || params[:action] =="_spam_insights"|| params[:action] =="_spam_revisions" || params[:action] =="_spam_flags" || params[:type] == "wiki" || params[:action] == "_spam_users"%> active <% end %>" href="/spam2/filter/all/30"><i class="drop fa fa-address-book text-primary"></i> Moderation</a>
<a class="wiki_drop_click dropdown-item <% if params[:type] == "wiki" %> active <% end %>" id="wiki_drop" href="/spam2/filter/wiki/30" ><i class="drop fa fa-book text-primary"></i> Wiki</a>
<a class="drop_click dropdown-item <% if params[:action] == "_spam_queue" %> active <% end %>" href="/spam2/queue/filter/everything" ><i class="drop fa fa-clock text-primary"></i> Queue</a>
<a class="drop_click dropdown-item <% if params[:action] == "_spam_revisions" %> active <% end %>" href="/spam2/revisions"><i class="drop fa fa-list text-primary"></i> Revision</a>
<a class="drop_click dropdown-item <% if params[:action] == "_spam_comments" %> active <% end %>" href="/spam2/comments/filter/all/30" ><i class="drop fa fa-comment text-primary"></i> Comments</a>
<a class="drop_click dropdown-item <% if params[:action] == "_spam_flags" %> active <% end %>" href="/spam2/flags/filter/all/30" ><i class="drop fa fa-flag text-primary"></i> Flag </a>
<a class="drop_click dropdown-item <% if params[:action] == "_spam_users" %> active <% end %>" href="/spam2/users/filter/all/30"><i class="drop fa fa-user text-primary"></i> User moderation</a>
</div>
</div>
</div>
<script>
$('#wiki_drop').on('click', function () { // Wiki filter
$(document).on('click', '.drop_click', function(){
localStorage.setItem('page-select', "30");
localStorage.setItem('filter', 'all');
});
$(document).on('click', '.wiki_drop_click', function(){
localStorage.setItem('page-select', "30");
localStorage.setItem('filter', 'wiki');
});
Expand Down Expand Up @@ -100,7 +104,10 @@
<option value="30">30</option>
<option value="50">50</option>
<option value="100">100</option>
<option value="150">150</option>
<option value="200">200</option>
<option value="400">400</option>
<option value="600">600</option>
<option value="1000">1000</option>
</select>
</div>
<% end %>
Expand Down
2 changes: 2 additions & 0 deletions app/views/spam2/_users.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ $(document).ready(function () {
$('#selectall').prop("checked", check);
disable_buttons('#selectall');
});
var pageselect = localStorage.getItem('page-select') || '30';
$("#pageselect").val(pageselect);
$('#pageselect').change(function () {
pagination("#pageselect", "/spam2/users/filter/");
});
Expand Down