From 4c7041e4b3e9c4ee1a89c819e1a1f536d27bbf24 Mon Sep 17 00:00:00 2001 From: jamal Date: Sat, 11 Oct 2014 15:50:06 -0400 Subject: [PATCH 001/305] Change Gather style to volunteer captains This will change the gather format to allow for players to volunteer to be captain / commander. The gather will not change from the running state until 2 commanders have volunteered. Once commanders have volunteered the gather will switch to the picking state. The voting state is no longer used. Also, added a new sound alert that will be played when the gather is full but doesn't have 2 captains. This alert will loop every 10 seconds unless you're the commander. And changed the music to play once the gather switches to the picking state and only if the player doesn't have the gather page on focus. --- app/controllers/gathers_controller.rb | 16 +++++++++++ app/helpers/gathers_helper.rb | 8 ++++-- app/models/gather.rb | 22 +++++++++++++-- app/models/gatherer.rb | 8 +++++- app/models/shoutmsg.rb | 1 - app/views/gathers/_running.html.erb | 7 +++++ app/views/gathers/_status.html.erb | 19 +++++++++++-- app/views/gathers/show.html.erb | 40 +++++++++++++++++++++------ config/locales/en.yml | 1 + 9 files changed, 103 insertions(+), 19 deletions(-) diff --git a/app/controllers/gathers_controller.rb b/app/controllers/gathers_controller.rb index d8f4a87..3f7d949 100644 --- a/app/controllers/gathers_controller.rb +++ b/app/controllers/gathers_controller.rb @@ -63,6 +63,22 @@ class GathersController < ApplicationController redirect_to @gather end + def captain + raise AccessError unless @gatherer + + if @gather.captain1.nil? and @gather.captain2 != @gatherer + @gather.update_attribute :captain1, @gatherer + elsif @gather.captain2.nil? and @gather.captain1 != @gatherer + @gather.update_attribute :captain2, @gatherer + elsif @gatherer == @gather.captain1 + @gather.update_attribute :captain1, nil + elsif @gatherer == @gather.captain2 + @gather.update_attribute :captain2, nil + end + + redirect_to @gather + end + private def get_gather diff --git a/app/helpers/gathers_helper.rb b/app/helpers/gathers_helper.rb index 90dbaee..44274de 100644 --- a/app/helpers/gathers_helper.rb +++ b/app/helpers/gathers_helper.rb @@ -1,8 +1,12 @@ module GathersHelper def render_gather if @gather.status == Gather::STATE_RUNNING - headers['Gather'] = 'running' - + if @gather.is_full? and !@gather.is_ready? and @gather.captain1 != @gatherer and @gather.captain2 != @gatherer + headers['Gather'] = 'full' + else + headers['Gather'] = 'running' + end + render partial: 'running', layout: false elsif @gather.status == Gather::STATE_VOTING if @gatherer and @gather.gatherer_votes.first(conditions: { user_id: cuser.id }) diff --git a/app/models/gather.rb b/app/models/gather.rb index 21507a2..ac1e4ae 100644 --- a/app/models/gather.rb +++ b/app/models/gather.rb @@ -89,6 +89,17 @@ class Gather < ActiveRecord::Base 5 end + def is_full? + return gatherers.count == Gather::FULL + end + + def is_ready? + if is_full? and !captain1.nil? and !captain2.nil? + return true + end + false + end + def first Gather.where(:category_id => category_id).order("id ASC").first end @@ -124,8 +135,6 @@ class Gather < ActiveRecord::Base g = Gather.new g.category = self.category g.save - self.captain1 = self.gatherers.most_voted[1] - self.captain2 = self.gatherers.most_voted[0] if self.gather_maps.count > 1 self.map1 = self.gather_maps.ordered[0] self.map2 = self.gather_maps.ordered[1] @@ -139,7 +148,7 @@ class Gather < ActiveRecord::Base end def check_captains - if captain1_id_changed? or captain2_id_changed? or admin + if status == STATE_RUNNING and is_ready? or admin self.turn = 1 self.status = STATE_PICKING gatherers.each do |gatherer| @@ -151,6 +160,13 @@ class Gather < ActiveRecord::Base gatherer.update_attributes(:team => nil, :skip_callbacks => true) end end + + # Create a new shout msgs when the gather is full + Shoutmsg.new({ + :shoutable_type => self.class.to_s, + :shoutable_id => self.id, + :text => I18n.t(:gather_start_shout) + }).save end end diff --git a/app/models/gatherer.rb b/app/models/gatherer.rb index 0b49f1b..45133c8 100644 --- a/app/models/gatherer.rb +++ b/app/models/gatherer.rb @@ -70,7 +70,7 @@ class Gatherer < ActiveRecord::Base validates :confirm, :acceptance => true, :unless => Proc.new {|gatherer| gatherer.user.gatherers.count >= 5} validate :validate_username - after_create :start_gather, :if => Proc.new {|gatherer| gatherer.gather.gatherers.count == Gather::FULL} + after_create :start_gather, :if => Proc.new {|gatherer| gatherer.gather.is_ready?} after_create :notify_gatherers, :if => Proc.new {|gatherer| gatherer.gather.gatherers.count == Gather::NOTIFY} after_update :change_turn, :unless => Proc.new {|gatherer| gatherer.skip_callbacks == true} after_destroy :cleanup_votes @@ -118,6 +118,12 @@ class Gatherer < ActiveRecord::Base end def cleanup_votes + if gather.captain1_id == id + gather.update_attribute :captain1, nil + elsif gather.captain2_id == id + gather.update_attribute :captain2, nil + end + gather.map_votes.all(:conditions => {:user_id => user_id}).each { |g| g.destroy } gather.server_votes.all(:conditions => {:user_id => user_id}).each { |g| g.destroy } gather.gatherer_votes.all(:conditions => {:user_id => user_id}).each { |g| g.destroy } diff --git a/app/models/shoutmsg.rb b/app/models/shoutmsg.rb index 60e0d59..45d7a47 100644 --- a/app/models/shoutmsg.rb +++ b/app/models/shoutmsg.rb @@ -17,7 +17,6 @@ class Shoutmsg < ActiveRecord::Base attr_protected :id, :created_at, :updated_at, :user_id validates_length_of :text, :in => 1..100 - validates_presence_of :user scope :recent, :include => :user, diff --git a/app/views/gathers/_running.html.erb b/app/views/gathers/_running.html.erb index de2d68f..3971c18 100644 --- a/app/views/gathers/_running.html.erb +++ b/app/views/gathers/_running.html.erb @@ -9,6 +9,13 @@ 0 %> class="away"<% end %>> <%= flag gatherer.user.country %> <%= namelink gatherer.user %> + + <% if gatherer == @gather.captain1 or gatherer == @gather.captain2 %> + + <%= icon('star') %> + + <% end %> + <% if cuser and cuser.admin? %> <%= link_to gatherer, method: :delete, class: 'delete' do %> <%= icon 'times' %> diff --git a/app/views/gathers/_status.html.erb b/app/views/gathers/_status.html.erb index 50a508d..12177c0 100644 --- a/app/views/gathers/_status.html.erb +++ b/app/views/gathers/_status.html.erb @@ -2,15 +2,28 @@ <% if @gather.status == Gather::STATE_RUNNING %> <% if @gatherer and @gatherer.can_destroy? cuser %> -

Gather running, <%= Gather::FULL - @gather.gatherers.length %> more needed.

- <%= link_to 'Leave Gather', @gatherer, confirm: 'Are you sure?', method: :delete, class: 'button tiny' %> + <% if Gather::FULL == @gather.gatherers.length %> +

Gather is full but we are waiting on commanders. If you would like to command, please use the button below.

+ <% else %> +

Gather running, <%= Gather::FULL - @gather.gatherers.length %> more needed.

+ <% end %> + + <%= form_tag "/gathers/captain/#{@gather.id}" do %> + <%= submit_tag (@gather.captain1 == @gatherer or @gather.captain2 == @gatherer) ? 'Stop Commanding' : 'Command a Team', class: 'button tiny' %> + <% end %> + + <%= link_to 'Leave Gather', @gatherer, confirm: 'Are you sure?', method: :delete, class: 'button tiny leave-gather' %> <% elsif (g = Gatherer.new(gather: @gather, user: cuser)).can_create?(cuser) %> <%= form_for g do |f| %> <%= f.hidden_field :gather_id %> <%= f.hidden_field :user_id %> -

Gather running, <%= Gather::FULL - @gather.gatherers.length %> more needed.

+ <% if Gather::FULL == @gather.gatherers.length %> +

Gather is full but we are waiting on commanders. If you would like to command, please use the button below.

+ <% else %> +

Gather running, <%= Gather::FULL - @gather.gatherers.length %> more needed.

+ <% end %>

You can download custom maps via the <%= link_to "Steam Workshop", "http://steamcommunity.com/workshop/browse?searchtext=&childpublishedfileid=0§ion=items&appid=4920&browsesort=trend&requiredtags%5B%5D=level" %>. diff --git a/app/views/gathers/show.html.erb b/app/views/gathers/show.html.erb index 509c9d1..463415c 100644 --- a/app/views/gathers/show.html.erb +++ b/app/views/gathers/show.html.erb @@ -1,5 +1,6 @@

\ No newline at end of file From 6082103a17d11c9cb595eed4f01c004b6caa9846 Mon Sep 17 00:00:00 2001 From: simplefl Date: Mon, 27 Apr 2015 20:34:39 +0200 Subject: [PATCH 047/305] Display channel password on gather page. --- app/views/gathers/show.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/gathers/show.html.erb b/app/views/gathers/show.html.erb index 8fad528..1d5d62e 100644 --- a/app/views/gathers/show.html.erb +++ b/app/views/gathers/show.html.erb @@ -150,6 +150,7 @@
  • <%= link_to "Teamspeak 3", "http://www.teamspeak.com/?page=downloads" %>
  • Server: ensl.org
    • +
  • Channel password: ns2gather
From fabcbf590088a20257710f8e185141b21d0e99b6 Mon Sep 17 00:00:00 2001 From: simplefl Date: Tue, 28 Apr 2015 17:51:22 +0200 Subject: [PATCH 048/305] Pump rmagick to 2.13.4. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index b161b85..ae4dda3 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ gem 'will_paginate', '~> 3.0.5' gem 'dynamic_form', '~> 1.1.4' gem 'country_code_select', '~> 1.0.1' gem 'active_link_to', '~> 1.0.2' -gem 'rmagick', '~> 2.13.2', require: false +gem 'rmagick', '~> 2.13.4', require: false gem 'steam-condenser', github: 'koraktor/steam-condenser-ruby' # Please install nodejs locally. From 80882866914420be3ef5f2500a592f13b7e81107 Mon Sep 17 00:00:00 2001 From: simplefl Date: Fri, 1 May 2015 00:48:51 +0200 Subject: [PATCH 049/305] Add steam group link to gather page. --- app/views/gathers/show.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/gathers/show.html.erb b/app/views/gathers/show.html.erb index 1d5d62e..bce9335 100644 --- a/app/views/gathers/show.html.erb +++ b/app/views/gathers/show.html.erb @@ -142,6 +142,7 @@
  • <%= link_to "Gather Spreadsheet", "https://docs.google.com/spreadsheets/d/1MNhP60WcTGA0xgpnmFCfRhlZWU106X6MgxLGgPt0N5A" %>
  • <%= link_to "Fill out Spreadsheet", "https://docs.google.com/forms/d/1PHkGwcM9Z6Qut4voBkR71cSSi9vB7xx-cOF6JtW7lmk/viewform" %>
    • +
  • <%= link_to "Steam group", "http://steamcommunity.com/groups/nslgathers" %>
From 05b02a3d31e15ed5aa186134a23c3a9de0daf977 Mon Sep 17 00:00:00 2001 From: cblanc Date: Sat, 2 May 2015 18:07:10 +0100 Subject: [PATCH 050/305] Fix error page for when the 404 is user not found --- app/views/layouts/errors.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/errors.html.erb b/app/views/layouts/errors.html.erb index b647100..d20070d 100644 --- a/app/views/layouts/errors.html.erb +++ b/app/views/layouts/errors.html.erb @@ -6,13 +6,13 @@ <%= favicon_link_tag 'shared/favicon.ico' %> - <%= stylesheet_link_tag "themes/#{active_theme}/errors" %> + <%= stylesheet_link_tag "themes/default/errors" %>

<%= params[:code] %>

From 25143d21f92cc2272002597bb4c1469ceadb8b27 Mon Sep 17 00:00:00 2001 From: Luke Barratt Date: Sat, 2 May 2015 23:46:16 +0100 Subject: [PATCH 051/305] Addec colour and documentaton style formatting to RSpec output to improve readability --- spec/spec_helper.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e31306e..f2956e2 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -31,6 +31,8 @@ RSpec.configure do |config| config.fixture_path = "#{::Rails.root}/spec/fixtures" config.order = 'random' config.use_transactional_fixtures = false + config.color = true + config.formatter = :documentation config.before(:each) do events_list_json = JSON.parse(File.read(Rails.root.join('spec/fixtures/google_calendar.json'))) From 3bd72b6ddf2ea5b2dd292b44894e316747b25877 Mon Sep 17 00:00:00 2001 From: cblanc Date: Tue, 5 May 2015 20:35:54 +0100 Subject: [PATCH 052/305] render_shoutmsgs never invoked --- app/controllers/shoutmsgs_controller.rb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/controllers/shoutmsgs_controller.rb b/app/controllers/shoutmsgs_controller.rb index 06a1e93..041116c 100644 --- a/app/controllers/shoutmsgs_controller.rb +++ b/app/controllers/shoutmsgs_controller.rb @@ -29,11 +29,4 @@ class ShoutmsgsController < ApplicationController @shoutmsg.destroy redirect_to_back end - - - private - - def render_shoutmsgs shoutable_type = nil, shoutable_id = nil - - end end From 165267c571a3e9c19d63abc1ddcb23dd202a69ef Mon Sep 17 00:00:00 2001 From: cblanc Date: Tue, 5 May 2015 22:43:54 +0100 Subject: [PATCH 053/305] Added test to find out how banning works --- spec/models/user_spec.rb | 44 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 spec/models/user_spec.rb diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb new file mode 100644 index 0000000..24ba3a2 --- /dev/null +++ b/spec/models/user_spec.rb @@ -0,0 +1,44 @@ +# == Schema Information +# +# Table name: users +# +# id :integer not null, primary key +# username :string(255) +# password :string(255) +# firstname :string(255) +# lastname :string(255) +# email :string(255) +# steamid :string(255) +# team_id :integer +# lastvisit :datetime +# created_at :datetime +# updated_at :datetime +# lastip :string(255) +# country :string(255) +# birthdate :date +# time_zone :string(255) +# version :integer +# public_email :boolean default(FALSE), not null +# + +require 'spec_helper' + +describe User do + let!(:user) { create :user } + + describe "#banned?" do + it "returns false if user is not banned" do + expect(user.banned?).to be_false + end + + it "returns true if user is banned" do + ban = Ban.create! ban_type: Ban::TYPE_SITE, expiry: Time.now + 10.days, user_name: user.username + expect(user.banned?).to be_true + end + + it "returns true for specific bans" do + ban = Ban.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now + 10.days, user_name: user.username + expect(user.banned? Ban::TYPE_MUTE).to be_true + end + end +end \ No newline at end of file From 79375b447433bef8c23b2ae771a3793c4b9f6996 Mon Sep 17 00:00:00 2001 From: cblanc Date: Tue, 5 May 2015 22:51:10 +0100 Subject: [PATCH 054/305] Bundle installed --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a090d97..0701597 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -193,7 +193,7 @@ GEM rake (10.3.2) rdoc (3.12.2) json (~> 1.4) - rmagick (2.13.2) + rmagick (2.13.4) rspec-core (2.14.8) rspec-expectations (2.14.5) diff-lcs (>= 1.1.3, < 2.0) @@ -298,7 +298,7 @@ DEPENDENCIES quiet_assets (~> 1.0.2) rails (~> 3.2.19) rails_autolink (~> 1.1.5) - rmagick (~> 2.13.2) + rmagick (~> 2.13.4) rspec-rails (~> 2.14.1) sanitize (~> 2.1.0) sass (~> 3.3.4) From 46e30e8a4c017deea30a2ee5956ba83c2b924dba Mon Sep 17 00:00:00 2001 From: cblanc Date: Tue, 5 May 2015 22:51:26 +0100 Subject: [PATCH 055/305] Updated test for expected ban behaviour --- spec/features/shoutbox/shoutbox_spec.rb | 35 +++++++++++-------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/spec/features/shoutbox/shoutbox_spec.rb b/spec/features/shoutbox/shoutbox_spec.rb index 30d75ac..dec6542 100644 --- a/spec/features/shoutbox/shoutbox_spec.rb +++ b/spec/features/shoutbox/shoutbox_spec.rb @@ -1,26 +1,23 @@ require 'spec_helper' -feature 'Shoutbox' do +feature 'Shoutbox', js: true do + let!(:user) { create :user } + background do - @user = create :user - sign_in_as @user - visit root_path + sign_in_as user end - feature 'user creates a shout', js: true do - scenario 'shouting with valid content' do - shout = rand(100000).to_s - fill_in 'shoutbox_text', with: shout - click_button 'Shout!' - expect(page).to have_content(shout) - end + scenario 'creating a valid shout' do + visit root_path + shout = rand(100000).to_s + fill_in 'shoutbox_text', with: shout + click_button 'Shout!' + expect(page).to have_content(shout) + end - scenario 'unable to while banned' do - @user.bans.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now + 10.days - shout = rand(100000).to_s - fill_in 'shoutbox_text', with: shout - click_button 'Shout!' - expect(page).to_not have_content(shout) - end - end + scenario 'creating shout while banned' do + Ban.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now + 10.days, user_name: user.username + visit root_path + expect(find("#sidebar")).to have_content "You have been muted." + end end \ No newline at end of file From 1a0100db20a8356dc669b07d12e4c316a19aff9e Mon Sep 17 00:00:00 2001 From: cblanc Date: Wed, 6 May 2015 00:04:41 +0100 Subject: [PATCH 056/305] Cleanup: move out js, require_self shouldnt be necessary --- app/assets/javascripts/application.js.coffee | 42 +------------------- 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index cc5b14b..8cb6a1b 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -6,43 +6,5 @@ //= require tinymce-jquery //= require yetii //= require local -//= require_self - -$ -> - $('#logout').click -> - $(this).closest('form').submit() - - $('select').each (i, el) -> - $select = $(el) - - $select.wrap '
' - $select.on 'DOMSubtreeModified', (event) -> - $el = $(this) - $wrapper = $el.parent() - - if $el.is("[disabled]") - $wrapper.addClass 'disabled' - else - $wrapper.removeClass 'disabled' - - $select.trigger 'DOMSubtreeModified' - - $('a[href=#form_submit]').click -> - $(this).closest('form').submit() - return false - - $('select.autosubmit').change -> - $(this).closest('form').submit() - - $('#notification').delay(3000).fadeOut() - - $('#steam-search a').click (event) -> - event.preventDefault() - - $search = $('#steam-search') - id = $search.data 'user-id' - - $search.html "

Searching...

" - - $.get "/api/v1/users/#{id}", (data) -> - $search.html "Steam Profile: #{data.steam.nickname}" +//= require shoutbox +//= require misc \ No newline at end of file From d6eba921f6459365edfd2054ea5ba05d45af082e Mon Sep 17 00:00:00 2001 From: cblanc Date: Wed, 6 May 2015 00:05:03 +0100 Subject: [PATCH 057/305] Cleanup: move out js, require_self shouldnt be necessary --- app/assets/javascripts/misc.js.coffee | 38 +++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 app/assets/javascripts/misc.js.coffee diff --git a/app/assets/javascripts/misc.js.coffee b/app/assets/javascripts/misc.js.coffee new file mode 100644 index 0000000..3a861c0 --- /dev/null +++ b/app/assets/javascripts/misc.js.coffee @@ -0,0 +1,38 @@ +$ -> + $('#logout').click -> + $(this).closest('form').submit() + + $('select').each (i, el) -> + $select = $(el) + + $select.wrap '
' + $select.on 'DOMSubtreeModified', (event) -> + $el = $(this) + $wrapper = $el.parent() + + if $el.is("[disabled]") + $wrapper.addClass 'disabled' + else + $wrapper.removeClass 'disabled' + + $select.trigger 'DOMSubtreeModified' + + $('a[href=#form_submit]').click -> + $(this).closest('form').submit() + return false + + $('select.autosubmit').change -> + $(this).closest('form').submit() + + $('#notification').delay(3000).fadeOut() + + $('#steam-search a').click (event) -> + event.preventDefault() + + $search = $('#steam-search') + id = $search.data 'user-id' + + $search.html "

Searching...

" + + $.get "/api/v1/users/#{id}", (data) -> + $search.html "Steam Profile: #{data.steam.nickname}" \ No newline at end of file From 8db7da0b209cb7607efb009b4db561b659c745a2 Mon Sep 17 00:00:00 2001 From: cblanc Date: Sat, 9 May 2015 16:20:51 +0100 Subject: [PATCH 058/305] Added shoutbox controller to perform client side validation --- app/assets/javascripts/shoutbox.js | 76 ++++++++++++++++++++++++++++++ app/views/shoutmsgs/_new.html.erb | 10 ++++ 2 files changed, 86 insertions(+) create mode 100644 app/assets/javascripts/shoutbox.js diff --git a/app/assets/javascripts/shoutbox.js b/app/assets/javascripts/shoutbox.js new file mode 100644 index 0000000..4d511d8 --- /dev/null +++ b/app/assets/javascripts/shoutbox.js @@ -0,0 +1,76 @@ +// Shoutbox Controller manages input validation on shoutmsg form + +function ShoutboxController (options) { + if (!(this instanceof ShoutboxController)) { + return new ShoutboxController(options); + } + this.options = options; + this.$context = options.context; + if (this.$context.length) { + this.init(options); + } else { + console.log("Unable to initialize shoutbox controller. No context provided"); + } + return this; +} + +// Initialise shoutbox state +ShoutboxController.prototype.init = function (options) { + var self = this; + self.$input = self.$context.find(".shout_input"); + self.$button = self.$context.find('input[type="submit"]'); + self.$messageBox = null; + self.$input.change(function () { + if (self.$input.val().length > 100) { + self.disableShoutbox(); + } else { + self.enableShoutbox(); + } + }); + return self; +}; + +// Displays a message if `message` present, otherwise removes message elemt +ShoutboxController.prototype.writeMessage = function (message) { + if (message === undefined) return this.removeMessageBox(); + this.createMessageBox().html(message); + return this; +}; + +// Adds message box to DOM and cache +ShoutboxController.prototype.createMessageBox = function () { + if (this.$messageBox) return this.$messageBox; + this.$messageBox = $("

", {class: "shout-warning"}).appendTo(this.$context.find(".fields")); + return this.$messageBox; +}; + +// Removes message box from DOM and cache +ShoutboxController.prototype.removeMessageBox = function () { + if (this.$messageBox) { + this.$messageBox.remove(); + this.$messageBox = null; + } + return this; +}; + +// Returns true if button is disabled +ShoutboxController.prototype.isDisabled = function () { + return this.$button.prop("disabled") === true; +}; + +// Disables Input Button +ShoutboxController.prototype.disableShoutbox = function () { + var chars = this.$input.val().length; + this.writeMessage(["Shout message length exceeded (",chars,"/100)"].join("")); + this.$button.prop("disabled", true); +}; + +// Removes any warnings and enableds shoutbox submit +ShoutboxController.prototype.enableShoutbox = function () { + if (!this.$button.prop("disabled")) { + return this; + } + // Remove any warnings + this.writeMessage(); + this.$button.prop("disabled", false); +}; \ No newline at end of file diff --git a/app/views/shoutmsgs/_new.html.erb b/app/views/shoutmsgs/_new.html.erb index 25907da..523b076 100644 --- a/app/views/shoutmsgs/_new.html.erb +++ b/app/views/shoutmsgs/_new.html.erb @@ -17,3 +17,13 @@ <% end %> <% end %> <% end %> + + \ No newline at end of file From d6d87bdf831e4f7e0fcd3eb3bf8780e61ad697b7 Mon Sep 17 00:00:00 2001 From: cblanc Date: Sat, 9 May 2015 16:21:18 +0100 Subject: [PATCH 059/305] Added necessary factory methods to test shoutbox --- spec/factories/category.rb | 8 ++++++++ spec/factories/gather.rb | 13 +++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 spec/factories/gather.rb diff --git a/spec/factories/category.rb b/spec/factories/category.rb index 5578a38..14dd5ef 100644 --- a/spec/factories/category.rb +++ b/spec/factories/category.rb @@ -3,4 +3,12 @@ FactoryGirl.define do sequence(:name) { |n| "Category #{n}" } sequence(:sort) { |n| n } end + + trait :news do + domain Category::DOMAIN_NEWS + end + + trait :game do + domain Category::DOMAIN_GAMES + end end \ No newline at end of file diff --git a/spec/factories/gather.rb b/spec/factories/gather.rb new file mode 100644 index 0000000..a7b1d0a --- /dev/null +++ b/spec/factories/gather.rb @@ -0,0 +1,13 @@ +FactoryGirl.define do + factory :gather do + association :category, factory: [:category, :game] + end + + trait :running do + status Gather::STATE_RUNNING + end + + trait :picking do + status Gather::STATE_PICKING + end +end From 353cd3262b73a6d85d3c205037f7a88a71a3215d Mon Sep 17 00:00:00 2001 From: cblanc Date: Sat, 9 May 2015 16:21:48 +0100 Subject: [PATCH 060/305] Added test for client side shoutbox validation --- spec/features/gathers/gathers_spec.rb | 37 +++++++++++++++++++++++++ spec/features/shoutbox/shoutbox_spec.rb | 11 ++++++++ 2 files changed, 48 insertions(+) create mode 100644 spec/features/gathers/gathers_spec.rb diff --git a/spec/features/gathers/gathers_spec.rb b/spec/features/gathers/gathers_spec.rb new file mode 100644 index 0000000..71026b3 --- /dev/null +++ b/spec/features/gathers/gathers_spec.rb @@ -0,0 +1,37 @@ +require 'spec_helper' + +feature 'Gathers', js: true do + let!(:user) { create :user } + let!(:gather) { create :gather, :running } + + feature 'Shoutbox' do + background do + sign_in_as user + end + + scenario 'create shout' do + visit gather_path(gather) + shout = rand(100000).to_s + fill_in "shout_Gather_#{gather.id}_text", with: shout + click_button 'Shout!' + expect(page).to have_content(shout) + end + + scenario 'enter more than 100 characters' do + valid_shout = 100.times.map { "a" }.join + invalid_shout = 101.times.map { "a" }.join + visit gather_path(gather) + expect(page).to_not have_content("Shout message length exceeded") + fill_in "shout_Gather_#{gather.id}_text", with: invalid_shout + expect(page).to have_content("Shout message length exceeded") + fill_in "shout_Gather_#{gather.id}_text", with: valid_shout + expect(page).to_not have_content("Shout message length exceeded") + end + + scenario 'creating shout while banned' do + Ban.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now + 10.days, user_name: user.username + visit root_path + expect(find("#sidebar")).to have_content "You have been muted." + end + end +end \ No newline at end of file diff --git a/spec/features/shoutbox/shoutbox_spec.rb b/spec/features/shoutbox/shoutbox_spec.rb index dec6542..a138a97 100644 --- a/spec/features/shoutbox/shoutbox_spec.rb +++ b/spec/features/shoutbox/shoutbox_spec.rb @@ -15,6 +15,17 @@ feature 'Shoutbox', js: true do expect(page).to have_content(shout) end + scenario 'enter more than 100 characters' do + valid_shout = 100.times.map { "a" }.join + invalid_shout = 101.times.map { "a" }.join + visit root_path + expect(page).to_not have_content("Shout message length exceeded") + fill_in 'shoutbox_text', with: invalid_shout + expect(page).to have_content("Shout message length exceeded") + fill_in 'shoutbox_text', with: valid_shout + expect(page).to_not have_content("Shout message length exceeded") + end + scenario 'creating shout while banned' do Ban.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now + 10.days, user_name: user.username visit root_path From 2d8bf792f7294b7d65be56d13af72feccdf27cf7 Mon Sep 17 00:00:00 2001 From: cblanc Date: Sat, 9 May 2015 16:36:50 +0100 Subject: [PATCH 061/305] Listen on both keyup and change events --- app/assets/javascripts/shoutbox.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/shoutbox.js b/app/assets/javascripts/shoutbox.js index 4d511d8..447f966 100644 --- a/app/assets/javascripts/shoutbox.js +++ b/app/assets/javascripts/shoutbox.js @@ -20,7 +20,7 @@ ShoutboxController.prototype.init = function (options) { self.$input = self.$context.find(".shout_input"); self.$button = self.$context.find('input[type="submit"]'); self.$messageBox = null; - self.$input.change(function () { + self.$input.bind("keyup change", function () { if (self.$input.val().length > 100) { self.disableShoutbox(); } else { @@ -61,7 +61,7 @@ ShoutboxController.prototype.isDisabled = function () { // Disables Input Button ShoutboxController.prototype.disableShoutbox = function () { var chars = this.$input.val().length; - this.writeMessage(["Shout message length exceeded (",chars,"/100)"].join("")); + this.writeMessage(["Maximum shout length exceeded (",chars,"/100)"].join("")); this.$button.prop("disabled", true); }; From 97162edfbae75db76b975d3f842c5896dd119987 Mon Sep 17 00:00:00 2001 From: cblanc Date: Sat, 9 May 2015 16:37:00 +0100 Subject: [PATCH 062/305] Changed wording on warning message --- spec/features/gathers/gathers_spec.rb | 6 +++--- spec/features/shoutbox/shoutbox_spec.rb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spec/features/gathers/gathers_spec.rb b/spec/features/gathers/gathers_spec.rb index 71026b3..cdb8f8a 100644 --- a/spec/features/gathers/gathers_spec.rb +++ b/spec/features/gathers/gathers_spec.rb @@ -21,11 +21,11 @@ feature 'Gathers', js: true do valid_shout = 100.times.map { "a" }.join invalid_shout = 101.times.map { "a" }.join visit gather_path(gather) - expect(page).to_not have_content("Shout message length exceeded") + expect(page).to_not have_content("Maximum shout length exceeded") fill_in "shout_Gather_#{gather.id}_text", with: invalid_shout - expect(page).to have_content("Shout message length exceeded") + expect(page).to have_content("Maximum shout length exceeded") fill_in "shout_Gather_#{gather.id}_text", with: valid_shout - expect(page).to_not have_content("Shout message length exceeded") + expect(page).to_not have_content("Maximum shout length exceeded") end scenario 'creating shout while banned' do diff --git a/spec/features/shoutbox/shoutbox_spec.rb b/spec/features/shoutbox/shoutbox_spec.rb index a138a97..5a40b6e 100644 --- a/spec/features/shoutbox/shoutbox_spec.rb +++ b/spec/features/shoutbox/shoutbox_spec.rb @@ -19,11 +19,11 @@ feature 'Shoutbox', js: true do valid_shout = 100.times.map { "a" }.join invalid_shout = 101.times.map { "a" }.join visit root_path - expect(page).to_not have_content("Shout message length exceeded") + expect(page).to_not have_content("Maximum shout length exceeded") fill_in 'shoutbox_text', with: invalid_shout - expect(page).to have_content("Shout message length exceeded") + expect(page).to have_content("Maximum shout length exceeded") fill_in 'shoutbox_text', with: valid_shout - expect(page).to_not have_content("Shout message length exceeded") + expect(page).to_not have_content("Maximum shout length exceeded") end scenario 'creating shout while banned' do From 5d8a693fedde17d2a84479f26896739960185756 Mon Sep 17 00:00:00 2001 From: cblanc Date: Sat, 9 May 2015 16:43:02 +0100 Subject: [PATCH 063/305] Cleanup --- app/views/shoutmsgs/_new.html.erb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/views/shoutmsgs/_new.html.erb b/app/views/shoutmsgs/_new.html.erb index 523b076..a424897 100644 --- a/app/views/shoutmsgs/_new.html.erb +++ b/app/views/shoutmsgs/_new.html.erb @@ -19,10 +19,8 @@ <% end %> \ No newline at end of file From 3e2458588c26dddc9da529581f4b7ffc14f7bb1d Mon Sep 17 00:00:00 2001 From: simplefl Date: Tue, 28 Apr 2015 17:51:22 +0200 Subject: [PATCH 071/305] Pump rmagick to 2.13.4. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index b161b85..ae4dda3 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ gem 'will_paginate', '~> 3.0.5' gem 'dynamic_form', '~> 1.1.4' gem 'country_code_select', '~> 1.0.1' gem 'active_link_to', '~> 1.0.2' -gem 'rmagick', '~> 2.13.2', require: false +gem 'rmagick', '~> 2.13.4', require: false gem 'steam-condenser', github: 'koraktor/steam-condenser-ruby' # Please install nodejs locally. From fb01424e361630171be02b3eea7d1d88d8e7f4c5 Mon Sep 17 00:00:00 2001 From: cblanc Date: Sat, 2 May 2015 18:07:10 +0100 Subject: [PATCH 072/305] Fix error page for when the 404 is user not found --- app/views/layouts/errors.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/errors.html.erb b/app/views/layouts/errors.html.erb index b647100..d20070d 100644 --- a/app/views/layouts/errors.html.erb +++ b/app/views/layouts/errors.html.erb @@ -6,13 +6,13 @@ <%= favicon_link_tag 'shared/favicon.ico' %> - <%= stylesheet_link_tag "themes/#{active_theme}/errors" %> + <%= stylesheet_link_tag "themes/default/errors" %>

<%= params[:code] %>

From 9574a51dd1ff3d3866fd4dbbd4f1e915127abad7 Mon Sep 17 00:00:00 2001 From: Luke Barratt Date: Sat, 2 May 2015 23:46:16 +0100 Subject: [PATCH 073/305] Addec colour and documentaton style formatting to RSpec output to improve readability --- spec/spec_helper.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e31306e..f2956e2 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -31,6 +31,8 @@ RSpec.configure do |config| config.fixture_path = "#{::Rails.root}/spec/fixtures" config.order = 'random' config.use_transactional_fixtures = false + config.color = true + config.formatter = :documentation config.before(:each) do events_list_json = JSON.parse(File.read(Rails.root.join('spec/fixtures/google_calendar.json'))) From 7044bb075853192f1821df0af68a27f6f6c6496a Mon Sep 17 00:00:00 2001 From: cblanc Date: Tue, 5 May 2015 20:35:54 +0100 Subject: [PATCH 074/305] render_shoutmsgs never invoked --- app/controllers/shoutmsgs_controller.rb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/controllers/shoutmsgs_controller.rb b/app/controllers/shoutmsgs_controller.rb index 06a1e93..041116c 100644 --- a/app/controllers/shoutmsgs_controller.rb +++ b/app/controllers/shoutmsgs_controller.rb @@ -29,11 +29,4 @@ class ShoutmsgsController < ApplicationController @shoutmsg.destroy redirect_to_back end - - - private - - def render_shoutmsgs shoutable_type = nil, shoutable_id = nil - - end end From 54f5bba669deb3a4455c5433b2ed64e9dba57d06 Mon Sep 17 00:00:00 2001 From: cblanc Date: Tue, 5 May 2015 22:43:54 +0100 Subject: [PATCH 075/305] Added test to find out how banning works --- spec/models/user_spec.rb | 44 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 spec/models/user_spec.rb diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb new file mode 100644 index 0000000..24ba3a2 --- /dev/null +++ b/spec/models/user_spec.rb @@ -0,0 +1,44 @@ +# == Schema Information +# +# Table name: users +# +# id :integer not null, primary key +# username :string(255) +# password :string(255) +# firstname :string(255) +# lastname :string(255) +# email :string(255) +# steamid :string(255) +# team_id :integer +# lastvisit :datetime +# created_at :datetime +# updated_at :datetime +# lastip :string(255) +# country :string(255) +# birthdate :date +# time_zone :string(255) +# version :integer +# public_email :boolean default(FALSE), not null +# + +require 'spec_helper' + +describe User do + let!(:user) { create :user } + + describe "#banned?" do + it "returns false if user is not banned" do + expect(user.banned?).to be_false + end + + it "returns true if user is banned" do + ban = Ban.create! ban_type: Ban::TYPE_SITE, expiry: Time.now + 10.days, user_name: user.username + expect(user.banned?).to be_true + end + + it "returns true for specific bans" do + ban = Ban.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now + 10.days, user_name: user.username + expect(user.banned? Ban::TYPE_MUTE).to be_true + end + end +end \ No newline at end of file From fa0cd88c15a29b7e9c03c5c2548607d41cbce278 Mon Sep 17 00:00:00 2001 From: cblanc Date: Tue, 5 May 2015 22:51:10 +0100 Subject: [PATCH 076/305] Bundle installed --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a090d97..0701597 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -193,7 +193,7 @@ GEM rake (10.3.2) rdoc (3.12.2) json (~> 1.4) - rmagick (2.13.2) + rmagick (2.13.4) rspec-core (2.14.8) rspec-expectations (2.14.5) diff-lcs (>= 1.1.3, < 2.0) @@ -298,7 +298,7 @@ DEPENDENCIES quiet_assets (~> 1.0.2) rails (~> 3.2.19) rails_autolink (~> 1.1.5) - rmagick (~> 2.13.2) + rmagick (~> 2.13.4) rspec-rails (~> 2.14.1) sanitize (~> 2.1.0) sass (~> 3.3.4) From 75e50ba49819fcef9d0579b847b466be75faea36 Mon Sep 17 00:00:00 2001 From: cblanc Date: Tue, 5 May 2015 22:51:26 +0100 Subject: [PATCH 077/305] Updated test for expected ban behaviour --- spec/features/shoutbox/shoutbox_spec.rb | 35 +++++++++++-------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/spec/features/shoutbox/shoutbox_spec.rb b/spec/features/shoutbox/shoutbox_spec.rb index 30d75ac..dec6542 100644 --- a/spec/features/shoutbox/shoutbox_spec.rb +++ b/spec/features/shoutbox/shoutbox_spec.rb @@ -1,26 +1,23 @@ require 'spec_helper' -feature 'Shoutbox' do +feature 'Shoutbox', js: true do + let!(:user) { create :user } + background do - @user = create :user - sign_in_as @user - visit root_path + sign_in_as user end - feature 'user creates a shout', js: true do - scenario 'shouting with valid content' do - shout = rand(100000).to_s - fill_in 'shoutbox_text', with: shout - click_button 'Shout!' - expect(page).to have_content(shout) - end + scenario 'creating a valid shout' do + visit root_path + shout = rand(100000).to_s + fill_in 'shoutbox_text', with: shout + click_button 'Shout!' + expect(page).to have_content(shout) + end - scenario 'unable to while banned' do - @user.bans.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now + 10.days - shout = rand(100000).to_s - fill_in 'shoutbox_text', with: shout - click_button 'Shout!' - expect(page).to_not have_content(shout) - end - end + scenario 'creating shout while banned' do + Ban.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now + 10.days, user_name: user.username + visit root_path + expect(find("#sidebar")).to have_content "You have been muted." + end end \ No newline at end of file From 75178aee09121251ee5de2ed4b04bd377593467e Mon Sep 17 00:00:00 2001 From: cblanc Date: Wed, 6 May 2015 00:04:41 +0100 Subject: [PATCH 078/305] Cleanup: move out js, require_self shouldnt be necessary --- app/assets/javascripts/application.js.coffee | 42 +------------------- 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index cc5b14b..8cb6a1b 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -6,43 +6,5 @@ //= require tinymce-jquery //= require yetii //= require local -//= require_self - -$ -> - $('#logout').click -> - $(this).closest('form').submit() - - $('select').each (i, el) -> - $select = $(el) - - $select.wrap '
' - $select.on 'DOMSubtreeModified', (event) -> - $el = $(this) - $wrapper = $el.parent() - - if $el.is("[disabled]") - $wrapper.addClass 'disabled' - else - $wrapper.removeClass 'disabled' - - $select.trigger 'DOMSubtreeModified' - - $('a[href=#form_submit]').click -> - $(this).closest('form').submit() - return false - - $('select.autosubmit').change -> - $(this).closest('form').submit() - - $('#notification').delay(3000).fadeOut() - - $('#steam-search a').click (event) -> - event.preventDefault() - - $search = $('#steam-search') - id = $search.data 'user-id' - - $search.html "

Searching...

" - - $.get "/api/v1/users/#{id}", (data) -> - $search.html "Steam Profile: #{data.steam.nickname}" +//= require shoutbox +//= require misc \ No newline at end of file From 6bc61ff4b40dc2b1ce01290e3a6e28012179825c Mon Sep 17 00:00:00 2001 From: cblanc Date: Wed, 6 May 2015 00:05:03 +0100 Subject: [PATCH 079/305] Cleanup: move out js, require_self shouldnt be necessary --- app/assets/javascripts/misc.js.coffee | 38 +++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 app/assets/javascripts/misc.js.coffee diff --git a/app/assets/javascripts/misc.js.coffee b/app/assets/javascripts/misc.js.coffee new file mode 100644 index 0000000..3a861c0 --- /dev/null +++ b/app/assets/javascripts/misc.js.coffee @@ -0,0 +1,38 @@ +$ -> + $('#logout').click -> + $(this).closest('form').submit() + + $('select').each (i, el) -> + $select = $(el) + + $select.wrap '
' + $select.on 'DOMSubtreeModified', (event) -> + $el = $(this) + $wrapper = $el.parent() + + if $el.is("[disabled]") + $wrapper.addClass 'disabled' + else + $wrapper.removeClass 'disabled' + + $select.trigger 'DOMSubtreeModified' + + $('a[href=#form_submit]').click -> + $(this).closest('form').submit() + return false + + $('select.autosubmit').change -> + $(this).closest('form').submit() + + $('#notification').delay(3000).fadeOut() + + $('#steam-search a').click (event) -> + event.preventDefault() + + $search = $('#steam-search') + id = $search.data 'user-id' + + $search.html "

Searching...

" + + $.get "/api/v1/users/#{id}", (data) -> + $search.html "Steam Profile: #{data.steam.nickname}" \ No newline at end of file From 5a684b430094ef1cd34418297b909a71383ff2cb Mon Sep 17 00:00:00 2001 From: cblanc Date: Sat, 9 May 2015 16:20:51 +0100 Subject: [PATCH 080/305] Added shoutbox controller to perform client side validation --- app/assets/javascripts/shoutbox.js | 76 ++++++++++++++++++++++++++++++ app/views/shoutmsgs/_new.html.erb | 10 ++++ 2 files changed, 86 insertions(+) create mode 100644 app/assets/javascripts/shoutbox.js diff --git a/app/assets/javascripts/shoutbox.js b/app/assets/javascripts/shoutbox.js new file mode 100644 index 0000000..4d511d8 --- /dev/null +++ b/app/assets/javascripts/shoutbox.js @@ -0,0 +1,76 @@ +// Shoutbox Controller manages input validation on shoutmsg form + +function ShoutboxController (options) { + if (!(this instanceof ShoutboxController)) { + return new ShoutboxController(options); + } + this.options = options; + this.$context = options.context; + if (this.$context.length) { + this.init(options); + } else { + console.log("Unable to initialize shoutbox controller. No context provided"); + } + return this; +} + +// Initialise shoutbox state +ShoutboxController.prototype.init = function (options) { + var self = this; + self.$input = self.$context.find(".shout_input"); + self.$button = self.$context.find('input[type="submit"]'); + self.$messageBox = null; + self.$input.change(function () { + if (self.$input.val().length > 100) { + self.disableShoutbox(); + } else { + self.enableShoutbox(); + } + }); + return self; +}; + +// Displays a message if `message` present, otherwise removes message elemt +ShoutboxController.prototype.writeMessage = function (message) { + if (message === undefined) return this.removeMessageBox(); + this.createMessageBox().html(message); + return this; +}; + +// Adds message box to DOM and cache +ShoutboxController.prototype.createMessageBox = function () { + if (this.$messageBox) return this.$messageBox; + this.$messageBox = $("

", {class: "shout-warning"}).appendTo(this.$context.find(".fields")); + return this.$messageBox; +}; + +// Removes message box from DOM and cache +ShoutboxController.prototype.removeMessageBox = function () { + if (this.$messageBox) { + this.$messageBox.remove(); + this.$messageBox = null; + } + return this; +}; + +// Returns true if button is disabled +ShoutboxController.prototype.isDisabled = function () { + return this.$button.prop("disabled") === true; +}; + +// Disables Input Button +ShoutboxController.prototype.disableShoutbox = function () { + var chars = this.$input.val().length; + this.writeMessage(["Shout message length exceeded (",chars,"/100)"].join("")); + this.$button.prop("disabled", true); +}; + +// Removes any warnings and enableds shoutbox submit +ShoutboxController.prototype.enableShoutbox = function () { + if (!this.$button.prop("disabled")) { + return this; + } + // Remove any warnings + this.writeMessage(); + this.$button.prop("disabled", false); +}; \ No newline at end of file diff --git a/app/views/shoutmsgs/_new.html.erb b/app/views/shoutmsgs/_new.html.erb index 25907da..523b076 100644 --- a/app/views/shoutmsgs/_new.html.erb +++ b/app/views/shoutmsgs/_new.html.erb @@ -17,3 +17,13 @@ <% end %> <% end %> <% end %> + + \ No newline at end of file From ebc371a1826277fbb31796bffbcfd680dc847ea4 Mon Sep 17 00:00:00 2001 From: cblanc Date: Sat, 9 May 2015 16:21:18 +0100 Subject: [PATCH 081/305] Added necessary factory methods to test shoutbox --- spec/factories/category.rb | 8 ++++++++ spec/factories/gather.rb | 13 +++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 spec/factories/gather.rb diff --git a/spec/factories/category.rb b/spec/factories/category.rb index 5578a38..14dd5ef 100644 --- a/spec/factories/category.rb +++ b/spec/factories/category.rb @@ -3,4 +3,12 @@ FactoryGirl.define do sequence(:name) { |n| "Category #{n}" } sequence(:sort) { |n| n } end + + trait :news do + domain Category::DOMAIN_NEWS + end + + trait :game do + domain Category::DOMAIN_GAMES + end end \ No newline at end of file diff --git a/spec/factories/gather.rb b/spec/factories/gather.rb new file mode 100644 index 0000000..a7b1d0a --- /dev/null +++ b/spec/factories/gather.rb @@ -0,0 +1,13 @@ +FactoryGirl.define do + factory :gather do + association :category, factory: [:category, :game] + end + + trait :running do + status Gather::STATE_RUNNING + end + + trait :picking do + status Gather::STATE_PICKING + end +end From 082793dbdde0e23364a618392b767db85b5d4833 Mon Sep 17 00:00:00 2001 From: cblanc Date: Sat, 9 May 2015 16:21:48 +0100 Subject: [PATCH 082/305] Added test for client side shoutbox validation --- spec/features/gathers/gathers_spec.rb | 37 +++++++++++++++++++++++++ spec/features/shoutbox/shoutbox_spec.rb | 11 ++++++++ 2 files changed, 48 insertions(+) create mode 100644 spec/features/gathers/gathers_spec.rb diff --git a/spec/features/gathers/gathers_spec.rb b/spec/features/gathers/gathers_spec.rb new file mode 100644 index 0000000..71026b3 --- /dev/null +++ b/spec/features/gathers/gathers_spec.rb @@ -0,0 +1,37 @@ +require 'spec_helper' + +feature 'Gathers', js: true do + let!(:user) { create :user } + let!(:gather) { create :gather, :running } + + feature 'Shoutbox' do + background do + sign_in_as user + end + + scenario 'create shout' do + visit gather_path(gather) + shout = rand(100000).to_s + fill_in "shout_Gather_#{gather.id}_text", with: shout + click_button 'Shout!' + expect(page).to have_content(shout) + end + + scenario 'enter more than 100 characters' do + valid_shout = 100.times.map { "a" }.join + invalid_shout = 101.times.map { "a" }.join + visit gather_path(gather) + expect(page).to_not have_content("Shout message length exceeded") + fill_in "shout_Gather_#{gather.id}_text", with: invalid_shout + expect(page).to have_content("Shout message length exceeded") + fill_in "shout_Gather_#{gather.id}_text", with: valid_shout + expect(page).to_not have_content("Shout message length exceeded") + end + + scenario 'creating shout while banned' do + Ban.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now + 10.days, user_name: user.username + visit root_path + expect(find("#sidebar")).to have_content "You have been muted." + end + end +end \ No newline at end of file diff --git a/spec/features/shoutbox/shoutbox_spec.rb b/spec/features/shoutbox/shoutbox_spec.rb index dec6542..a138a97 100644 --- a/spec/features/shoutbox/shoutbox_spec.rb +++ b/spec/features/shoutbox/shoutbox_spec.rb @@ -15,6 +15,17 @@ feature 'Shoutbox', js: true do expect(page).to have_content(shout) end + scenario 'enter more than 100 characters' do + valid_shout = 100.times.map { "a" }.join + invalid_shout = 101.times.map { "a" }.join + visit root_path + expect(page).to_not have_content("Shout message length exceeded") + fill_in 'shoutbox_text', with: invalid_shout + expect(page).to have_content("Shout message length exceeded") + fill_in 'shoutbox_text', with: valid_shout + expect(page).to_not have_content("Shout message length exceeded") + end + scenario 'creating shout while banned' do Ban.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now + 10.days, user_name: user.username visit root_path From 4927de57a96bfd9967b4a2844b7019972d7a2d4e Mon Sep 17 00:00:00 2001 From: cblanc Date: Sat, 9 May 2015 16:36:50 +0100 Subject: [PATCH 083/305] Listen on both keyup and change events --- app/assets/javascripts/shoutbox.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/shoutbox.js b/app/assets/javascripts/shoutbox.js index 4d511d8..447f966 100644 --- a/app/assets/javascripts/shoutbox.js +++ b/app/assets/javascripts/shoutbox.js @@ -20,7 +20,7 @@ ShoutboxController.prototype.init = function (options) { self.$input = self.$context.find(".shout_input"); self.$button = self.$context.find('input[type="submit"]'); self.$messageBox = null; - self.$input.change(function () { + self.$input.bind("keyup change", function () { if (self.$input.val().length > 100) { self.disableShoutbox(); } else { @@ -61,7 +61,7 @@ ShoutboxController.prototype.isDisabled = function () { // Disables Input Button ShoutboxController.prototype.disableShoutbox = function () { var chars = this.$input.val().length; - this.writeMessage(["Shout message length exceeded (",chars,"/100)"].join("")); + this.writeMessage(["Maximum shout length exceeded (",chars,"/100)"].join("")); this.$button.prop("disabled", true); }; From 2eb7a86e05ccfef318f7a76c4040f9ddf0c4b099 Mon Sep 17 00:00:00 2001 From: cblanc Date: Sat, 9 May 2015 16:37:00 +0100 Subject: [PATCH 084/305] Changed wording on warning message --- spec/features/gathers/gathers_spec.rb | 6 +++--- spec/features/shoutbox/shoutbox_spec.rb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spec/features/gathers/gathers_spec.rb b/spec/features/gathers/gathers_spec.rb index 71026b3..cdb8f8a 100644 --- a/spec/features/gathers/gathers_spec.rb +++ b/spec/features/gathers/gathers_spec.rb @@ -21,11 +21,11 @@ feature 'Gathers', js: true do valid_shout = 100.times.map { "a" }.join invalid_shout = 101.times.map { "a" }.join visit gather_path(gather) - expect(page).to_not have_content("Shout message length exceeded") + expect(page).to_not have_content("Maximum shout length exceeded") fill_in "shout_Gather_#{gather.id}_text", with: invalid_shout - expect(page).to have_content("Shout message length exceeded") + expect(page).to have_content("Maximum shout length exceeded") fill_in "shout_Gather_#{gather.id}_text", with: valid_shout - expect(page).to_not have_content("Shout message length exceeded") + expect(page).to_not have_content("Maximum shout length exceeded") end scenario 'creating shout while banned' do diff --git a/spec/features/shoutbox/shoutbox_spec.rb b/spec/features/shoutbox/shoutbox_spec.rb index a138a97..5a40b6e 100644 --- a/spec/features/shoutbox/shoutbox_spec.rb +++ b/spec/features/shoutbox/shoutbox_spec.rb @@ -19,11 +19,11 @@ feature 'Shoutbox', js: true do valid_shout = 100.times.map { "a" }.join invalid_shout = 101.times.map { "a" }.join visit root_path - expect(page).to_not have_content("Shout message length exceeded") + expect(page).to_not have_content("Maximum shout length exceeded") fill_in 'shoutbox_text', with: invalid_shout - expect(page).to have_content("Shout message length exceeded") + expect(page).to have_content("Maximum shout length exceeded") fill_in 'shoutbox_text', with: valid_shout - expect(page).to_not have_content("Shout message length exceeded") + expect(page).to_not have_content("Maximum shout length exceeded") end scenario 'creating shout while banned' do From 8c1ade983410594af9d6aa52dfc3cae1a64831e3 Mon Sep 17 00:00:00 2001 From: cblanc Date: Sat, 9 May 2015 16:43:02 +0100 Subject: [PATCH 085/305] Cleanup --- app/views/shoutmsgs/_new.html.erb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/views/shoutmsgs/_new.html.erb b/app/views/shoutmsgs/_new.html.erb index 523b076..a424897 100644 --- a/app/views/shoutmsgs/_new.html.erb +++ b/app/views/shoutmsgs/_new.html.erb @@ -19,10 +19,8 @@ <% end %> \ No newline at end of file + $(document).ready(function () { + $.PeriodicalUpdater("/shoutmsgs/index.js", { + method: "GET", + type: "script", + minTimeout: 20000, + multiplier: 3, + maxTimeout: 300000 + }); + }); + From ddf55aae4e28e6c1b1cb59cfe3428a517fc1f1d3 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Mon, 15 Jun 2015 23:16:44 +0100 Subject: [PATCH 157/305] Bring back user plugin --- app/controllers/plugin_controller.rb | 53 ++++++++++++++++++++++++++++ config/routes.rb | 2 ++ 2 files changed, 55 insertions(+) create mode 100644 app/controllers/plugin_controller.rb diff --git a/app/controllers/plugin_controller.rb b/app/controllers/plugin_controller.rb new file mode 100644 index 0000000..9103c2f --- /dev/null +++ b/app/controllers/plugin_controller.rb @@ -0,0 +1,53 @@ +class PluginController < ApplicationController + def user + buffer = [] + out = [] + + if ban = Ban.first(:conditions => ["expiry > UTC_TIMESTAMP() AND steamid = ? AND ban_type = ?", params[:id], Ban::TYPE_SERVER]) + out << "#USER#" + out << "BANNED" + out << ban.expiry.utc.to_i + out << ban.reason + out << "\r\r\r\r\r\r\r" + elsif user = User.first(:conditions => {:steamid => params[:id]}) + teamer = (user.team ? user.teamers.active.of_team(user.team).first : nil) + icon = 0 + rank = "User" + if Group.find(Group::DONORS).users.exists?(user) + rank = "Donor" + icon = icon | 1 + end + if Group.find(Group::CHAMPIONS).users.exists?(user) + icon = icon | 2 + end + if user.ref? + rank = "Referee" + icon = icon | 4 + end + if user.admin? + rank = "Admin" + icon = icon | 8 + end + + buffer << user.steamid + buffer << user.username + buffer << user.lastip + buffer << (user.team ? Verification.uncrap(user.team.to_s) : "No Team") + buffer << user.id + buffer << user.team_id + buffer << rank + buffer << (teamer ? teamer.ranks[teamer.rank] : "") + buffer << icon + buffer << params[:ch] ? params[:ch] : "" + buffer << (user.can_play? ? "1" : "0") + + out << "#USER#" + out << Verification.verify(buffer.join) + out << buffer.join("\r") + else + out << "#FAIL#" + end + + render_out out + end +end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 9aaca00..483f9d2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -111,6 +111,8 @@ Ensl::Application.routes.draw do match 'movies/preview' match 'movies/snapshot' + match 'plugin/user' + match 'users/forgot' match 'users/recover' match 'users/agenda' From 1c6079ca73dec6aa0a76538dcbab7912f21f15ea Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Mon, 15 Jun 2015 23:35:41 +0100 Subject: [PATCH 158/305] Bring back verify --- lib/verification.rb | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/lib/verification.rb b/lib/verification.rb index 9611585..1820152 100644 --- a/lib/verification.rb +++ b/lib/verification.rb @@ -1,4 +1,45 @@ module Verification + def Verification.verify input + md5 = Digest::MD5.hexdigest("9WvcZ9hX" + input + "KF7L4luQ").upcase.split(//) + chars = ["A", "B", "C", "D", "E", "F"] + nums = [] + lastPos = md5[31].to_i + result = "" + + for i in 0..9 + pos = md5[i].to_i + + if pos == 0 + pos = lastPos ** (i % 4) + elsif (pos % 4) == 0 + pos = pos * lastPos + i + elsif (pos % 3) == 0 + pos = pos ** (i % 4) + elsif (pos % 2) == 0 + pos = pos * i + pos + end + + pos = (pos > 31) ? (pos % 32) : pos + curChar = md5[31 - pos] + curNum = curChar.to_i + + if nums.include? curNum + if curNum == 0 + curChar = chars[pos % 6] + else + curChar = (pos % 10).to_s + end + curNum = curChar.to_i + end + + nums << curNum + result << curChar + lastPos = pos + end + + return result + end + def Verification.uncrap str str.to_s.gsub(/[^A-Za-z0-9_\-]/, "") end From 6c0d20df50c29c33a27a907aa7bffb4c36b352e0 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Mon, 15 Jun 2015 23:44:24 +0100 Subject: [PATCH 159/305] Restore render out method --- app/controllers/plugin_controller.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/controllers/plugin_controller.rb b/app/controllers/plugin_controller.rb index 9103c2f..76a2885 100644 --- a/app/controllers/plugin_controller.rb +++ b/app/controllers/plugin_controller.rb @@ -50,4 +50,9 @@ class PluginController < ApplicationController render_out out end + + def render_out out + @text = out.join("\r") + render :layout => false + end end \ No newline at end of file From 7041c0bbe58cd01c4f0749924f68e7ce5dd91b73 Mon Sep 17 00:00:00 2001 From: Ari Timonen Date: Mon, 22 Jun 2015 00:32:27 +0300 Subject: [PATCH 160/305] Remove logging functionality as legacy --- app/controllers/log_events_controller.rb | 85 -------- app/controllers/log_files_controller.rb | 42 ---- app/controllers/rounds_controller.rb | 26 --- app/models/log.rb | 197 ------------------- app/models/log_event.rb | 25 --- app/models/log_file.rb | 95 --------- app/models/round.rb | 128 ------------ app/models/rounder.rb | 52 ----- app/views/log_events/edit.html.erb | 16 -- app/views/log_events/index.html.erb | 20 -- app/views/log_events/new.html.erb | 15 -- app/views/log_events/show.html.erb | 8 - app/views/rounds/_rounds.html.erb | 23 --- app/views/rounds/index.html.erb | 7 - app/views/rounds/show.html.erb | 150 -------------- db/schema.rb | 134 ++----------- public/images/weapons/acidrocket.gif | Bin 1466 -> 0 bytes public/images/weapons/bilebomb.gif | Bin 830 -> 0 bytes public/images/weapons/bite2gun.gif | Bin 1527 -> 0 bytes public/images/weapons/bitegun.gif | Bin 1514 -> 0 bytes public/images/weapons/bitegun2.gif | Bin 1527 -> 0 bytes public/images/weapons/charge.gif | Bin 2756 -> 0 bytes public/images/weapons/claws.gif | Bin 2391 -> 0 bytes public/images/weapons/devour.gif | Bin 2453 -> 0 bytes public/images/weapons/digest.gif | Bin 2453 -> 0 bytes public/images/weapons/gernades.gif | Bin 1468 -> 0 bytes public/images/weapons/gore.gif | Bin 2391 -> 0 bytes public/images/weapons/grenade.gif | Bin 1468 -> 0 bytes public/images/weapons/handgrenade.gif | Bin 841 -> 0 bytes public/images/weapons/healspray.gif | Bin 2038 -> 0 bytes public/images/weapons/heavymachinegun.gif | Bin 2230 -> 0 bytes public/images/weapons/item_mine.gif | Bin 689 -> 0 bytes public/images/weapons/knife.gif | Bin 1348 -> 0 bytes public/images/weapons/leap.gif | Bin 939 -> 0 bytes public/images/weapons/machinegun.gif | Bin 1542 -> 0 bytes public/images/weapons/mines.gif | Bin 689 -> 0 bytes public/images/weapons/oc.gif | Bin 1712 -> 0 bytes public/images/weapons/offensechamber.gif | Bin 1712 -> 0 bytes public/images/weapons/para.gif | Bin 1156 -> 0 bytes public/images/weapons/pistol.gif | Bin 1368 -> 0 bytes public/images/weapons/sentry.gif | Bin 676 -> 0 bytes public/images/weapons/shotgun.gif | Bin 1634 -> 0 bytes public/images/weapons/siege.gif | Bin 895 -> 0 bytes public/images/weapons/spikes.gif | Bin 684 -> 0 bytes public/images/weapons/spit.gif | Bin 1599 -> 0 bytes public/images/weapons/spitgunspit.gif | Bin 1599 -> 0 bytes public/images/weapons/spore.gif | Bin 1861 -> 0 bytes public/images/weapons/sporegunprojectile.gif | Bin 1861 -> 0 bytes public/images/weapons/swipe.gif | Bin 1407 -> 0 bytes public/images/weapons/welder.gif | Bin 1668 -> 0 bytes public/images/weapons/xeno.gif | Bin 2250 -> 0 bytes script/shell/log_file_update.sh | 10 - 52 files changed, 13 insertions(+), 1020 deletions(-) delete mode 100644 app/controllers/log_events_controller.rb delete mode 100644 app/controllers/log_files_controller.rb delete mode 100644 app/controllers/rounds_controller.rb delete mode 100644 app/models/log.rb delete mode 100644 app/models/log_event.rb delete mode 100644 app/models/log_file.rb delete mode 100644 app/models/round.rb delete mode 100644 app/models/rounder.rb delete mode 100644 app/views/log_events/edit.html.erb delete mode 100644 app/views/log_events/index.html.erb delete mode 100644 app/views/log_events/new.html.erb delete mode 100644 app/views/log_events/show.html.erb delete mode 100644 app/views/rounds/_rounds.html.erb delete mode 100644 app/views/rounds/index.html.erb delete mode 100644 app/views/rounds/show.html.erb delete mode 100644 public/images/weapons/acidrocket.gif delete mode 100644 public/images/weapons/bilebomb.gif delete mode 100644 public/images/weapons/bite2gun.gif delete mode 100644 public/images/weapons/bitegun.gif delete mode 100644 public/images/weapons/bitegun2.gif delete mode 100644 public/images/weapons/charge.gif delete mode 100644 public/images/weapons/claws.gif delete mode 100644 public/images/weapons/devour.gif delete mode 100644 public/images/weapons/digest.gif delete mode 100644 public/images/weapons/gernades.gif delete mode 100644 public/images/weapons/gore.gif delete mode 100644 public/images/weapons/grenade.gif delete mode 100644 public/images/weapons/handgrenade.gif delete mode 100644 public/images/weapons/healspray.gif delete mode 100644 public/images/weapons/heavymachinegun.gif delete mode 100644 public/images/weapons/item_mine.gif delete mode 100644 public/images/weapons/knife.gif delete mode 100644 public/images/weapons/leap.gif delete mode 100644 public/images/weapons/machinegun.gif delete mode 100644 public/images/weapons/mines.gif delete mode 100644 public/images/weapons/oc.gif delete mode 100644 public/images/weapons/offensechamber.gif delete mode 100644 public/images/weapons/para.gif delete mode 100644 public/images/weapons/pistol.gif delete mode 100644 public/images/weapons/sentry.gif delete mode 100644 public/images/weapons/shotgun.gif delete mode 100644 public/images/weapons/siege.gif delete mode 100644 public/images/weapons/spikes.gif delete mode 100644 public/images/weapons/spit.gif delete mode 100644 public/images/weapons/spitgunspit.gif delete mode 100644 public/images/weapons/spore.gif delete mode 100644 public/images/weapons/sporegunprojectile.gif delete mode 100644 public/images/weapons/swipe.gif delete mode 100644 public/images/weapons/welder.gif delete mode 100644 public/images/weapons/xeno.gif delete mode 100644 script/shell/log_file_update.sh diff --git a/app/controllers/log_events_controller.rb b/app/controllers/log_events_controller.rb deleted file mode 100644 index e1064ee..0000000 --- a/app/controllers/log_events_controller.rb +++ /dev/null @@ -1,85 +0,0 @@ -class LogEventsController < ApplicationController - # GET /log_events - # GET /log_events.xml - def index - @log_events = LogEvent.all - - respond_to do |format| - format.html # index.html.erb - format.xml { render xml: @log_events } - end - end - - # GET /log_events/1 - # GET /log_events/1.xml - def show - @log_event = LogEvent.find(params[:id]) - - respond_to do |format| - format.html # show.html.erb - format.xml { render xml: @log_event } - end - end - - # GET /log_events/new - # GET /log_events/new.xml - def new - @log_event = LogEvent.new - - respond_to do |format| - format.html # new.html.erb - format.xml { render xml: @log_event } - end - end - - # GET /log_events/1/edit - def edit - @log_event = LogEvent.find(params[:id]) - end - - # POST /log_events - # POST /log_events.xml - def create - @log_event = LogEvent.new(params[:log_event]) - - respond_to do |format| - if @log_event.save - flash[:notice] = t(:logevent_create) - format.html { redirect_to(@log_event) } - format.xml { render xml: @log_event, :status => :created, :location => @log_event } - else - format.html { render :new } - format.xml { render xml: @log_event.errors, :status => :unprocessable_entity } - end - end - end - - # PUT /log_events/1 - # PUT /log_events/1.xml - def update - @log_event = LogEvent.find(params[:id]) - - respond_to do |format| - if @log_event.update_attributes(params[:log_event]) - flash[:notice] = t(:logevent_update) - format.html { redirect_to(@log_event) } - format.xml { head :ok } - else - format.html { render :edit } - format.xml { render xml: @log_event.errors, :status => :unprocessable_entity } - end - end - end - - # DELETE /log_events/1 - # DELETE /log_events/1.xml - def destroy - @log_event = LogEvent.find(params[:id]) - @log_event.destroy - - respond_to do |format| - format.html { redirect_to(log_events_url) } - format.xml { head :ok } - end - end -end diff --git a/app/controllers/log_files_controller.rb b/app/controllers/log_files_controller.rb deleted file mode 100644 index dda7433..0000000 --- a/app/controllers/log_files_controller.rb +++ /dev/null @@ -1,42 +0,0 @@ -class LogFilesController < ApplicationController - def index - LogFile.process - render text: 'Ok' - end - - def handle - LogFile.find(params[:id]).deal - render text: 'Ok' - end - - def refresh - LogFile.unhandled.each do |lf| - lf.deal - end - end - - def fix - Rounder.find_in_batches(batch_size: 100) do |rounders| - rounders.each do |r| - r.team_id = nil - if r.user and t = Teamer.historic(r.user, r.round.start).first - r.team_id = t.team_id - end - r.save - end - end - end - - def pix - Round.all.each do |r| - r.team1_id = nil - r.team2_id = nil - [1, 2].each do |team| - if s = r.rounders.team(team).stats.first - r["team#{team}_id"] = s["team_id"] - end - end - r.save - end - end -end diff --git a/app/controllers/rounds_controller.rb b/app/controllers/rounds_controller.rb deleted file mode 100644 index b09511b..0000000 --- a/app/controllers/rounds_controller.rb +++ /dev/null @@ -1,26 +0,0 @@ -class RoundsController < ApplicationController - def index - sort = case params['sort'] - when "start" then "start" - when "server" then "server_id" - when "team1" then "team1_id" - when "team2" then "team2_id" - when "map" then "map_name" - when "commander" then "commander_id" - end - - @rounds = Round.basic.paginate \ - order: sort, - page: params[:page], - per_page: 30 - - if params[:ajax] - render partial: 'list', layout: false - return - end - end - - def show - @round = Round.find(params[:id]) - end -end diff --git a/app/models/log.rb b/app/models/log.rb deleted file mode 100644 index 71e0794..0000000 --- a/app/models/log.rb +++ /dev/null @@ -1,197 +0,0 @@ -# == Schema Information -# -# Table name: logs -# -# id :integer not null, primary key -# server_id :integer -# text :text -# domain :integer -# created_at :datetime -# round_id :integer -# details :string(255) -# actor_id :integer -# target_id :integer -# specifics1 :string(255) -# specifics2 :string(255) -# log_file_id :integer -# - -class Log < ActiveRecord::Base - include Extra - attr_accessor :text - - DOMAIN_LOG = 1 - DOMAIN_INFO = 4 - - TEAM_MARINES = 1 - TEAM_ALIENS = 2 - - RE_PLAYER = /".*?<\d*><\w*>"/ - RE_PLAYER_ID = /".*?<\d*><\w*>"/ - RE_PLAYER_ID_NAME_TEAM = /"(.*?)<\d*><([a-z]*)1team>"/ - RE_PLAYER_NAME = /"(.*?)<\d*><[a-z]*1team>"/ - RE_PLAYER_NAME_TEAM = /"(.*?)<\d*><([a-z]*)1team>"/ - - scope :recent, :order => "id DESC", :limit => 5 - scope :ordered, :order => "created_at ASC, id ASC" - scope :with_details, - lambda { |details| {:conditions => ["details LIKE ?", details]} } - scope :unhandled, :conditions => {:details => nil} - scope :stats, - :select => "id, details, COUNT(*) as num", - :group => "details", - :order => "details" - - belongs_to :details, :class_name => "LogEvent" - belongs_to :server - belongs_to :round - belongs_to :server - belongs_to :log_file - belongs_to :actor, :class_name => "Rounder" - belongs_to :target, :class_name => "Rounder" - - def since - (created_at - round.start).to_i - end - - def time - return sprintf("%02d:%02d", since/60, since%60) - end - - def frag - text.match(/^#{RE_PLAYER_NAME_TEAM} killed #{RE_PLAYER_NAME_TEAM} with "([a-z0-9_]*)"$/) - end - - def role - text.match(/^#{RE_PLAYER_NAME} changed role to "([a-z0-9_]*)"$/) - end - - def match_map vars - if m = text.match(/^Started map "([A-Za-z0-9_]*)"/) - vars[:map] = m[1] - self.details = LogEvent.get "map" - self.specifics1 = m[1] - end - end - - def match_start vars - if text.match(/^Game reset complete.$/) - vars[:round] = Round.new - vars[:round].server = server - vars[:round].start = created_at - vars[:round].map_name = vars[:map] - vars[:round].map = Map.with_name(vars[:map]).first - vars[:round].save - vars[:lifeforms] = {} - self.details = LogEvent.get "start" - end - end - - def match_end vars - if m = text.match(/^Team ([1-2]) has lost.$/) - vars[:round].winner = (m[1].to_i == 1 ? 2 : 1) - vars[:round].end = created_at - [1, 2].each do |team| - if s = vars[:round].rounders.team(team).stats.first - vars[:round]["team#{team}_id"] = s["team_id"] - end - end - vars[:round].save - vars[:round] = nil - self.details = LogEvent.get "end" - end - end - - def match_join vars - if m = text.match(/^#{RE_PLAYER_ID_NAME_TEAM} .*$/) and !(self.actor = vars[:round].rounders.match(m[2]).first) - self.actor = Rounder.new - self.actor.round = vars[:round] - self.actor.name = m[1] - self.actor.steamid = m[2] - self.actor.user = User.first(:conditions => {:steamid => m[2]}) or User.historic(m[2]) - self.actor.team = (m[3] == "marine" ? TEAM_MARINES : TEAM_ALIENS) - if self.actor.user and t = Teamer.historic(actor.user, vars[:round].start).first - self.actor.ensl_team = t.team - end - self.actor.kills = 0 - self.actor.deaths = 0 - self.actor.save - self.details = LogEvent.get "join" - end - end - - def match_kill vars - if m = text.match(/^#{RE_PLAYER} killed #{RE_PLAYER_ID} with "([a-z0-9_]*)"$/) - if self.actor - actor.increment :kills - actor.save - end - if self.target = vars[:round].rounders.match(m[1]).first - target.increment :deaths - target.save - end - self.details = LogEvent.get "kill" - self.specifics1 = m[3] - save - end - end - - def match_say vars - if m = text.match(/^#{RE_PLAYER} (say(_team)?) ".*"$/) - self.details = "say" - self.specifics1 = m[1] - end - end - - def match_built vars - if m = text.match(/^#{RE_PLAYER} triggered "structure_built" \(type "([a-z0-9_]*)"\)$/) - self.details = "built_" + m[1] - end - end - - def match_destroyed vars - if m = text.match(/^#{RE_PLAYER} triggered "structure_destroyed" \(type "([a-z0-9_]*)"\)$/) - self.details = "destroyed_" + m[1] - end - end - - def match_research_start vars - if m = text.match(/^#{RE_PLAYER} triggered "research_start" \(type "([a-z0-9_]*)"\)$/) - self.details = m[1] - end - end - - def match_research_cancel vars - if m = text.match(/^#{RE_PLAYER} triggered "research_cancel" \(type "([a-z0-9_]*)"\)$/) - self.details = "research_cancel" - end - end - - def match_role vars - if m = text.match(/^#{RE_PLAYER_ID} changed role to "([a-z0-9_]*)"$/) - if m[2] == "gestate" - self.details = "gestate" - elsif actor - if m[2] == "commander" and !vars[:round].commander - vars[:round].commander = actor - vars[:round].save - end - if !actor.roles - actor.update_attribute :roles, m[2] - elsif !self.actor.roles.include?(m[2]) - actor.update_attribute :roles, actor.roles + ", " + m[2] - end - self.details = ((vars[:lifeforms].include? actor.id and vars[:lifeforms][actor.id] == m[2]) ? "upgrade" : m[2]) - vars[:lifeforms][actor.id] = m[2] - end - end - end - - def self.add server, domain, text - log = new - log.server = server - log.domain = domain - log.text = text - log.save - end -end diff --git a/app/models/log_event.rb b/app/models/log_event.rb deleted file mode 100644 index 65b0b4f..0000000 --- a/app/models/log_event.rb +++ /dev/null @@ -1,25 +0,0 @@ -# == Schema Information -# -# Table name: log_events -# -# id :integer not null, primary key -# name :string(255) -# description :string(255) -# team :integer -# created_at :datetime -# updated_at :datetime -# - -class LogEvent < ActiveRecord::Base - def self.get search, team = nil - if f = first({:conditions => {:name => search}}) - return f - else - f = LogEvent.new - f.name = "get" - f.team = team if team - f.save - return f - end - end -end diff --git a/app/models/log_file.rb b/app/models/log_file.rb deleted file mode 100644 index f430d05..0000000 --- a/app/models/log_file.rb +++ /dev/null @@ -1,95 +0,0 @@ -# encoding: US-ASCII -# == Schema Information -# -# Table name: log_files -# -# id :integer not null, primary key -# name :string(255) -# md5 :string(255) -# size :integer -# server_id :integer -# updated_at :datetime -# - - -require 'digest/md5' - -class LogFile < ActiveRecord::Base - NON_ASCII = /[\x80-\xff]/ - LOGS = File.join(Rails.root, "tmp", "logs") - - attr_accessor :path - belongs_to :server - - has_many :logs - has_many :rounds, :through => :logs - - def after_create - Pathname(path).each_line do |line| - if m = line.gsub(NON_ASCII, "").match(/\d{2}:\d{2}:\d{2}: (.*)/) - log = Log.new - log.server = server - log.domain = Log::DOMAIN_LOG - log.log_file = self - log.text = m[1].strip - next if log.text.match(/^Server cvar/) - next if log.text.match(/^\[ENSL\]/) - next if log.text.match(/STEAM USERID validated/) - next if log.text.match(/^\[META\]/) - l.created_at = DateTime.parse(line.match(/\d{2}\/\d{2}\/\d{4} \- \d{2}:\d{2}:\d{2}:/)[0]) - vars = {} - log.match_map vars or log.match_start vars - if vars[:round] and !log.details - log.match_end vars \ - or log.match_join vars \ - or log.match_kill vars \ - or log.match_say vars \ - or log.match_built vars \ - or log.match_destroyed vars \ - or log.match_research_start vars \ - or log.match_research_cancel vars \ - or log.match_role vars \ - end - if log.details - log.round = vars[:round] if vars[:round] - log.save - end - end - end - rounds.each do |r| - unless r.end - r.destroy - end - end - Log.delete_all(["details IS NULL AND log_file_id = ?", self.id]) - end - - def format path - self.name = File.basename(path) - self.size = File.size(path) - self.md5 = Digest::MD5.hexdigest(File.read(path)) - self.updated_at = File.mtime(path) - self.path = path - end - - def deal - # TODO - end - - def self.process - Dir.glob("#{LOGS}/*").each do |entry| - dir = File.basename(entry).to_i - if File.directory?(entry) and dir > 0 and Server.find(dir) - Dir.glob("#{entry}/*.log").each do |file| - lf = LogFile.new - lf.format file - lf.server_id = dir - - unless LogFile.first(:conditions => {:name => lf.name, :size => lf.size, :server_id => dir.to_i}) - lf.save - end - end - end - end - end -end diff --git a/app/models/round.rb b/app/models/round.rb deleted file mode 100644 index 3263114..0000000 --- a/app/models/round.rb +++ /dev/null @@ -1,128 +0,0 @@ -# == Schema Information -# -# Table name: rounds -# -# id :integer not null, primary key -# server_id :integer -# start :datetime -# end :datetime -# winner :integer -# match_id :integer -# commander_id :integer -# team1_id :integer -# team2_id :integer -# map_name :string(255) -# map_id :integer -# - -class Round < ActiveRecord::Base - scope :basic, :include => [:commander, :map, :server, :team1, :team2], :order => "start DESC" - scope :team_stats, - :select => "team1_id AS team_id, COUNT(*) as rounds, AVG(winner) AS wlr, teams.name", - :joins => "LEFT JOIN teams ON teams.id = team1_id", - :group => "team_id", - :order => "rounds DESC", - :having => "rounds > 10 AND team_id IS NOT NULL", - :limit => 100 - - has_many :rounders, :dependent => :destroy - has_many :logs, :dependent => :destroy - - belongs_to :team1, :class_name => "Team" - belongs_to :team2, :class_name => "Team" - belongs_to :server - belongs_to :match - belongs_to :commander, :class_name => "Rounder" - belongs_to :map - - def length - sprintf("%02d:%02d", (self.end - self.start).to_i/60, (self.end - self.start).to_i%60) - end - - def winner_s - winner == 1 ? "Marines" : "Aliens" - end - - def marine_stats - {"built_resourcetower" => "Marine RTs", - "built_item_genericammo" => "Ammo Packs", - "built_item_health" => "Medpacks"} - end - - def alien_stats - {"built_alienresourcetower" => "Alien RTs", - "lerk" => "Lerks", - "fade" => "Fades", - "onos" => "Onoses"} - end - - def self.marine_events - {"built_resourcetower" => "RT Built", - "built_phasegate" => "PG Built", - "built_team_infportal" => "IP Built", - "built_team_armory" => "Armory Built", - "built_team_observatory" => "Obs Built", - "built_team_armslab" => "ARMS Built", - "built_team_command" => "CC Built", - "built_team_prototypelab" => "Proto Built", - "built_team_turretfactory" => "TF Built", - "built_team_turret" => "Turret Built", - "built_team_siegeturret" => "Siege Built", - "destroyed_resourcetower" => "RT Destroyed", - "destroyed_phasegate" => "PG Destroyed", - "destroyed_team_infportal" => "IP Destroyed", - "destroyed_team_armory" => "Armory Destroyed", - "destroyed_team_observatory" => "Obs Destroyed", - "destroyed_team_armslab" => "ARMS Destroyed", - "destroyed_team_command" => "CC Destroyed", - "destroyed_team_prototypelab" => "Proto Destroyed", - "destroyed_team_turretfactory" => "TF Destroyed", - "destroyed_team_turret" => "Turret Destroyed", - "destroyed_team_siegeturret" => "Siege Destroyed", - "scan" => "Scan", - "research_motiontracking" => "MT Tech", - "research_phasetech" => "PG Tech", - "research_distressbeacon" => "Beacon", - "research_armorl1" => "Armor 1", - "research_armorl2" => "Armor 2", - "research_armorl3" => "Armor 3", - "research_weaponsl1" => "Weapons 1", - "research_weaponsl2" => "Weapons 2", - "research_weaponsl3" => "Weapons 3", - "research_advarmory" => "AA", - "research_electrical" => "Electrify", - "research_advturretfactory" => "A-TFAC", - "research_cancel" => "Research Cancel", - "kill" => "Frag"} - end - - def self.alien_events - {"built_team_hive" => "Hive Built", - "built_movementchamber" => "MC Built", - "built_sensorychamber" => "SC Built", - "built_defensechamber" => "DC Built", - "built_offensechamber" => "OC Built", - "built_alienresourcetower" => "RT Built", - "destroyed_team_hive" => "Hive Destroyed", - "destroyed_movementchamber" => "MC Destroyed", - "destroyed_sensorychamber" => "SC Destroyed", - "destroyed_defensechamber" => "DC Destroyed", - "destroyed_offensechamber" => "OC Destroyed", - "destroyed_alienresourcetower" => "RT Destroyed", - "gorge" => "Gorge up", - "lerk" => "Lerk up", - "fade" => "Fade up", - "onos" => "Onos up", - "kill" => "Frag"} - end - - def self.alien_event event - return alien_events[event] if alien_events.include?(event) - return nil - end - - def self.marine_event event - return marine_events[event] if marine_events.include?(event) - return nil - end -end diff --git a/app/models/rounder.rb b/app/models/rounder.rb deleted file mode 100644 index 0914f5d..0000000 --- a/app/models/rounder.rb +++ /dev/null @@ -1,52 +0,0 @@ -# == Schema Information -# -# Table name: rounders -# -# id :integer not null, primary key -# round_id :integer -# user_id :integer -# team :integer -# roles :string(255) -# kills :integer -# deaths :integer -# name :string(255) -# steamid :string(255) -# team_id :integer -# - -class Rounder < ActiveRecord::Base - attr_accessor :lifeform - - scope :team, lambda { |team| {:conditions => {:team => team}} } - scope :match, lambda { |steamid| {:conditions => {:steamid => steamid}} } - scope :ordered, :order => "kills DESC, deaths ASC" - scope :stats, - :select => "id, team_id, COUNT(*) as num", - :group => "team_id", - :order => "num DESC", - :having => "num > 3" - scope :player_stats, - :select => "id, user_id, SUM(kills)/SUM(deaths) as kpd, COUNT(*) as rounds", - :group => "user_id", - :order => "kpd DESC", - :having => "rounds > 30 AND kpd > 0 AND user_id IS NOT NULL", - :limit => 100 - scope :team_stats, - :select => "id, team_id, SUM(kills)/SUM(deaths) as kpd, COUNT(DISTINCT round_id) as rounds", - :group => "team_id", - :order => "kpd DESC", - :having => "rounds > 30 AND kpd > 0 AND team_id IS NOT NULL", - :limit => 100 - scope :extras, :include => [:round, :user] - scope :within, - lambda { |from, to| - {:conditions => ["created_at > ? AND created_at < ?", from.utc, to.utc]} } - - belongs_to :round - belongs_to :user - belongs_to :ensl_team, :class_name => "Team", :foreign_key => "team_id" - - def to_s - user ? user.username : name - end -end diff --git a/app/views/log_events/edit.html.erb b/app/views/log_events/edit.html.erb deleted file mode 100644 index bd1c0d8..0000000 --- a/app/views/log_events/edit.html.erb +++ /dev/null @@ -1,16 +0,0 @@ -

Editing log_event

- -<%= form_for(@log_event) do |f| %> - <%= f.error_messages %> - -

- <%= f.label :name %>
- <%= f.text_field :name %> -

-

- <%= f.submit 'Update' %> -

-<% end %> - -<%= link_to 'Show', @log_event %> | -<%= link_to 'Back', log_events_path %> \ No newline at end of file diff --git a/app/views/log_events/index.html.erb b/app/views/log_events/index.html.erb deleted file mode 100644 index 5619d98..0000000 --- a/app/views/log_events/index.html.erb +++ /dev/null @@ -1,20 +0,0 @@ -

Listing log_events

- - - - - - - <% @log_events.each do |log_event| %> - - - - - - - <% end %> -
Name
<%=h log_event.name %><%= link_to 'Show', log_event %><%= link_to 'Edit', edit_log_event_path(log_event) %><%= link_to 'Destroy', log_event, :confirm => 'Are you sure?', :method => :delete %>
- -
- -<%= link_to 'New log_event', new_log_event_path %> diff --git a/app/views/log_events/new.html.erb b/app/views/log_events/new.html.erb deleted file mode 100644 index d2e38e1..0000000 --- a/app/views/log_events/new.html.erb +++ /dev/null @@ -1,15 +0,0 @@ -

New log_event

- -<%= form_for(@log_event) do |f| %> - <%= f.error_messages %> - -

- <%= f.label :name %>
- <%= f.text_field :name %> -

-

- <%= f.submit 'Create' %> -

-<% end %> - -<%= link_to 'Back', log_events_path %> \ No newline at end of file diff --git a/app/views/log_events/show.html.erb b/app/views/log_events/show.html.erb deleted file mode 100644 index 9c64c19..0000000 --- a/app/views/log_events/show.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -

- Name: - <%=h @log_event.name %> -

- - -<%= link_to 'Edit', edit_log_event_path(@log_event) %> | -<%= link_to 'Back', log_events_path %> \ No newline at end of file diff --git a/app/views/rounds/_rounds.html.erb b/app/views/rounds/_rounds.html.erb deleted file mode 100644 index a807b82..0000000 --- a/app/views/rounds/_rounds.html.erb +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - <% rounds.each do |round| %> - - - - - - - - - <% end %> -
<%= sort_link "Date", :start %><%= sort_link "Server", :server %><%= sort_link "Team 1", :team1 %><%= sort_link "Team 2", :team2 %><%= sort_link "Map", :map %><%= sort_link "commander", :commander %>
<%= link_to (shorttime round.start), round %><%= namelink round.server %><%= namelink round.team1 if round.team1 %><%= namelink round.team2 if round.team2 %><%= round.map.nil? ? h(round.map_name) : namelink(round.map) %><%= (round.commander.nil? or round.commander.user.nil?) ? h(round.commander) : namelink(round.commander.user) %>
- -<%= will_paginate rounds %> diff --git a/app/views/rounds/index.html.erb b/app/views/rounds/index.html.erb deleted file mode 100644 index e3ce175..0000000 --- a/app/views/rounds/index.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -

- ENSL Round Archive -

- -
- <%= render :partial => "rounds", :object => @rounds %> -
diff --git a/app/views/rounds/show.html.erb b/app/views/rounds/show.html.erb deleted file mode 100644 index 0d74984..0000000 --- a/app/views/rounds/show.html.erb +++ /dev/null @@ -1,150 +0,0 @@ -
-

- <%= namelink @round.server %> : <%= longtime @round.start %> -

-
- -
-

- General Info and Statistics -

- -
- <%= cascade @round, ["winner_s", "length", "commander", "map_name"] %> -
- -
- <% @round.logs.stats.each do |s| %> - <% next unless @round.marine_stats.include? s.details %> - <%= @round.marine_stats[s.details] %>: <%= s.num %>
- <% end %> -
-
- <% @round.logs.stats.each do |s| %> - <% next unless @round.alien_stats.include? s.details %> - <%= @round.alien_stats[s.details] %>: <%= s.num %>
- <% end %> -
-
- -<% {Log::TEAM_MARINES => "Marines", Log::TEAM_ALIENS => "Aliens"}.each do |team, name| %> -
-

- <%= name %> -

- - - - - - - - - - - <% @round.rounders.team(team).ordered.each do |rounder| %> - - - - - - - - - <% end %> -
NameENSLTeamRolesKillsDeaths
<%= h rounder.name %><%= namelink rounder.user if rounder.user %><%= namelink rounder.ensl_team if rounder.ensl_team %><%= h rounder.roles %><%= rounder.kills %><%= rounder.deaths %>
-
-<% end %> - -
-

- Round Timeline -

- -
-
-

- Aliens -

- - <% alien_total = 0 %> - <% consecutives = 0 %> - <% @round.logs.each do |log| %> - <% next unless e = Round.alien_event(log.details) %> - <% next if log.details == "kill" and (m = log.frag)[2] != "alien" %> - <% add = log.since*8 - alien_total %> - <% consecutives = add < 0 ? (consecutives + 1) : 0 %> - <% left = 145 - (add < 0 ? 105*consecutives : 0) %> - - <% if log.details == "kill" %> -
- - <%= Verification.uncrap(m[1])[0, 7] %> - - <%= image_tag 'weapons/' + m[5] + '.gif', :width => 22, :height => 14 %> - - <%= Verification.uncrap(m[3])[0, 7] %> - -
- <% else %> -
- <% if ["onos", "fade", "lerk", "gorge"].include? log.details %> - <%= Verification.uncrap(log.role[1])[0, 7] %> <%= log.role[2] %>s - <% else %> - <%= h e %> - <% end %> -
- <% end %> - - <% add = add + 15 %> - <% alien_total = alien_total + (add > 0 ? add : 0) %> - <% end %> -
- -
- -
-

- Marines -

- - <% marine_total = 0 %> - <% consecutives = 0 %> - <% @round.logs.each do |log| %> - <% next unless e = Round.marine_event(log.details) %> - <% next if log.details == "kill" and (m = log.frag)[2] != "marine" %> - <% add = log.since*8 - marine_total %> - <% consecutives = add < 0 ? (consecutives + 1) : 0 %> - <% left = 3 + (add < 0 ? 105*consecutives : 0) %> - - <% if log.details == "kill" %> -
- - <%= Verification.uncrap(m[1])[0, 7] %> - - <%= image_tag 'weapons/' + m[5] + '.gif', :width => 30, :height => 14 %> - - <%= Verification.uncrap(m[3])[0, 7] %> - -
- <% else %> -
- <%= h e %> -
- <% end %> - - <% add = add + 15 %> - <% marine_total = marine_total + (add > 0 ? add : 0) %> - <% end %> -
- - <% total = marine_total > alien_total ? marine_total : alien_total %> - -
-
- -
diff --git a/db/schema.rb b/db/schema.rb index e0aad41..fb40af1 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,21 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20150518162749) do - - create_table "admin_requests", :force => true do |t| - t.string "addr" - t.string "pwd" - t.integer "server_id" - t.string "player" - t.integer "user_id" - t.string "msg" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "admin_requests", ["server_id"], :name => "index_admin_requests_on_server_id" - add_index "admin_requests", ["user_id"], :name => "index_admin_requests_on_user_id" +ActiveRecord::Schema.define(:version => 20150621212615) do create_table "article_versions", :force => true do |t| t.integer "article_id" @@ -214,16 +200,6 @@ ActiveRecord::Schema.define(:version => 20150518162749) do add_index "data_files", ["directory_id"], :name => "index_data_files_on_directory_id" add_index "data_files", ["related_id"], :name => "index_data_files_on_related_id" - create_table "deleteds", :force => true do |t| - t.integer "deletable_id" - t.string "deletable_type" - t.integer "user_id" - t.text "reason" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "related_id" - end - create_table "directories", :force => true do |t| t.string "name" t.string "description" @@ -236,21 +212,6 @@ ActiveRecord::Schema.define(:version => 20150518162749) do add_index "directories", ["parent_id"], :name => "index_directories_on_parent_id" - create_table "firms", :force => true do |t| - t.string "name" - t.string "y_code" - t.string "email" - t.string "website" - t.string "phone" - t.string "address" - t.integer "zipcode" - t.string "town" - t.integer "owner" - t.string "opentime" - t.datetime "created_at" - t.datetime "updated_at" - end - create_table "forumers", :force => true do |t| t.integer "forum_id" t.integer "group_id" @@ -379,44 +340,6 @@ ActiveRecord::Schema.define(:version => 20150518162749) do add_index "locks", ["lockable_id", "lockable_type"], :name => "index_locks_on_lockable_id_and_lockable_type" - create_table "log_events", :force => true do |t| - t.string "name" - t.string "description" - t.integer "team" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "log_files", :force => true do |t| - t.string "name" - t.string "md5" - t.integer "size" - t.integer "server_id" - t.datetime "updated_at" - end - - add_index "log_files", ["server_id"], :name => "index_log_files_on_server_id" - - create_table "logs", :force => true do |t| - t.integer "server_id" - t.text "text" - t.integer "domain" - t.datetime "created_at" - t.integer "round_id" - t.string "details" - t.integer "actor_id" - t.integer "target_id" - t.string "specifics1" - t.string "specifics2" - t.integer "log_file_id" - end - - add_index "logs", ["actor_id"], :name => "index_logs_on_actor_id" - add_index "logs", ["log_file_id"], :name => "index_logs_on_log_file_id" - add_index "logs", ["round_id"], :name => "index_logs_on_round_id" - add_index "logs", ["server_id"], :name => "index_logs_on_server_id" - add_index "logs", ["target_id"], :name => "index_logs_on_target_id" - create_table "maps", :force => true do |t| t.string "name" t.string "download" @@ -518,13 +441,6 @@ ActiveRecord::Schema.define(:version => 20150518162749) do add_index "movies", ["status"], :name => "index_movies_on_status" add_index "movies", ["user_id"], :name => "index_movies_on_user_id" - create_table "nodes", :force => true do |t| - t.string "name" - t.integer "foreign_key" - t.datetime "created_at" - t.datetime "updated_at" - end - create_table "options", :force => true do |t| t.string "option" t.integer "poll_id" @@ -667,42 +583,6 @@ ActiveRecord::Schema.define(:version => 20150518162749) do add_index "readings", ["user_id", "readable_id", "readable_type"], :name => "index_readings_on_user_id_and_readable_id_and_readable_type" add_index "readings", ["user_id"], :name => "index_readings_on_user_id" - create_table "rounders", :force => true do |t| - t.integer "round_id" - t.integer "user_id" - t.integer "team" - t.string "roles" - t.integer "kills" - t.integer "deaths" - t.string "name" - t.string "steamid" - t.integer "team_id" - end - - add_index "rounders", ["round_id"], :name => "index_rounders_on_round_id" - add_index "rounders", ["team_id"], :name => "index_rounders_on_team_id" - add_index "rounders", ["user_id"], :name => "index_rounders_on_user_id" - - create_table "rounds", :force => true do |t| - t.integer "server_id" - t.datetime "start" - t.datetime "end" - t.integer "winner" - t.integer "match_id" - t.integer "commander_id" - t.integer "team1_id" - t.integer "team2_id" - t.string "map_name" - t.integer "map_id" - end - - add_index "rounds", ["commander_id"], :name => "index_rounds_on_commander_id" - add_index "rounds", ["map_id"], :name => "index_rounds_on_map_id" - add_index "rounds", ["match_id"], :name => "index_rounds_on_match_id" - add_index "rounds", ["server_id"], :name => "index_rounds_on_server_id" - add_index "rounds", ["team1_id"], :name => "index_rounds_on_team1_id" - add_index "rounds", ["team2_id"], :name => "index_rounds_on_team2_id" - create_table "server_versions", :force => true do |t| t.integer "server_id" t.integer "version" @@ -758,6 +638,18 @@ ActiveRecord::Schema.define(:version => 20150518162749) do add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id" add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at" + create_table "shoutmsg_archive", :force => true do |t| + t.integer "user_id" + t.string "text" + t.datetime "created_at" + t.datetime "updated_at" + t.string "shoutable_type" + t.integer "shoutable_id" + end + + add_index "shoutmsg_archive", ["shoutable_type", "shoutable_id"], :name => "index_shoutmsgs_on_shoutable_type_and_shoutable_id" + add_index "shoutmsg_archive", ["user_id"], :name => "index_shoutmsgs_on_user_id" + create_table "shoutmsgs", :force => true do |t| t.integer "user_id" t.string "text" diff --git a/public/images/weapons/acidrocket.gif b/public/images/weapons/acidrocket.gif deleted file mode 100644 index 0fb434f4573079fdaf569bacfe2fac0dfef82fc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1466 zcmeH{Yfn=L0EXYThtoqT^ps+`h|DcjI6gKi&Yvgq(1><8@4^9$bOd5TNk z&@Qv-kb>XOV0J7P2o7QhkOU|au_Sn0@F~Q{B7p}%9E5x%#zQnq0_F%HrjaZ}Y9i7^ zn45(3B+M5hLkvkWq$!Z4LY{^NX;7qN;XEkkA!|NV8Bj}*Ek%wL8X0nB$WtI+fu#$f zRbsgcg^RFKjiPL<%7Jb%^com)Va$ao4<-3nvlQk6lxb1E3~QI8Vma0oVnY!si%_)+ z)eLHM*rZ3T0dE#Yk3&%P*E!g=cn$~02 z2JEiHo+>m~p`{voYtXt8`!?Y~E!>;o*#fT>J{u0&(OHMCI&^Qvp=~(44S{-mP>-Vx zIM#sPMx1yLr=2*n69Y{+yBp`5aiIklTX5-peAJ4M_u-TMxavaCg==lN?!o6?e9?|u zKHNTtFAw6YPK3HJ+>P)dL=I!*2u1_=<|w}F#ognGp1}8gxOWocr|`pR-2V_i4`SjR ze!YOHAw0f}CztWZ6+FFynX7nq6|Zjm&wqMA`ci1vS!ZjivrG2WH*J>`my}gN`hsBb z@CxeJdb}0|)Jw3abW?C(*h7g_wPV4-NCzz|?Ke3e62g`J-}X5(Jsx)gP1Q<1%Zw1Q zNh!A-wyq=UO5b*8gd06;*gG`z_#H*3#MJd8|K!kwUQf|tFcr3TX6deh2RC&xV>>^? z*zX@)eMDjI`Dc34c)YRO7r(?s_rXXW6>OfQ9-iwES(T&c=#Swh4vX`R0L?9rWc&9=su#K}L;clB!4 zJf)w@l!wkR9b@I4Nuyu)n#GqFKbUDF11ZHToL*5$%5#6RI?p*a*E6B>%L2^Bu@qHn zz#};@)e+#z8Hq)Z8jZ3OtH+@e7HesCsz=F=nb$C7D^aw_r3R{y`PAH#E3~BV$c4?8+=M#Ma1lY=LP!8c9y` zGclBeaj*mlYT>9TKWGh;sn>%n?f{ce!{k_M_T@cJ;69wj9 z!qg%=9U^mPnrR}<3^ylE>2mYD5-q~~oWC5A1lWVR*-kn<;>9MoS%Lv;B0ElP{Y{@# zJriOPkhsY;m+0Y`G`l85!CM#U)uxa;wdmF!ZxZnZemJ1#$|vwVHw%RV4;hZ%}ngV)GZWx zXc=SBa+4^apu-U_%QW82g2)!4nJ$YlW{GhRVwUKGF+AwYbbI&9??3oz>h_eDb$SuG zewzC!6ezbKC`l4f320PkRp`{{H5jxQb(oT|=&>5udY=)y35OZcLaG(#R?=*w+sJhA zkON7?l|ptZIZn1Y$xSCO19t}bnG{NFcd^4oQ8u1z9?79NmtA?3xG8m0{xB5G$7!jg^$8AmX{+L(k3)XichgbL(Ha8v1RHp^k?tmrH_`Jn zp%zZH@=_aT57Kvt@L~Gfi5x-hAlganD8m6pju8)%2r|*lWH(dCdG#c(J?FuMM^>MzL;M+-VO!3_` zKhARdb$(vpmqj*~`1hm#=elR{_XIjafi9^x7EFnDM=CeZZV%HeRt8*SqaQBt5Te8EmPr`gBj4!X}t>!!4y;DI$TBY0K9~7zt zU3INB5Y-g6`Iy-Q@IzI!@ z_5Ql{lt1@|v&es}#HrX4-tT^Ly2TP1RO^hZVtzdCifB@I9Qe}fS@=!9n;6Yd##b)C H=cVF5#B1#` diff --git a/public/images/weapons/bite2gun.gif b/public/images/weapons/bite2gun.gif deleted file mode 100644 index 8e7fb7995ac7c5f01cf0ec9093f3f2201b6fd1a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1527 zcmeH{YfqC00EJKQFTFr-^a4eAOQqmY0YQrbwzSxyMFCM!PzwVu16{?6uuW|%mm+0? ziw+fBy&+o|g3(Aaw@@w>&6X9%GP1Fx>gF^tOG#M9zTof|><{eZ`2{EEImX-#n)I>+ z$neJ%EQUq}odyOSOgadH;1b}4Ae4c-97a~H0NHG**ERi5u zf*2`C8Diy7MPO+J;uKIvAwCKTORy{&%So&tkra#MSfr?s8i%wvtX5-9JT&oGyA12z zL1rSdmSg=2=vE>-3HoFhl3`p0Qz~-PuxT~SYmleG=5%aXi~O}HSck$46lG#t7Pe<$ z$9fcNu~UbVY?SJ;TaUdtu;if3h;k#|HK8IGl^d~dBMz8x(2V!;P_-G=n{j9htOYny zh?=c9x)rt}9NUK4?Kr*z^~LyLCr*^$WGNhb&|pDR8Jf${Qh_s-aPLFgetf(i9S3o~ z8l8u6@qJvf;_?x6*Wk)gcx<>Ygk3^m~^ z7ap|W>lS=-2E(oJx-rs*v9s{C%^N3om=|>I=N?!=GOwcpI~~@#fzD{C5N7fo0kvrA3BAN zH%NS|$6HZAEPx`GnFc)G(}YMuALeVFO*}F~g8+rj4&`PvOblK(g2UCCwYm{1TVQb) z+a1|XhFn`$6tH-GXSp(EevllcF@&n=dFxX>iy5-PJ<Crm7r%y}LMNrq@eg=^lU8)e^=@0zd-dveZ*r2`8?&*)>^ zC|hKCFXcY1Q@X+4Rd;pN=O)DV89(K@vpIaZYls+B){HA!4erj7XH9OQ`ta+Qv*o7= zMahLZQ%6|?Cm~&Fv$j1q-hwbcz`yD}O=ro>ee(lUPG{PB^TORs(Tgnvw|{HQD+5hy zZ{=hw(vS9xGw7m>nLx60fPmBXgvP3x49`(^XQbqCIQ$qdbLCWUgqNW4+leCopn=Uy zvP0dSNO3az|C-EIqfVoxB`nUJ2){867TM)@n9*ldhKqBykH%fJJ@Mro8Pc(2nHgi? zrpqQH^i^FNLf(JO(Gu7FfKni;A0~a_ytLUUDQ|a5uDX?5crEsF7a`!(&&)DpykGsk zsEU-SkfrCvcU)D?^qO)tJ5{CYs@6{W*|xweL!Z?p3sG2ydRU4>wKYt`$-BB{Hm`nw zNfso{v0}U9%NvFLZL@|*Z;R{dL+~DvtY|`;>LN|h+N1aMcKE_YLlUaeN>3gan~7n+ z;Mlj`g6K9^l3ntVr+^{U&zXKAR`!A#Sv@hBP*S7vb_m*GF{tgu)Nx*Nd*EkbdIQC! zYP>OMlymPDBpPc~!GwHF3e%U84`Z6!C-tEc1os-HD!yK<2@H(!R!#GF wQl%!XgF#N^(?TLk`3|GF)UKn26!+et^M-trRF0uXOEdgE(|(`7c<$@|1sjAYQUCw| diff --git a/public/images/weapons/bitegun.gif b/public/images/weapons/bitegun.gif deleted file mode 100644 index b6c159dbb5f9e0e6a371e4c61e741b7480d22efc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1514 zcmeIx{ZrBh0LSqUUqHSfD)<1Xh+h&BO_vlJmerRB6-^7xo)#6NHeFWc+_I;|7p1gW zp;1}rqFP&Z)mZa3ciZkj$*|oT?z~-lx@)a%?XKEg;)M5kV?OY9i8- zke&>AG87VINsx)M$K`lp4267e1%S1kf0wrEhqA&~EEEK6xoP&iL=rvfB zhsATTBp*u)V3-GEAxv7BwWwGCiw>1VSYC|kg{aYEMG00ef^`vU7o)Be^-HjNDb_5- z+GSWr!)C%p6E>N#xeWF)I4aO+L30(hRH3CBt<`wB25l>_Z6$VCv9k^xtFUV=y4GU% zI_z1GeJ^7F2E1+qvkBds(PPIU2l|?DxEcLhaP%d3S~1Xy<6Gg~iW6-Z+K$sZ;M<9j z4!rpa{GB-WD$c)#3%hW!3zzre>V8~5fPfP>TzKDw(QbUugAd*K=pa7s#ixA;zJX9b zCXOO}43i#21~D~=+sE;l7oVTNos;@7M77U6B9xpC3>@6`MMm8#P3Kl81h@38dEcCQh1VSK`YwULe4MrEKrV*fw9EM+D^ZS``l2R4hWDIM( zo14tb6ZHlOEW-J3Ch9i_3+b;#QE(tW^`c45iGz8&~Ju=xRd>Xbkmit+;!s?-xe39ieP0Y2PVL9o+ z$?b^BRE_r%=h>TXD$;k`c~0pnvS<g757-LsMAG*~``jZdE|&=epS`(=crF-a1F8 z*|gC^Sq^sr*wNG^DB5k&;52~d#j@|*^RqcI+&w9Uy&TgL?lK5zrGhw-)KBDet z*_|re(a2BgJ!E}%w(k-k9r%kCOg_>pi>T{J)wsXGy3R!n72fBOmLO%3*K|F$sBPoZ zkvUCI2ErMmy0Id2wvQZaHpskUzM_288Wxmvg-k-n%;DZtgNB)uc8ZL*s1~`SGQ&M4 zcAw&GE4-Q6Vz)Cg=8@B!y2h+Mn9(}MkePYyk0&G@m=lqt&)$ou&$M;$leo2Bnh^S< z?AYQ+`-HgOOR*D|&)VH0oxRp2kmXbKes)+nrP!ninHu>)@7L@UooIv|zmGP=Wc7GL ZgmO6G5)?o2kN0D22DeN87;dDo_+MwXcrX9} diff --git a/public/images/weapons/bitegun2.gif b/public/images/weapons/bitegun2.gif deleted file mode 100644 index 8e7fb7995ac7c5f01cf0ec9093f3f2201b6fd1a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1527 zcmeH{YfqC00EJKQFTFr-^a4eAOQqmY0YQrbwzSxyMFCM!PzwVu16{?6uuW|%mm+0? ziw+fBy&+o|g3(Aaw@@w>&6X9%GP1Fx>gF^tOG#M9zTof|><{eZ`2{EEImX-#n)I>+ z$neJ%EQUq}odyOSOgadH;1b}4Ae4c-97a~H0NHG**ERi5u zf*2`C8Diy7MPO+J;uKIvAwCKTORy{&%So&tkra#MSfr?s8i%wvtX5-9JT&oGyA12z zL1rSdmSg=2=vE>-3HoFhl3`p0Qz~-PuxT~SYmleG=5%aXi~O}HSck$46lG#t7Pe<$ z$9fcNu~UbVY?SJ;TaUdtu;if3h;k#|HK8IGl^d~dBMz8x(2V!;P_-G=n{j9htOYny zh?=c9x)rt}9NUK4?Kr*z^~LyLCr*^$WGNhb&|pDR8Jf${Qh_s-aPLFgetf(i9S3o~ z8l8u6@qJvf;_?x6*Wk)gcx<>Ygk3^m~^ z7ap|W>lS=-2E(oJx-rs*v9s{C%^N3om=|>I=N?!=GOwcpI~~@#fzD{C5N7fo0kvrA3BAN zH%NS|$6HZAEPx`GnFc)G(}YMuALeVFO*}F~g8+rj4&`PvOblK(g2UCCwYm{1TVQb) z+a1|XhFn`$6tH-GXSp(EevllcF@&n=dFxX>iy5-PJ<Crm7r%y}LMNrq@eg=^lU8)e^=@0zd-dveZ*r2`8?&*)>^ zC|hKCFXcY1Q@X+4Rd;pN=O)DV89(K@vpIaZYls+B){HA!4erj7XH9OQ`ta+Qv*o7= zMahLZQ%6|?Cm~&Fv$j1q-hwbcz`yD}O=ro>ee(lUPG{PB^TORs(Tgnvw|{HQD+5hy zZ{=hw(vS9xGw7m>nLx60fPmBXgvP3x49`(^XQbqCIQ$qdbLCWUgqNW4+leCopn=Uy zvP0dSNO3az|C-EIqfVoxB`nUJ2){867TM)@n9*ldhKqBykH%fJJ@Mro8Pc(2nHgi? zrpqQH^i^FNLf(JO(Gu7FfKni;A0~a_ytLUUDQ|a5uDX?5crEsF7a`!(&&)DpykGsk zsEU-SkfrCvcU)D?^qO)tJ5{CYs@6{W*|xweL!Z?p3sG2ydRU4>wKYt`$-BB{Hm`nw zNfso{v0}U9%NvFLZL@|*Z;R{dL+~DvtY|`;>LN|h+N1aMcKE_YLlUaeN>3gan~7n+ z;Mlj`g6K9^l3ntVr+^{U&zXKAR`!A#Sv@hBP*S7vb_m*GF{tgu)Nx*Nd*EkbdIQC! zYP>OMlymPDBpPc~!GwHF3e%U84`Z6!C-tEc1os-HD!yK<2@H(!R!#GF wQl%!XgF#N^(?TLk`3|GF)UKn26!+et^M-trRF0uXOEdgE(|(`7c<$@|1sjAYQUCw| diff --git a/public/images/weapons/charge.gif b/public/images/weapons/charge.gif deleted file mode 100644 index 035cc34f2350e25addd4b3e5da6fa04de5627354..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2756 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 diff --git a/public/images/weapons/devour.gif b/public/images/weapons/devour.gif deleted file mode 100644 index 394be8ed208d4ae7824276074568cb3265a40bb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2453 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 diff --git a/public/images/weapons/grenade.gif b/public/images/weapons/grenade.gif deleted file mode 100644 index 083b5e42537e9035022bbb5e7505e127b6e33fe3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1468 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 diff --git a/public/images/weapons/heavymachinegun.gif b/public/images/weapons/heavymachinegun.gif deleted file mode 100644 index b1b1243ee0fede2a732556211545bbc28893e221..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2230 zcmd_p{ZrG20mt!Ao*xK#Bs_!w-*0#@AP)%&MxdG}AOVDkSP@YJLIqSB5R{>{Bm@Da z7!(yNDxp+4%eCOSD>}PNcoLnnvBe$s?2fqIi8rs~2e-q!9oxEpW3NBqefQ2a=V&%p zR6>T=6ZjtrC{$4CpfNyag2@4k3swL)f#C4L6(B$eo*01=@PojYLKp&JC`4fpheIMq zPz0or2qq9hB1D1EXvktAi$nN2$m0=_fXMZTOhi-?$P|z&DAb7FfS8SlO+(x!tkXcb z8OjXAXCmPPtlxsftw_=#S&tM0RM}AHK%I+J6E>K!F&}9KNZ*D{MbKEF*^Z1I$SgtT zPGo(E4|ZY8Zfq@sb`P}W(CvkO9}HF)D`2cd_5tKnA-5W)gD}^?T#LLqp zqhT0FN6>T=&9`v;Hd?+y%NSa}#))rmVjQ2`!Ku6W^tWjH7WPRv?!j>%&IfRQhmPN) z(}PYgx~9-QjWe@2JBPCm(KC@`r>a?|*bx1B9XD4!p9Pj?Dgb+A!rrvui(vm%=K;^8@hGP&%a8Rjo21&-xZwy!rM z?)sS7?(39=6}65SANe1NqV-ixF^%(P_qy~`Ro#>sRsbJL_L!A2-L1@d`sBp{)Ak5$ z{b}OGJs&4Vd*RZ9;ifui)Q4@WEeQ;%JJ8tkAgGpnH7AKRSlZr*+0U*-4D$mY>kNPF zAq}lc&akt)Kc()^bTX!v6PB7kI65z^Ja~22*JVi)boTj}l-`@66ZPQ$m6@J_KmesxQ$M4M^Le4JHuI~)fj_o zSNtr+shCDR_wbNCJ0$19cB5D`;GGtxFRDyY?K9)Fh%ZMcvcp?epUuk2hCX&^5&E*F z<|;BfD6Pt4XUYb&4sP1NtTV#WMK@ivN8ZpOEz0uKgUSjfoPxdm>aOTIjnq|>NtX00XoR*}&BxqdKppeE-Th_LRRq#lr?9eLN z$sy&tXC);)qU@0Jlj^zPvbWwjDzDmS;BH!KGk&Y3lT*Q!T6->sY#X1}W-SsvVTsD` z4Eo?5aZ#Ij(moeFaE&r2+)q5CFbh)ec^M%_p^j?uP&#C`nZ7PE{jS9*Dj4dU6I)9B zvq3xFjn4|Uj_QokiusA`p!zOdM_A>cUuTGtFHC7wRtiHv2nio``!805K;vsO2oAf{ zMrWx-&5-Up>?cC@Xe(yo_83#mifhhS+2UPQ7CTch;IngLYb;bwc};6}jUJg3xa;BI-l^rIwc!Q*8FmwLcV?)PNSct(QCU}mjosbZVU zOW`S9p6}Riyb_z$9;))PLnL{6y%2P0Az8VimD}tTo|DEQOoCD0?;IuC%}H%uzGB)D z5#;CWU#3Z&v$0AOB{024FCDj}kXn*msB-wKtj_qJO5s|w$rz`Y;FOfS61qa^i6s@R z^g(xEjm5;TAE!3Wdf4hx3ftGm{&t>tuA*SN5ZhpDy zwv6pfNu2TuDhbEuq7invbvk&`Lr-?qFw&qG++1q+naP0Ye#fn0B0*7lnv*Hi3mihH za`l%ORhO634+v+5XcF&dFSFiL!)L6t)FrprHq;&ol9|+^NJYajA2rGYmT|fGviw>1juEP>m@u&%7RH8Ax0^KU156g$z)uUu+h5qZleQnP p509{0F=afNS8|T$4lE)l{41hNq{{!ERlCJ;& diff --git a/public/images/weapons/item_mine.gif b/public/images/weapons/item_mine.gif deleted file mode 100644 index 076d125894db599347ab931b367ae5a861a88a82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 689 zcmci9%TLk)00;1|hJ-p1HNy}YKSMzLnUJO+`9KnRh>!{rWohDkwH|6gvCLA@Rs1C&^P+~>tNhs=}Y=FuJbqh4D(6&R@ z0o^(1&!g%B43}W+MD=A<+fn0y=?W~@VC_Zy08YDcW(bWQG>xL^25dLcb_eZ~=(q>_ z6F6qj^AtVLaCHu@H*hatcnKrR@CGsV4!%`Ptl{`)?Na2;fLCme;nJH6<4x&{W_L&GB;FTXa=JLdBxE9-KEE}5A% zet*gp4W=yDD9AU-6*bfTX}YLbQf^7qX`j!JvzVlzh|5>MUiMHVaaC*?SxH-2b*IVo z9B~0_-}?=xz+6gCiHwNf+@$Vd#0ZI`jJWSxKem7V`n^pVqa+_pkny;T;jKs03r<>+ z=+uz0g4dO842A+2c-*z2w*2|n;Ovb_d8p@xJ}o80W{O=C_OfGr%y_NMav-~}Kk^X$ zn?5t%1L&3mEPnNqW%R&{d5?y%KjY=w86s*hYPR(i HH4^fF)32~u diff --git a/public/images/weapons/knife.gif b/public/images/weapons/knife.gif deleted file mode 100644 index 4bc36aa3e9f4260c01f584851eaf6851781d6f5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1348 zcmeIx{ZrEg0LSsq*yhHA@EwmaHrOUO9)-c6Ay3;FY{Pg)K|*8>bkG$8c~U_)o;Dcb zFnq{J$3v8WH9aW0;|B(taAlp8c~n-jIx3|*xa+#>>Zs#?=*M1v!u#$mS7wWnRT*I7 z=OOGOQ{m|gA^_e&@L|E9g8&|wVPNh@5Fe}vup<#1h2Us}#DE(MZX9?5>`OqX5PT8B zlM#Lp5h;jFLsUAVGY})e0V!fL5tju)HUx6SE0Cas@DLJTLQ*bX%!jBD2aAzXf|SEZ zJ%Y4Sq#s2_Im9nRTmi{3NGp+91(^!66Ub5{yBhKuC{97CfwC4kbvX12^6HVNMScSc z8c}c>Ma?K`L2)Ze+Hm*`O50J|fwJ=`*P&dGiY`=iqp}y31{^m+)en^k>WfehqGkvu zFGDko+N-F$j@RBo{VixMXc$Gq7*0>1X%fxvpyf7Nr_eTywi%p#59i*;IV(Eu;ruKv z%t7}d^z-Qa2;B=XETV52{SKJ!!?c2dRSbTN!B24M0WPm$_zPV55?3GN+B)9+79-zb z9&@dFrzpG0K*zntAGqt2CGF$ux!AWiY zW&LRJ{(*ovwcQ-3-q_2|ZvC1ws#E9j;*J(W4#`ot6V+(gd*hZrryB5u)bCr-2S(~$a!^yDW+_$HANvkO9Lrgf<3jlMOcogNx$X7&MAtv*n=E z82cu0c$(Fv5S>7B(3N&|Dg97~b#dMGL;Imr?(D*};_B+;&VJ~wv-J1g_xcas4p+1J z3BM64tPSH)+j$Udhma4k0Fqn~LhKNM6oZmr=OYB(Si=wh4X* z0uJ;z5p*HsM!y@+doa+7Auqx{L=NNScEp~-NC#f&#L1^I+JzL0j31{0mmAm z$l+))*m}DBM+Ac1ANGwqCju7eQY)4Oc46XTW5{_ZL-Sd5Z&)% zI3V^p@0%0%zLeLvv(6D8td#JYWq3S0W={(Y!zt-pfDqvU+0f->0is-H`GBdlZo9s_<4v)50bQtHqcy4OVWXirvb0JhI)n3e{ za&nccecyhriE~8?<%#gBmH)?IYq{U0mub7eg#&l+>iQ3gF)kG?agsO5&~1(?dTCWU zO-hr=-^&0|8M4=j1jgqgl3UpXPkMTs5h)NKpClS^cdGhE=DF#rGn diff --git a/public/images/weapons/machinegun.gif b/public/images/weapons/machinegun.gif deleted file mode 100644 index 4b9c79644817bdcfccc7caea43db508929982884..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1542 zcmd_pi&N4E00;0d`~U#~L42jCKNUiW6fDzHOVAWwMQZ8H8kiPVnwpiHwLnQJduXZU zW%cv1&0H;Qb$gtUCCaN)wm6&yY|0&v~nDg@6Rd@%$b5O_l94WSQ2i{S1Du>>Ce@C<+# z3GX0y2g4@>zB2eOhMydgF!(DFumk~01TIBT1cFouRwHB?q{|_T!s2MiV-UI$p{o!U z3q?GZtcG$8mTC~LMMNT0YoShtIt7tBEK9}mbVOxfMJA%xBSw#y4Oo?p*c`-eMBFCC z=VJ9cSd)*00%*1%(SRf)k_wSrgp^|Fb|BS+)DooaMEWkI??z@B*6qQ%a;&d_z7qPq z$l8aj{m4FmoN8=*54i`CdkA?SAm5C93kvE`V8xar*jkUR4S3fE<1rW;vF!x5okVdn zwx7n1GcdKFqzyaIVOKj!&!e;hWf!pL6883>>Lcv?82c~dKp(0i#$LgO0fujwYY!1(%?9nT6)qVA0Fu}u_3Y6+Ggz^9kc3A%jQrIlgdKe_!NbaRis zdH&X9o3f}(KV&xAnS9aULOJKN;`Bw~$S)FVM%H?tbz>{H&z-hFq)zLl)X!#^-jtzh zviOqCof~@IRGBKH7Z#?4byq*+)O8suSY+MH*#;kCdWhyCvzkT)ilJtDe)J8^h#w(w z4AB(5l|q(!cO*NwMU^)xJC#76lwG7=SUuxr9CmSzvZ6s&V;&gw+1}C2L<(h)iq`yN zCWO&(>RbHCLA{k1^{b&s8_|(87Py&=c6hb1zhgFn?s!_A#Q-JiGLi#^<}oJIpX}P<`lX|lHTk>mNi*e4!`51 zmcdmDhnYS_O&Ug6Kh?yRn5bdq`c~BP)Iw*n)Jh5af-_nMk^|i4NG(gMYszB?Jo;!Z z{s&cB&XS2HyI{}b@@&msr-}x-(_u*{otf2159=Z)h>U87R!6>mUdxkDm}~pxA|pdw zAhB3j{x-ePGneetCVDn$G%f+Qo8f6k^ETL90uN^l54%oM6U<`0et!Iq$Q$EAmGs5@ sZSK+8an`2Z#y{^ce^VWGt2vIBcZqgKy@xKEKg7(AS^CP!VKNZ=AD@k-O8@`> diff --git a/public/images/weapons/mines.gif b/public/images/weapons/mines.gif deleted file mode 100644 index 076d125894db599347ab931b367ae5a861a88a82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 689 zcmci9%TLk)00;1|hJ-p1HNy}YKSMzLnUJO+`9KnRh>!{rWohDkwH|6gvCLA@Rs1C&^P+~>tNhs=}Y=FuJbqh4D(6&R@ z0o^(1&!g%B43}W+MD=A<+fn0y=?W~@VC_Zy08YDcW(bWQG>xL^25dLcb_eZ~=(q>_ z6F6qj^AtVLaCHu@H*hatcnKrR@CGsV4!%`Ptl{`)?Na2;fLCme;nJH6<4x&{W_L&GB;FTXa=JLdBxE9-KEE}5A% zet*gp4W=yDD9AU-6*bfTX}YLbQf^7qX`j!JvzVlzh|5>MUiMHVaaC*?SxH-2b*IVo z9B~0_-}?=xz+6gCiHwNf+@$Vd#0ZI`jJWSxKem7V`n^pVqa+_pkny;T;jKs03r<>+ z=+uz0g4dO842A+2c-*z2w*2|n;Ovb_d8p@xJ}o80W{O=C_OfGr%y_NMav-~}Kk^X$ zn?5t%1L&3mEPnNqW%R&{d5?y%KjY=w86s*hYPR(i HH4^fF)32~u diff --git a/public/images/weapons/oc.gif b/public/images/weapons/oc.gif deleted file mode 100644 index 306e056b595f4440c625a0b74dba94f420a2990e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1712 zcmds&i&N4E0LQ<;?}vzh_y`}FL7Mm=hdr&VctohZz|e3}frG@$6`DOPYd?{UkP5R} z@6^)Ftf*{9x32BKIb z#UVK!W8;yM0P!fKjzU@@(nmug#5fT$MUW;TD+%M1F);;`QZQMJDXGX##k6!x&%g`` zW{$(GOvpciLJDOTW@kY)9_k6mn}oTOF>eayXJf%sESv_-G-#)zAP2e`D4dC+nOHmv zdKrr4SfYSIiKR*`n~miv7*#N-QKH5txiII!l8+Vnu+Br-Jgi)R@&)*GAy#W()1q<_ z)+|Dm4r>dst_bTFqgs!R#i;oho0njV0iPK_Ek*4z)Gdd@hc1fg_bTx(3ZvXjzNabvV8rZ5z;Djg!?l zwF#$d(6t$7x8Uq&I7h)t;es6(?dYz<7Y_L9ak(B}I&oz?zS@qjUGO)ccL(}*qJI~z z?!q+>uJ6W;-T1Z%-|fNod-20Q{J0Od_T#4m7(9sEhj8aGem;V`$MEYh+-t^fE%?0^ z!Q;4p0*~79_#}opFmwt}I`OmP8HKIHKs6tLcc#!ATbHp@}l$uSTVqq)vZRB0-`tydcat1V+TFu5== zRjDs%l(VBwDDCX_kulfp!irjxBH-L1qmQ`%RBp?y-zy8`$0^P_fBDXbzX-*1+tyioXu-kuP~wR}PO6AT>Ds$`+62~}aocW$~v$dp0wlBMfOr8DD zWLMg%?gB*RL{yP!?Rr~(bhg1uk6);(U~rRz!(?2cr)ayZYG3}LgTk2?wH>-cTlXh!^&m$Xpv`Cw&<=2(E9D=^OHo$&7V_zKIu+pzBYVYp8Td%*zKAJVA4FzcJ=afFQ%G{BqWOo$D$? zE2K{teEOk$w=%(bP$SvJ0fB&ZG{{fGmZQTF> diff --git a/public/images/weapons/offensechamber.gif b/public/images/weapons/offensechamber.gif deleted file mode 100644 index 306e056b595f4440c625a0b74dba94f420a2990e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1712 zcmds&i&N4E0LQ<;?}vzh_y`}FL7Mm=hdr&VctohZz|e3}frG@$6`DOPYd?{UkP5R} z@6^)Ftf*{9x32BKIb z#UVK!W8;yM0P!fKjzU@@(nmug#5fT$MUW;TD+%M1F);;`QZQMJDXGX##k6!x&%g`` zW{$(GOvpciLJDOTW@kY)9_k6mn}oTOF>eayXJf%sESv_-G-#)zAP2e`D4dC+nOHmv zdKrr4SfYSIiKR*`n~miv7*#N-QKH5txiII!l8+Vnu+Br-Jgi)R@&)*GAy#W()1q<_ z)+|Dm4r>dst_bTFqgs!R#i;oho0njV0iPK_Ek*4z)Gdd@hc1fg_bTx(3ZvXjzNabvV8rZ5z;Djg!?l zwF#$d(6t$7x8Uq&I7h)t;es6(?dYz<7Y_L9ak(B}I&oz?zS@qjUGO)ccL(}*qJI~z z?!q+>uJ6W;-T1Z%-|fNod-20Q{J0Od_T#4m7(9sEhj8aGem;V`$MEYh+-t^fE%?0^ z!Q;4p0*~79_#}opFmwt}I`OmP8HKIHKs6tLcc#!ATbHp@}l$uSTVqq)vZRB0-`tydcat1V+TFu5== zRjDs%l(VBwDDCX_kulfp!irjxBH-L1qmQ`%RBp?y-zy8`$0^P_fBDXbzX-*1+tyioXu-kuP~wR}PO6AT>Ds$`+62~}aocW$~v$dp0wlBMfOr8DD zWLMg%?gB*RL{yP!?Rr~(bhg1uk6);(U~rRz!(?2cr)ayZYG3}LgTk2?wH>-cTlXh!^&m$Xpv`Cw&<=2(E9D=^OHo$&7V_zKIu+pzBYVYp8Td%*zKAJVA4FzcJ=afFQ%G{BqWOo$D$? zE2K{teEOk$w=%(bP$SvJ0fB&ZG{{fGmZQTF> diff --git a/public/images/weapons/para.gif b/public/images/weapons/para.gif deleted file mode 100644 index 7b0e128fdcc4c3c3c9a574524e54ec13ac74ead1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1156 zcmb8s|5K6&0LSqUUxj?Y2PAz&$%iijB`T05f+7eA6p9d~WnUzZP?ow| z<+i(hxoelXt$7!?Z6%f z_Byf8g-#dtyV2!Aw--HIa9|61edzPym1gv}AkurxZ5RyU*mk_O z14C^XZo^1BUf+r19XPQY@qI{i;$#@7_TzLn&h%ii2h#`f=0Tk8!`l(ejo{-ET!|qS z!zk+|R|G(v{BFB-Q@L*3jJ=8bYOS`?zt&soCW~{**(7oh&35A^17{=p?gh-H= zFCoR#RLMG-^1M4{^;kDI~N%tk*f6+%u9D#eEiob^ENQdCobI`FVmY4c?)@il!fB&bxO{ zrD^-#TWsEt#NPM^KVRhfSPgby}?2HItf)-<9ZgWoGTl1C#F>_oaN^PddVa652EGS=fJaQaW&`PtJNeRb=S8 zKgt+yOe7lx=1|p=t7%g7xMRM3%Hho~@A+UMS z^zyi1%LHQV-@muTM}gt8E-BB+a@DS_4kZ7DL#peu*I0>&yB zt8usnS+&TjgQ*@lXK|zv<|dfWA@>4~UPN9C@>-GKhWtw?xQr8T;iL_P9Vm35=n9IR zIMoTuHI!XP*$q^_&kI?!d-kijx8C?Dd?X$3d0{de)=HPgOs~%kSqH6)&i@5PQdcT0{YxFOpe+2{I z;?^_VevY?)!0=BP{u%dIG4d-$*D(G&CN}WFpP2j`Gh3AZ{dWcUTTD$;g~eJ?&bwG` zt>Wp8CNub(L;?-}AYuEC?NLD40)fIcOu4-slwfh8ufa_XjYxMen5Eh)!Lf%2c&b%3 znH8JU(`OqQG2UcRs#d;v*c~jk@KmK6l-zq6ZL}{{8%sIdL@V(LA^G&m(@_*`s75QZ z_hd9J&q<_05>G>s?m)IarW5t;6B-Or>z6=)9 z@5+kZ{=ae;O>B9Q&lWfHv4tiw4H`BD&hAjYtcN$p8DORRm*`Z{(e{m9dhqngc`&(_%U*l?5Y$odWv}uT_Ny{>#NK>=jID;zvRv< z?yeJhOKgLMcf>#Qc$f8k<^Mt2*LGbS_Xozu#2Xg_6QaxG^&$P0C8(Lja~@-xG@CRO6y;;pSA6{zGC4XNox34duh)4zeXpdg zrJ-++{HB!J)<4=ZWk8twxuI3)>^swoUE9Lx-C&a-TY3LRU8j8N4o*fEG`T%fAGZ^h z;;Dk^#As0LwhB2Z!^)lcElHtF`y^a&ho6W-dcF0_=$g@-s@e+tcJySHg&*wrR)Zk; OerX@Az5c%3j_n^T^@`&F diff --git a/public/images/weapons/shotgun.gif b/public/images/weapons/shotgun.gif deleted file mode 100644 index bdfcd82d33b4eed0f218b8e44729f936700ee8f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1634 zcmeIx=}(gf0LSrPAD)&LN^fXU=mAv9C5IdZ1bP8Q1{M`jF53Zeh*}gQV~8zhMZ_Yg zEW@lgGBamPt1M%SGcAX6n=fD^1~+3sjk3L}W^dicgfa-j zAPUC@IW}y<#z=%jAv7A|7>HvbiGwU2vIK-BB76%Xk|9sQrZhw_E$99G%3mD>!}?ZC{}68rrYpLnlt$K<5-rehJH0 zuuh}vYxI1J-rMN+;M6Pz<}r8|LqFo|JzThti^~{$fKQ&#|MwpikgapIN9s(ib+yvt zjjavR{DL9_WN%1{AO1${yF1>E0{S{A^boz%;pwLHqbu(^CuaLO;oHXV8cvVMQ=59c zDpyUufRQq0+M)gaOn5~5l=bHG0efgpdBm;9B`c@sP$-%gHMxUq$&IB|;@JRStbOEo zVbtZaLQ;E{E!@X_gOTcXQ48@@Kf)occ|b*l zJ!GFXIomevr4Y18F3DjgM0j{XyFY7g@wrmun=PqbS(x}Ve<-NQqOk6&FAhs5hNUyw z?}j9qq-+cfhlXYqY%;vgG0|+Y7q5=gh}BrI0KBEipk=(Nzqu@svGTix)d!mFn9Ta6T1 z`+~HKJ*;?1FQ&R2GbGF7A_A(F6FSa8g<8{A%6viPuD9Qk^|E5doI2itx2tOu`f@@y zzf85NV=xDyB26|+H#emLV5C#bR!y}1!2&fWZg`fJ?v`qNm6hn`$k$wCc$>|Y$FCqC z>t%;vocGf>aaEN(F6|27DRF0iTAQ@%CacOZqTM@gA_KSDy)(?{R`bWIf;BTuTzD%{ zAKt87^w|^ZNYqUczj@Wn%<*r07%~0s#v=N8>l`yh&+Vc$1^0OTv+Top0rz=-Xw?~2 zMk-&w^y-N2=L|s}Q|@#MwHeFi_;WEoCPeO0{frK+}sH_ThyU?^$Yif+u|QT z=^%b>O%qTUNtOj|9QD{=XY9VwUdv2pr||ZDcIYk#aj;K#{SkZf%8KU6C|hS`oUgzB L=GnMbz(M9esMew- diff --git a/public/images/weapons/siege.gif b/public/images/weapons/siege.gif deleted file mode 100644 index c7d7ff616262bec565d2255e5f78d2951a380546..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 895 zcmZwE?^DtT0LSqU@I^pH1OX8Qzlb6V@?-wUL?uLiiYSSu28a$dTWw~{(N>H6BB|Id zb-U}@R#a~Dsuk^4-fp)$wQhO0C+)7??NK*(J=k{ZZhNv@PukY=z3=@Wyqs=F)7}vi zNPHW|f6-`Q(7`0Y&H*O}Tn-9y!OH_bA4Oag6+py;xDdsBln5X#f=q}~ArxYii9r@a zDS@g46;f16p)N(092z;Q6{snLjzp~zdL@i1m{h1&qd|?vD(umqNrUDZn6+rt!J>!N zfOaEnCUlr!e+AAuxa#3P!B>ZtR#qtyukQ8e=)|Jt{gtw6^W<^AMX&9*3dP2T zNRO*C)L&712?dvD9flf3eXV7%uB&%K=?>{jW!#3=HhYHw-pJ6fHxT}MuDG&FESG4t z<`4*09*0Fp`A_CWq`b6}%OU7Anp7>!URW-l)9Ji*Y%n}W{V|=@co-6+I?sH&L84n=KQ@!?>Usggd`R* zB)|(lSkH@e5?msO%x*Cgvm8p%;d)zj^c;)lVHYN?50~js2%ih0?)hAyG58J2X$)p@ zGGjs-@nF<`(kK_g9I0o(R9k-&ubk3zF%zUn19RO!kv3RZsuPmXz7T ze_hxpr!v)tZ$8z1@tsxp%-8)?(z4Jg%g+3q8La!1qiTvhwmU@DFSk;H#mC2-{-nE{ YDGxpJJE(Mv@*#g9>D*1_GwCq@3#T*qq5uE@ diff --git a/public/images/weapons/spikes.gif b/public/images/weapons/spikes.gif deleted file mode 100644 index dc5e988dbbb41795a251c598f151b7b4f3b37440..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 684 zcmcK1TThY!0Eh8E_=cQBKoogFd=W4_CZ@V}Zv; zJO{!!Bpk#;Vmy-g5DOp?f=qx^1epl(Bv4`~B~X!2lSr50XbLnb$dDtOLaqXNN@$hH zSD`Q+MH=WeFlNG(g_3NP=HNswELvE#D9=Y_0jhOy=uvAxoe}j$G?>s-iWW24t>`F6 zmkr%E^i;xG1(zLX?Qqw?Q;TzTINyN5CJdc|w;5MjG28~^fcjna;AWtE<&e}o>BHdFs1K-eQ{+j5?uU&$(_ z@~_@$8KIX2=p2q}$EmQy@~N`#qOHC6i@oMi#=em8@p@L%O7dkbKSI!G8d`K`#m(h4 VKH}BvZI0tf=SC={TIZo)`Uhd;p-un* diff --git a/public/images/weapons/spit.gif b/public/images/weapons/spit.gif deleted file mode 100644 index c978d56d37a53205f18940b702690435ddce69a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1599 zcmeH`i&N7D0LQ<3xc&BE{s!B4v)|Z+0RzWF1QFfF<_5}ZqL6}aDk7l>*3X?&a|sL>A1Wu57WP(f1uBO{({fl$C$q=E8Cg_ z34R^IGiWp{V1mU2hXpPhd;&on2)J0tgOHElAcQoSU^QZk5nD~zmXGZPs9l2>3sF~uokiGHjQUbEn9;Zvd)C5M zhL_i2?|L+qqq!XWDzN_rv~0kEjW}3|LzS>sp>-3So6%-LyA|ElI8u#cH8@^_o?5tS z@md{D>_p#g^zX*Wm+*Q$PBmb#5pEmK?!~z#ywQyF`*7hEyw!qB2XOfyE+4`bJ3Mw= zbKq?Ut~>Eg8{R#P(RRGoj`ut9K^H#kg7*k~M=^E`N(A^ko-l&9j+t#fg=y1K&mdmae=1$_x+ zpAL61I;O-~)hUVtcD-SY!RxaqAIaFgiCgb|)iqvI9GOyFxB=f->W0-G^DE$`T0pnB4G88)jRX98p4<$1*c!;C-tq z7zlI0IIyVb78$E}Fs&$PpHrFj@r9xeBKYXRM;iJ9j#yn`8fb1{`N**O42uTd-X%r- z?oz+f99MigBe~l-!IMOUNa9L70WFgdm(&#eFgm+R+VMnYlJ-@cod}WJNS%SDq6QfPrP>Y}*`wj)yJ_sGrYABs8C{`v z2G!b2S&^@hKXt}B0%tm-&67PoVqU7K_Fm%JG4ap>l!nf_;Ck4~UDcdw2udbXjWHc6 z`efv0rAx<7`(5qi3G#1x86=TOv7;@doW;9y-{De^sK+=dC~X&&>r=;BNptWE6rEl= z|MK189@dt@6QKXBRco0-_4ZZ^pHh<>^ktM6NyKf2V6omcPH^q@BqL8Xn-`SjzR{=S zJkStwTZPOo9Qr8W<7b92{o-u5hT$z<*rt(`6qq}uM>P&2x@5|$6J)liopjM~#b4YX PS|0!L_(yxFh(yl6i0w6P diff --git a/public/images/weapons/spitgunspit.gif b/public/images/weapons/spitgunspit.gif deleted file mode 100644 index c978d56d37a53205f18940b702690435ddce69a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1599 zcmeH`i&N7D0LQ<3xc&BE{s!B4v)|Z+0RzWF1QFfF<_5}ZqL6}aDk7l>*3X?&a|sL>A1Wu57WP(f1uBO{({fl$C$q=E8Cg_ z34R^IGiWp{V1mU2hXpPhd;&on2)J0tgOHElAcQoSU^QZk5nD~zmXGZPs9l2>3sF~uokiGHjQUbEn9;Zvd)C5M zhL_i2?|L+qqq!XWDzN_rv~0kEjW}3|LzS>sp>-3So6%-LyA|ElI8u#cH8@^_o?5tS z@md{D>_p#g^zX*Wm+*Q$PBmb#5pEmK?!~z#ywQyF`*7hEyw!qB2XOfyE+4`bJ3Mw= zbKq?Ut~>Eg8{R#P(RRGoj`ut9K^H#kg7*k~M=^E`N(A^ko-l&9j+t#fg=y1K&mdmae=1$_x+ zpAL61I;O-~)hUVtcD-SY!RxaqAIaFgiCgb|)iqvI9GOyFxB=f->W0-G^DE$`T0pnB4G88)jRX98p4<$1*c!;C-tq z7zlI0IIyVb78$E}Fs&$PpHrFj@r9xeBKYXRM;iJ9j#yn`8fb1{`N**O42uTd-X%r- z?oz+f99MigBe~l-!IMOUNa9L70WFgdm(&#eFgm+R+VMnYlJ-@cod}WJNS%SDq6QfPrP>Y}*`wj)yJ_sGrYABs8C{`v z2G!b2S&^@hKXt}B0%tm-&67PoVqU7K_Fm%JG4ap>l!nf_;Ck4~UDcdw2udbXjWHc6 z`efv0rAx<7`(5qi3G#1x86=TOv7;@doW;9y-{De^sK+=dC~X&&>r=;BNptWE6rEl= z|MK189@dt@6QKXBRco0-_4ZZ^pHh<>^ktM6NyKf2V6omcPH^q@BqL8Xn-`SjzR{=S zJkStwTZPOo9Qr8W<7b92{o-u5hT$z<*rt(`6qq}uM>P&2x@5|$6J)liopjM~#b4YX PS|0!L_(yxFh(yl6i0w6P diff --git a/public/images/weapons/spore.gif b/public/images/weapons/spore.gif deleted file mode 100644 index 653cc1ec83a2e444855114253b3cfba43414a776..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1861 zcmeH`>rY#U0Y`tfuODC=Uvq72g9G2JD}Tv>QdB{p_WD+13d#n1?nrXdnXzyv8NJytFTXp{W>((;NW*~s1}Fo(5#2? zyD%AGu7{-_ExTcT4z>og?ZJ_~=-7wO{Wy96U5&6eqWd6vn$UX)eTQ-EF#4O}VDW+x zCrlVH<3%%0T5zfb&K9_=7_{Og8;062+>X=j80o;74t%c@qen4z6lc5eiXG$Kc(n%; z&*Qb{G1-gP`|!pwobQLbA5#vz`2wboW99_DKY$AZ@Vp4`N%&78;KZy8bAz}vgv-OY zGK|n^y!|q+zKrl0%%8#aQ7nw&oiW@zhsASv_Z9qb9Phn~TNC)vYluuD`Z{jEfjj5% z6E}W3g`Z8~=WpSIX)Mp+!wdMxgO~>&`>^82F9Z11MZ{skCJh)*sd8A9e7KD&m` zujA1T{PqU2H}Sjo@cUc%!;kUweLP#n)<^i}7ytKvDZp&Y%@f0}$>AaT{F%uS+S=A> z2lExd$;UUS{dSLUM}cS?9Ff)*izNLbs%9V)V?45|hW$&KP4F%&ZM2sXJ)(-$y30h2 zb@~K(`hX~pP7?VA1>_iAzIL_R@pY}Kmq;3U0#dC$5Ki)iVy!J>xYIr_&ND1}>QgCJ zSTTvIt--m{wuR5>vxXHm%ct}St;2JhUqBVxo%KTxm+JJEP;CCs?N?Uz%n;Ep7{0jr zt$)@UT_!=eP@=VGW6{-FA-`xSlVg0VLRq<6&9StWEX@6wf;N=coD%94+ zyPO^x-n{DIP_l;~6iLb&9pky2iE4T?9ZgFbM!pafRT@^jVtqQ{lNjPz6L~7QC71S$ zaMH3P8>EjXQybX!ig>~#t+umCzQ&eg3C1~ZrM(a5Tcm>$Ur;IO%bN0;P{b$J#k1zZ z;{hWfITla0mW@ifeLSg!PV$NdoJK)KWZWd$IUP3gi^3o@)1uvNv_--^DDLZskvw|Y z?h}@T5+<4B6OL8h{O|0l_D08->#7EKHbGF+kyTm$k}EAeykR$qY6qUC#QP#!!is<* zN>KjrJ&w6xY||@L^cqac?QvYoQ06AigOaOk&${xtyLK-jjYkOODE>A_9(a;9iFU;j zDQQE(8Bn`A7)xPqR?Zigs}~YiWXpH`W$!e6xvuOA&97-^?rvG+rpE~{gikgt%5#aR zfNF7XU6e8&GL>)fxYiY9K~kV~EGIl%@jq^E5GBuI>$^fBBcYmD`4eB=ypi?GjZ5Jg z_i6OlG^{(CVLD@pBws5s&e0>eO_O{^F)>F8GAnjM`>fw9)NdqwVyn|-)!3dmQ$k(s zt(2%-sDP?_N9AkDp!CLkT3y{N$!l_6YQ9cY^ABr<=l01UeowID@{8y6~Vtp zSNWuP!I;N7J&JoI>+C+`X-`K9g+`K1z@PEH8RHQA!4Wh33e(pI-U z%wwK8FH-u+D@n3%Cqt0?;;cn+=f2UVn%ZzZAgg<=3oPG)6m=qGIB!(lJ)Wmy!@Oyl z*d62KHRcwJ?Jn7c%}1o0<*NSp13J%>5NuanBLZyQ%Bq*VZ3vJyCr>rP^0bCe#rN%W r`xGmhV0mPS=5bw#BedbZ>T5eK&tGKumGp|YAvf9Faofh_;^2P(RHUEB diff --git a/public/images/weapons/sporegunprojectile.gif b/public/images/weapons/sporegunprojectile.gif deleted file mode 100644 index 653cc1ec83a2e444855114253b3cfba43414a776..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1861 zcmeH`>rY#U0Y`tfuODC=Uvq72g9G2JD}Tv>QdB{p_WD+13d#n1?nrXdnXzyv8NJytFTXp{W>((;NW*~s1}Fo(5#2? zyD%AGu7{-_ExTcT4z>og?ZJ_~=-7wO{Wy96U5&6eqWd6vn$UX)eTQ-EF#4O}VDW+x zCrlVH<3%%0T5zfb&K9_=7_{Og8;062+>X=j80o;74t%c@qen4z6lc5eiXG$Kc(n%; z&*Qb{G1-gP`|!pwobQLbA5#vz`2wboW99_DKY$AZ@Vp4`N%&78;KZy8bAz}vgv-OY zGK|n^y!|q+zKrl0%%8#aQ7nw&oiW@zhsASv_Z9qb9Phn~TNC)vYluuD`Z{jEfjj5% z6E}W3g`Z8~=WpSIX)Mp+!wdMxgO~>&`>^82F9Z11MZ{skCJh)*sd8A9e7KD&m` zujA1T{PqU2H}Sjo@cUc%!;kUweLP#n)<^i}7ytKvDZp&Y%@f0}$>AaT{F%uS+S=A> z2lExd$;UUS{dSLUM}cS?9Ff)*izNLbs%9V)V?45|hW$&KP4F%&ZM2sXJ)(-$y30h2 zb@~K(`hX~pP7?VA1>_iAzIL_R@pY}Kmq;3U0#dC$5Ki)iVy!J>xYIr_&ND1}>QgCJ zSTTvIt--m{wuR5>vxXHm%ct}St;2JhUqBVxo%KTxm+JJEP;CCs?N?Uz%n;Ep7{0jr zt$)@UT_!=eP@=VGW6{-FA-`xSlVg0VLRq<6&9StWEX@6wf;N=coD%94+ zyPO^x-n{DIP_l;~6iLb&9pky2iE4T?9ZgFbM!pafRT@^jVtqQ{lNjPz6L~7QC71S$ zaMH3P8>EjXQybX!ig>~#t+umCzQ&eg3C1~ZrM(a5Tcm>$Ur;IO%bN0;P{b$J#k1zZ z;{hWfITla0mW@ifeLSg!PV$NdoJK)KWZWd$IUP3gi^3o@)1uvNv_--^DDLZskvw|Y z?h}@T5+<4B6OL8h{O|0l_D08->#7EKHbGF+kyTm$k}EAeykR$qY6qUC#QP#!!is<* zN>KjrJ&w6xY||@L^cqac?QvYoQ06AigOaOk&${xtyLK-jjYkOODE>A_9(a;9iFU;j zDQQE(8Bn`A7)xPqR?Zigs}~YiWXpH`W$!e6xvuOA&97-^?rvG+rpE~{gikgt%5#aR zfNF7XU6e8&GL>)fxYiY9K~kV~EGIl%@jq^E5GBuI>$^fBBcYmD`4eB=ypi?GjZ5Jg z_i6OlG^{(CVLD@pBws5s&e0>eO_O{^F)>F8GAnjM`>fw9)NdqwVyn|-)!3dmQ$k(s zt(2%-sDP?_N9AkDp!CLkT3y{N$!l_6YQ9cY^ABr<=l01UeowID@{8y6~Vtp zSNWuP!I;N7J&JoI>+C+`X-`K9g+`K1z@PEH8RHQA!4Wh33e(pI-U z%wwK8FH-u+D@n3%Cqt0?;;cn+=f2UVn%ZzZAgg<=3oPG)6m=qGIB!(lJ)Wmy!@Oyl z*d62KHRcwJ?Jn7c%}1o0<*NSp13J%>5NuanBLZyQ%Bq*VZ3vJyCr>rP^0bCe#rN%W r`xGmhV0mPS=5bw#BedbZ>T5eK&tGKumGp|YAvf9Faofh_;^2P(RHUEB diff --git a/public/images/weapons/swipe.gif b/public/images/weapons/swipe.gif deleted file mode 100644 index 5c53f531f7728c6732256239374dad08d507da77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1407 zcmeH``%aSw07rj?(iUjx$8{~#(o$@>$!&;;s9$ZNEfj1S3L*+rn4lZ$|$HdA}Jc`O-PPG%4Y10g(eo-El7<++E(n^hTYqcz8x7P_DGQ>!#)}I z%aI+AoOt9api|(05_u}*C*tEo6sS?C#-U^!PC-!$iZ#${QIZNn8jkJ4@!cp(M|lP+ z_Tp3)D)+&(AJy3~=b$zhr*){$$GL-OIEbb~G#8@fFxrly{U|z$(WysQ2`-kR`x96V z=r6+;MqDn(m6Q1LQ(UXSSD#_15?@#0n<|V}ZTPhvbDj9@0_HDbp$C8T;E@%7_QBSV$Ct1)fF}cZ zI*4aiv3wQJui>BTcyS#oLs%Wc+i(B(KMDxfTxF&CxrY2aL0O@pK%h`1Yao10r8wa& zLf-H3eiSg)KwOad;A99BD?F{?iTE&AJkLgVIQYaw*(VX=fIFmPK3GjpOOCM zijGmP6a7Vjmy#Jld1wztfYrFrBA)f%nLTfy9FWmC{3x|?enjSU+GL=oa#D3VXVdY{ z!SUt7CT?J8oxGsA`hF{m#ppIJlDQOL$1ce$E6BDKg~POJu`iL}gomyfh}2uQDp#$$ zxKeQJ!G#@%R-k(&*0w0S#zx5!|9ihghuQQ}2WOt#PVLxCm_5Z-o1?#?aFQ-*GrpwJ z7=G>5Ziy4Kw^%+crdCP&SZ{*3^+!^3f*Wce9r$^q9k=mKZ-ST3m|7?4&{)p!lLcCP zzwE5pMH$^_nP#pdZ6+dm7G@t2|JWUO0q^%&VZzOoPBM%sv}eilwDKBHT}>^wMBe*E zsxq2{J6z0G6Z=S-h0fbsuy|&DV^-fpQn8caE}I=?ws#~S5$T>EsYeu&Q_C8FTQt{4 z1+mgZS1;vIK-X7J@f3Ti?hu*JH34!}q=&)8%(%2V<82O)q`5F}E)XXj0A(00Nj`vcP16#Q{4QY%VyV;DjNV2QG;a0YZfc6Co@dWCX}a@S`A*Ko|{C48mg} zmLh^eL>waHF((mok|3Ff==q3AMr;aV<(QiaDh-qZaZ1FeBOwEcnMlgQJQZY%AX|+2 z*+^cBlpM&HAythJG)T*ZLI|$iE#*#Hy zx)wR5SXKsl9q4kX*F#f*Tr;#5Xe*(sg1#CCD~ubFSA)D-EZ>Cu&B(W5MIBad#magV zHo&wErjJpy9Ys5^stLu-SiKXgcVTS{*6u;cUX<=bnH^=VD0iUTiS;g2>_t~=Qj3z0sEI|`x_#c9x-tu#| zSuKs$YH3q#V~y01x55PKZzdxc|3d!Wj`yN~cnby*ZM^C6ItXEMx!+_s94U!h-ftZ9 z2&v+)p4#{j9ULm!3C9D&B$lWBd=7~{NVlWSfqk|mPoEQ z2(V11T10xaJVC-k8y)Z0n@H^~?Q}ZLvInHrO_C<x3;@WN)TqaGhWy0X%$Pzo4pndlv7NdD)sy@CWN|M=< zaZ6xjNrW4cuklNUxrcaxY8fZ+HZhQuX?iMyM|U_tQ#aco)c6yHyUj$YmvJB{b?K?- zXHzVfl#9l7anaW~r!Ppav{1QSO!eO4(;2#sP_b1y5J>9Yn1{%O z8Qf>3U|=YcAKGKwC3^NkKUaK5;ZW}^sRu-U>2SPDrD+!~$=K$P>$Z&(iKkkoIrDmC zZAPALkS3FMn}&T6O)_-=Pg*U_6&2MCv{S7U45pe^wAwj+F*MC!%gqSn(spZzV04nn z)^rZ#?FY%<{@5D{h))FY4f!u$Hp9HNlD1g8&sWZj3KHq$VU;ce@`*%H$RUZ=GG~ znyWGLb)t&bV=nQ#KHZm;PPQ`0#h%hJs(F&nj@ew(;0rd+UUHC5zoiXKO6{YA6mGD> zMP^#P5@x+g(nt|;U36S$eA*j#yRf==lr7rSGB7MqC#+?L7Zb`6o&^oVWKJ}nDK4oW zC=oRc=|qSssc#KSWHRhrQFMcWZ&lrL^5wXd8@6E5&0vs?QC_f(ih!U*r~M~^Aw8p= zRZDyVW~fL3aO9J8VW7Y^$Oz^{n!QZQO?zYIckYqWxo)M7G$_0yF_pxWQ@o>tzh7KB q$nOwu?0=~nY)HBO?kZkSI=HEx7hYzn&Fu}E?5+FfIXj4n?Ee5YajP!Ys|2oFL;Fd~By9fFt; zNJ1eEL!210aKwirAriBrAdf;~G?HSVkRU}0r4*@gNQ*N* zO2$G37NuaZ650=-ONBlS*=fj0M{Wl4R4~jz{#+EyL!lZ)nOHU-#`!4DLdgP{7GlLB ztXzaui&3hZV9CXXTx`rkxd9bRv1utP3$UdCTMMzR2-}OW zV;OcDQC*Ch64WlouH~pRVfPB`S&6-?ux}Oim*T)`)UUz8wfLwEhsr>&gY`q$*TZ2( zqXkVH&|Hqg6=V8gRc61C98# z6Azm4n`S&b3{MLNkHC8rL&q?D93#i^s1>7ac-)33C-K{M{H_DPKZP$&!FL+ZI`L%} zo}a;2XYt}3zCMqa=kbS&_~S*4yYQ!O{P_|ldN6qz-(JDgReX09udiXc7t-hUk{NpBOZsYB3{B-aClJvbuUt3|Rt0DsxKG@lzN_A zb)WXd$C$k<#r?6bhMc06PFvM+25}Cri~Oz=IsbP+MF>OVp!i9otaj{@HPlf zbxm~DX!EqBP!&?p>eAW?!Q2HkJ?tk!apoRq%Q;7blQ%wkKfRyW+#*|ZY>Zes$MA(D z=irMO>W4UX3rF#;J+b_?gw6L?XijQ;QJWZ~biz#p>E9t+xY5&Zh^lfQsL|$>HpsmB%8oMU=Sj=nwX!aV|3i(=BIXZMI)Txp<>)`9 zhXM*K({iP)rdq>n*AW{}_Ws70ZF!V+`c+=^V%n(lQ@G58*;@&kaVEW8yH?5VCdDSM zC|gt_pLB?d+9z|RO$D)h#lX0(<%Zqdn-_o26ifQ$52vxnU^xY_?x%AYO0kSdvJ$ID zLX2t)8El@Gj!LT3Pwkdvs%Ngq)<qcZTX< zc_d!#FkT}AHLxNjC0k4B)Lt^guBtUC?)KVvF{c$jG=x_6X`7^7ef=#@z2nTo?`2N6 zg$&AHaAIUuosY8d#dTnkB8{773Je++tMYy^dsfNI6HRemqNiEBllZ7%)-J^}gS`J; zddVW21(`UU-^xCg$3XN+MQfZC+=J4R~L_&+ETof*I23B9dDN>($jFvW}7_ zOn_$s&7ab67R}K7QJPcAeMRVu%)l{~8}+a=+8KfksY5X#-Q1kgOH{Sm z9)X&MAk)l}`6YBd1}L^^P{JOCf31&|;hPi{YqWl}kyMxm{Wi@ogZq5s!f8uDgHx|u zlEzk*N!ha{T27M0`u+25rG434o*DU!UJYM4ZH@Ssn==(=Z2lCQI!{#0yG3L$0doXm)G9%lV5n#}C9@{8QeaDj!NGxKHm zYl$Gs=pkZUAnM!b?fj``wsl-v`N|RV#>}(4p;<3~1h>F5kJC?=RkmJ>>C{peeH!w> z-JU}6Zi!w#La8X0NHqb!)GgXbAG%T{%G_!lKic)I=fICQ{N6eX<0ihMfvo=lh=&Zx diff --git a/script/shell/log_file_update.sh b/script/shell/log_file_update.sh deleted file mode 100644 index 5ff20b8..0000000 --- a/script/shell/log_file_update.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -LIMIT=5985 -a=4268 - -while [ "$a" -le $LIMIT ] -do - wget -O /dev/null http://www.ensl.org/log_files/handle/"$a" - let "a+=1" -done From 7b9bb64b8b76efd4448d1cd08d69b2eda5d6edf4 Mon Sep 17 00:00:00 2001 From: Ari Timonen Date: Mon, 22 Jun 2015 00:43:16 +0300 Subject: [PATCH 161/305] Fix access check bug --- app/models/team.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/team.rb b/app/models/team.rb index a427900..8715593 100644 --- a/app/models/team.rb +++ b/app/models/team.rb @@ -114,7 +114,7 @@ class Team < ActiveRecord::Base end def can_update? cuser - cuser and is_leader? cuser or cuser.admin? + cuser and (is_leader? cuser or cuser.admin?) end def can_destroy? cuser From b742be79829ffe5c45901e2db3a83ad0d106332c Mon Sep 17 00:00:00 2001 From: simplefl Date: Sat, 27 Jun 2015 14:23:37 +0200 Subject: [PATCH 162/305] Only admins can change usernames. --- app/controllers/users_controller.rb | 1 + app/models/user.rb | 4 ++++ app/views/users/edit.html.erb | 2 ++ 3 files changed, 7 insertions(+) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 257aaae..6550c67 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -63,6 +63,7 @@ class UsersController < ApplicationController def update raise AccessError unless @user.can_update? cuser + params[:user].delete(:username) unless @user.can_change_name? cuser if @user.update_attributes params[:user] flash[:notice] = t(:users_update) redirect_to_back diff --git a/app/models/user.rb b/app/models/user.rb index 5110deb..12554f6 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -271,6 +271,10 @@ class User < ActiveRecord::Base cuser and (self == cuser or cuser.admin?) end + def can_change_name? cuser + cuser and cuser.admin? + end + def can_destroy? cuser cuser and cuser.admin? end diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 752f357..b4fcba7 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -15,10 +15,12 @@
+ <% if cuser and @user.can_change_name? cuser %>
<%= f.label :username, 'Username', class: 'required' %> <%= f.text_field :username %>
+ <% end %>
<%= f.label :raw_password, "Password" %> <%= f.password_field :raw_password %> From 75dfb48026dd221cf31ddbe4752126b96deb1cc9 Mon Sep 17 00:00:00 2001 From: Ari Timonen Date: Mon, 22 Jun 2015 00:32:27 +0300 Subject: [PATCH 163/305] Remove logging functionality as legacy --- app/controllers/log_events_controller.rb | 85 -------- app/controllers/log_files_controller.rb | 42 ---- app/controllers/rounds_controller.rb | 26 --- app/models/log.rb | 197 ------------------- app/models/log_event.rb | 25 --- app/models/log_file.rb | 95 --------- app/models/round.rb | 128 ------------ app/models/rounder.rb | 52 ----- app/views/log_events/edit.html.erb | 16 -- app/views/log_events/index.html.erb | 20 -- app/views/log_events/new.html.erb | 15 -- app/views/log_events/show.html.erb | 8 - app/views/rounds/_rounds.html.erb | 23 --- app/views/rounds/index.html.erb | 7 - app/views/rounds/show.html.erb | 150 -------------- db/schema.rb | 134 ++----------- public/images/weapons/acidrocket.gif | Bin 1466 -> 0 bytes public/images/weapons/bilebomb.gif | Bin 830 -> 0 bytes public/images/weapons/bite2gun.gif | Bin 1527 -> 0 bytes public/images/weapons/bitegun.gif | Bin 1514 -> 0 bytes public/images/weapons/bitegun2.gif | Bin 1527 -> 0 bytes public/images/weapons/charge.gif | Bin 2756 -> 0 bytes public/images/weapons/claws.gif | Bin 2391 -> 0 bytes public/images/weapons/devour.gif | Bin 2453 -> 0 bytes public/images/weapons/digest.gif | Bin 2453 -> 0 bytes public/images/weapons/gernades.gif | Bin 1468 -> 0 bytes public/images/weapons/gore.gif | Bin 2391 -> 0 bytes public/images/weapons/grenade.gif | Bin 1468 -> 0 bytes public/images/weapons/handgrenade.gif | Bin 841 -> 0 bytes public/images/weapons/healspray.gif | Bin 2038 -> 0 bytes public/images/weapons/heavymachinegun.gif | Bin 2230 -> 0 bytes public/images/weapons/item_mine.gif | Bin 689 -> 0 bytes public/images/weapons/knife.gif | Bin 1348 -> 0 bytes public/images/weapons/leap.gif | Bin 939 -> 0 bytes public/images/weapons/machinegun.gif | Bin 1542 -> 0 bytes public/images/weapons/mines.gif | Bin 689 -> 0 bytes public/images/weapons/oc.gif | Bin 1712 -> 0 bytes public/images/weapons/offensechamber.gif | Bin 1712 -> 0 bytes public/images/weapons/para.gif | Bin 1156 -> 0 bytes public/images/weapons/pistol.gif | Bin 1368 -> 0 bytes public/images/weapons/sentry.gif | Bin 676 -> 0 bytes public/images/weapons/shotgun.gif | Bin 1634 -> 0 bytes public/images/weapons/siege.gif | Bin 895 -> 0 bytes public/images/weapons/spikes.gif | Bin 684 -> 0 bytes public/images/weapons/spit.gif | Bin 1599 -> 0 bytes public/images/weapons/spitgunspit.gif | Bin 1599 -> 0 bytes public/images/weapons/spore.gif | Bin 1861 -> 0 bytes public/images/weapons/sporegunprojectile.gif | Bin 1861 -> 0 bytes public/images/weapons/swipe.gif | Bin 1407 -> 0 bytes public/images/weapons/welder.gif | Bin 1668 -> 0 bytes public/images/weapons/xeno.gif | Bin 2250 -> 0 bytes script/shell/log_file_update.sh | 10 - 52 files changed, 13 insertions(+), 1020 deletions(-) delete mode 100644 app/controllers/log_events_controller.rb delete mode 100644 app/controllers/log_files_controller.rb delete mode 100644 app/controllers/rounds_controller.rb delete mode 100644 app/models/log.rb delete mode 100644 app/models/log_event.rb delete mode 100644 app/models/log_file.rb delete mode 100644 app/models/round.rb delete mode 100644 app/models/rounder.rb delete mode 100644 app/views/log_events/edit.html.erb delete mode 100644 app/views/log_events/index.html.erb delete mode 100644 app/views/log_events/new.html.erb delete mode 100644 app/views/log_events/show.html.erb delete mode 100644 app/views/rounds/_rounds.html.erb delete mode 100644 app/views/rounds/index.html.erb delete mode 100644 app/views/rounds/show.html.erb delete mode 100644 public/images/weapons/acidrocket.gif delete mode 100644 public/images/weapons/bilebomb.gif delete mode 100644 public/images/weapons/bite2gun.gif delete mode 100644 public/images/weapons/bitegun.gif delete mode 100644 public/images/weapons/bitegun2.gif delete mode 100644 public/images/weapons/charge.gif delete mode 100644 public/images/weapons/claws.gif delete mode 100644 public/images/weapons/devour.gif delete mode 100644 public/images/weapons/digest.gif delete mode 100644 public/images/weapons/gernades.gif delete mode 100644 public/images/weapons/gore.gif delete mode 100644 public/images/weapons/grenade.gif delete mode 100644 public/images/weapons/handgrenade.gif delete mode 100644 public/images/weapons/healspray.gif delete mode 100644 public/images/weapons/heavymachinegun.gif delete mode 100644 public/images/weapons/item_mine.gif delete mode 100644 public/images/weapons/knife.gif delete mode 100644 public/images/weapons/leap.gif delete mode 100644 public/images/weapons/machinegun.gif delete mode 100644 public/images/weapons/mines.gif delete mode 100644 public/images/weapons/oc.gif delete mode 100644 public/images/weapons/offensechamber.gif delete mode 100644 public/images/weapons/para.gif delete mode 100644 public/images/weapons/pistol.gif delete mode 100644 public/images/weapons/sentry.gif delete mode 100644 public/images/weapons/shotgun.gif delete mode 100644 public/images/weapons/siege.gif delete mode 100644 public/images/weapons/spikes.gif delete mode 100644 public/images/weapons/spit.gif delete mode 100644 public/images/weapons/spitgunspit.gif delete mode 100644 public/images/weapons/spore.gif delete mode 100644 public/images/weapons/sporegunprojectile.gif delete mode 100644 public/images/weapons/swipe.gif delete mode 100644 public/images/weapons/welder.gif delete mode 100644 public/images/weapons/xeno.gif delete mode 100644 script/shell/log_file_update.sh diff --git a/app/controllers/log_events_controller.rb b/app/controllers/log_events_controller.rb deleted file mode 100644 index e1064ee..0000000 --- a/app/controllers/log_events_controller.rb +++ /dev/null @@ -1,85 +0,0 @@ -class LogEventsController < ApplicationController - # GET /log_events - # GET /log_events.xml - def index - @log_events = LogEvent.all - - respond_to do |format| - format.html # index.html.erb - format.xml { render xml: @log_events } - end - end - - # GET /log_events/1 - # GET /log_events/1.xml - def show - @log_event = LogEvent.find(params[:id]) - - respond_to do |format| - format.html # show.html.erb - format.xml { render xml: @log_event } - end - end - - # GET /log_events/new - # GET /log_events/new.xml - def new - @log_event = LogEvent.new - - respond_to do |format| - format.html # new.html.erb - format.xml { render xml: @log_event } - end - end - - # GET /log_events/1/edit - def edit - @log_event = LogEvent.find(params[:id]) - end - - # POST /log_events - # POST /log_events.xml - def create - @log_event = LogEvent.new(params[:log_event]) - - respond_to do |format| - if @log_event.save - flash[:notice] = t(:logevent_create) - format.html { redirect_to(@log_event) } - format.xml { render xml: @log_event, :status => :created, :location => @log_event } - else - format.html { render :new } - format.xml { render xml: @log_event.errors, :status => :unprocessable_entity } - end - end - end - - # PUT /log_events/1 - # PUT /log_events/1.xml - def update - @log_event = LogEvent.find(params[:id]) - - respond_to do |format| - if @log_event.update_attributes(params[:log_event]) - flash[:notice] = t(:logevent_update) - format.html { redirect_to(@log_event) } - format.xml { head :ok } - else - format.html { render :edit } - format.xml { render xml: @log_event.errors, :status => :unprocessable_entity } - end - end - end - - # DELETE /log_events/1 - # DELETE /log_events/1.xml - def destroy - @log_event = LogEvent.find(params[:id]) - @log_event.destroy - - respond_to do |format| - format.html { redirect_to(log_events_url) } - format.xml { head :ok } - end - end -end diff --git a/app/controllers/log_files_controller.rb b/app/controllers/log_files_controller.rb deleted file mode 100644 index dda7433..0000000 --- a/app/controllers/log_files_controller.rb +++ /dev/null @@ -1,42 +0,0 @@ -class LogFilesController < ApplicationController - def index - LogFile.process - render text: 'Ok' - end - - def handle - LogFile.find(params[:id]).deal - render text: 'Ok' - end - - def refresh - LogFile.unhandled.each do |lf| - lf.deal - end - end - - def fix - Rounder.find_in_batches(batch_size: 100) do |rounders| - rounders.each do |r| - r.team_id = nil - if r.user and t = Teamer.historic(r.user, r.round.start).first - r.team_id = t.team_id - end - r.save - end - end - end - - def pix - Round.all.each do |r| - r.team1_id = nil - r.team2_id = nil - [1, 2].each do |team| - if s = r.rounders.team(team).stats.first - r["team#{team}_id"] = s["team_id"] - end - end - r.save - end - end -end diff --git a/app/controllers/rounds_controller.rb b/app/controllers/rounds_controller.rb deleted file mode 100644 index b09511b..0000000 --- a/app/controllers/rounds_controller.rb +++ /dev/null @@ -1,26 +0,0 @@ -class RoundsController < ApplicationController - def index - sort = case params['sort'] - when "start" then "start" - when "server" then "server_id" - when "team1" then "team1_id" - when "team2" then "team2_id" - when "map" then "map_name" - when "commander" then "commander_id" - end - - @rounds = Round.basic.paginate \ - order: sort, - page: params[:page], - per_page: 30 - - if params[:ajax] - render partial: 'list', layout: false - return - end - end - - def show - @round = Round.find(params[:id]) - end -end diff --git a/app/models/log.rb b/app/models/log.rb deleted file mode 100644 index 71e0794..0000000 --- a/app/models/log.rb +++ /dev/null @@ -1,197 +0,0 @@ -# == Schema Information -# -# Table name: logs -# -# id :integer not null, primary key -# server_id :integer -# text :text -# domain :integer -# created_at :datetime -# round_id :integer -# details :string(255) -# actor_id :integer -# target_id :integer -# specifics1 :string(255) -# specifics2 :string(255) -# log_file_id :integer -# - -class Log < ActiveRecord::Base - include Extra - attr_accessor :text - - DOMAIN_LOG = 1 - DOMAIN_INFO = 4 - - TEAM_MARINES = 1 - TEAM_ALIENS = 2 - - RE_PLAYER = /".*?<\d*><\w*>"/ - RE_PLAYER_ID = /".*?<\d*><\w*>"/ - RE_PLAYER_ID_NAME_TEAM = /"(.*?)<\d*><([a-z]*)1team>"/ - RE_PLAYER_NAME = /"(.*?)<\d*><[a-z]*1team>"/ - RE_PLAYER_NAME_TEAM = /"(.*?)<\d*><([a-z]*)1team>"/ - - scope :recent, :order => "id DESC", :limit => 5 - scope :ordered, :order => "created_at ASC, id ASC" - scope :with_details, - lambda { |details| {:conditions => ["details LIKE ?", details]} } - scope :unhandled, :conditions => {:details => nil} - scope :stats, - :select => "id, details, COUNT(*) as num", - :group => "details", - :order => "details" - - belongs_to :details, :class_name => "LogEvent" - belongs_to :server - belongs_to :round - belongs_to :server - belongs_to :log_file - belongs_to :actor, :class_name => "Rounder" - belongs_to :target, :class_name => "Rounder" - - def since - (created_at - round.start).to_i - end - - def time - return sprintf("%02d:%02d", since/60, since%60) - end - - def frag - text.match(/^#{RE_PLAYER_NAME_TEAM} killed #{RE_PLAYER_NAME_TEAM} with "([a-z0-9_]*)"$/) - end - - def role - text.match(/^#{RE_PLAYER_NAME} changed role to "([a-z0-9_]*)"$/) - end - - def match_map vars - if m = text.match(/^Started map "([A-Za-z0-9_]*)"/) - vars[:map] = m[1] - self.details = LogEvent.get "map" - self.specifics1 = m[1] - end - end - - def match_start vars - if text.match(/^Game reset complete.$/) - vars[:round] = Round.new - vars[:round].server = server - vars[:round].start = created_at - vars[:round].map_name = vars[:map] - vars[:round].map = Map.with_name(vars[:map]).first - vars[:round].save - vars[:lifeforms] = {} - self.details = LogEvent.get "start" - end - end - - def match_end vars - if m = text.match(/^Team ([1-2]) has lost.$/) - vars[:round].winner = (m[1].to_i == 1 ? 2 : 1) - vars[:round].end = created_at - [1, 2].each do |team| - if s = vars[:round].rounders.team(team).stats.first - vars[:round]["team#{team}_id"] = s["team_id"] - end - end - vars[:round].save - vars[:round] = nil - self.details = LogEvent.get "end" - end - end - - def match_join vars - if m = text.match(/^#{RE_PLAYER_ID_NAME_TEAM} .*$/) and !(self.actor = vars[:round].rounders.match(m[2]).first) - self.actor = Rounder.new - self.actor.round = vars[:round] - self.actor.name = m[1] - self.actor.steamid = m[2] - self.actor.user = User.first(:conditions => {:steamid => m[2]}) or User.historic(m[2]) - self.actor.team = (m[3] == "marine" ? TEAM_MARINES : TEAM_ALIENS) - if self.actor.user and t = Teamer.historic(actor.user, vars[:round].start).first - self.actor.ensl_team = t.team - end - self.actor.kills = 0 - self.actor.deaths = 0 - self.actor.save - self.details = LogEvent.get "join" - end - end - - def match_kill vars - if m = text.match(/^#{RE_PLAYER} killed #{RE_PLAYER_ID} with "([a-z0-9_]*)"$/) - if self.actor - actor.increment :kills - actor.save - end - if self.target = vars[:round].rounders.match(m[1]).first - target.increment :deaths - target.save - end - self.details = LogEvent.get "kill" - self.specifics1 = m[3] - save - end - end - - def match_say vars - if m = text.match(/^#{RE_PLAYER} (say(_team)?) ".*"$/) - self.details = "say" - self.specifics1 = m[1] - end - end - - def match_built vars - if m = text.match(/^#{RE_PLAYER} triggered "structure_built" \(type "([a-z0-9_]*)"\)$/) - self.details = "built_" + m[1] - end - end - - def match_destroyed vars - if m = text.match(/^#{RE_PLAYER} triggered "structure_destroyed" \(type "([a-z0-9_]*)"\)$/) - self.details = "destroyed_" + m[1] - end - end - - def match_research_start vars - if m = text.match(/^#{RE_PLAYER} triggered "research_start" \(type "([a-z0-9_]*)"\)$/) - self.details = m[1] - end - end - - def match_research_cancel vars - if m = text.match(/^#{RE_PLAYER} triggered "research_cancel" \(type "([a-z0-9_]*)"\)$/) - self.details = "research_cancel" - end - end - - def match_role vars - if m = text.match(/^#{RE_PLAYER_ID} changed role to "([a-z0-9_]*)"$/) - if m[2] == "gestate" - self.details = "gestate" - elsif actor - if m[2] == "commander" and !vars[:round].commander - vars[:round].commander = actor - vars[:round].save - end - if !actor.roles - actor.update_attribute :roles, m[2] - elsif !self.actor.roles.include?(m[2]) - actor.update_attribute :roles, actor.roles + ", " + m[2] - end - self.details = ((vars[:lifeforms].include? actor.id and vars[:lifeforms][actor.id] == m[2]) ? "upgrade" : m[2]) - vars[:lifeforms][actor.id] = m[2] - end - end - end - - def self.add server, domain, text - log = new - log.server = server - log.domain = domain - log.text = text - log.save - end -end diff --git a/app/models/log_event.rb b/app/models/log_event.rb deleted file mode 100644 index 65b0b4f..0000000 --- a/app/models/log_event.rb +++ /dev/null @@ -1,25 +0,0 @@ -# == Schema Information -# -# Table name: log_events -# -# id :integer not null, primary key -# name :string(255) -# description :string(255) -# team :integer -# created_at :datetime -# updated_at :datetime -# - -class LogEvent < ActiveRecord::Base - def self.get search, team = nil - if f = first({:conditions => {:name => search}}) - return f - else - f = LogEvent.new - f.name = "get" - f.team = team if team - f.save - return f - end - end -end diff --git a/app/models/log_file.rb b/app/models/log_file.rb deleted file mode 100644 index f430d05..0000000 --- a/app/models/log_file.rb +++ /dev/null @@ -1,95 +0,0 @@ -# encoding: US-ASCII -# == Schema Information -# -# Table name: log_files -# -# id :integer not null, primary key -# name :string(255) -# md5 :string(255) -# size :integer -# server_id :integer -# updated_at :datetime -# - - -require 'digest/md5' - -class LogFile < ActiveRecord::Base - NON_ASCII = /[\x80-\xff]/ - LOGS = File.join(Rails.root, "tmp", "logs") - - attr_accessor :path - belongs_to :server - - has_many :logs - has_many :rounds, :through => :logs - - def after_create - Pathname(path).each_line do |line| - if m = line.gsub(NON_ASCII, "").match(/\d{2}:\d{2}:\d{2}: (.*)/) - log = Log.new - log.server = server - log.domain = Log::DOMAIN_LOG - log.log_file = self - log.text = m[1].strip - next if log.text.match(/^Server cvar/) - next if log.text.match(/^\[ENSL\]/) - next if log.text.match(/STEAM USERID validated/) - next if log.text.match(/^\[META\]/) - l.created_at = DateTime.parse(line.match(/\d{2}\/\d{2}\/\d{4} \- \d{2}:\d{2}:\d{2}:/)[0]) - vars = {} - log.match_map vars or log.match_start vars - if vars[:round] and !log.details - log.match_end vars \ - or log.match_join vars \ - or log.match_kill vars \ - or log.match_say vars \ - or log.match_built vars \ - or log.match_destroyed vars \ - or log.match_research_start vars \ - or log.match_research_cancel vars \ - or log.match_role vars \ - end - if log.details - log.round = vars[:round] if vars[:round] - log.save - end - end - end - rounds.each do |r| - unless r.end - r.destroy - end - end - Log.delete_all(["details IS NULL AND log_file_id = ?", self.id]) - end - - def format path - self.name = File.basename(path) - self.size = File.size(path) - self.md5 = Digest::MD5.hexdigest(File.read(path)) - self.updated_at = File.mtime(path) - self.path = path - end - - def deal - # TODO - end - - def self.process - Dir.glob("#{LOGS}/*").each do |entry| - dir = File.basename(entry).to_i - if File.directory?(entry) and dir > 0 and Server.find(dir) - Dir.glob("#{entry}/*.log").each do |file| - lf = LogFile.new - lf.format file - lf.server_id = dir - - unless LogFile.first(:conditions => {:name => lf.name, :size => lf.size, :server_id => dir.to_i}) - lf.save - end - end - end - end - end -end diff --git a/app/models/round.rb b/app/models/round.rb deleted file mode 100644 index 3263114..0000000 --- a/app/models/round.rb +++ /dev/null @@ -1,128 +0,0 @@ -# == Schema Information -# -# Table name: rounds -# -# id :integer not null, primary key -# server_id :integer -# start :datetime -# end :datetime -# winner :integer -# match_id :integer -# commander_id :integer -# team1_id :integer -# team2_id :integer -# map_name :string(255) -# map_id :integer -# - -class Round < ActiveRecord::Base - scope :basic, :include => [:commander, :map, :server, :team1, :team2], :order => "start DESC" - scope :team_stats, - :select => "team1_id AS team_id, COUNT(*) as rounds, AVG(winner) AS wlr, teams.name", - :joins => "LEFT JOIN teams ON teams.id = team1_id", - :group => "team_id", - :order => "rounds DESC", - :having => "rounds > 10 AND team_id IS NOT NULL", - :limit => 100 - - has_many :rounders, :dependent => :destroy - has_many :logs, :dependent => :destroy - - belongs_to :team1, :class_name => "Team" - belongs_to :team2, :class_name => "Team" - belongs_to :server - belongs_to :match - belongs_to :commander, :class_name => "Rounder" - belongs_to :map - - def length - sprintf("%02d:%02d", (self.end - self.start).to_i/60, (self.end - self.start).to_i%60) - end - - def winner_s - winner == 1 ? "Marines" : "Aliens" - end - - def marine_stats - {"built_resourcetower" => "Marine RTs", - "built_item_genericammo" => "Ammo Packs", - "built_item_health" => "Medpacks"} - end - - def alien_stats - {"built_alienresourcetower" => "Alien RTs", - "lerk" => "Lerks", - "fade" => "Fades", - "onos" => "Onoses"} - end - - def self.marine_events - {"built_resourcetower" => "RT Built", - "built_phasegate" => "PG Built", - "built_team_infportal" => "IP Built", - "built_team_armory" => "Armory Built", - "built_team_observatory" => "Obs Built", - "built_team_armslab" => "ARMS Built", - "built_team_command" => "CC Built", - "built_team_prototypelab" => "Proto Built", - "built_team_turretfactory" => "TF Built", - "built_team_turret" => "Turret Built", - "built_team_siegeturret" => "Siege Built", - "destroyed_resourcetower" => "RT Destroyed", - "destroyed_phasegate" => "PG Destroyed", - "destroyed_team_infportal" => "IP Destroyed", - "destroyed_team_armory" => "Armory Destroyed", - "destroyed_team_observatory" => "Obs Destroyed", - "destroyed_team_armslab" => "ARMS Destroyed", - "destroyed_team_command" => "CC Destroyed", - "destroyed_team_prototypelab" => "Proto Destroyed", - "destroyed_team_turretfactory" => "TF Destroyed", - "destroyed_team_turret" => "Turret Destroyed", - "destroyed_team_siegeturret" => "Siege Destroyed", - "scan" => "Scan", - "research_motiontracking" => "MT Tech", - "research_phasetech" => "PG Tech", - "research_distressbeacon" => "Beacon", - "research_armorl1" => "Armor 1", - "research_armorl2" => "Armor 2", - "research_armorl3" => "Armor 3", - "research_weaponsl1" => "Weapons 1", - "research_weaponsl2" => "Weapons 2", - "research_weaponsl3" => "Weapons 3", - "research_advarmory" => "AA", - "research_electrical" => "Electrify", - "research_advturretfactory" => "A-TFAC", - "research_cancel" => "Research Cancel", - "kill" => "Frag"} - end - - def self.alien_events - {"built_team_hive" => "Hive Built", - "built_movementchamber" => "MC Built", - "built_sensorychamber" => "SC Built", - "built_defensechamber" => "DC Built", - "built_offensechamber" => "OC Built", - "built_alienresourcetower" => "RT Built", - "destroyed_team_hive" => "Hive Destroyed", - "destroyed_movementchamber" => "MC Destroyed", - "destroyed_sensorychamber" => "SC Destroyed", - "destroyed_defensechamber" => "DC Destroyed", - "destroyed_offensechamber" => "OC Destroyed", - "destroyed_alienresourcetower" => "RT Destroyed", - "gorge" => "Gorge up", - "lerk" => "Lerk up", - "fade" => "Fade up", - "onos" => "Onos up", - "kill" => "Frag"} - end - - def self.alien_event event - return alien_events[event] if alien_events.include?(event) - return nil - end - - def self.marine_event event - return marine_events[event] if marine_events.include?(event) - return nil - end -end diff --git a/app/models/rounder.rb b/app/models/rounder.rb deleted file mode 100644 index 0914f5d..0000000 --- a/app/models/rounder.rb +++ /dev/null @@ -1,52 +0,0 @@ -# == Schema Information -# -# Table name: rounders -# -# id :integer not null, primary key -# round_id :integer -# user_id :integer -# team :integer -# roles :string(255) -# kills :integer -# deaths :integer -# name :string(255) -# steamid :string(255) -# team_id :integer -# - -class Rounder < ActiveRecord::Base - attr_accessor :lifeform - - scope :team, lambda { |team| {:conditions => {:team => team}} } - scope :match, lambda { |steamid| {:conditions => {:steamid => steamid}} } - scope :ordered, :order => "kills DESC, deaths ASC" - scope :stats, - :select => "id, team_id, COUNT(*) as num", - :group => "team_id", - :order => "num DESC", - :having => "num > 3" - scope :player_stats, - :select => "id, user_id, SUM(kills)/SUM(deaths) as kpd, COUNT(*) as rounds", - :group => "user_id", - :order => "kpd DESC", - :having => "rounds > 30 AND kpd > 0 AND user_id IS NOT NULL", - :limit => 100 - scope :team_stats, - :select => "id, team_id, SUM(kills)/SUM(deaths) as kpd, COUNT(DISTINCT round_id) as rounds", - :group => "team_id", - :order => "kpd DESC", - :having => "rounds > 30 AND kpd > 0 AND team_id IS NOT NULL", - :limit => 100 - scope :extras, :include => [:round, :user] - scope :within, - lambda { |from, to| - {:conditions => ["created_at > ? AND created_at < ?", from.utc, to.utc]} } - - belongs_to :round - belongs_to :user - belongs_to :ensl_team, :class_name => "Team", :foreign_key => "team_id" - - def to_s - user ? user.username : name - end -end diff --git a/app/views/log_events/edit.html.erb b/app/views/log_events/edit.html.erb deleted file mode 100644 index bd1c0d8..0000000 --- a/app/views/log_events/edit.html.erb +++ /dev/null @@ -1,16 +0,0 @@ -

Editing log_event

- -<%= form_for(@log_event) do |f| %> - <%= f.error_messages %> - -

- <%= f.label :name %>
- <%= f.text_field :name %> -

-

- <%= f.submit 'Update' %> -

-<% end %> - -<%= link_to 'Show', @log_event %> | -<%= link_to 'Back', log_events_path %> \ No newline at end of file diff --git a/app/views/log_events/index.html.erb b/app/views/log_events/index.html.erb deleted file mode 100644 index 5619d98..0000000 --- a/app/views/log_events/index.html.erb +++ /dev/null @@ -1,20 +0,0 @@ -

Listing log_events

- - - - - - - <% @log_events.each do |log_event| %> - - - - - - - <% end %> -
Name
<%=h log_event.name %><%= link_to 'Show', log_event %><%= link_to 'Edit', edit_log_event_path(log_event) %><%= link_to 'Destroy', log_event, :confirm => 'Are you sure?', :method => :delete %>
- -
- -<%= link_to 'New log_event', new_log_event_path %> diff --git a/app/views/log_events/new.html.erb b/app/views/log_events/new.html.erb deleted file mode 100644 index d2e38e1..0000000 --- a/app/views/log_events/new.html.erb +++ /dev/null @@ -1,15 +0,0 @@ -

New log_event

- -<%= form_for(@log_event) do |f| %> - <%= f.error_messages %> - -

- <%= f.label :name %>
- <%= f.text_field :name %> -

-

- <%= f.submit 'Create' %> -

-<% end %> - -<%= link_to 'Back', log_events_path %> \ No newline at end of file diff --git a/app/views/log_events/show.html.erb b/app/views/log_events/show.html.erb deleted file mode 100644 index 9c64c19..0000000 --- a/app/views/log_events/show.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -

- Name: - <%=h @log_event.name %> -

- - -<%= link_to 'Edit', edit_log_event_path(@log_event) %> | -<%= link_to 'Back', log_events_path %> \ No newline at end of file diff --git a/app/views/rounds/_rounds.html.erb b/app/views/rounds/_rounds.html.erb deleted file mode 100644 index a807b82..0000000 --- a/app/views/rounds/_rounds.html.erb +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - <% rounds.each do |round| %> - - - - - - - - - <% end %> -
<%= sort_link "Date", :start %><%= sort_link "Server", :server %><%= sort_link "Team 1", :team1 %><%= sort_link "Team 2", :team2 %><%= sort_link "Map", :map %><%= sort_link "commander", :commander %>
<%= link_to (shorttime round.start), round %><%= namelink round.server %><%= namelink round.team1 if round.team1 %><%= namelink round.team2 if round.team2 %><%= round.map.nil? ? h(round.map_name) : namelink(round.map) %><%= (round.commander.nil? or round.commander.user.nil?) ? h(round.commander) : namelink(round.commander.user) %>
- -<%= will_paginate rounds %> diff --git a/app/views/rounds/index.html.erb b/app/views/rounds/index.html.erb deleted file mode 100644 index e3ce175..0000000 --- a/app/views/rounds/index.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -

- ENSL Round Archive -

- -
- <%= render :partial => "rounds", :object => @rounds %> -
diff --git a/app/views/rounds/show.html.erb b/app/views/rounds/show.html.erb deleted file mode 100644 index 0d74984..0000000 --- a/app/views/rounds/show.html.erb +++ /dev/null @@ -1,150 +0,0 @@ -
-

- <%= namelink @round.server %> : <%= longtime @round.start %> -

-
- -
-

- General Info and Statistics -

- -
- <%= cascade @round, ["winner_s", "length", "commander", "map_name"] %> -
- -
- <% @round.logs.stats.each do |s| %> - <% next unless @round.marine_stats.include? s.details %> - <%= @round.marine_stats[s.details] %>: <%= s.num %>
- <% end %> -
-
- <% @round.logs.stats.each do |s| %> - <% next unless @round.alien_stats.include? s.details %> - <%= @round.alien_stats[s.details] %>: <%= s.num %>
- <% end %> -
-
- -<% {Log::TEAM_MARINES => "Marines", Log::TEAM_ALIENS => "Aliens"}.each do |team, name| %> -
-

- <%= name %> -

- - - - - - - - - - - <% @round.rounders.team(team).ordered.each do |rounder| %> - - - - - - - - - <% end %> -
NameENSLTeamRolesKillsDeaths
<%= h rounder.name %><%= namelink rounder.user if rounder.user %><%= namelink rounder.ensl_team if rounder.ensl_team %><%= h rounder.roles %><%= rounder.kills %><%= rounder.deaths %>
-
-<% end %> - -
-

- Round Timeline -

- -
-
-

- Aliens -

- - <% alien_total = 0 %> - <% consecutives = 0 %> - <% @round.logs.each do |log| %> - <% next unless e = Round.alien_event(log.details) %> - <% next if log.details == "kill" and (m = log.frag)[2] != "alien" %> - <% add = log.since*8 - alien_total %> - <% consecutives = add < 0 ? (consecutives + 1) : 0 %> - <% left = 145 - (add < 0 ? 105*consecutives : 0) %> - - <% if log.details == "kill" %> -
- - <%= Verification.uncrap(m[1])[0, 7] %> - - <%= image_tag 'weapons/' + m[5] + '.gif', :width => 22, :height => 14 %> - - <%= Verification.uncrap(m[3])[0, 7] %> - -
- <% else %> -
- <% if ["onos", "fade", "lerk", "gorge"].include? log.details %> - <%= Verification.uncrap(log.role[1])[0, 7] %> <%= log.role[2] %>s - <% else %> - <%= h e %> - <% end %> -
- <% end %> - - <% add = add + 15 %> - <% alien_total = alien_total + (add > 0 ? add : 0) %> - <% end %> -
- -
- -
-

- Marines -

- - <% marine_total = 0 %> - <% consecutives = 0 %> - <% @round.logs.each do |log| %> - <% next unless e = Round.marine_event(log.details) %> - <% next if log.details == "kill" and (m = log.frag)[2] != "marine" %> - <% add = log.since*8 - marine_total %> - <% consecutives = add < 0 ? (consecutives + 1) : 0 %> - <% left = 3 + (add < 0 ? 105*consecutives : 0) %> - - <% if log.details == "kill" %> -
- - <%= Verification.uncrap(m[1])[0, 7] %> - - <%= image_tag 'weapons/' + m[5] + '.gif', :width => 30, :height => 14 %> - - <%= Verification.uncrap(m[3])[0, 7] %> - -
- <% else %> -
- <%= h e %> -
- <% end %> - - <% add = add + 15 %> - <% marine_total = marine_total + (add > 0 ? add : 0) %> - <% end %> -
- - <% total = marine_total > alien_total ? marine_total : alien_total %> - -
-
- -
diff --git a/db/schema.rb b/db/schema.rb index e0aad41..fb40af1 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,21 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20150518162749) do - - create_table "admin_requests", :force => true do |t| - t.string "addr" - t.string "pwd" - t.integer "server_id" - t.string "player" - t.integer "user_id" - t.string "msg" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "admin_requests", ["server_id"], :name => "index_admin_requests_on_server_id" - add_index "admin_requests", ["user_id"], :name => "index_admin_requests_on_user_id" +ActiveRecord::Schema.define(:version => 20150621212615) do create_table "article_versions", :force => true do |t| t.integer "article_id" @@ -214,16 +200,6 @@ ActiveRecord::Schema.define(:version => 20150518162749) do add_index "data_files", ["directory_id"], :name => "index_data_files_on_directory_id" add_index "data_files", ["related_id"], :name => "index_data_files_on_related_id" - create_table "deleteds", :force => true do |t| - t.integer "deletable_id" - t.string "deletable_type" - t.integer "user_id" - t.text "reason" - t.datetime "created_at" - t.datetime "updated_at" - t.integer "related_id" - end - create_table "directories", :force => true do |t| t.string "name" t.string "description" @@ -236,21 +212,6 @@ ActiveRecord::Schema.define(:version => 20150518162749) do add_index "directories", ["parent_id"], :name => "index_directories_on_parent_id" - create_table "firms", :force => true do |t| - t.string "name" - t.string "y_code" - t.string "email" - t.string "website" - t.string "phone" - t.string "address" - t.integer "zipcode" - t.string "town" - t.integer "owner" - t.string "opentime" - t.datetime "created_at" - t.datetime "updated_at" - end - create_table "forumers", :force => true do |t| t.integer "forum_id" t.integer "group_id" @@ -379,44 +340,6 @@ ActiveRecord::Schema.define(:version => 20150518162749) do add_index "locks", ["lockable_id", "lockable_type"], :name => "index_locks_on_lockable_id_and_lockable_type" - create_table "log_events", :force => true do |t| - t.string "name" - t.string "description" - t.integer "team" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "log_files", :force => true do |t| - t.string "name" - t.string "md5" - t.integer "size" - t.integer "server_id" - t.datetime "updated_at" - end - - add_index "log_files", ["server_id"], :name => "index_log_files_on_server_id" - - create_table "logs", :force => true do |t| - t.integer "server_id" - t.text "text" - t.integer "domain" - t.datetime "created_at" - t.integer "round_id" - t.string "details" - t.integer "actor_id" - t.integer "target_id" - t.string "specifics1" - t.string "specifics2" - t.integer "log_file_id" - end - - add_index "logs", ["actor_id"], :name => "index_logs_on_actor_id" - add_index "logs", ["log_file_id"], :name => "index_logs_on_log_file_id" - add_index "logs", ["round_id"], :name => "index_logs_on_round_id" - add_index "logs", ["server_id"], :name => "index_logs_on_server_id" - add_index "logs", ["target_id"], :name => "index_logs_on_target_id" - create_table "maps", :force => true do |t| t.string "name" t.string "download" @@ -518,13 +441,6 @@ ActiveRecord::Schema.define(:version => 20150518162749) do add_index "movies", ["status"], :name => "index_movies_on_status" add_index "movies", ["user_id"], :name => "index_movies_on_user_id" - create_table "nodes", :force => true do |t| - t.string "name" - t.integer "foreign_key" - t.datetime "created_at" - t.datetime "updated_at" - end - create_table "options", :force => true do |t| t.string "option" t.integer "poll_id" @@ -667,42 +583,6 @@ ActiveRecord::Schema.define(:version => 20150518162749) do add_index "readings", ["user_id", "readable_id", "readable_type"], :name => "index_readings_on_user_id_and_readable_id_and_readable_type" add_index "readings", ["user_id"], :name => "index_readings_on_user_id" - create_table "rounders", :force => true do |t| - t.integer "round_id" - t.integer "user_id" - t.integer "team" - t.string "roles" - t.integer "kills" - t.integer "deaths" - t.string "name" - t.string "steamid" - t.integer "team_id" - end - - add_index "rounders", ["round_id"], :name => "index_rounders_on_round_id" - add_index "rounders", ["team_id"], :name => "index_rounders_on_team_id" - add_index "rounders", ["user_id"], :name => "index_rounders_on_user_id" - - create_table "rounds", :force => true do |t| - t.integer "server_id" - t.datetime "start" - t.datetime "end" - t.integer "winner" - t.integer "match_id" - t.integer "commander_id" - t.integer "team1_id" - t.integer "team2_id" - t.string "map_name" - t.integer "map_id" - end - - add_index "rounds", ["commander_id"], :name => "index_rounds_on_commander_id" - add_index "rounds", ["map_id"], :name => "index_rounds_on_map_id" - add_index "rounds", ["match_id"], :name => "index_rounds_on_match_id" - add_index "rounds", ["server_id"], :name => "index_rounds_on_server_id" - add_index "rounds", ["team1_id"], :name => "index_rounds_on_team1_id" - add_index "rounds", ["team2_id"], :name => "index_rounds_on_team2_id" - create_table "server_versions", :force => true do |t| t.integer "server_id" t.integer "version" @@ -758,6 +638,18 @@ ActiveRecord::Schema.define(:version => 20150518162749) do add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id" add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at" + create_table "shoutmsg_archive", :force => true do |t| + t.integer "user_id" + t.string "text" + t.datetime "created_at" + t.datetime "updated_at" + t.string "shoutable_type" + t.integer "shoutable_id" + end + + add_index "shoutmsg_archive", ["shoutable_type", "shoutable_id"], :name => "index_shoutmsgs_on_shoutable_type_and_shoutable_id" + add_index "shoutmsg_archive", ["user_id"], :name => "index_shoutmsgs_on_user_id" + create_table "shoutmsgs", :force => true do |t| t.integer "user_id" t.string "text" diff --git a/public/images/weapons/acidrocket.gif b/public/images/weapons/acidrocket.gif deleted file mode 100644 index 0fb434f4573079fdaf569bacfe2fac0dfef82fc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1466 zcmeH{Yfn=L0EXYThtoqT^ps+`h|DcjI6gKi&Yvgq(1><8@4^9$bOd5TNk z&@Qv-kb>XOV0J7P2o7QhkOU|au_Sn0@F~Q{B7p}%9E5x%#zQnq0_F%HrjaZ}Y9i7^ zn45(3B+M5hLkvkWq$!Z4LY{^NX;7qN;XEkkA!|NV8Bj}*Ek%wL8X0nB$WtI+fu#$f zRbsgcg^RFKjiPL<%7Jb%^com)Va$ao4<-3nvlQk6lxb1E3~QI8Vma0oVnY!si%_)+ z)eLHM*rZ3T0dE#Yk3&%P*E!g=cn$~02 z2JEiHo+>m~p`{voYtXt8`!?Y~E!>;o*#fT>J{u0&(OHMCI&^Qvp=~(44S{-mP>-Vx zIM#sPMx1yLr=2*n69Y{+yBp`5aiIklTX5-peAJ4M_u-TMxavaCg==lN?!o6?e9?|u zKHNTtFAw6YPK3HJ+>P)dL=I!*2u1_=<|w}F#ognGp1}8gxOWocr|`pR-2V_i4`SjR ze!YOHAw0f}CztWZ6+FFynX7nq6|Zjm&wqMA`ci1vS!ZjivrG2WH*J>`my}gN`hsBb z@CxeJdb}0|)Jw3abW?C(*h7g_wPV4-NCzz|?Ke3e62g`J-}X5(Jsx)gP1Q<1%Zw1Q zNh!A-wyq=UO5b*8gd06;*gG`z_#H*3#MJd8|K!kwUQf|tFcr3TX6deh2RC&xV>>^? z*zX@)eMDjI`Dc34c)YRO7r(?s_rXXW6>OfQ9-iwES(T&c=#Swh4vX`R0L?9rWc&9=su#K}L;clB!4 zJf)w@l!wkR9b@I4Nuyu)n#GqFKbUDF11ZHToL*5$%5#6RI?p*a*E6B>%L2^Bu@qHn zz#};@)e+#z8Hq)Z8jZ3OtH+@e7HesCsz=F=nb$C7D^aw_r3R{y`PAH#E3~BV$c4?8+=M#Ma1lY=LP!8c9y` zGclBeaj*mlYT>9TKWGh;sn>%n?f{ce!{k_M_T@cJ;69wj9 z!qg%=9U^mPnrR}<3^ylE>2mYD5-q~~oWC5A1lWVR*-kn<;>9MoS%Lv;B0ElP{Y{@# zJriOPkhsY;m+0Y`G`l85!CM#U)uxa;wdmF!ZxZnZemJ1#$|vwVHw%RV4;hZ%}ngV)GZWx zXc=SBa+4^apu-U_%QW82g2)!4nJ$YlW{GhRVwUKGF+AwYbbI&9??3oz>h_eDb$SuG zewzC!6ezbKC`l4f320PkRp`{{H5jxQb(oT|=&>5udY=)y35OZcLaG(#R?=*w+sJhA zkON7?l|ptZIZn1Y$xSCO19t}bnG{NFcd^4oQ8u1z9?79NmtA?3xG8m0{xB5G$7!jg^$8AmX{+L(k3)XichgbL(Ha8v1RHp^k?tmrH_`Jn zp%zZH@=_aT57Kvt@L~Gfi5x-hAlganD8m6pju8)%2r|*lWH(dCdG#c(J?FuMM^>MzL;M+-VO!3_` zKhARdb$(vpmqj*~`1hm#=elR{_XIjafi9^x7EFnDM=CeZZV%HeRt8*SqaQBt5Te8EmPr`gBj4!X}t>!!4y;DI$TBY0K9~7zt zU3INB5Y-g6`Iy-Q@IzI!@ z_5Ql{lt1@|v&es}#HrX4-tT^Ly2TP1RO^hZVtzdCifB@I9Qe}fS@=!9n;6Yd##b)C H=cVF5#B1#` diff --git a/public/images/weapons/bite2gun.gif b/public/images/weapons/bite2gun.gif deleted file mode 100644 index 8e7fb7995ac7c5f01cf0ec9093f3f2201b6fd1a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1527 zcmeH{YfqC00EJKQFTFr-^a4eAOQqmY0YQrbwzSxyMFCM!PzwVu16{?6uuW|%mm+0? ziw+fBy&+o|g3(Aaw@@w>&6X9%GP1Fx>gF^tOG#M9zTof|><{eZ`2{EEImX-#n)I>+ z$neJ%EQUq}odyOSOgadH;1b}4Ae4c-97a~H0NHG**ERi5u zf*2`C8Diy7MPO+J;uKIvAwCKTORy{&%So&tkra#MSfr?s8i%wvtX5-9JT&oGyA12z zL1rSdmSg=2=vE>-3HoFhl3`p0Qz~-PuxT~SYmleG=5%aXi~O}HSck$46lG#t7Pe<$ z$9fcNu~UbVY?SJ;TaUdtu;if3h;k#|HK8IGl^d~dBMz8x(2V!;P_-G=n{j9htOYny zh?=c9x)rt}9NUK4?Kr*z^~LyLCr*^$WGNhb&|pDR8Jf${Qh_s-aPLFgetf(i9S3o~ z8l8u6@qJvf;_?x6*Wk)gcx<>Ygk3^m~^ z7ap|W>lS=-2E(oJx-rs*v9s{C%^N3om=|>I=N?!=GOwcpI~~@#fzD{C5N7fo0kvrA3BAN zH%NS|$6HZAEPx`GnFc)G(}YMuALeVFO*}F~g8+rj4&`PvOblK(g2UCCwYm{1TVQb) z+a1|XhFn`$6tH-GXSp(EevllcF@&n=dFxX>iy5-PJ<Crm7r%y}LMNrq@eg=^lU8)e^=@0zd-dveZ*r2`8?&*)>^ zC|hKCFXcY1Q@X+4Rd;pN=O)DV89(K@vpIaZYls+B){HA!4erj7XH9OQ`ta+Qv*o7= zMahLZQ%6|?Cm~&Fv$j1q-hwbcz`yD}O=ro>ee(lUPG{PB^TORs(Tgnvw|{HQD+5hy zZ{=hw(vS9xGw7m>nLx60fPmBXgvP3x49`(^XQbqCIQ$qdbLCWUgqNW4+leCopn=Uy zvP0dSNO3az|C-EIqfVoxB`nUJ2){867TM)@n9*ldhKqBykH%fJJ@Mro8Pc(2nHgi? zrpqQH^i^FNLf(JO(Gu7FfKni;A0~a_ytLUUDQ|a5uDX?5crEsF7a`!(&&)DpykGsk zsEU-SkfrCvcU)D?^qO)tJ5{CYs@6{W*|xweL!Z?p3sG2ydRU4>wKYt`$-BB{Hm`nw zNfso{v0}U9%NvFLZL@|*Z;R{dL+~DvtY|`;>LN|h+N1aMcKE_YLlUaeN>3gan~7n+ z;Mlj`g6K9^l3ntVr+^{U&zXKAR`!A#Sv@hBP*S7vb_m*GF{tgu)Nx*Nd*EkbdIQC! zYP>OMlymPDBpPc~!GwHF3e%U84`Z6!C-tEc1os-HD!yK<2@H(!R!#GF wQl%!XgF#N^(?TLk`3|GF)UKn26!+et^M-trRF0uXOEdgE(|(`7c<$@|1sjAYQUCw| diff --git a/public/images/weapons/bitegun.gif b/public/images/weapons/bitegun.gif deleted file mode 100644 index b6c159dbb5f9e0e6a371e4c61e741b7480d22efc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1514 zcmeIx{ZrBh0LSqUUqHSfD)<1Xh+h&BO_vlJmerRB6-^7xo)#6NHeFWc+_I;|7p1gW zp;1}rqFP&Z)mZa3ciZkj$*|oT?z~-lx@)a%?XKEg;)M5kV?OY9i8- zke&>AG87VINsx)M$K`lp4267e1%S1kf0wrEhqA&~EEEK6xoP&iL=rvfB zhsATTBp*u)V3-GEAxv7BwWwGCiw>1VSYC|kg{aYEMG00ef^`vU7o)Be^-HjNDb_5- z+GSWr!)C%p6E>N#xeWF)I4aO+L30(hRH3CBt<`wB25l>_Z6$VCv9k^xtFUV=y4GU% zI_z1GeJ^7F2E1+qvkBds(PPIU2l|?DxEcLhaP%d3S~1Xy<6Gg~iW6-Z+K$sZ;M<9j z4!rpa{GB-WD$c)#3%hW!3zzre>V8~5fPfP>TzKDw(QbUugAd*K=pa7s#ixA;zJX9b zCXOO}43i#21~D~=+sE;l7oVTNos;@7M77U6B9xpC3>@6`MMm8#P3Kl81h@38dEcCQh1VSK`YwULe4MrEKrV*fw9EM+D^ZS``l2R4hWDIM( zo14tb6ZHlOEW-J3Ch9i_3+b;#QE(tW^`c45iGz8&~Ju=xRd>Xbkmit+;!s?-xe39ieP0Y2PVL9o+ z$?b^BRE_r%=h>TXD$;k`c~0pnvS<g757-LsMAG*~``jZdE|&=epS`(=crF-a1F8 z*|gC^Sq^sr*wNG^DB5k&;52~d#j@|*^RqcI+&w9Uy&TgL?lK5zrGhw-)KBDet z*_|re(a2BgJ!E}%w(k-k9r%kCOg_>pi>T{J)wsXGy3R!n72fBOmLO%3*K|F$sBPoZ zkvUCI2ErMmy0Id2wvQZaHpskUzM_288Wxmvg-k-n%;DZtgNB)uc8ZL*s1~`SGQ&M4 zcAw&GE4-Q6Vz)Cg=8@B!y2h+Mn9(}MkePYyk0&G@m=lqt&)$ou&$M;$leo2Bnh^S< z?AYQ+`-HgOOR*D|&)VH0oxRp2kmXbKes)+nrP!ninHu>)@7L@UooIv|zmGP=Wc7GL ZgmO6G5)?o2kN0D22DeN87;dDo_+MwXcrX9} diff --git a/public/images/weapons/bitegun2.gif b/public/images/weapons/bitegun2.gif deleted file mode 100644 index 8e7fb7995ac7c5f01cf0ec9093f3f2201b6fd1a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1527 zcmeH{YfqC00EJKQFTFr-^a4eAOQqmY0YQrbwzSxyMFCM!PzwVu16{?6uuW|%mm+0? ziw+fBy&+o|g3(Aaw@@w>&6X9%GP1Fx>gF^tOG#M9zTof|><{eZ`2{EEImX-#n)I>+ z$neJ%EQUq}odyOSOgadH;1b}4Ae4c-97a~H0NHG**ERi5u zf*2`C8Diy7MPO+J;uKIvAwCKTORy{&%So&tkra#MSfr?s8i%wvtX5-9JT&oGyA12z zL1rSdmSg=2=vE>-3HoFhl3`p0Qz~-PuxT~SYmleG=5%aXi~O}HSck$46lG#t7Pe<$ z$9fcNu~UbVY?SJ;TaUdtu;if3h;k#|HK8IGl^d~dBMz8x(2V!;P_-G=n{j9htOYny zh?=c9x)rt}9NUK4?Kr*z^~LyLCr*^$WGNhb&|pDR8Jf${Qh_s-aPLFgetf(i9S3o~ z8l8u6@qJvf;_?x6*Wk)gcx<>Ygk3^m~^ z7ap|W>lS=-2E(oJx-rs*v9s{C%^N3om=|>I=N?!=GOwcpI~~@#fzD{C5N7fo0kvrA3BAN zH%NS|$6HZAEPx`GnFc)G(}YMuALeVFO*}F~g8+rj4&`PvOblK(g2UCCwYm{1TVQb) z+a1|XhFn`$6tH-GXSp(EevllcF@&n=dFxX>iy5-PJ<Crm7r%y}LMNrq@eg=^lU8)e^=@0zd-dveZ*r2`8?&*)>^ zC|hKCFXcY1Q@X+4Rd;pN=O)DV89(K@vpIaZYls+B){HA!4erj7XH9OQ`ta+Qv*o7= zMahLZQ%6|?Cm~&Fv$j1q-hwbcz`yD}O=ro>ee(lUPG{PB^TORs(Tgnvw|{HQD+5hy zZ{=hw(vS9xGw7m>nLx60fPmBXgvP3x49`(^XQbqCIQ$qdbLCWUgqNW4+leCopn=Uy zvP0dSNO3az|C-EIqfVoxB`nUJ2){867TM)@n9*ldhKqBykH%fJJ@Mro8Pc(2nHgi? zrpqQH^i^FNLf(JO(Gu7FfKni;A0~a_ytLUUDQ|a5uDX?5crEsF7a`!(&&)DpykGsk zsEU-SkfrCvcU)D?^qO)tJ5{CYs@6{W*|xweL!Z?p3sG2ydRU4>wKYt`$-BB{Hm`nw zNfso{v0}U9%NvFLZL@|*Z;R{dL+~DvtY|`;>LN|h+N1aMcKE_YLlUaeN>3gan~7n+ z;Mlj`g6K9^l3ntVr+^{U&zXKAR`!A#Sv@hBP*S7vb_m*GF{tgu)Nx*Nd*EkbdIQC! zYP>OMlymPDBpPc~!GwHF3e%U84`Z6!C-tEc1os-HD!yK<2@H(!R!#GF wQl%!XgF#N^(?TLk`3|GF)UKn26!+et^M-trRF0uXOEdgE(|(`7c<$@|1sjAYQUCw| diff --git a/public/images/weapons/charge.gif b/public/images/weapons/charge.gif deleted file mode 100644 index 035cc34f2350e25addd4b3e5da6fa04de5627354..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2756 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 diff --git a/public/images/weapons/devour.gif b/public/images/weapons/devour.gif deleted file mode 100644 index 394be8ed208d4ae7824276074568cb3265a40bb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2453 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 diff --git a/public/images/weapons/grenade.gif b/public/images/weapons/grenade.gif deleted file mode 100644 index 083b5e42537e9035022bbb5e7505e127b6e33fe3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1468 zcmeIxYfn=L0Eh8^>Fu<%(8DQ|+6yhTfP#98phf0dS}sK{9ucQ29iajnAi<(IP|@`U z$R!E{1Q(`SgeS)riqRriCmXu?bkE$Erjq zlAv4-)f%W%piV{HT4>ipOC#QZgbmQ8L!W`fO-M2#ITOj7u{sNDwjkwoq?)ic8|y4s zZv~wTLmmwINV8!>0n!VRQG|`f*t88s2FC5!yaQQf$l8h5-oTb!Fxg=)huHy31+10G zaUy3Aa;uP6jrnL^~!<+BH?uOk1hYt=v-fBlh2P!(@?1r-k)hF@x0BQ$OJA}GZs2{=J(`ftv z`_95OhNcM|m_+k=9Q+V17tneUhcDyEM>u)~$3BMpQ+Tez`x*S#;Qt)$U!XI9<2TSf zhn}10`4T6-#=tEMev6^+aO!&u-^0j#y#FIcf5w?boPB`t-!SnA=az8(4_tVLOMm0a z3h}@HRzSN#TKCsDn`^2yEp^Scn*4%d2HJl(EFoSZ_0=7(Mgg$`7NN9Fj|F@LwZ;*e zUJMXY<7nUFbi7q0jiK9IPHumaee`)N9hfNaCX_gsu|Cd8h1zmWlJIM1SD4(w80)sP zyCpKEuFRv`Di){Y;gH4W_j0K{u7&$dKp3S+q>Ujrk5n7#Cqv7u*&d2gR!+@(Zbqug zqVulKXIuR~>P$nXWp=Jhs?lj$7Z%+tesxBlYeM&DK$M(Dk2FZyht`#}-eLNGVRs4y zG3iF85+0H1<|VGDQd2>IZ?|H)NsEX}nhPiq&Xq9dvSR7I_XtproWri19D@yw+ zq1k5O%Th+Qp@buSx4cz4w>#TDQ9Neml;-r$N=zY*HC%3!1lR&p2Gs-1Z9=`REfA!n zo`nus`n8QJu2|9>AWPF{avC=WuX~B8WR08M@Y6V7-~M8TCp86^2h3~Hba$^f{rYWl z9Nol;v`CtQ;`MzlFL%QfDbNqjlgCwcW!Za#WUq$dsLjKS!1&E_nAkus`o$fYlQVo> zhr~;$93f{ene?KzK36?rwg~iY#wR;SKO;HA{eq?GJV&8E#Y$pffq&4QLS zbJ?uahqh{~wRLf6Wmc=l9$IUy2itn6-dbCQe?#AW{)4Z@T3uY?%7qfo4`RKDC`9tW z7lI!HK^z1k2*rqzAXW;I9AX9HRge&ns3F~e1Pv0jkdu&8P|#56K%_vO3QY#Inb2l| z%mJATDi3r%Xg!h&z!<<3LbnkqB}gqr+GeDeA)_3bMr4|hWkz;bC332eTaCOLR_mc!H&W(2R1rU)PSN!6gQ!`86{!cu&D*5E!f_J5r%wgTA+KZ|lSoXtm05ykT4Lc0m5!gJa^`Nd7^~YiFgQFkL6KEJf<4H6PqS=e> zELsC-8%Em*+Q-mw1|4V7GlhNAIC2w%PyYT#^dE`&ShuUUyNl}E*V{u`taT31zalw8 z3?gg&&iW|u|9COP`uu_6kK{`yhx)YMGvVI zT}CFYdJiE%%6Qz53OXgL)MB?2OzO{>wa%GIeQfMxR6q5!QmCx%`9`tsH{#y7Ro8dN z0%uety_`H}fMKG`P-qdaVp5gHr-Uq?%tF&j9GE8*MR|IM==GX)66UnXbqGf5F@8(XK z$3ofeEG8GG*Y7d-cT zo|3ZSoZKc8)cE@yybg;64jX(f2tI^-#1aq-ArV0u19>bIVkloDL7WuvGHjDWtw4ej zi6k^6w#Oqm9@I9_Dx|8RO~8%>q-n4-3F%45*pAF(=qS8NBa4PU6^2w~Yhg^o?lkP# ziM{E_Nk?8L^4~y#4*TCkVHTKOFzZodfW-i7HcEbiQX|TCGA?2MusF z!u>WpN73(qw+VyI7;eFbPF!|k|p2wZ@_~asf-HZ84`1E~z`T>69LcoQEKHT--vwkdk@wpdE!}#4W ze*YnYmk}Dl@)fLH#i|c$V|XxzKaAs#6Ij27N0az!3V;4NzP^EPZXj|So4>%*S^RAl zKivC2|7(EWk{5M3o4TDX)O#noTd9(=ay#h%a9JY!0Nsyz{3r^DEwBhpX<#PgA*ANT znN4$ekf2S|M5mdZM9L4WhrYXVdDpo*vU{Or&7w#b)y(OAX11J@+d{U|d~s@B`qb1J z!4)O8+16i%S8XDhv2?yv`JMG6m0qDSuqls8naVA$i`;fkyb=GG4%gTdwrxl|G4i5n zbvUJueW}Bo*7K`y8PrO%!Dk?kR8)X6#5&Pqp9SW9RRUoX6jJ|NrG9vBu^~EQ= zVdcJjEcSHKp4c&M-BPQAu?!4wz7qL4LyvA+Jq_PKX#RYet4PqH5svaPi4m1Tliy1S zB>H)3b0O>|6XW%=O_@n-yqK~jyfr?@*GTgw>YP<~cJNmOh2v{<@zud!u`_fm2Q7@@ zDYy<7OQ;PZreIwk=4cy!YmL)T%zgg&qFP1QzpB3=^RUkXu#Diuj$|O2e8(z_|UYWb`&`9NSjKLRJRW@@O zD_N@RToyMrGk{9H!DJH(MgRrxzs6_IB}+;CjI*_60V02h;5{ z=9p|MjV;+f5-(jj3vN51+A7=#Y%$K8siF-%nL)znkexI_5Wcnnwak@ki zGwEpI9j&hUno(3!VX1yzU&K{`GRIv!>HlIYKA?yeZ#VZ+{c*e5dWNr5aaYO0>8MA% zHyGu`>({2t;+}o`M!6W*uL~3%Gkq})&!gcd6;Ibaf~xfFN~v?n#Zeuh~_vj=YN^DklA~$v99@tTe5Jua5MkSUQEp z&)l+^wH5yMD%Q&Du|4=F&^j{^Z|8EV)6M_xr?}E`A7MxCE&IjZNB zz(9nL$htTwCI|1#P)OyCdSowM;#|F1>4LuZDg4C!&Z{igC z+(i4jM>gc*Sp#lzR>sX(jO_H-N}JNz?!+Y%QKbs;vt--! eFjw0-DK=VsoZyi2CSFP@i%@?vmQ|#dA^*Rb__iwm diff --git a/public/images/weapons/heavymachinegun.gif b/public/images/weapons/heavymachinegun.gif deleted file mode 100644 index b1b1243ee0fede2a732556211545bbc28893e221..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2230 zcmd_p{ZrG20mt!Ao*xK#Bs_!w-*0#@AP)%&MxdG}AOVDkSP@YJLIqSB5R{>{Bm@Da z7!(yNDxp+4%eCOSD>}PNcoLnnvBe$s?2fqIi8rs~2e-q!9oxEpW3NBqefQ2a=V&%p zR6>T=6ZjtrC{$4CpfNyag2@4k3swL)f#C4L6(B$eo*01=@PojYLKp&JC`4fpheIMq zPz0or2qq9hB1D1EXvktAi$nN2$m0=_fXMZTOhi-?$P|z&DAb7FfS8SlO+(x!tkXcb z8OjXAXCmPPtlxsftw_=#S&tM0RM}AHK%I+J6E>K!F&}9KNZ*D{MbKEF*^Z1I$SgtT zPGo(E4|ZY8Zfq@sb`P}W(CvkO9}HF)D`2cd_5tKnA-5W)gD}^?T#LLqp zqhT0FN6>T=&9`v;Hd?+y%NSa}#))rmVjQ2`!Ku6W^tWjH7WPRv?!j>%&IfRQhmPN) z(}PYgx~9-QjWe@2JBPCm(KC@`r>a?|*bx1B9XD4!p9Pj?Dgb+A!rrvui(vm%=K;^8@hGP&%a8Rjo21&-xZwy!rM z?)sS7?(39=6}65SANe1NqV-ixF^%(P_qy~`Ro#>sRsbJL_L!A2-L1@d`sBp{)Ak5$ z{b}OGJs&4Vd*RZ9;ifui)Q4@WEeQ;%JJ8tkAgGpnH7AKRSlZr*+0U*-4D$mY>kNPF zAq}lc&akt)Kc()^bTX!v6PB7kI65z^Ja~22*JVi)boTj}l-`@66ZPQ$m6@J_KmesxQ$M4M^Le4JHuI~)fj_o zSNtr+shCDR_wbNCJ0$19cB5D`;GGtxFRDyY?K9)Fh%ZMcvcp?epUuk2hCX&^5&E*F z<|;BfD6Pt4XUYb&4sP1NtTV#WMK@ivN8ZpOEz0uKgUSjfoPxdm>aOTIjnq|>NtX00XoR*}&BxqdKppeE-Th_LRRq#lr?9eLN z$sy&tXC);)qU@0Jlj^zPvbWwjDzDmS;BH!KGk&Y3lT*Q!T6->sY#X1}W-SsvVTsD` z4Eo?5aZ#Ij(moeFaE&r2+)q5CFbh)ec^M%_p^j?uP&#C`nZ7PE{jS9*Dj4dU6I)9B zvq3xFjn4|Uj_QokiusA`p!zOdM_A>cUuTGtFHC7wRtiHv2nio``!805K;vsO2oAf{ zMrWx-&5-Up>?cC@Xe(yo_83#mifhhS+2UPQ7CTch;IngLYb;bwc};6}jUJg3xa;BI-l^rIwc!Q*8FmwLcV?)PNSct(QCU}mjosbZVU zOW`S9p6}Riyb_z$9;))PLnL{6y%2P0Az8VimD}tTo|DEQOoCD0?;IuC%}H%uzGB)D z5#;CWU#3Z&v$0AOB{024FCDj}kXn*msB-wKtj_qJO5s|w$rz`Y;FOfS61qa^i6s@R z^g(xEjm5;TAE!3Wdf4hx3ftGm{&t>tuA*SN5ZhpDy zwv6pfNu2TuDhbEuq7invbvk&`Lr-?qFw&qG++1q+naP0Ye#fn0B0*7lnv*Hi3mihH za`l%ORhO634+v+5XcF&dFSFiL!)L6t)FrprHq;&ol9|+^NJYajA2rGYmT|fGviw>1juEP>m@u&%7RH8Ax0^KU156g$z)uUu+h5qZleQnP p509{0F=afNS8|T$4lE)l{41hNq{{!ERlCJ;& diff --git a/public/images/weapons/item_mine.gif b/public/images/weapons/item_mine.gif deleted file mode 100644 index 076d125894db599347ab931b367ae5a861a88a82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 689 zcmci9%TLk)00;1|hJ-p1HNy}YKSMzLnUJO+`9KnRh>!{rWohDkwH|6gvCLA@Rs1C&^P+~>tNhs=}Y=FuJbqh4D(6&R@ z0o^(1&!g%B43}W+MD=A<+fn0y=?W~@VC_Zy08YDcW(bWQG>xL^25dLcb_eZ~=(q>_ z6F6qj^AtVLaCHu@H*hatcnKrR@CGsV4!%`Ptl{`)?Na2;fLCme;nJH6<4x&{W_L&GB;FTXa=JLdBxE9-KEE}5A% zet*gp4W=yDD9AU-6*bfTX}YLbQf^7qX`j!JvzVlzh|5>MUiMHVaaC*?SxH-2b*IVo z9B~0_-}?=xz+6gCiHwNf+@$Vd#0ZI`jJWSxKem7V`n^pVqa+_pkny;T;jKs03r<>+ z=+uz0g4dO842A+2c-*z2w*2|n;Ovb_d8p@xJ}o80W{O=C_OfGr%y_NMav-~}Kk^X$ zn?5t%1L&3mEPnNqW%R&{d5?y%KjY=w86s*hYPR(i HH4^fF)32~u diff --git a/public/images/weapons/knife.gif b/public/images/weapons/knife.gif deleted file mode 100644 index 4bc36aa3e9f4260c01f584851eaf6851781d6f5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1348 zcmeIx{ZrEg0LSsq*yhHA@EwmaHrOUO9)-c6Ay3;FY{Pg)K|*8>bkG$8c~U_)o;Dcb zFnq{J$3v8WH9aW0;|B(taAlp8c~n-jIx3|*xa+#>>Zs#?=*M1v!u#$mS7wWnRT*I7 z=OOGOQ{m|gA^_e&@L|E9g8&|wVPNh@5Fe}vup<#1h2Us}#DE(MZX9?5>`OqX5PT8B zlM#Lp5h;jFLsUAVGY})e0V!fL5tju)HUx6SE0Cas@DLJTLQ*bX%!jBD2aAzXf|SEZ zJ%Y4Sq#s2_Im9nRTmi{3NGp+91(^!66Ub5{yBhKuC{97CfwC4kbvX12^6HVNMScSc z8c}c>Ma?K`L2)Ze+Hm*`O50J|fwJ=`*P&dGiY`=iqp}y31{^m+)en^k>WfehqGkvu zFGDko+N-F$j@RBo{VixMXc$Gq7*0>1X%fxvpyf7Nr_eTywi%p#59i*;IV(Eu;ruKv z%t7}d^z-Qa2;B=XETV52{SKJ!!?c2dRSbTN!B24M0WPm$_zPV55?3GN+B)9+79-zb z9&@dFrzpG0K*zntAGqt2CGF$ux!AWiY zW&LRJ{(*ovwcQ-3-q_2|ZvC1ws#E9j;*J(W4#`ot6V+(gd*hZrryB5u)bCr-2S(~$a!^yDW+_$HANvkO9Lrgf<3jlMOcogNx$X7&MAtv*n=E z82cu0c$(Fv5S>7B(3N&|Dg97~b#dMGL;Imr?(D*};_B+;&VJ~wv-J1g_xcas4p+1J z3BM64tPSH)+j$Udhma4k0Fqn~LhKNM6oZmr=OYB(Si=wh4X* z0uJ;z5p*HsM!y@+doa+7Auqx{L=NNScEp~-NC#f&#L1^I+JzL0j31{0mmAm z$l+))*m}DBM+Ac1ANGwqCju7eQY)4Oc46XTW5{_ZL-Sd5Z&)% zI3V^p@0%0%zLeLvv(6D8td#JYWq3S0W={(Y!zt-pfDqvU+0f->0is-H`GBdlZo9s_<4v)50bQtHqcy4OVWXirvb0JhI)n3e{ za&nccecyhriE~8?<%#gBmH)?IYq{U0mub7eg#&l+>iQ3gF)kG?agsO5&~1(?dTCWU zO-hr=-^&0|8M4=j1jgqgl3UpXPkMTs5h)NKpClS^cdGhE=DF#rGn diff --git a/public/images/weapons/machinegun.gif b/public/images/weapons/machinegun.gif deleted file mode 100644 index 4b9c79644817bdcfccc7caea43db508929982884..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1542 zcmd_pi&N4E00;0d`~U#~L42jCKNUiW6fDzHOVAWwMQZ8H8kiPVnwpiHwLnQJduXZU zW%cv1&0H;Qb$gtUCCaN)wm6&yY|0&v~nDg@6Rd@%$b5O_l94WSQ2i{S1Du>>Ce@C<+# z3GX0y2g4@>zB2eOhMydgF!(DFumk~01TIBT1cFouRwHB?q{|_T!s2MiV-UI$p{o!U z3q?GZtcG$8mTC~LMMNT0YoShtIt7tBEK9}mbVOxfMJA%xBSw#y4Oo?p*c`-eMBFCC z=VJ9cSd)*00%*1%(SRf)k_wSrgp^|Fb|BS+)DooaMEWkI??z@B*6qQ%a;&d_z7qPq z$l8aj{m4FmoN8=*54i`CdkA?SAm5C93kvE`V8xar*jkUR4S3fE<1rW;vF!x5okVdn zwx7n1GcdKFqzyaIVOKj!&!e;hWf!pL6883>>Lcv?82c~dKp(0i#$LgO0fujwYY!1(%?9nT6)qVA0Fu}u_3Y6+Ggz^9kc3A%jQrIlgdKe_!NbaRis zdH&X9o3f}(KV&xAnS9aULOJKN;`Bw~$S)FVM%H?tbz>{H&z-hFq)zLl)X!#^-jtzh zviOqCof~@IRGBKH7Z#?4byq*+)O8suSY+MH*#;kCdWhyCvzkT)ilJtDe)J8^h#w(w z4AB(5l|q(!cO*NwMU^)xJC#76lwG7=SUuxr9CmSzvZ6s&V;&gw+1}C2L<(h)iq`yN zCWO&(>RbHCLA{k1^{b&s8_|(87Py&=c6hb1zhgFn?s!_A#Q-JiGLi#^<}oJIpX}P<`lX|lHTk>mNi*e4!`51 zmcdmDhnYS_O&Ug6Kh?yRn5bdq`c~BP)Iw*n)Jh5af-_nMk^|i4NG(gMYszB?Jo;!Z z{s&cB&XS2HyI{}b@@&msr-}x-(_u*{otf2159=Z)h>U87R!6>mUdxkDm}~pxA|pdw zAhB3j{x-ePGneetCVDn$G%f+Qo8f6k^ETL90uN^l54%oM6U<`0et!Iq$Q$EAmGs5@ sZSK+8an`2Z#y{^ce^VWGt2vIBcZqgKy@xKEKg7(AS^CP!VKNZ=AD@k-O8@`> diff --git a/public/images/weapons/mines.gif b/public/images/weapons/mines.gif deleted file mode 100644 index 076d125894db599347ab931b367ae5a861a88a82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 689 zcmci9%TLk)00;1|hJ-p1HNy}YKSMzLnUJO+`9KnRh>!{rWohDkwH|6gvCLA@Rs1C&^P+~>tNhs=}Y=FuJbqh4D(6&R@ z0o^(1&!g%B43}W+MD=A<+fn0y=?W~@VC_Zy08YDcW(bWQG>xL^25dLcb_eZ~=(q>_ z6F6qj^AtVLaCHu@H*hatcnKrR@CGsV4!%`Ptl{`)?Na2;fLCme;nJH6<4x&{W_L&GB;FTXa=JLdBxE9-KEE}5A% zet*gp4W=yDD9AU-6*bfTX}YLbQf^7qX`j!JvzVlzh|5>MUiMHVaaC*?SxH-2b*IVo z9B~0_-}?=xz+6gCiHwNf+@$Vd#0ZI`jJWSxKem7V`n^pVqa+_pkny;T;jKs03r<>+ z=+uz0g4dO842A+2c-*z2w*2|n;Ovb_d8p@xJ}o80W{O=C_OfGr%y_NMav-~}Kk^X$ zn?5t%1L&3mEPnNqW%R&{d5?y%KjY=w86s*hYPR(i HH4^fF)32~u diff --git a/public/images/weapons/oc.gif b/public/images/weapons/oc.gif deleted file mode 100644 index 306e056b595f4440c625a0b74dba94f420a2990e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1712 zcmds&i&N4E0LQ<;?}vzh_y`}FL7Mm=hdr&VctohZz|e3}frG@$6`DOPYd?{UkP5R} z@6^)Ftf*{9x32BKIb z#UVK!W8;yM0P!fKjzU@@(nmug#5fT$MUW;TD+%M1F);;`QZQMJDXGX##k6!x&%g`` zW{$(GOvpciLJDOTW@kY)9_k6mn}oTOF>eayXJf%sESv_-G-#)zAP2e`D4dC+nOHmv zdKrr4SfYSIiKR*`n~miv7*#N-QKH5txiII!l8+Vnu+Br-Jgi)R@&)*GAy#W()1q<_ z)+|Dm4r>dst_bTFqgs!R#i;oho0njV0iPK_Ek*4z)Gdd@hc1fg_bTx(3ZvXjzNabvV8rZ5z;Djg!?l zwF#$d(6t$7x8Uq&I7h)t;es6(?dYz<7Y_L9ak(B}I&oz?zS@qjUGO)ccL(}*qJI~z z?!q+>uJ6W;-T1Z%-|fNod-20Q{J0Od_T#4m7(9sEhj8aGem;V`$MEYh+-t^fE%?0^ z!Q;4p0*~79_#}opFmwt}I`OmP8HKIHKs6tLcc#!ATbHp@}l$uSTVqq)vZRB0-`tydcat1V+TFu5== zRjDs%l(VBwDDCX_kulfp!irjxBH-L1qmQ`%RBp?y-zy8`$0^P_fBDXbzX-*1+tyioXu-kuP~wR}PO6AT>Ds$`+62~}aocW$~v$dp0wlBMfOr8DD zWLMg%?gB*RL{yP!?Rr~(bhg1uk6);(U~rRz!(?2cr)ayZYG3}LgTk2?wH>-cTlXh!^&m$Xpv`Cw&<=2(E9D=^OHo$&7V_zKIu+pzBYVYp8Td%*zKAJVA4FzcJ=afFQ%G{BqWOo$D$? zE2K{teEOk$w=%(bP$SvJ0fB&ZG{{fGmZQTF> diff --git a/public/images/weapons/offensechamber.gif b/public/images/weapons/offensechamber.gif deleted file mode 100644 index 306e056b595f4440c625a0b74dba94f420a2990e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1712 zcmds&i&N4E0LQ<;?}vzh_y`}FL7Mm=hdr&VctohZz|e3}frG@$6`DOPYd?{UkP5R} z@6^)Ftf*{9x32BKIb z#UVK!W8;yM0P!fKjzU@@(nmug#5fT$MUW;TD+%M1F);;`QZQMJDXGX##k6!x&%g`` zW{$(GOvpciLJDOTW@kY)9_k6mn}oTOF>eayXJf%sESv_-G-#)zAP2e`D4dC+nOHmv zdKrr4SfYSIiKR*`n~miv7*#N-QKH5txiII!l8+Vnu+Br-Jgi)R@&)*GAy#W()1q<_ z)+|Dm4r>dst_bTFqgs!R#i;oho0njV0iPK_Ek*4z)Gdd@hc1fg_bTx(3ZvXjzNabvV8rZ5z;Djg!?l zwF#$d(6t$7x8Uq&I7h)t;es6(?dYz<7Y_L9ak(B}I&oz?zS@qjUGO)ccL(}*qJI~z z?!q+>uJ6W;-T1Z%-|fNod-20Q{J0Od_T#4m7(9sEhj8aGem;V`$MEYh+-t^fE%?0^ z!Q;4p0*~79_#}opFmwt}I`OmP8HKIHKs6tLcc#!ATbHp@}l$uSTVqq)vZRB0-`tydcat1V+TFu5== zRjDs%l(VBwDDCX_kulfp!irjxBH-L1qmQ`%RBp?y-zy8`$0^P_fBDXbzX-*1+tyioXu-kuP~wR}PO6AT>Ds$`+62~}aocW$~v$dp0wlBMfOr8DD zWLMg%?gB*RL{yP!?Rr~(bhg1uk6);(U~rRz!(?2cr)ayZYG3}LgTk2?wH>-cTlXh!^&m$Xpv`Cw&<=2(E9D=^OHo$&7V_zKIu+pzBYVYp8Td%*zKAJVA4FzcJ=afFQ%G{BqWOo$D$? zE2K{teEOk$w=%(bP$SvJ0fB&ZG{{fGmZQTF> diff --git a/public/images/weapons/para.gif b/public/images/weapons/para.gif deleted file mode 100644 index 7b0e128fdcc4c3c3c9a574524e54ec13ac74ead1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1156 zcmb8s|5K6&0LSqUUxj?Y2PAz&$%iijB`T05f+7eA6p9d~WnUzZP?ow| z<+i(hxoelXt$7!?Z6%f z_Byf8g-#dtyV2!Aw--HIa9|61edzPym1gv}AkurxZ5RyU*mk_O z14C^XZo^1BUf+r19XPQY@qI{i;$#@7_TzLn&h%ii2h#`f=0Tk8!`l(ejo{-ET!|qS z!zk+|R|G(v{BFB-Q@L*3jJ=8bYOS`?zt&soCW~{**(7oh&35A^17{=p?gh-H= zFCoR#RLMG-^1M4{^;kDI~N%tk*f6+%u9D#eEiob^ENQdCobI`FVmY4c?)@il!fB&bxO{ zrD^-#TWsEt#NPM^KVRhfSPgby}?2HItf)-<9ZgWoGTl1C#F>_oaN^PddVa652EGS=fJaQaW&`PtJNeRb=S8 zKgt+yOe7lx=1|p=t7%g7xMRM3%Hho~@A+UMS z^zyi1%LHQV-@muTM}gt8E-BB+a@DS_4kZ7DL#peu*I0>&yB zt8usnS+&TjgQ*@lXK|zv<|dfWA@>4~UPN9C@>-GKhWtw?xQr8T;iL_P9Vm35=n9IR zIMoTuHI!XP*$q^_&kI?!d-kijx8C?Dd?X$3d0{de)=HPgOs~%kSqH6)&i@5PQdcT0{YxFOpe+2{I z;?^_VevY?)!0=BP{u%dIG4d-$*D(G&CN}WFpP2j`Gh3AZ{dWcUTTD$;g~eJ?&bwG` zt>Wp8CNub(L;?-}AYuEC?NLD40)fIcOu4-slwfh8ufa_XjYxMen5Eh)!Lf%2c&b%3 znH8JU(`OqQG2UcRs#d;v*c~jk@KmK6l-zq6ZL}{{8%sIdL@V(LA^G&m(@_*`s75QZ z_hd9J&q<_05>G>s?m)IarW5t;6B-Or>z6=)9 z@5+kZ{=ae;O>B9Q&lWfHv4tiw4H`BD&hAjYtcN$p8DORRm*`Z{(e{m9dhqngc`&(_%U*l?5Y$odWv}uT_Ny{>#NK>=jID;zvRv< z?yeJhOKgLMcf>#Qc$f8k<^Mt2*LGbS_Xozu#2Xg_6QaxG^&$P0C8(Lja~@-xG@CRO6y;;pSA6{zGC4XNox34duh)4zeXpdg zrJ-++{HB!J)<4=ZWk8twxuI3)>^swoUE9Lx-C&a-TY3LRU8j8N4o*fEG`T%fAGZ^h z;;Dk^#As0LwhB2Z!^)lcElHtF`y^a&ho6W-dcF0_=$g@-s@e+tcJySHg&*wrR)Zk; OerX@Az5c%3j_n^T^@`&F diff --git a/public/images/weapons/shotgun.gif b/public/images/weapons/shotgun.gif deleted file mode 100644 index bdfcd82d33b4eed0f218b8e44729f936700ee8f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1634 zcmeIx=}(gf0LSrPAD)&LN^fXU=mAv9C5IdZ1bP8Q1{M`jF53Zeh*}gQV~8zhMZ_Yg zEW@lgGBamPt1M%SGcAX6n=fD^1~+3sjk3L}W^dicgfa-j zAPUC@IW}y<#z=%jAv7A|7>HvbiGwU2vIK-BB76%Xk|9sQrZhw_E$99G%3mD>!}?ZC{}68rrYpLnlt$K<5-rehJH0 zuuh}vYxI1J-rMN+;M6Pz<}r8|LqFo|JzThti^~{$fKQ&#|MwpikgapIN9s(ib+yvt zjjavR{DL9_WN%1{AO1${yF1>E0{S{A^boz%;pwLHqbu(^CuaLO;oHXV8cvVMQ=59c zDpyUufRQq0+M)gaOn5~5l=bHG0efgpdBm;9B`c@sP$-%gHMxUq$&IB|;@JRStbOEo zVbtZaLQ;E{E!@X_gOTcXQ48@@Kf)occ|b*l zJ!GFXIomevr4Y18F3DjgM0j{XyFY7g@wrmun=PqbS(x}Ve<-NQqOk6&FAhs5hNUyw z?}j9qq-+cfhlXYqY%;vgG0|+Y7q5=gh}BrI0KBEipk=(Nzqu@svGTix)d!mFn9Ta6T1 z`+~HKJ*;?1FQ&R2GbGF7A_A(F6FSa8g<8{A%6viPuD9Qk^|E5doI2itx2tOu`f@@y zzf85NV=xDyB26|+H#emLV5C#bR!y}1!2&fWZg`fJ?v`qNm6hn`$k$wCc$>|Y$FCqC z>t%;vocGf>aaEN(F6|27DRF0iTAQ@%CacOZqTM@gA_KSDy)(?{R`bWIf;BTuTzD%{ zAKt87^w|^ZNYqUczj@Wn%<*r07%~0s#v=N8>l`yh&+Vc$1^0OTv+Top0rz=-Xw?~2 zMk-&w^y-N2=L|s}Q|@#MwHeFi_;WEoCPeO0{frK+}sH_ThyU?^$Yif+u|QT z=^%b>O%qTUNtOj|9QD{=XY9VwUdv2pr||ZDcIYk#aj;K#{SkZf%8KU6C|hS`oUgzB L=GnMbz(M9esMew- diff --git a/public/images/weapons/siege.gif b/public/images/weapons/siege.gif deleted file mode 100644 index c7d7ff616262bec565d2255e5f78d2951a380546..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 895 zcmZwE?^DtT0LSqU@I^pH1OX8Qzlb6V@?-wUL?uLiiYSSu28a$dTWw~{(N>H6BB|Id zb-U}@R#a~Dsuk^4-fp)$wQhO0C+)7??NK*(J=k{ZZhNv@PukY=z3=@Wyqs=F)7}vi zNPHW|f6-`Q(7`0Y&H*O}Tn-9y!OH_bA4Oag6+py;xDdsBln5X#f=q}~ArxYii9r@a zDS@g46;f16p)N(092z;Q6{snLjzp~zdL@i1m{h1&qd|?vD(umqNrUDZn6+rt!J>!N zfOaEnCUlr!e+AAuxa#3P!B>ZtR#qtyukQ8e=)|Jt{gtw6^W<^AMX&9*3dP2T zNRO*C)L&712?dvD9flf3eXV7%uB&%K=?>{jW!#3=HhYHw-pJ6fHxT}MuDG&FESG4t z<`4*09*0Fp`A_CWq`b6}%OU7Anp7>!URW-l)9Ji*Y%n}W{V|=@co-6+I?sH&L84n=KQ@!?>Usggd`R* zB)|(lSkH@e5?msO%x*Cgvm8p%;d)zj^c;)lVHYN?50~js2%ih0?)hAyG58J2X$)p@ zGGjs-@nF<`(kK_g9I0o(R9k-&ubk3zF%zUn19RO!kv3RZsuPmXz7T ze_hxpr!v)tZ$8z1@tsxp%-8)?(z4Jg%g+3q8La!1qiTvhwmU@DFSk;H#mC2-{-nE{ YDGxpJJE(Mv@*#g9>D*1_GwCq@3#T*qq5uE@ diff --git a/public/images/weapons/spikes.gif b/public/images/weapons/spikes.gif deleted file mode 100644 index dc5e988dbbb41795a251c598f151b7b4f3b37440..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 684 zcmcK1TThY!0Eh8E_=cQBKoogFd=W4_CZ@V}Zv; zJO{!!Bpk#;Vmy-g5DOp?f=qx^1epl(Bv4`~B~X!2lSr50XbLnb$dDtOLaqXNN@$hH zSD`Q+MH=WeFlNG(g_3NP=HNswELvE#D9=Y_0jhOy=uvAxoe}j$G?>s-iWW24t>`F6 zmkr%E^i;xG1(zLX?Qqw?Q;TzTINyN5CJdc|w;5MjG28~^fcjna;AWtE<&e}o>BHdFs1K-eQ{+j5?uU&$(_ z@~_@$8KIX2=p2q}$EmQy@~N`#qOHC6i@oMi#=em8@p@L%O7dkbKSI!G8d`K`#m(h4 VKH}BvZI0tf=SC={TIZo)`Uhd;p-un* diff --git a/public/images/weapons/spit.gif b/public/images/weapons/spit.gif deleted file mode 100644 index c978d56d37a53205f18940b702690435ddce69a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1599 zcmeH`i&N7D0LQ<3xc&BE{s!B4v)|Z+0RzWF1QFfF<_5}ZqL6}aDk7l>*3X?&a|sL>A1Wu57WP(f1uBO{({fl$C$q=E8Cg_ z34R^IGiWp{V1mU2hXpPhd;&on2)J0tgOHElAcQoSU^QZk5nD~zmXGZPs9l2>3sF~uokiGHjQUbEn9;Zvd)C5M zhL_i2?|L+qqq!XWDzN_rv~0kEjW}3|LzS>sp>-3So6%-LyA|ElI8u#cH8@^_o?5tS z@md{D>_p#g^zX*Wm+*Q$PBmb#5pEmK?!~z#ywQyF`*7hEyw!qB2XOfyE+4`bJ3Mw= zbKq?Ut~>Eg8{R#P(RRGoj`ut9K^H#kg7*k~M=^E`N(A^ko-l&9j+t#fg=y1K&mdmae=1$_x+ zpAL61I;O-~)hUVtcD-SY!RxaqAIaFgiCgb|)iqvI9GOyFxB=f->W0-G^DE$`T0pnB4G88)jRX98p4<$1*c!;C-tq z7zlI0IIyVb78$E}Fs&$PpHrFj@r9xeBKYXRM;iJ9j#yn`8fb1{`N**O42uTd-X%r- z?oz+f99MigBe~l-!IMOUNa9L70WFgdm(&#eFgm+R+VMnYlJ-@cod}WJNS%SDq6QfPrP>Y}*`wj)yJ_sGrYABs8C{`v z2G!b2S&^@hKXt}B0%tm-&67PoVqU7K_Fm%JG4ap>l!nf_;Ck4~UDcdw2udbXjWHc6 z`efv0rAx<7`(5qi3G#1x86=TOv7;@doW;9y-{De^sK+=dC~X&&>r=;BNptWE6rEl= z|MK189@dt@6QKXBRco0-_4ZZ^pHh<>^ktM6NyKf2V6omcPH^q@BqL8Xn-`SjzR{=S zJkStwTZPOo9Qr8W<7b92{o-u5hT$z<*rt(`6qq}uM>P&2x@5|$6J)liopjM~#b4YX PS|0!L_(yxFh(yl6i0w6P diff --git a/public/images/weapons/spitgunspit.gif b/public/images/weapons/spitgunspit.gif deleted file mode 100644 index c978d56d37a53205f18940b702690435ddce69a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1599 zcmeH`i&N7D0LQ<3xc&BE{s!B4v)|Z+0RzWF1QFfF<_5}ZqL6}aDk7l>*3X?&a|sL>A1Wu57WP(f1uBO{({fl$C$q=E8Cg_ z34R^IGiWp{V1mU2hXpPhd;&on2)J0tgOHElAcQoSU^QZk5nD~zmXGZPs9l2>3sF~uokiGHjQUbEn9;Zvd)C5M zhL_i2?|L+qqq!XWDzN_rv~0kEjW}3|LzS>sp>-3So6%-LyA|ElI8u#cH8@^_o?5tS z@md{D>_p#g^zX*Wm+*Q$PBmb#5pEmK?!~z#ywQyF`*7hEyw!qB2XOfyE+4`bJ3Mw= zbKq?Ut~>Eg8{R#P(RRGoj`ut9K^H#kg7*k~M=^E`N(A^ko-l&9j+t#fg=y1K&mdmae=1$_x+ zpAL61I;O-~)hUVtcD-SY!RxaqAIaFgiCgb|)iqvI9GOyFxB=f->W0-G^DE$`T0pnB4G88)jRX98p4<$1*c!;C-tq z7zlI0IIyVb78$E}Fs&$PpHrFj@r9xeBKYXRM;iJ9j#yn`8fb1{`N**O42uTd-X%r- z?oz+f99MigBe~l-!IMOUNa9L70WFgdm(&#eFgm+R+VMnYlJ-@cod}WJNS%SDq6QfPrP>Y}*`wj)yJ_sGrYABs8C{`v z2G!b2S&^@hKXt}B0%tm-&67PoVqU7K_Fm%JG4ap>l!nf_;Ck4~UDcdw2udbXjWHc6 z`efv0rAx<7`(5qi3G#1x86=TOv7;@doW;9y-{De^sK+=dC~X&&>r=;BNptWE6rEl= z|MK189@dt@6QKXBRco0-_4ZZ^pHh<>^ktM6NyKf2V6omcPH^q@BqL8Xn-`SjzR{=S zJkStwTZPOo9Qr8W<7b92{o-u5hT$z<*rt(`6qq}uM>P&2x@5|$6J)liopjM~#b4YX PS|0!L_(yxFh(yl6i0w6P diff --git a/public/images/weapons/spore.gif b/public/images/weapons/spore.gif deleted file mode 100644 index 653cc1ec83a2e444855114253b3cfba43414a776..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1861 zcmeH`>rY#U0Y`tfuODC=Uvq72g9G2JD}Tv>QdB{p_WD+13d#n1?nrXdnXzyv8NJytFTXp{W>((;NW*~s1}Fo(5#2? zyD%AGu7{-_ExTcT4z>og?ZJ_~=-7wO{Wy96U5&6eqWd6vn$UX)eTQ-EF#4O}VDW+x zCrlVH<3%%0T5zfb&K9_=7_{Og8;062+>X=j80o;74t%c@qen4z6lc5eiXG$Kc(n%; z&*Qb{G1-gP`|!pwobQLbA5#vz`2wboW99_DKY$AZ@Vp4`N%&78;KZy8bAz}vgv-OY zGK|n^y!|q+zKrl0%%8#aQ7nw&oiW@zhsASv_Z9qb9Phn~TNC)vYluuD`Z{jEfjj5% z6E}W3g`Z8~=WpSIX)Mp+!wdMxgO~>&`>^82F9Z11MZ{skCJh)*sd8A9e7KD&m` zujA1T{PqU2H}Sjo@cUc%!;kUweLP#n)<^i}7ytKvDZp&Y%@f0}$>AaT{F%uS+S=A> z2lExd$;UUS{dSLUM}cS?9Ff)*izNLbs%9V)V?45|hW$&KP4F%&ZM2sXJ)(-$y30h2 zb@~K(`hX~pP7?VA1>_iAzIL_R@pY}Kmq;3U0#dC$5Ki)iVy!J>xYIr_&ND1}>QgCJ zSTTvIt--m{wuR5>vxXHm%ct}St;2JhUqBVxo%KTxm+JJEP;CCs?N?Uz%n;Ep7{0jr zt$)@UT_!=eP@=VGW6{-FA-`xSlVg0VLRq<6&9StWEX@6wf;N=coD%94+ zyPO^x-n{DIP_l;~6iLb&9pky2iE4T?9ZgFbM!pafRT@^jVtqQ{lNjPz6L~7QC71S$ zaMH3P8>EjXQybX!ig>~#t+umCzQ&eg3C1~ZrM(a5Tcm>$Ur;IO%bN0;P{b$J#k1zZ z;{hWfITla0mW@ifeLSg!PV$NdoJK)KWZWd$IUP3gi^3o@)1uvNv_--^DDLZskvw|Y z?h}@T5+<4B6OL8h{O|0l_D08->#7EKHbGF+kyTm$k}EAeykR$qY6qUC#QP#!!is<* zN>KjrJ&w6xY||@L^cqac?QvYoQ06AigOaOk&${xtyLK-jjYkOODE>A_9(a;9iFU;j zDQQE(8Bn`A7)xPqR?Zigs}~YiWXpH`W$!e6xvuOA&97-^?rvG+rpE~{gikgt%5#aR zfNF7XU6e8&GL>)fxYiY9K~kV~EGIl%@jq^E5GBuI>$^fBBcYmD`4eB=ypi?GjZ5Jg z_i6OlG^{(CVLD@pBws5s&e0>eO_O{^F)>F8GAnjM`>fw9)NdqwVyn|-)!3dmQ$k(s zt(2%-sDP?_N9AkDp!CLkT3y{N$!l_6YQ9cY^ABr<=l01UeowID@{8y6~Vtp zSNWuP!I;N7J&JoI>+C+`X-`K9g+`K1z@PEH8RHQA!4Wh33e(pI-U z%wwK8FH-u+D@n3%Cqt0?;;cn+=f2UVn%ZzZAgg<=3oPG)6m=qGIB!(lJ)Wmy!@Oyl z*d62KHRcwJ?Jn7c%}1o0<*NSp13J%>5NuanBLZyQ%Bq*VZ3vJyCr>rP^0bCe#rN%W r`xGmhV0mPS=5bw#BedbZ>T5eK&tGKumGp|YAvf9Faofh_;^2P(RHUEB diff --git a/public/images/weapons/sporegunprojectile.gif b/public/images/weapons/sporegunprojectile.gif deleted file mode 100644 index 653cc1ec83a2e444855114253b3cfba43414a776..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1861 zcmeH`>rY#U0Y`tfuODC=Uvq72g9G2JD}Tv>QdB{p_WD+13d#n1?nrXdnXzyv8NJytFTXp{W>((;NW*~s1}Fo(5#2? zyD%AGu7{-_ExTcT4z>og?ZJ_~=-7wO{Wy96U5&6eqWd6vn$UX)eTQ-EF#4O}VDW+x zCrlVH<3%%0T5zfb&K9_=7_{Og8;062+>X=j80o;74t%c@qen4z6lc5eiXG$Kc(n%; z&*Qb{G1-gP`|!pwobQLbA5#vz`2wboW99_DKY$AZ@Vp4`N%&78;KZy8bAz}vgv-OY zGK|n^y!|q+zKrl0%%8#aQ7nw&oiW@zhsASv_Z9qb9Phn~TNC)vYluuD`Z{jEfjj5% z6E}W3g`Z8~=WpSIX)Mp+!wdMxgO~>&`>^82F9Z11MZ{skCJh)*sd8A9e7KD&m` zujA1T{PqU2H}Sjo@cUc%!;kUweLP#n)<^i}7ytKvDZp&Y%@f0}$>AaT{F%uS+S=A> z2lExd$;UUS{dSLUM}cS?9Ff)*izNLbs%9V)V?45|hW$&KP4F%&ZM2sXJ)(-$y30h2 zb@~K(`hX~pP7?VA1>_iAzIL_R@pY}Kmq;3U0#dC$5Ki)iVy!J>xYIr_&ND1}>QgCJ zSTTvIt--m{wuR5>vxXHm%ct}St;2JhUqBVxo%KTxm+JJEP;CCs?N?Uz%n;Ep7{0jr zt$)@UT_!=eP@=VGW6{-FA-`xSlVg0VLRq<6&9StWEX@6wf;N=coD%94+ zyPO^x-n{DIP_l;~6iLb&9pky2iE4T?9ZgFbM!pafRT@^jVtqQ{lNjPz6L~7QC71S$ zaMH3P8>EjXQybX!ig>~#t+umCzQ&eg3C1~ZrM(a5Tcm>$Ur;IO%bN0;P{b$J#k1zZ z;{hWfITla0mW@ifeLSg!PV$NdoJK)KWZWd$IUP3gi^3o@)1uvNv_--^DDLZskvw|Y z?h}@T5+<4B6OL8h{O|0l_D08->#7EKHbGF+kyTm$k}EAeykR$qY6qUC#QP#!!is<* zN>KjrJ&w6xY||@L^cqac?QvYoQ06AigOaOk&${xtyLK-jjYkOODE>A_9(a;9iFU;j zDQQE(8Bn`A7)xPqR?Zigs}~YiWXpH`W$!e6xvuOA&97-^?rvG+rpE~{gikgt%5#aR zfNF7XU6e8&GL>)fxYiY9K~kV~EGIl%@jq^E5GBuI>$^fBBcYmD`4eB=ypi?GjZ5Jg z_i6OlG^{(CVLD@pBws5s&e0>eO_O{^F)>F8GAnjM`>fw9)NdqwVyn|-)!3dmQ$k(s zt(2%-sDP?_N9AkDp!CLkT3y{N$!l_6YQ9cY^ABr<=l01UeowID@{8y6~Vtp zSNWuP!I;N7J&JoI>+C+`X-`K9g+`K1z@PEH8RHQA!4Wh33e(pI-U z%wwK8FH-u+D@n3%Cqt0?;;cn+=f2UVn%ZzZAgg<=3oPG)6m=qGIB!(lJ)Wmy!@Oyl z*d62KHRcwJ?Jn7c%}1o0<*NSp13J%>5NuanBLZyQ%Bq*VZ3vJyCr>rP^0bCe#rN%W r`xGmhV0mPS=5bw#BedbZ>T5eK&tGKumGp|YAvf9Faofh_;^2P(RHUEB diff --git a/public/images/weapons/swipe.gif b/public/images/weapons/swipe.gif deleted file mode 100644 index 5c53f531f7728c6732256239374dad08d507da77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1407 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 diff --git a/script/shell/log_file_update.sh b/script/shell/log_file_update.sh deleted file mode 100644 index 5ff20b8..0000000 --- a/script/shell/log_file_update.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -LIMIT=5985 -a=4268 - -while [ "$a" -le $LIMIT ] -do - wget -O /dev/null http://www.ensl.org/log_files/handle/"$a" - let "a+=1" -done From 748fbdb151c68ed547a680bb5f39eb9d7b29866b Mon Sep 17 00:00:00 2001 From: Ari Timonen Date: Mon, 22 Jun 2015 00:43:16 +0300 Subject: [PATCH 164/305] Fix access check bug --- app/models/team.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/team.rb b/app/models/team.rb index a427900..8715593 100644 --- a/app/models/team.rb +++ b/app/models/team.rb @@ -114,7 +114,7 @@ class Team < ActiveRecord::Base end def can_update? cuser - cuser and is_leader? cuser or cuser.admin? + cuser and (is_leader? cuser or cuser.admin?) end def can_destroy? cuser From 7cb5142e275066b9e27da9a56cec2e6c382f1e61 Mon Sep 17 00:00:00 2001 From: simplefl Date: Sat, 27 Jun 2015 14:23:37 +0200 Subject: [PATCH 165/305] Only admins can change usernames. --- app/controllers/users_controller.rb | 1 + app/models/user.rb | 4 ++++ app/views/users/edit.html.erb | 2 ++ 3 files changed, 7 insertions(+) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 257aaae..6550c67 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -63,6 +63,7 @@ class UsersController < ApplicationController def update raise AccessError unless @user.can_update? cuser + params[:user].delete(:username) unless @user.can_change_name? cuser if @user.update_attributes params[:user] flash[:notice] = t(:users_update) redirect_to_back diff --git a/app/models/user.rb b/app/models/user.rb index 5110deb..12554f6 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -271,6 +271,10 @@ class User < ActiveRecord::Base cuser and (self == cuser or cuser.admin?) end + def can_change_name? cuser + cuser and cuser.admin? + end + def can_destroy? cuser cuser and cuser.admin? end diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 752f357..b4fcba7 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -15,10 +15,12 @@
+ <% if cuser and @user.can_change_name? cuser %>
<%= f.label :username, 'Username', class: 'required' %> <%= f.text_field :username %>
+ <% end %>
<%= f.label :raw_password, "Password" %> <%= f.password_field :raw_password %> From d6baebc3bc6040df9ea2f24f712b19621fc5b4c4 Mon Sep 17 00:00:00 2001 From: Ari Timonen Date: Thu, 2 Jul 2015 02:34:39 +0300 Subject: [PATCH 166/305] Remove tweets --- app/controllers/tweets_controller.rb | 29 ---------------------------- app/models/tweet.rb | 22 --------------------- app/views/tweets/index.html.erb | 12 ------------ app/views/tweets/show.html.erb | 14 -------------- app/views/widgets/_tweets.html.erb | 19 ------------------ db/schema.rb | 11 +---------- 6 files changed, 1 insertion(+), 106 deletions(-) delete mode 100644 app/controllers/tweets_controller.rb delete mode 100644 app/models/tweet.rb delete mode 100644 app/views/tweets/index.html.erb delete mode 100644 app/views/tweets/show.html.erb delete mode 100644 app/views/widgets/_tweets.html.erb diff --git a/app/controllers/tweets_controller.rb b/app/controllers/tweets_controller.rb deleted file mode 100644 index 93106d0..0000000 --- a/app/controllers/tweets_controller.rb +++ /dev/null @@ -1,29 +0,0 @@ -require 'rss/2.0' -require 'open-uri' - -class TweetsController < ApplicationController - def index - @tweets = Tweet.all order: "created_at DESC" - @nobody = true - end - - def show - @tweet = Tweet.find(params[:id]) - end - - def refresh - open('http://twitter.com/statuses/user_timeline/16676427.rss') do |http| - RSS::Parser.parse(http.read, false).items.each do |item| - unless Tweet.first :conditions => {:link => item.link} - tweet = Tweet.new - tweet.link = item.link - tweet.msg = item.title.gsub(/NS2: /, "") - tweet.created_at = DateTime.parse item.pubDate.to_s - tweet.save - end - end - end - - render text: t(:tweets_refresh) - end -end diff --git a/app/models/tweet.rb b/app/models/tweet.rb deleted file mode 100644 index 6e34819..0000000 --- a/app/models/tweet.rb +++ /dev/null @@ -1,22 +0,0 @@ -# == Schema Information -# -# Table name: tweets -# -# id :integer not null, primary key -# msg :string(255) -# link :string(255) -# created_at :datetime -# updated_at :datetime -# - -class Tweet < ActiveRecord::Base - include Extra - - scope :recent2, :order => "created_at DESC", :limit => 2 - scope :recent, :order => "created_at DESC", :limit => 5 - has_many :comments, :as => :commentable - - def to_s - msg - end -end diff --git a/app/views/tweets/index.html.erb b/app/views/tweets/index.html.erb deleted file mode 100644 index 2d60b49..0000000 --- a/app/views/tweets/index.html.erb +++ /dev/null @@ -1,12 +0,0 @@ -<% @tweets.each do |item| %> - -
-

- <%= link_to (longtime item.created_at), item.link %> -

-

- <%= raw h item.msg %> -

- <%= link_to "Comments: #{item.comments.count}", item %> -
-<% end %> diff --git a/app/views/tweets/show.html.erb b/app/views/tweets/show.html.erb deleted file mode 100644 index c4303b7..0000000 --- a/app/views/tweets/show.html.erb +++ /dev/null @@ -1,14 +0,0 @@ -

- NS2 Feed -

- -
-

- <%= link_to (longtime @tweet.created_at), @tweet.link %> -

-

- <%= h @tweet.msg %> -

-
- -<%= add_comments @tweet %> diff --git a/app/views/widgets/_tweets.html.erb b/app/views/widgets/_tweets.html.erb deleted file mode 100644 index 31c5d63..0000000 --- a/app/views/widgets/_tweets.html.erb +++ /dev/null @@ -1,19 +0,0 @@ -
Latest NS2 tweets
-
-
-

- Latest tweets -

-
    -
      - <% Tweet.recent.each do |tweet| %> -
    1. - <%= namelink tweet, 25 %> -
      2. - <% end %> -
    -
-
-
- -<%= link_to "More..", articles_path %> diff --git a/db/schema.rb b/db/schema.rb index fb40af1..5422b4f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20150621212615) do +ActiveRecord::Schema.define(:version => 20150701233306) do create_table "article_versions", :force => true do |t| t.integer "article_id" @@ -715,15 +715,6 @@ ActiveRecord::Schema.define(:version => 20150621212615) do add_index "topics", ["forum_id"], :name => "index_topics_on_forum_id" add_index "topics", ["user_id"], :name => "index_topics_on_user_id" - create_table "tweets", :force => true do |t| - t.string "msg" - t.string "link" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "tweets", ["created_at"], :name => "index_tweets_on_created_at" - create_table "user_versions", :force => true do |t| t.integer "user_id" t.integer "version" From f39ab459f683c582fb6b74e9bfb2fd9bd143e37d Mon Sep 17 00:00:00 2001 From: Ari Timonen Date: Thu, 2 Jul 2015 02:34:58 +0300 Subject: [PATCH 167/305] Remove tweets, continued --- db/migrate/20150701233306_remove_tweets.rb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 db/migrate/20150701233306_remove_tweets.rb diff --git a/db/migrate/20150701233306_remove_tweets.rb b/db/migrate/20150701233306_remove_tweets.rb new file mode 100644 index 0000000..d86c6ee --- /dev/null +++ b/db/migrate/20150701233306_remove_tweets.rb @@ -0,0 +1,8 @@ +class RemoveTweets < ActiveRecord::Migration + def up + drop_table :tweets + end + + def down + end +end From 6b1f4d1a7997ece6d2590f606d769168fdc83c07 Mon Sep 17 00:00:00 2001 From: simplefl Date: Sat, 18 Jul 2015 12:33:09 +0200 Subject: [PATCH 168/305] Display nsltv seperated in calender widget. --- app/helpers/application_helper.rb | 20 +++++++++++++++++++- app/views/widgets/_calendar.html.erb | 23 ++++++++++++++++++++++- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2c44635..fcf1e89 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -171,8 +171,26 @@ module ApplicationHelper end end + def nsltv_regex + /\[NSLTV\]/i + end + def upcoming_matches - GoogleCalendar.new(ENV['GOOGLE_CALENDAR_ID'], timezone_offset).upcoming.sort_by do |event| + GoogleCalendar.new(ENV['GOOGLE_CALENDAR_ID'], timezone_offset). + upcoming. + find_all{|e| + not nsltv_regex =~ (e.summary) + }.sort_by do |event| + event.start + end + end + + def upcoming_nsltv + GoogleCalendar.new(ENV['GOOGLE_CALENDAR_ID'], timezone_offset). + upcoming. + find_all{|e| + nsltv_regex =~ (e.summary) + }.sort_by do |event| event.start end end diff --git a/app/views/widgets/_calendar.html.erb b/app/views/widgets/_calendar.html.erb index ccb3094..9dc7fbd 100644 --- a/app/views/widgets/_calendar.html.erb +++ b/app/views/widgets/_calendar.html.erb @@ -2,7 +2,7 @@

<%= t('widget.schedule') %>

-
+
<% upcoming_matches.group_by{ |e| e.start.month }.each do |month, events| %> <% events.group_by { |e| e.start.day }.each do |day, day_events| %>
<%= day_events.first.start.strftime("%A, %e %B") %>
@@ -19,3 +19,24 @@
<% end %> +<% if upcoming_nsltv.size > 0 %> +
+

NSLTV

+ +
+ <% upcoming_nsltv.group_by{ |e| e.start.month }.each do |month, events| %> + <% events.group_by { |e| e.start.day }.each do |day, day_events| %> +
<%= day_events.first.start.strftime("%A, %e %B") %>
+ <% day_events.each do |event| %> +
+

+ <%= event.start.strftime("%H:%M %Z") %> + <%= event.formatted_summary.sub(nsltv_regex, '') %> +

+
+ <% end %> + <% end %> + <% end %> +
+
+<% end %> From 8301064e3bd2002d5f5246cc78829b13a413fd4e Mon Sep 17 00:00:00 2001 From: simplefl Date: Sun, 19 Jul 2015 12:33:49 +0200 Subject: [PATCH 169/305] Bug fix and clean up with nsltv tag. --- app/helpers/application_helper.rb | 13 ++----------- app/services/google_calendar.rb | 19 ++++++++++++++++--- app/views/widgets/_calendar.html.erb | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index fcf1e89..9b9d542 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -171,26 +171,17 @@ module ApplicationHelper end end - def nsltv_regex - /\[NSLTV\]/i - end def upcoming_matches GoogleCalendar.new(ENV['GOOGLE_CALENDAR_ID'], timezone_offset). - upcoming. - find_all{|e| - not nsltv_regex =~ (e.summary) - }.sort_by do |event| + upcoming.sort_by do |event| event.start end end def upcoming_nsltv GoogleCalendar.new(ENV['GOOGLE_CALENDAR_ID'], timezone_offset). - upcoming. - find_all{|e| - nsltv_regex =~ (e.summary) - }.sort_by do |event| + upcoming_nsltv.sort_by do |event| event.start end end diff --git a/app/services/google_calendar.rb b/app/services/google_calendar.rb index 179e7dc..5996844 100644 --- a/app/services/google_calendar.rb +++ b/app/services/google_calendar.rb @@ -20,7 +20,15 @@ class GoogleCalendar def upcoming events.select do |event| - event.start >= (Time.zone.now - 2.hours) + event.start >= (Time.zone.now - 2.hours) && + (not event.nsltv_regex =~ event.summary) + end + end + + def upcoming_nsltv + events.select do |event| + event.start >= (Time.zone.now - 2.hours) && + event.nsltv_regex =~ (event.summary) end end @@ -111,8 +119,13 @@ class GoogleCalendar @entry["end"]["dateTime"].to_datetime.in_time_zone(@timezone_offset) end + def nsltv_regex + /\[NSLTV\]/i + end + def formatted_summary - summary.gsub(/(http\:\/\/)(.*[^)])/i, '\2').html_safe + summary.gsub(/(http\:\/\/)(.*[^)])/i, '\2'). + gsub(nsltv_regex, '').html_safe end def [](key) @@ -123,4 +136,4 @@ class GoogleCalendar self[method.to_s] end end -end \ No newline at end of file +end diff --git a/app/views/widgets/_calendar.html.erb b/app/views/widgets/_calendar.html.erb index 9dc7fbd..90ab71d 100644 --- a/app/views/widgets/_calendar.html.erb +++ b/app/views/widgets/_calendar.html.erb @@ -31,7 +31,7 @@

<%= event.start.strftime("%H:%M %Z") %> - <%= event.formatted_summary.sub(nsltv_regex, '') %> + <%= event.formatted_summary %>

<% end %> From a351b0375461eabd9e944ed898a6062d27d514a8 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Tue, 21 Jul 2015 14:27:33 +0100 Subject: [PATCH 170/305] Added additional data to users json api --- app/controllers/api/v1/users_controller.rb | 6 +++++ .../api/v1/users_controller_spec.rb | 22 ++++++++++++++++++- spec/factories/user.rb | 4 ++++ 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb index 95128cf..2762f2c 100644 --- a/app/controllers/api/v1/users_controller.rb +++ b/app/controllers/api/v1/users_controller.rb @@ -8,6 +8,12 @@ class Api::V1::UsersController < Api::V1::BaseController @steam = SteamCondenser::Community::SteamId.from_steam_id("STEAM_#{@user.steamid}") render json: { + id: @user.id, + username: @user.username, + country: @user.country, + time_zone: @user.time_zone, + avatar: @user.profile.avatar.url, + admin: @user.admin?, steam: { url: @steam.base_url, nickname: @steam.nickname diff --git a/spec/controllers/api/v1/users_controller_spec.rb b/spec/controllers/api/v1/users_controller_spec.rb index 7a73530..0fa31b2 100644 --- a/spec/controllers/api/v1/users_controller_spec.rb +++ b/spec/controllers/api/v1/users_controller_spec.rb @@ -5,9 +5,29 @@ describe Api::V1::UsersController do request.accept = 'application/json' end + describe '#show' do + before do + @user = create :user_with_team, :chris + end + + it 'returns user data' do + get :show, id: @user.id + + expect(response).to be_success + expect(json['id']).to eq(@user.id) + expect(json['username']).to eq(@user.username) + expect(json['country']).to eq(@user.country) + expect(json['time_zone']).to eq(@user.time_zone) + expect(json['admin']).to eq(@user.admin?) + expect(json).to have_key("steam") + expect(json['steam']).to have_key("url") + expect(json['steam']).to have_key("nickname") + end + end + describe '#index' do before do - 10.times { create(:user_with_team) } + 5.times { create(:user_with_team) } end it 'returns all users and associated teams' do diff --git a/spec/factories/user.rb b/spec/factories/user.rb index 9b15973..74942ac 100644 --- a/spec/factories/user.rb +++ b/spec/factories/user.rb @@ -20,6 +20,10 @@ FactoryGirl.define do end end + trait :chris do + steamid "0:1:58097444" + end + factory :user_with_team do after(:create) do |user| create(:team, founder: user) From b4cedd9dc7fa7584527c72946d0386c5eaed7b91 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Wed, 22 Jul 2015 17:22:38 +0100 Subject: [PATCH 171/305] Return 404 if user not found --- app/controllers/api/v1/users_controller.rb | 2 ++ spec/controllers/api/v1/users_controller_spec.rb | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb index 2762f2c..9a22225 100644 --- a/app/controllers/api/v1/users_controller.rb +++ b/app/controllers/api/v1/users_controller.rb @@ -19,5 +19,7 @@ class Api::V1::UsersController < Api::V1::BaseController nickname: @steam.nickname } } + rescue ActiveRecord::RecordNotFound + raise ActionController::RoutingError.new('User Not Found') end end diff --git a/spec/controllers/api/v1/users_controller_spec.rb b/spec/controllers/api/v1/users_controller_spec.rb index 0fa31b2..73f1740 100644 --- a/spec/controllers/api/v1/users_controller_spec.rb +++ b/spec/controllers/api/v1/users_controller_spec.rb @@ -23,6 +23,12 @@ describe Api::V1::UsersController do expect(json['steam']).to have_key("url") expect(json['steam']).to have_key("nickname") end + + it 'returns 404 if user does not exist' do + expect { + get :show, id: -1 + }.to raise_error(ActionController::RoutingError) + end end describe '#index' do From b0db658ef64abeba9cefbebc8a0b20a2d284553b Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Sat, 1 Aug 2015 16:20:49 +0100 Subject: [PATCH 172/305] Added server api --- app/controllers/api/v1/servers_controller.rb | 21 ++++ config/routes.rb | 97 ++++++++++--------- .../api/v1/servers_controller_spec.rb | 20 ++++ spec/factories/server.rb | 20 ++-- 4 files changed, 104 insertions(+), 54 deletions(-) create mode 100644 app/controllers/api/v1/servers_controller.rb create mode 100644 spec/controllers/api/v1/servers_controller_spec.rb diff --git a/app/controllers/api/v1/servers_controller.rb b/app/controllers/api/v1/servers_controller.rb new file mode 100644 index 0000000..fe5a6cf --- /dev/null +++ b/app/controllers/api/v1/servers_controller.rb @@ -0,0 +1,21 @@ +class Api::V1::ServersController < Api::V1::BaseController + def index + render json: { servers: active_servers } + end + + private + + def active_servers + Server.active.map do |s| + { + id: s.id, + description: s.description, + dns: s.dns, + ip: s.ip, + port: s.port, + password: s.password, + category_id: s.category_id + } + end + end +end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 483f9d2..0cf0a48 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,76 +6,77 @@ Ensl::Application.routes.draw do namespace :api do namespace :v1 do resources :users, only: [:show, :index] + resources :servers, only: [:index] end end - root to: "articles#news_index" + root to: "articles#news_index" - resources :articles do - resources :versions - end + resources :articles do + resources :versions + end match 'contests/del_map' match 'contests/scores' match 'contests/historical', to: "contests#historical" - resources :contests do - get 'current', on: :collection - end + resources :contests do + get 'current', on: :collection + end resources :log_events - resources :categories - resources :options - resources :polls + resources :categories + resources :options + resources :polls match 'comments/quote' - resources :comments - resources :shoutmsgs - resources :teamers - resources :teams - resources :gathers - resources :gatherers - resources :groups - resources :groupers - resources :forumers - resources :topics + resources :comments + resources :shoutmsgs + resources :teamers + resources :teams + resources :gathers + resources :gatherers + resources :groups + resources :groupers + resources :forumers + resources :topics match 'forums/up' match 'forums/down' - resources :forums - resources :users - resources :locks - resources :contesters - resources :contests - resources :challenges - resources :servers - resources :predictions - resources :rounds - resources :matches do |m| + resources :forums + resources :users + resources :locks + resources :contesters + resources :contests + resources :challenges + resources :servers + resources :predictions + resources :rounds + resources :matches do |m| get :admin, to: "matches#admin", on: :collection get :ref, to: "matches#ref" end - resources :maps - resources :logs - resources :log_files - resources :directories + resources :maps + resources :logs + resources :log_files + resources :directories resources :data_files - resources :predictions - resources :weeks - resources :movies - resources :messages - resources :sites - resources :bans - resources :tweets - resources :issues + resources :predictions + resources :weeks + resources :movies + resources :messages + resources :sites + resources :bans + resources :tweets + resources :issues match 'posts/quote' - resources :posts - resources :brackets + resources :posts + resources :brackets match 'about/action' match 'about/staff' @@ -127,10 +128,10 @@ Ensl::Application.routes.draw do match 'votes/create' - match ':controller/:action', requirements: { action: /A-Za-z/ } - match ':controller/:action/:id' - match ':controller/:action/:id.:format' - match ':controller/:action/:id/:id2' + match ':controller/:action', requirements: { action: /A-Za-z/ } + match ':controller/:action/:id' + match ':controller/:action/:id.:format' + match ':controller/:action/:id/:id2' match 'teamers/replace', to: 'teamers#replace', as: 'teamers_replace' end diff --git a/spec/controllers/api/v1/servers_controller_spec.rb b/spec/controllers/api/v1/servers_controller_spec.rb new file mode 100644 index 0000000..8b55eec --- /dev/null +++ b/spec/controllers/api/v1/servers_controller_spec.rb @@ -0,0 +1,20 @@ +require 'spec_helper' + +describe Api::V1::ServersController do + before do + request.accept = 'application/json' + end + + describe '#index' do + let!(:server) { create :server, :active } + let!(:inactive_server) { create :server, :inactive } + + it 'returns a list of servers' do + get :index + expect(response).to be_success + expect(json['servers'].length).to eq(1) + json_server = json['servers'][0] + expect(json_server['id']).to eq(server.id) + end + end +end \ No newline at end of file diff --git a/spec/factories/server.rb b/spec/factories/server.rb index 837c9ad..e5cb877 100644 --- a/spec/factories/server.rb +++ b/spec/factories/server.rb @@ -1,8 +1,16 @@ FactoryGirl.define do - factory :server do - sequence(:name) { |n| "ServerName#{n}" } - sequence(:dns) { |n| "DNS#{n}" } - sequence(:ip) { |n| "192.168.#{n % 255}.#{n}" } - sequence(:port) { |n| "#{1000 + n}" } - end + factory :server do + sequence(:name) { |n| "ServerName#{n}" } + sequence(:dns) { |n| "DNS#{n}" } + sequence(:ip) { |n| "192.168.#{n % 255}.#{n}" } + sequence(:port) { |n| "#{1000 + n}" } + + trait :active do + active true + end + + trait :inactive do + active false + end + end end \ No newline at end of file From fc98dd3b6575f967543260671a58cf1f5bc22479 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Sat, 1 Aug 2015 16:33:40 +0100 Subject: [PATCH 173/305] Ooops --- app/controllers/shoutmsgs_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/shoutmsgs_controller.rb b/app/controllers/shoutmsgs_controller.rb index 395328a..041116c 100644 --- a/app/controllers/shoutmsgs_controller.rb +++ b/app/controllers/shoutmsgs_controller.rb @@ -15,7 +15,6 @@ class ShoutmsgsController < ApplicationController def create @shoutmsg = Shoutmsg.new params[:shoutmsg] - puts @shoutmsg @shoutmsg.user = cuser raise AccessError unless @shoutmsg.can_create? cuser From 3ec284b92564b7142f84f5f44a32ab1fb6f4668d Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Sat, 1 Aug 2015 16:34:01 +0100 Subject: [PATCH 174/305] Added maps api --- app/controllers/api/v1/maps_controller.rb | 17 +++++++++++++++++ config/routes.rb | 1 + .../api/v1/maps_controller_spec.rb | 19 +++++++++++++++++++ spec/factories/map.rb | 5 +++++ 4 files changed, 42 insertions(+) create mode 100644 app/controllers/api/v1/maps_controller.rb create mode 100644 spec/controllers/api/v1/maps_controller_spec.rb create mode 100644 spec/factories/map.rb diff --git a/app/controllers/api/v1/maps_controller.rb b/app/controllers/api/v1/maps_controller.rb new file mode 100644 index 0000000..da7ffbb --- /dev/null +++ b/app/controllers/api/v1/maps_controller.rb @@ -0,0 +1,17 @@ +class Api::V1::MapsController < Api::V1::BaseController + def index + render json: { maps: gather_maps } + end + + private + + def gather_maps + Map.classic.basic.map do |m| + { + id: m.id, + name: m.name, + category_id: m.category_id + } + end + end +end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 0cf0a48..1442471 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,6 +7,7 @@ Ensl::Application.routes.draw do namespace :v1 do resources :users, only: [:show, :index] resources :servers, only: [:index] + resources :maps, only: [:index] end end diff --git a/spec/controllers/api/v1/maps_controller_spec.rb b/spec/controllers/api/v1/maps_controller_spec.rb new file mode 100644 index 0000000..8d1d4ba --- /dev/null +++ b/spec/controllers/api/v1/maps_controller_spec.rb @@ -0,0 +1,19 @@ +require 'spec_helper' + +describe Api::V1::MapsController do + before do + request.accept = 'application/json' + end + + describe '#index' do + let!(:map) { create :map } + + it 'returns a list of maps' do + get :index + expect(response).to be_success + expect(json['maps'].length).to eq(1) + json_map = json['maps'][0] + expect(json_map['id']).to eq(map.id) + end + end +end \ No newline at end of file diff --git a/spec/factories/map.rb b/spec/factories/map.rb new file mode 100644 index 0000000..36ce198 --- /dev/null +++ b/spec/factories/map.rb @@ -0,0 +1,5 @@ +FactoryGirl.define do + factory :map do + sequence(:name) { |n| "ns_MapName#{n}" } + end +end From 3f1077dff8ab11141babc08b985ab993f5daaa6a Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Sat, 1 Aug 2015 16:44:39 +0100 Subject: [PATCH 175/305] Added ban information to user api --- app/controllers/api/v1/users_controller.rb | 5 ++ .../api/v1/users_controller_spec.rb | 19 ++++++++ spec/factories/ban.rb | 46 +++++++++++-------- 3 files changed, 51 insertions(+), 19 deletions(-) diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb index 9a22225..af2f5ff 100644 --- a/app/controllers/api/v1/users_controller.rb +++ b/app/controllers/api/v1/users_controller.rb @@ -17,6 +17,11 @@ class Api::V1::UsersController < Api::V1::BaseController steam: { url: @steam.base_url, nickname: @steam.nickname + }, + bans: { + gather: @user.banned?(Ban::TYPE_GATHER).present?, + mute: @user.banned?(Ban::TYPE_MUTE).present?, + site: @user.banned?(Ban::TYPE_SITE).present? } } rescue ActiveRecord::RecordNotFound diff --git a/spec/controllers/api/v1/users_controller_spec.rb b/spec/controllers/api/v1/users_controller_spec.rb index 73f1740..4cc19e6 100644 --- a/spec/controllers/api/v1/users_controller_spec.rb +++ b/spec/controllers/api/v1/users_controller_spec.rb @@ -29,6 +29,25 @@ describe Api::V1::UsersController do get :show, id: -1 }.to raise_error(ActionController::RoutingError) end + + it 'returns correct ban if user muted' do + create :ban, :mute, user: @user + get :show, id: @user.id + expect(response).to be_success + expect(json['bans']['mute']).to eq(true) + end + it 'returns correct ban if user gather banned' do + create :ban, :gather, user: @user + get :show, id: @user.id + expect(response).to be_success + expect(json['bans']['gather']).to eq(true) + end + it 'returns correct ban if user site banned' do + create :ban, :site, user: @user + get :show, id: @user.id + expect(response).to be_success + expect(json['bans']['site']).to eq(true) + end end describe '#index' do diff --git a/spec/factories/ban.rb b/spec/factories/ban.rb index 81a5c7b..0f998be 100644 --- a/spec/factories/ban.rb +++ b/spec/factories/ban.rb @@ -1,23 +1,31 @@ FactoryGirl.define do - factory :ban do - ban_type Ban::TYPE_SITE - expiry Date.today + 1 - # Hack because of the awkward way bans are created (requires user_name) - before(:create) do |ban| - if ban.user.nil? - user = create :user - ban.user_name = user.username - else - ban.user_name = ban.user.username - end - end - end + factory :ban do + ban_type Ban::TYPE_SITE + expiry Date.today + 1 + # Hack because of the awkward way bans are created (requires user_name) + before(:create) do |ban| + if ban.user.nil? + user = create :user + ban.user_name = user.username + else + ban.user_name = ban.user.username + end + end + end - trait :mute do - ban_type Ban::TYPE_MUTE - end + trait :mute do + ban_type Ban::TYPE_MUTE + end - trait :expired do - expiry Date.yesterday - 1 - end + trait :site do + ban_type Ban::TYPE_SITE + end + + trait :gather do + ban_type Ban::TYPE_GATHER + end + + trait :expired do + expiry Date.yesterday - 1 + end end \ No newline at end of file From d6e317b6f0dd49415f23ceabb2d867ba5f9d845a Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Sat, 1 Aug 2015 17:05:17 +0100 Subject: [PATCH 176/305] Added team information to usre --- app/controllers/api/v1/users_controller.rb | 3 ++- spec/controllers/api/v1/users_controller_spec.rb | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb index af2f5ff..ea0f56b 100644 --- a/app/controllers/api/v1/users_controller.rb +++ b/app/controllers/api/v1/users_controller.rb @@ -22,7 +22,8 @@ class Api::V1::UsersController < Api::V1::BaseController gather: @user.banned?(Ban::TYPE_GATHER).present?, mute: @user.banned?(Ban::TYPE_MUTE).present?, site: @user.banned?(Ban::TYPE_SITE).present? - } + }, + team: @user.team.present? ? { id: @user.team.id, name: @user.team.name } : nil } rescue ActiveRecord::RecordNotFound raise ActionController::RoutingError.new('User Not Found') diff --git a/spec/controllers/api/v1/users_controller_spec.rb b/spec/controllers/api/v1/users_controller_spec.rb index 4cc19e6..534b939 100644 --- a/spec/controllers/api/v1/users_controller_spec.rb +++ b/spec/controllers/api/v1/users_controller_spec.rb @@ -6,8 +6,8 @@ describe Api::V1::UsersController do end describe '#show' do - before do - @user = create :user_with_team, :chris + before(:each) do + @user = create :user, :chris end it 'returns user data' do @@ -22,6 +22,10 @@ describe Api::V1::UsersController do expect(json).to have_key("steam") expect(json['steam']).to have_key("url") expect(json['steam']).to have_key("nickname") + expect(json['bans']['mute']).to eq(false) + expect(json['bans']['gather']).to eq(false) + expect(json['bans']['site']).to eq(false) + expect(json['team']).to be_nil end it 'returns 404 if user does not exist' do @@ -48,6 +52,14 @@ describe Api::V1::UsersController do expect(response).to be_success expect(json['bans']['site']).to eq(true) end + it 'returns team information' do + @user.destroy + @user_with_team = create :user_with_team, :chris + get :show, id: @user_with_team.id + expect(response).to be_success + expect(json['team']['id']).to eq(@user_with_team.team.id) + expect(json['team']['name']).to eq(@user_with_team.team.name) + end end describe '#index' do From 43514b358e25008d09e094c76c8b8785eaf04224 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Wed, 12 Aug 2015 01:54:41 +0100 Subject: [PATCH 177/305] Enable session store across gather domains --- config/environments/production.rb | 3 +++ config/environments/staging.rb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/config/environments/production.rb b/config/environments/production.rb index f607881..efb76b4 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -61,4 +61,7 @@ Ensl::Application.configure do # Send deprecation notices to registered listeners config.active_support.deprecation = :notify + + # Custom Session Store config to allow gathers.staging.ensl.org + config.session_store :cookie_store, key: '_ENSL_session_key', expire_after: 30.days.to_i, domain: "gathers.ensl.org" end \ No newline at end of file diff --git a/config/environments/staging.rb b/config/environments/staging.rb index 797adaa..745ce9f 100644 --- a/config/environments/staging.rb +++ b/config/environments/staging.rb @@ -61,4 +61,7 @@ Ensl::Application.configure do # Send deprecation notices to registered listeners config.active_support.deprecation = :notify + + # Custom Session Store config to allow gathers.staging.ensl.org + config.session_store :cookie_store, key: '_ENSL_session_key', expire_after: 30.days.to_i, domain: "gathers.staging.ensl.org" end From b87a77405eefe792e3ac55021e7234c40986c5e8 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Sat, 15 Aug 2015 11:48:55 +0100 Subject: [PATCH 178/305] Revert session cookie changes in production --- config/environments/production.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index efb76b4..c646579 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -63,5 +63,5 @@ Ensl::Application.configure do config.active_support.deprecation = :notify # Custom Session Store config to allow gathers.staging.ensl.org - config.session_store :cookie_store, key: '_ENSL_session_key', expire_after: 30.days.to_i, domain: "gathers.ensl.org" + # config.session_store :cookie_store, key: '_ENSL_session_key', expire_after: 30.days.to_i, domain: "gathers.ensl.org" end \ No newline at end of file From 04c66e1bea9610c4f260c0b4e7b6b7c9512259a4 Mon Sep 17 00:00:00 2001 From: Luke Barratt Date: Sat, 15 Aug 2015 12:50:28 +0100 Subject: [PATCH 179/305] Upgrade ruby to 2.2.2. Bump rails to 3.2.22 - Upgrade RSpec to 3.3 - Auto formatted existing specs - Fixes broken test assertions - Update capistrano rbenv_ruby to target 2.2.2 - Added test-unit as test dependency as it has been removed form ruby 2.2 --- Gemfile | 9 +- Gemfile.lock | 114 ++++++++++-------- config/deploy.rb | 8 +- .../api/v1/maps_controller_spec.rb | 5 +- .../api/v1/servers_controller_spec.rb | 5 +- .../api/v1/users_controller_spec.rb | 6 +- spec/models/ban_spec.rb | 101 ++++++++-------- spec/models/issue_spec.rb | 85 +++++++------ spec/models/message_spec.rb | 77 ++++++------ spec/models/server_spec.rb | 111 ++++++++--------- spec/models/user_spec.rb | 32 ++--- spec/spec_helper.rb | 3 +- 12 files changed, 298 insertions(+), 258 deletions(-) diff --git a/Gemfile b/Gemfile index 9bb95ef..3c71a7c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,9 @@ source 'http://rubygems.org' -ruby '2.1.5' +ruby '2.2.2' gem 'dotenv-rails', '~> 0.10.0' -gem 'rails', '~> 3.2.19' +gem 'rails', '~> 3.2.22' gem 'mysql2', '~> 0.3.15' gem 'dalli', '~> 2.7.0' gem 'puma', '~> 2.11.1' @@ -59,12 +59,13 @@ group :test do gem 'simplecov', '~> 0.7.1', require: false gem 'codeclimate-test-reporter', '~> 0.3.0', require: nil gem 'database_cleaner', '~> 1.2.0' - gem 'rspec-rails', '~> 2.14.1' - gem 'capybara', '~> 2.2.1' + gem 'rspec-rails', '~> 3.3.3' + gem 'capybara', '~> 2.4.4' gem 'poltergeist', '~> 1.6.0' gem 'selenium-webdriver', '~> 2.41.0' gem 'factory_girl_rails', '~> 4.4.1' gem 'timecop', '~> 0.7.1' + gem 'test-unit', '~> 3.1.3' end group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index b02d36d..99f2468 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,12 +9,12 @@ GIT GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.19) - actionpack (= 3.2.19) + actionmailer (3.2.22) + actionpack (= 3.2.22) mail (~> 2.5.4) - actionpack (3.2.19) - activemodel (= 3.2.19) - activesupport (= 3.2.19) + actionpack (3.2.22) + activemodel (= 3.2.22) + activesupport (= 3.2.22) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -24,18 +24,18 @@ GEM sprockets (~> 2.2.1) active_link_to (1.0.2) actionpack - activemodel (3.2.19) - activesupport (= 3.2.19) + activemodel (3.2.22) + activesupport (= 3.2.22) builder (~> 3.0.0) - activerecord (3.2.19) - activemodel (= 3.2.19) - activesupport (= 3.2.19) + activerecord (3.2.22) + activemodel (= 3.2.22) + activesupport (= 3.2.22) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.19) - activemodel (= 3.2.19) - activesupport (= 3.2.19) - activesupport (3.2.19) + activeresource (3.2.22) + activemodel (= 3.2.22) + activesupport (= 3.2.22) + activesupport (3.2.22) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) annotate (2.6.3) @@ -69,7 +69,7 @@ GEM capistrano-rbenv (2.0.2) capistrano (~> 3.1) sshkit (~> 1.3) - capybara (2.2.1) + capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -122,19 +122,19 @@ GEM haml (4.0.5) tilt hike (1.2.3) - i18n (0.6.11) + i18n (0.7.0) journey (1.0.4) jquery-rails (2.0.3) railties (>= 3.1.0, < 5.0) thor (~> 0.14) - json (1.8.1) + json (1.8.3) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) method_source (0.8.2) mime-types (1.25.1) - mini_portile (0.5.3) - multi_json (1.10.1) + mini_portile (0.6.2) + multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) mysql2 (0.3.15) @@ -145,8 +145,8 @@ GEM net-ssh (>= 2.6.5) net-ssh (2.9.0) newrelic_rpm (3.7.2.195) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) + nokogiri (1.6.6.2) + mini_portile (~> 0.6.0) oj (2.5.5) poltergeist (1.6.0) capybara (~> 2.1) @@ -154,6 +154,7 @@ GEM multi_json (~> 1.0) websocket-driver (>= 0.2.0) polyglot (0.3.5) + power_assert (0.2.4) pry (0.9.12.6) coderay (~> 1.0) method_source (~> 0.8) @@ -165,46 +166,51 @@ GEM rack (>= 1.1, < 2.0) quiet_assets (1.0.2) railties (>= 3.1, < 5.0) - rack (1.4.5) + rack (1.4.7) rack-cache (1.2) rack (>= 0.4) rack-ssl (1.3.4) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) - rails (3.2.19) - actionmailer (= 3.2.19) - actionpack (= 3.2.19) - activerecord (= 3.2.19) - activeresource (= 3.2.19) - activesupport (= 3.2.19) + rails (3.2.22) + actionmailer (= 3.2.22) + actionpack (= 3.2.22) + activerecord (= 3.2.22) + activeresource (= 3.2.22) + activesupport (= 3.2.22) bundler (~> 1.0) - railties (= 3.2.19) + railties (= 3.2.22) rails_autolink (1.1.5) rails (> 3.1) - railties (3.2.19) - actionpack (= 3.2.19) - activesupport (= 3.2.19) + railties (3.2.22) + actionpack (= 3.2.22) + activesupport (= 3.2.22) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.3.2) + rake (10.4.2) rdoc (3.12.2) json (~> 1.4) rmagick (2.13.4) - rspec-core (2.14.8) - rspec-expectations (2.14.5) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.6) - rspec-rails (2.14.2) - actionpack (>= 3.0) - activemodel (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) + rspec-core (3.3.2) + rspec-support (~> 3.3.0) + rspec-expectations (3.3.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.3.0) + rspec-mocks (3.3.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.3.0) + rspec-rails (3.3.3) + actionpack (>= 3.0, < 4.3) + activesupport (>= 3.0, < 4.3) + railties (>= 3.0, < 4.3) + rspec-core (~> 3.3.0) + rspec-expectations (~> 3.3.0) + rspec-mocks (~> 3.3.0) + rspec-support (~> 3.3.0) + rspec-support (3.3.0) rubyzip (1.1.3) sanitize (2.1.0) nokogiri (>= 1.4.4) @@ -223,7 +229,7 @@ GEM simplecov-html (~> 0.7.1) simplecov-html (0.7.1) slop (3.5.0) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -234,6 +240,8 @@ GEM term-ansicolor term-ansicolor (1.3.0) tins (~> 1.0) + test-unit (3.1.3) + power_assert thor (0.19.1) tilt (1.4.1) timecop (0.7.1) @@ -243,7 +251,7 @@ GEM treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.41) + tzinfo (0.3.44) uglifier (2.5.0) execjs (>= 0.3.0) json (>= 1.8.0) @@ -270,7 +278,7 @@ DEPENDENCIES capistrano-bundler (~> 1.1.2) capistrano-rails (~> 1.1) capistrano-rbenv (~> 2.0.2) - capybara (~> 2.2.1) + capybara (~> 2.4.4) carrierwave (~> 0.10.0) codeclimate-test-reporter (~> 0.3.0) coffee-rails (~> 3.2.2) @@ -294,10 +302,10 @@ DEPENDENCIES pry-byebug (~> 1.3.2) puma (~> 2.11.1) quiet_assets (~> 1.0.2) - rails (~> 3.2.19) + rails (~> 3.2.22) rails_autolink (~> 1.1.5) rmagick (~> 2.13.4) - rspec-rails (~> 2.14.1) + rspec-rails (~> 3.3.3) sanitize (~> 2.1.0) sass (~> 3.3.4) sass-rails (~> 3.2.6) @@ -305,7 +313,11 @@ DEPENDENCIES simplecov (~> 0.7.1) sprockets (~> 2.2.1) steam-condenser! + test-unit (~> 3.1.3) timecop (~> 0.7.1) tinymce-rails (~> 3.5.9) uglifier (~> 2.5.0) will_paginate (~> 3.0.5) + +BUNDLED WITH + 1.10.5 diff --git a/config/deploy.rb b/config/deploy.rb index 25b07bb..f49dc72 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -9,7 +9,7 @@ set :repo_url, 'https://github.com/ENSL/ensl.org.git' set :keep_releases, 10 set :rbenv_type, :user -set :rbenv_ruby, '2.1.5' +set :rbenv_ruby, '2.2.2' set :bundle_flags, '--quiet' set :dotenv_role, [:app, :web] @@ -18,10 +18,10 @@ set :puma_pid, -> { File.join(shared_path, 'tmp', 'pids', 'puma.pid') } set :writable_dirs, %w{public tmp} set :linked_files, %w{.env} -set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle +set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system public/local public/uploads public/files} -set :normalize_asset_timestamps, %{public/images +set :normalize_asset_timestamps, %{public/images public/javascripts public/stylesheets} @@ -89,4 +89,4 @@ namespace :puma do def valid_pid? test "[ -f #{fetch(:puma_pid)} ]" and test "kill -0 $( cat #{fetch(:puma_pid)} )" end -end \ No newline at end of file +end diff --git a/spec/controllers/api/v1/maps_controller_spec.rb b/spec/controllers/api/v1/maps_controller_spec.rb index 8d1d4ba..2e76605 100644 --- a/spec/controllers/api/v1/maps_controller_spec.rb +++ b/spec/controllers/api/v1/maps_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Api::V1::MapsController do before do request.accept = 'application/json' - end + end describe '#index' do let!(:map) { create :map } @@ -16,4 +16,5 @@ describe Api::V1::MapsController do expect(json_map['id']).to eq(map.id) end end -end \ No newline at end of file +end + diff --git a/spec/controllers/api/v1/servers_controller_spec.rb b/spec/controllers/api/v1/servers_controller_spec.rb index 8b55eec..c515ace 100644 --- a/spec/controllers/api/v1/servers_controller_spec.rb +++ b/spec/controllers/api/v1/servers_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Api::V1::ServersController do before do request.accept = 'application/json' - end + end describe '#index' do let!(:server) { create :server, :active } @@ -17,4 +17,5 @@ describe Api::V1::ServersController do expect(json_server['id']).to eq(server.id) end end -end \ No newline at end of file +end + diff --git a/spec/controllers/api/v1/users_controller_spec.rb b/spec/controllers/api/v1/users_controller_spec.rb index 534b939..24dae61 100644 --- a/spec/controllers/api/v1/users_controller_spec.rb +++ b/spec/controllers/api/v1/users_controller_spec.rb @@ -40,18 +40,21 @@ describe Api::V1::UsersController do expect(response).to be_success expect(json['bans']['mute']).to eq(true) end + it 'returns correct ban if user gather banned' do create :ban, :gather, user: @user get :show, id: @user.id expect(response).to be_success expect(json['bans']['gather']).to eq(true) end + it 'returns correct ban if user site banned' do create :ban, :site, user: @user get :show, id: @user.id expect(response).to be_success expect(json['bans']['site']).to eq(true) end + it 'returns team information' do @user.destroy @user_with_team = create :user_with_team, :chris @@ -81,7 +84,7 @@ describe Api::V1::UsersController do user_json = json["users"].first nested_team_json = user_json["team"] - + expect(user_json).to have_key("username") expect(user_json).to have_key("steamid") expect(user_json).to have_key("team") @@ -91,3 +94,4 @@ describe Api::V1::UsersController do end end end + diff --git a/spec/models/ban_spec.rb b/spec/models/ban_spec.rb index 32bb277..a58f8e8 100644 --- a/spec/models/ban_spec.rb +++ b/spec/models/ban_spec.rb @@ -18,56 +18,61 @@ require 'spec_helper' describe Ban do - let!(:user) { create :user } - let(:ban) { Ban.new } - let!(:server) { create :server } + let!(:user) { create :user } + let(:ban) { Ban.new } + let!(:server) { create :server } - describe '#check_user' do - it "assigns user by user_name" do - ban.user_name = user.username - ban.check_user - expect(ban.user).to eq(user) - end - it "assigns user and server if user_name not present" do - ban.steamid = user.steamid - ban.addr = server.addr - ban.check_user - expect(ban.user).to eq(user) - expect(ban.server).to eq(server) - end - end - - describe 'Permissions' do - let!(:user) { create :user } - let!(:admin) { create :user, :admin } - let!(:server_user) { create :user } - let(:ban) { Ban.new } + describe '#check_user' do + it "assigns user by user_name" do + ban.user_name = user.username + ban.check_user + expect(ban.user).to eq(user) + end - describe 'can_create?' do - it 'returns true for admins' do - expect(ban.can_create? admin).to be_true - end - it 'returns false for non-admins' do - expect(ban.can_create? user).to be_false - end - end + it "assigns user and server if user_name not present" do + ban.steamid = user.steamid + ban.addr = server.addr + ban.check_user + expect(ban.user).to eq(user) + expect(ban.server).to eq(server) + end + end - describe 'can_destroy?' do - it 'returns true for admin' do - expect(ban.can_destroy? admin).to be_true - end - it 'returns false for non-admins' do - expect(ban.can_destroy? user).to be_false - end - end + describe 'Permissions' do + let!(:user) { create :user } + let!(:admin) { create :user, :admin } + let!(:server_user) { create :user } + let(:ban) { Ban.new } - describe 'can_update?' do - it 'returns true for admin' do - expect(ban.can_update? admin).to be_true - end - it 'returns false for non-admins' do - expect(ban.can_update? user).to be_false - end - end - end + describe 'can_create?' do + it 'returns true for admins' do + expect(ban.can_create? admin).to be_truthy + end + + it 'returns false for non-admins' do + expect(ban.can_create? user).to be_falsey + end + end + + describe 'can_destroy?' do + it 'returns true for admin' do + expect(ban.can_destroy? admin).to be_truthy + end + + it 'returns false for non-admins' do + expect(ban.can_destroy? user).to be_falsey + end + end + + describe 'can_update?' do + it 'returns true for admin' do + expect(ban.can_update? admin).to be_truthy + end + + it 'returns false for non-admins' do + expect(ban.can_update? user).to be_falsey + end + end + end end + diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb index dc5f961..fcec064 100644 --- a/spec/models/issue_spec.rb +++ b/spec/models/issue_spec.rb @@ -18,43 +18,50 @@ require 'spec_helper' describe 'User' do - describe 'Permissions' do - let!(:user) { create :user } - let!(:admin) { create :user, :admin } - let(:issue) { Issue.new } + describe 'Permissions' do + let!(:user) { create :user } + let!(:admin) { create :user, :admin } + let(:issue) { Issue.new } - describe 'can_show?' do - it 'returns true for author' do - issue.author = user - expect(issue.can_show? user).to be_true - end - it 'returns true for admin' do - expect(issue.can_show? admin).to be_true - end - it 'returns false if neither admin nor author' do - expect(issue.can_show? user).to be_false - end - end - describe 'can_create?' do - it "returns true" do - expect(issue.can_create? nil).to be_true - end - end - describe 'can_update?' do - it 'returns true for admin' do - expect(issue.can_update? admin).to be_true - end - it 'returns false for non-admin' do - expect(issue.can_update? user).to be_false - end - end - describe 'can_destroy?' do - it 'returns true for admin' do - expect(issue.can_destroy? admin).to be_true - end - it 'returns false for non-admin' do - expect(issue.can_destroy? user).to be_false - end - end - end -end \ No newline at end of file + describe 'can_show?' do + it 'returns true for author' do + issue.author = user + expect(issue.can_show? user).to be_truthy + end + + it 'returns true for admin' do + expect(issue.can_show? admin).to be_truthy + end + + it 'returns false if neither admin nor author' do + expect(issue.can_show? user).to be_falsey + end + end + + describe 'can_create?' do + it "returns true" do + expect(issue.can_create? nil).to be_truthy + end + end + + describe 'can_update?' do + it 'returns true for admin' do + expect(issue.can_update? admin).to be_truthy + end + + it 'returns false for non-admin' do + expect(issue.can_update? user).to be_falsey + end + end + + describe 'can_destroy?' do + it 'returns true for admin' do + expect(issue.can_destroy? admin).to be_truthy + end + + it 'returns false for non-admin' do + expect(issue.can_destroy? user).to be_falsey + end + end + end +end diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb index b0aa6ef..bcedcde 100644 --- a/spec/models/message_spec.rb +++ b/spec/models/message_spec.rb @@ -17,41 +17,48 @@ require 'spec_helper' describe Message do - let!(:user) { create :user } + let!(:user) { create :user } - describe 'create' do - let(:message) { build :message } - it 'creates a new message' do - expect(message.valid?).to be_true - expect do - message.save! - end.to change(Message, :count).by(1) - end - end + describe 'create' do + let(:message) { build :message } - describe 'Permissions' do - let(:message) { Message.new } - describe 'can_create?' do - it 'returns true for user' do - expect(message.can_create?(user)).to be_true - end - it 'returns false if user is banned' do - create :ban, :mute, user: user - expect(message.can_create?(user)).to be_false - end - end + it 'creates a new message' do + expect(message.valid?).to eq(true) + expect do + message.save! + end.to change(Message, :count).by(1) + end + end + + describe 'Permissions' do + let(:message) { Message.new } + + describe 'can_create?' do + it 'returns true for user' do + expect(message.can_create?(user)).to be_truthy + end + + it 'returns false if user is banned' do + create :ban, :mute, user: user + expect(message.can_create?(user)).to be_falsey + end + end + + describe 'can_show?' do + let!(:message) { create :message } + + it 'returns true if sender' do + expect(message.can_show?(message.sender)).to be_truthy + end + + it 'returns true if receiver' do + expect(message.can_show?(message.recipient)).to be_truthy + end + + it 'returns false if neither sender nor receiver' do + expect(message.can_show?(user)).to be_falsey + end + end + end +end - describe 'can_show?' do - let!(:message) { create :message } - it 'returns true if sender' do - expect(message.can_show?(message.sender)).to be_true - end - it 'returns true if receiver' do - expect(message.can_show?(message.recipient)).to be_true - end - it 'returns false if neither sender nor receiver' do - expect(message.can_show?(user)).to be_false - end - end - end -end \ No newline at end of file diff --git a/spec/models/server_spec.rb b/spec/models/server_spec.rb index a4ec8cf..b850be9 100644 --- a/spec/models/server_spec.rb +++ b/spec/models/server_spec.rb @@ -33,65 +33,66 @@ require 'spec_helper' describe Server do - describe 'create' do - it 'sets category to 45 if domain is NS2' do - server = create :server, domain: Server::DOMAIN_NS2 - expect(server.category_id).to eq(45) - end - it 'sets category to 44 if domain is not NS2' do - server = create :server, domain: Server::DOMAIN_HLDS - expect(server.category_id).to eq(44) - end - end + describe 'create' do + it 'sets category to 45 if domain is NS2' do + server = create :server, domain: Server::DOMAIN_NS2 + expect(server.category_id).to eq(45) + end + it 'sets category to 44 if domain is not NS2' do + server = create :server, domain: Server::DOMAIN_HLDS + expect(server.category_id).to eq(44) + end + end - describe 'addr' do - it 'returns properly formatted IP and port number' do - ip = '1.1.1.1' - port = '8000' - server = create :server, ip: ip, port: port - expect(server.addr).to eq('1.1.1.1:8000') - end - end + describe 'addr' do + it 'returns properly formatted IP and port number' do + ip = '1.1.1.1' + port = '8000' + server = create :server, ip: ip, port: port + expect(server.addr).to eq('1.1.1.1:8000') + end + end - describe 'to_s' do - it 'returns server name' do - server_name = "Foo" - server = create :server, name: server_name - expect(server.to_s).to eq(server_name) - end - end + describe 'to_s' do + it 'returns server name' do + server_name = "Foo" + server = create :server, name: server_name + expect(server.to_s).to eq(server_name) + end + end - describe 'Permissions' do - let!(:user) { create :user } - let!(:admin) { create :user, :admin } - let!(:server_user) {create :user } - let!(:server) { create :server, user: server_user } + describe 'Permissions' do + let!(:user) { create :user } + let!(:admin) { create :user, :admin } + let!(:server_user) {create :user } + let!(:server) { create :server, user: server_user } - describe 'can_create?' do - it 'returns true for non-admins' do - expect(server.can_create? user).to be_true - end - end + describe 'can_create?' do + it 'returns true for non-admins' do + expect(server.can_create? user).to be_truthy + end + end - describe 'can_destroy?' do - it 'returns true for admin' do - expect(server.can_destroy? admin).to be_true - end - it 'returns false for non-admins' do - expect(server.can_destroy? user).to be_false - end - end + describe 'can_destroy?' do + it 'returns true for admin' do + expect(server.can_destroy? admin).to eq(true) + end + it 'returns false for non-admins' do + expect(server.can_destroy? user).to eq(false) + end + end - describe 'can_update?' do - it 'returns true for admin' do - expect(server.can_update? admin).to be_true - end - it 'returns true if server belongs to user' do - expect(server.can_update? server_user).to be_true - end - it 'returns false for non-admins' do - expect(server.can_update? user).to be_false - end - end - end + describe 'can_update?' do + it 'returns true for admin' do + expect(server.can_update? admin).to eq(true) + end + it 'returns true if server belongs to user' do + expect(server.can_update? server_user).to eq(true) + end + it 'returns false for non-admins' do + expect(server.can_update? user).to eq(false) + end + end + end end + diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 24ba3a2..f1d7077 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -24,21 +24,21 @@ require 'spec_helper' describe User do - let!(:user) { create :user } - - describe "#banned?" do - it "returns false if user is not banned" do - expect(user.banned?).to be_false - end + let!(:user) { create :user } - it "returns true if user is banned" do - ban = Ban.create! ban_type: Ban::TYPE_SITE, expiry: Time.now + 10.days, user_name: user.username - expect(user.banned?).to be_true - end + describe "#banned?" do + it "returns false if user is not banned" do + expect(user.banned?).to be_falsey + end - it "returns true for specific bans" do - ban = Ban.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now + 10.days, user_name: user.username - expect(user.banned? Ban::TYPE_MUTE).to be_true - end - end -end \ No newline at end of file + it "returns true if user is banned" do + ban = Ban.create! ban_type: Ban::TYPE_SITE, expiry: Time.now + 10.days, user_name: user.username + expect(user.banned?).to be_truthy + end + + it "returns true for specific bans" do + ban = Ban.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now + 10.days, user_name: user.username + expect(user.banned? Ban::TYPE_MUTE).to be_truthy + end + end +end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 8e8b650..85567d0 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -10,7 +10,7 @@ require 'rspec/rails' require 'capybara/rspec' require 'capybara/poltergeist' -Capybara.default_wait_time = 30 +Capybara.default_wait_time = 5 Capybara.register_driver :poltergeist do |app| Capybara::Poltergeist::Driver.new(app, timeout: 30, @@ -34,6 +34,7 @@ RSpec.configure do |config| config.use_transactional_fixtures = false config.color = true config.formatter = :documentation + config.infer_spec_type_from_file_location! config.before(:each) do events_list_json = JSON.parse(File.read(Rails.root.join('spec/fixtures/google_calendar.json'))) From 5a3be391f3986ac854b0e4384ea8c5a677b860de Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Sat, 15 Aug 2015 13:25:44 +0100 Subject: [PATCH 180/305] Add missing groups --- spec/factories/group.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/spec/factories/group.rb b/spec/factories/group.rb index 0a101b3..bf72ae2 100644 --- a/spec/factories/group.rb +++ b/spec/factories/group.rb @@ -9,4 +9,14 @@ FactoryGirl.define do name "Admins" id Group::ADMINS end + + trait :champions do + name "Champions" + id Group::CHAMPIONS + end + + trait :donors do + name "Donors" + id Group::DONORS + end end From 6dfcc0114fb50f718669e7af715c7825022c467d Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Sat, 15 Aug 2015 13:30:39 +0100 Subject: [PATCH 181/305] Remove IP address data from users plugin --- app/controllers/plugin_controller.rb | 103 +++++++++--------- .../plugin/plugin_controller_spec.rb | 29 +++++ 2 files changed, 80 insertions(+), 52 deletions(-) create mode 100644 spec/controllers/plugin/plugin_controller_spec.rb diff --git a/app/controllers/plugin_controller.rb b/app/controllers/plugin_controller.rb index 76a2885..8603141 100644 --- a/app/controllers/plugin_controller.rb +++ b/app/controllers/plugin_controller.rb @@ -1,58 +1,57 @@ class PluginController < ApplicationController - def user - buffer = [] - out = [] + def user + buffer = [] + out = [] + if ban = Ban.first(:conditions => ["expiry > UTC_TIMESTAMP() AND steamid = ? AND ban_type = ?", params[:id], Ban::TYPE_SERVER]) + out << "#USER#" + out << "BANNED" + out << ban.expiry.utc.to_i + out << ban.reason + out << "\r\r\r\r\r\r\r" + elsif user = User.first(:conditions => {:steamid => params[:id]}) + teamer = (user.team ? user.teamers.active.of_team(user.team).first : nil) + icon = 0 + rank = "User" + if Group.find(Group::DONORS).users.exists?(user) + rank = "Donor" + icon = icon | 1 + end + if Group.find(Group::CHAMPIONS).users.exists?(user) + icon = icon | 2 + end + if user.ref? + rank = "Referee" + icon = icon | 4 + end + if user.admin? + rank = "Admin" + icon = icon | 8 + end - if ban = Ban.first(:conditions => ["expiry > UTC_TIMESTAMP() AND steamid = ? AND ban_type = ?", params[:id], Ban::TYPE_SERVER]) - out << "#USER#" - out << "BANNED" - out << ban.expiry.utc.to_i - out << ban.reason - out << "\r\r\r\r\r\r\r" - elsif user = User.first(:conditions => {:steamid => params[:id]}) - teamer = (user.team ? user.teamers.active.of_team(user.team).first : nil) - icon = 0 - rank = "User" - if Group.find(Group::DONORS).users.exists?(user) - rank = "Donor" - icon = icon | 1 - end - if Group.find(Group::CHAMPIONS).users.exists?(user) - icon = icon | 2 - end - if user.ref? - rank = "Referee" - icon = icon | 4 - end - if user.admin? - rank = "Admin" - icon = icon | 8 - end + buffer << user.steamid + buffer << user.username + buffer << '0.0.0.0' + buffer << (user.team ? Verification.uncrap(user.team.to_s) : "No Team") + buffer << user.id + buffer << user.team_id + buffer << rank + buffer << (teamer ? teamer.ranks[teamer.rank] : "") + buffer << icon + buffer << params[:ch] ? params[:ch] : "" + buffer << (user.can_play? ? "1" : "0") - buffer << user.steamid - buffer << user.username - buffer << user.lastip - buffer << (user.team ? Verification.uncrap(user.team.to_s) : "No Team") - buffer << user.id - buffer << user.team_id - buffer << rank - buffer << (teamer ? teamer.ranks[teamer.rank] : "") - buffer << icon - buffer << params[:ch] ? params[:ch] : "" - buffer << (user.can_play? ? "1" : "0") + out << "#USER#" + out << Verification.verify(buffer.join) + out << buffer.join("\r") + else + out << "#FAIL#" + end - out << "#USER#" - out << Verification.verify(buffer.join) - out << buffer.join("\r") - else - out << "#FAIL#" - end + render_out out + end - render_out out - end - - def render_out out - @text = out.join("\r") - render :layout => false - end + def render_out out + @text = out.join("\r") + render :layout => false + end end \ No newline at end of file diff --git a/spec/controllers/plugin/plugin_controller_spec.rb b/spec/controllers/plugin/plugin_controller_spec.rb new file mode 100644 index 0000000..e9585af --- /dev/null +++ b/spec/controllers/plugin/plugin_controller_spec.rb @@ -0,0 +1,29 @@ +require 'spec_helper' + +describe PluginController do + render_views + + describe '#user' do + before do + create :group, :donors + create :group, :champions + end + + let!(:user) { create :user_with_team } + + it 'returns user data' do + get :user, id: user.steamid + expect(response).to be_success + expect(response.body).to include(user.username) + end + + it 'definitely does not return IP address' do + last_ip = '127.0.0.1' + user.lastip = last_ip + user.save! + get :user, id: user.steamid + expect(response).to be_success + expect(response).to_not include(last_ip) + end + end +end \ No newline at end of file From b11db192d7f003a5bbaf84ff12f1e6374b1e90fc Mon Sep 17 00:00:00 2001 From: Luke Barratt Date: Sat, 15 Aug 2015 17:44:33 +0100 Subject: [PATCH 182/305] Moved test-unit to the Gemfile to fix issues with activesupport --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 3c71a7c..8bfe310 100644 --- a/Gemfile +++ b/Gemfile @@ -23,6 +23,7 @@ gem 'country_code_select', '~> 1.0.1' gem 'active_link_to', '~> 1.0.2' gem 'rmagick', '~> 2.13.4', require: false gem 'steam-condenser', github: 'koraktor/steam-condenser-ruby' +gem 'test-unit', '~> 3.1.3' # Please install nodejs locally. gem 'therubyracer', '~> 0.12.1' if RUBY_PLATFORM == 'x86_64-linux' @@ -65,7 +66,6 @@ group :test do gem 'selenium-webdriver', '~> 2.41.0' gem 'factory_girl_rails', '~> 4.4.1' gem 'timecop', '~> 0.7.1' - gem 'test-unit', '~> 3.1.3' end group :development, :test do From 8544e46380540098ed92f68a589d913ebb197cfb Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Sat, 15 Aug 2015 18:42:44 +0100 Subject: [PATCH 183/305] Set new session store name and domain for staging --- config/environments/staging.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environments/staging.rb b/config/environments/staging.rb index 745ce9f..8bdbaa6 100644 --- a/config/environments/staging.rb +++ b/config/environments/staging.rb @@ -63,5 +63,5 @@ Ensl::Application.configure do config.active_support.deprecation = :notify # Custom Session Store config to allow gathers.staging.ensl.org - config.session_store :cookie_store, key: '_ENSL_session_key', expire_after: 30.days.to_i, domain: "gathers.staging.ensl.org" + config.session_store :cookie_store, key: "_ENSL_session_key_staging", expire_after: 30.days.to_i, domain: ".staging.ensl.org" end From f778ab6d5df7e8e086b1b08f2443b8cfff0c16cb Mon Sep 17 00:00:00 2001 From: Luke Barratt Date: Sat, 15 Aug 2015 19:23:42 +0100 Subject: [PATCH 184/305] Style guide updates to specs --- .../api/v1/maps_controller_spec.rb | 1 - .../api/v1/servers_controller_spec.rb | 1 - .../api/v1/users_controller_spec.rb | 1 - spec/models/ban_spec.rb | 27 +++++----- spec/models/issue_spec.rb | 28 +++++----- spec/models/message_spec.rb | 23 ++++---- spec/models/server_spec.rb | 53 +++++++++++-------- spec/models/user_spec.rb | 10 +++- 8 files changed, 77 insertions(+), 67 deletions(-) diff --git a/spec/controllers/api/v1/maps_controller_spec.rb b/spec/controllers/api/v1/maps_controller_spec.rb index 2e76605..689f7c3 100644 --- a/spec/controllers/api/v1/maps_controller_spec.rb +++ b/spec/controllers/api/v1/maps_controller_spec.rb @@ -17,4 +17,3 @@ describe Api::V1::MapsController do end end end - diff --git a/spec/controllers/api/v1/servers_controller_spec.rb b/spec/controllers/api/v1/servers_controller_spec.rb index c515ace..1e3437f 100644 --- a/spec/controllers/api/v1/servers_controller_spec.rb +++ b/spec/controllers/api/v1/servers_controller_spec.rb @@ -18,4 +18,3 @@ describe Api::V1::ServersController do end end end - diff --git a/spec/controllers/api/v1/users_controller_spec.rb b/spec/controllers/api/v1/users_controller_spec.rb index 24dae61..72b42ab 100644 --- a/spec/controllers/api/v1/users_controller_spec.rb +++ b/spec/controllers/api/v1/users_controller_spec.rb @@ -94,4 +94,3 @@ describe Api::V1::UsersController do end end end - diff --git a/spec/models/ban_spec.rb b/spec/models/ban_spec.rb index a58f8e8..5bcfc74 100644 --- a/spec/models/ban_spec.rb +++ b/spec/models/ban_spec.rb @@ -15,17 +15,18 @@ # ip :string(255) # -require 'spec_helper' +require "spec_helper" describe Ban do let!(:user) { create :user } let(:ban) { Ban.new } let!(:server) { create :server } - describe '#check_user' do + describe "#check_user" do it "assigns user by user_name" do ban.user_name = user.username ban.check_user + expect(ban.user).to eq(user) end @@ -33,46 +34,46 @@ describe Ban do ban.steamid = user.steamid ban.addr = server.addr ban.check_user + expect(ban.user).to eq(user) expect(ban.server).to eq(server) end end - describe 'Permissions' do + describe "Permissions" do let!(:user) { create :user } let!(:admin) { create :user, :admin } let!(:server_user) { create :user } let(:ban) { Ban.new } - describe 'can_create?' do - it 'returns true for admins' do + describe "can_create?" do + it "returns true for admins" do expect(ban.can_create? admin).to be_truthy end - it 'returns false for non-admins' do + it "returns false for non-admins" do expect(ban.can_create? user).to be_falsey end end - describe 'can_destroy?' do - it 'returns true for admin' do + describe "can_destroy?" do + it "returns true for admin" do expect(ban.can_destroy? admin).to be_truthy end - it 'returns false for non-admins' do + it "returns false for non-admins" do expect(ban.can_destroy? user).to be_falsey end end - describe 'can_update?' do - it 'returns true for admin' do + describe "can_update?" do + it "returns true for admin" do expect(ban.can_update? admin).to be_truthy end - it 'returns false for non-admins' do + it "returns false for non-admins" do expect(ban.can_update? user).to be_falsey end end end end - diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb index fcec064..7345990 100644 --- a/spec/models/issue_spec.rb +++ b/spec/models/issue_spec.rb @@ -15,51 +15,51 @@ # text_parsed :text # -require 'spec_helper' +require "spec_helper" -describe 'User' do - describe 'Permissions' do +describe "User" do + describe "Permissions" do let!(:user) { create :user } let!(:admin) { create :user, :admin } let(:issue) { Issue.new } - describe 'can_show?' do - it 'returns true for author' do + describe "can_show?" do + it "returns true for author" do issue.author = user expect(issue.can_show? user).to be_truthy end - it 'returns true for admin' do + it "returns true for admin" do expect(issue.can_show? admin).to be_truthy end - it 'returns false if neither admin nor author' do + it "returns false if neither admin nor author" do expect(issue.can_show? user).to be_falsey end end - describe 'can_create?' do + describe "can_create?" do it "returns true" do expect(issue.can_create? nil).to be_truthy end end - describe 'can_update?' do - it 'returns true for admin' do + describe "can_update?" do + it "returns true for admin" do expect(issue.can_update? admin).to be_truthy end - it 'returns false for non-admin' do + it "returns false for non-admin" do expect(issue.can_update? user).to be_falsey end end - describe 'can_destroy?' do - it 'returns true for admin' do + describe "can_destroy?" do + it "returns true for admin" do expect(issue.can_destroy? admin).to be_truthy end - it 'returns false for non-admin' do + it "returns false for non-admin" do expect(issue.can_destroy? user).to be_falsey end end diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb index bcedcde..17a93b6 100644 --- a/spec/models/message_spec.rb +++ b/spec/models/message_spec.rb @@ -14,15 +14,15 @@ # text_parsed :text # -require 'spec_helper' +require "spec_helper" describe Message do let!(:user) { create :user } - describe 'create' do + describe "create" do let(:message) { build :message } - it 'creates a new message' do + it "creates a new message" do expect(message.valid?).to eq(true) expect do message.save! @@ -30,35 +30,34 @@ describe Message do end end - describe 'Permissions' do + describe "Permissions" do let(:message) { Message.new } - describe 'can_create?' do - it 'returns true for user' do + describe "can_create?" do + it "returns true for user" do expect(message.can_create?(user)).to be_truthy end - it 'returns false if user is banned' do + it "returns false if user is banned" do create :ban, :mute, user: user expect(message.can_create?(user)).to be_falsey end end - describe 'can_show?' do + describe "can_show?" do let!(:message) { create :message } - it 'returns true if sender' do + it "returns true if sender" do expect(message.can_show?(message.sender)).to be_truthy end - it 'returns true if receiver' do + it "returns true if receiver" do expect(message.can_show?(message.recipient)).to be_truthy end - it 'returns false if neither sender nor receiver' do + it "returns false if neither sender nor receiver" do expect(message.can_show?(user)).to be_falsey end end end end - diff --git a/spec/models/server_spec.rb b/spec/models/server_spec.rb index b850be9..bd45b15 100644 --- a/spec/models/server_spec.rb +++ b/spec/models/server_spec.rb @@ -30,69 +30,76 @@ # category_id :integer # -require 'spec_helper' +require "spec_helper" describe Server do - describe 'create' do - it 'sets category to 45 if domain is NS2' do + describe "create" do + it "sets category to 45 if domain is NS2" do server = create :server, domain: Server::DOMAIN_NS2 + expect(server.category_id).to eq(45) end - it 'sets category to 44 if domain is not NS2' do + + it "sets category to 44 if domain is not NS2" do server = create :server, domain: Server::DOMAIN_HLDS + expect(server.category_id).to eq(44) end end - describe 'addr' do - it 'returns properly formatted IP and port number' do - ip = '1.1.1.1' - port = '8000' + describe "addr" do + it "returns properly formatted IP and port number" do + ip = "1.1.1.1" + port = "8000" server = create :server, ip: ip, port: port - expect(server.addr).to eq('1.1.1.1:8000') + + expect(server.addr).to eq("1.1.1.1:8000") end end - describe 'to_s' do - it 'returns server name' do + describe "to_s" do + it "returns server name" do server_name = "Foo" server = create :server, name: server_name + expect(server.to_s).to eq(server_name) end end - describe 'Permissions' do + describe "Permissions" do let!(:user) { create :user } let!(:admin) { create :user, :admin } - let!(:server_user) {create :user } + let!(:server_user) { create :user } let!(:server) { create :server, user: server_user } - describe 'can_create?' do - it 'returns true for non-admins' do + describe "can_create?" do + it "returns true for non-admins" do expect(server.can_create? user).to be_truthy end end - describe 'can_destroy?' do - it 'returns true for admin' do + describe "can_destroy?" do + it "returns true for admin" do expect(server.can_destroy? admin).to eq(true) end - it 'returns false for non-admins' do + + it "returns false for non-admins" do expect(server.can_destroy? user).to eq(false) end end - describe 'can_update?' do - it 'returns true for admin' do + describe "can_update?" do + it "returns true for admin" do expect(server.can_update? admin).to eq(true) end - it 'returns true if server belongs to user' do + + it "returns true if server belongs to user" do expect(server.can_update? server_user).to eq(true) end - it 'returns false for non-admins' do + + it "returns false for non-admins" do expect(server.can_update? user).to eq(false) end end end end - diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index f1d7077..0931978 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -32,12 +32,18 @@ describe User do end it "returns true if user is banned" do - ban = Ban.create! ban_type: Ban::TYPE_SITE, expiry: Time.now + 10.days, user_name: user.username + Ban.create!(ban_type: Ban::TYPE_SITE, + expiry: Time.now + 10.days, + user_name: user.username) + expect(user.banned?).to be_truthy end it "returns true for specific bans" do - ban = Ban.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now + 10.days, user_name: user.username + Ban.create!(ban_type: Ban::TYPE_MUTE, + expiry: Time.now + 10.days, + user_name: user.username) + expect(user.banned? Ban::TYPE_MUTE).to be_truthy end end From e6f05374d3fa0794065852b5a58f7560284c4abe Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Mon, 17 Aug 2015 18:55:03 +0100 Subject: [PATCH 185/305] Added id to users API index method --- app/services/api/v1/users_collection.rb | 4 +++- spec/controllers/api/v1/users_controller_spec.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/services/api/v1/users_collection.rb b/app/services/api/v1/users_collection.rb index 8065d41..2630913 100644 --- a/app/services/api/v1/users_collection.rb +++ b/app/services/api/v1/users_collection.rb @@ -29,7 +29,8 @@ class Api::V1::UsersCollection < Api::V1::Collection users_table[:steamid], teams_table[:name], teams_table[:tag], - teams_table[:logo] + teams_table[:logo], + users_table[:id] ] end @@ -45,6 +46,7 @@ class Api::V1::UsersCollection < Api::V1::Collection def map_query execute_query.map do |row| { + id: row[5], username: row[0], steamid: row[1], team: { diff --git a/spec/controllers/api/v1/users_controller_spec.rb b/spec/controllers/api/v1/users_controller_spec.rb index 72b42ab..3a8d07e 100644 --- a/spec/controllers/api/v1/users_controller_spec.rb +++ b/spec/controllers/api/v1/users_controller_spec.rb @@ -81,11 +81,11 @@ describe Api::V1::UsersController do it 'returns the excpected JSON keys' do get :index - user_json = json["users"].first nested_team_json = user_json["team"] expect(user_json).to have_key("username") + expect(user_json).to have_key("id") expect(user_json).to have_key("steamid") expect(user_json).to have_key("team") expect(nested_team_json).to have_key("name") From a3d9f5bc0641e77faf39b9de58c61b2a68137744 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Mon, 17 Aug 2015 19:06:47 +0100 Subject: [PATCH 186/305] Invalid steam ids on the users API now returns null for steam attributes --- app/controllers/api/v1/users_controller.rb | 14 +++++++++++--- spec/controllers/api/v1/users_controller_spec.rb | 11 +++++++++++ spec/services/api/v1/users_collection_spec.rb | 4 ++-- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb index ea0f56b..bae11dc 100644 --- a/app/controllers/api/v1/users_controller.rb +++ b/app/controllers/api/v1/users_controller.rb @@ -5,7 +5,7 @@ class Api::V1::UsersController < Api::V1::BaseController def show @user = User.find(params[:id]) - @steam = SteamCondenser::Community::SteamId.from_steam_id("STEAM_#{@user.steamid}") + @steam = steam_profile @user render json: { id: @user.id, @@ -15,8 +15,8 @@ class Api::V1::UsersController < Api::V1::BaseController avatar: @user.profile.avatar.url, admin: @user.admin?, steam: { - url: @steam.base_url, - nickname: @steam.nickname + url: @steam.nil? ? nil : @steam.base_url, + nickname: @steam.nil? ? nil : @steam.nickname }, bans: { gather: @user.banned?(Ban::TYPE_GATHER).present?, @@ -28,4 +28,12 @@ class Api::V1::UsersController < Api::V1::BaseController rescue ActiveRecord::RecordNotFound raise ActionController::RoutingError.new('User Not Found') end + + private + + def steam_profile user + SteamCondenser::Community::SteamId.from_steam_id("STEAM_#{user.steamid}") + rescue SteamCondenser::Error => e + return nil + end end diff --git a/spec/controllers/api/v1/users_controller_spec.rb b/spec/controllers/api/v1/users_controller_spec.rb index 3a8d07e..4ea3f54 100644 --- a/spec/controllers/api/v1/users_controller_spec.rb +++ b/spec/controllers/api/v1/users_controller_spec.rb @@ -28,6 +28,17 @@ describe Api::V1::UsersController do expect(json['team']).to be_nil end + it 'returns data for users with invalid steam ids' do + @user.steamid = '0:0:000' + @user.save! + + get :show, id: @user.id + + expect(response).to be_success + expect(json['steam']['url']).to be_nil + expect(json['steam']['nickname']).to be_nil + end + it 'returns 404 if user does not exist' do expect { get :show, id: -1 diff --git a/spec/services/api/v1/users_collection_spec.rb b/spec/services/api/v1/users_collection_spec.rb index 9d29c02..62dfbd9 100644 --- a/spec/services/api/v1/users_collection_spec.rb +++ b/spec/services/api/v1/users_collection_spec.rb @@ -23,8 +23,8 @@ describe Api::V1::UsersCollection do expect(collection.execute_query.size).to eq(3) end - it 'returns 5 columns' do - expect(collection.execute_query.first.size).to eq(5) + it 'returns 6 columns' do + expect(collection.execute_query.first.size).to eq(6) end end end From 2665df6b71f359885f89ec258c3b631152fd69fe Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Mon, 17 Aug 2015 19:16:32 +0100 Subject: [PATCH 187/305] Fix style --- app/controllers/api/v1/users_controller.rb | 8 +-- .../api/v1/users_controller_spec.rb | 64 +++++++++---------- spec/services/api/v1/users_collection_spec.rb | 14 ++-- 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb index bae11dc..69af4ba 100644 --- a/app/controllers/api/v1/users_controller.rb +++ b/app/controllers/api/v1/users_controller.rb @@ -15,7 +15,7 @@ class Api::V1::UsersController < Api::V1::BaseController avatar: @user.profile.avatar.url, admin: @user.admin?, steam: { - url: @steam.nil? ? nil : @steam.base_url, + url: @steam.nil? ? nil : @steam.base_url, nickname: @steam.nil? ? nil : @steam.nickname }, bans: { @@ -31,9 +31,9 @@ class Api::V1::UsersController < Api::V1::BaseController private - def steam_profile user + def steam_profile(user) SteamCondenser::Community::SteamId.from_steam_id("STEAM_#{user.steamid}") - rescue SteamCondenser::Error => e - return nil + rescue SteamCondenser::Error + nil end end diff --git a/spec/controllers/api/v1/users_controller_spec.rb b/spec/controllers/api/v1/users_controller_spec.rb index 4ea3f54..2701f7a 100644 --- a/spec/controllers/api/v1/users_controller_spec.rb +++ b/spec/controllers/api/v1/users_controller_spec.rb @@ -1,87 +1,87 @@ -require 'spec_helper' +require "spec_helper" describe Api::V1::UsersController do before do - request.accept = 'application/json' + request.accept = "application/json" end - describe '#show' do + describe "#show" do before(:each) do @user = create :user, :chris end - it 'returns user data' do + it "returns user data" do get :show, id: @user.id expect(response).to be_success - expect(json['id']).to eq(@user.id) - expect(json['username']).to eq(@user.username) - expect(json['country']).to eq(@user.country) - expect(json['time_zone']).to eq(@user.time_zone) - expect(json['admin']).to eq(@user.admin?) + expect(json["id"]).to eq(@user.id) + expect(json["username"]).to eq(@user.username) + expect(json["country"]).to eq(@user.country) + expect(json["time_zone"]).to eq(@user.time_zone) + expect(json["admin"]).to eq(@user.admin?) expect(json).to have_key("steam") - expect(json['steam']).to have_key("url") - expect(json['steam']).to have_key("nickname") - expect(json['bans']['mute']).to eq(false) - expect(json['bans']['gather']).to eq(false) - expect(json['bans']['site']).to eq(false) - expect(json['team']).to be_nil + expect(json["steam"]).to have_key("url") + expect(json["steam"]).to have_key("nickname") + expect(json["bans"]["mute"]).to eq(false) + expect(json["bans"]["gather"]).to eq(false) + expect(json["bans"]["site"]).to eq(false) + expect(json["team"]).to be_nil end - it 'returns data for users with invalid steam ids' do - @user.steamid = '0:0:000' + it "returns data for users with invalid steam ids" do + @user.steamid = "0:0:000" @user.save! get :show, id: @user.id expect(response).to be_success - expect(json['steam']['url']).to be_nil - expect(json['steam']['nickname']).to be_nil + expect(json["steam"]["url"]).to be_nil + expect(json["steam"]["nickname"]).to be_nil end - it 'returns 404 if user does not exist' do + it "returns 404 if user does not exist" do expect { get :show, id: -1 }.to raise_error(ActionController::RoutingError) end - it 'returns correct ban if user muted' do + it "returns correct ban if user muted" do create :ban, :mute, user: @user get :show, id: @user.id expect(response).to be_success - expect(json['bans']['mute']).to eq(true) + expect(json["bans"]["mute"]).to eq(true) end - it 'returns correct ban if user gather banned' do + it "returns correct ban if user gather banned" do create :ban, :gather, user: @user get :show, id: @user.id expect(response).to be_success - expect(json['bans']['gather']).to eq(true) + expect(json["bans"]["gather"]).to eq(true) end - it 'returns correct ban if user site banned' do + it "returns correct ban if user site banned" do create :ban, :site, user: @user get :show, id: @user.id expect(response).to be_success - expect(json['bans']['site']).to eq(true) + expect(json["bans"]["site"]).to eq(true) end - it 'returns team information' do + it "returns team information" do @user.destroy @user_with_team = create :user_with_team, :chris get :show, id: @user_with_team.id expect(response).to be_success - expect(json['team']['id']).to eq(@user_with_team.team.id) - expect(json['team']['name']).to eq(@user_with_team.team.name) + expect(json["team"]["id"]).to eq(@user_with_team.team.id) + expect(json["team"]["name"]).to eq(@user_with_team.team.name) end end - describe '#index' do + describe "#index" do before do 5.times { create(:user_with_team) } end - it 'returns all users and associated teams' do + it "returns all users and associated teams" do users = User.all get :index @@ -90,7 +90,7 @@ describe Api::V1::UsersController do expect(json["users"].size).to eq(users.size) end - it 'returns the excpected JSON keys' do + it "returns the excpected JSON keys" do get :index user_json = json["users"].first nested_team_json = user_json["team"] diff --git a/spec/services/api/v1/users_collection_spec.rb b/spec/services/api/v1/users_collection_spec.rb index 62dfbd9..66437e9 100644 --- a/spec/services/api/v1/users_collection_spec.rb +++ b/spec/services/api/v1/users_collection_spec.rb @@ -1,29 +1,29 @@ -require 'spec_helper' +require "spec_helper" describe Api::V1::UsersCollection do let(:collection) { Api::V1::UsersCollection.new } - describe '#execute_query' do - describe 'when there are users with no teams' do + describe "#execute_query" do + describe "when there are users with no teams" do before do 3.times { create(:user) } end - it 'returns 0 results' do + it "returns 0 results" do expect(collection.execute_query.size).to eq(0) end end - describe 'when there are some users with teams' do + describe "when there are some users with teams" do before do 3.times { create(:user_with_team) } end - it 'returns 3 results' do + it "returns 3 results" do expect(collection.execute_query.size).to eq(3) end - it 'returns 6 columns' do + it "returns 6 columns" do expect(collection.execute_query.first.size).to eq(6) end end From a2ebca64f4a3b1889851b56c179223c7602ab779 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Tue, 18 Aug 2015 11:05:52 +0100 Subject: [PATCH 188/305] Share production ensl session store with subdomains --- config/environments/production.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index c646579..6cdc6d3 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -63,5 +63,5 @@ Ensl::Application.configure do config.active_support.deprecation = :notify # Custom Session Store config to allow gathers.staging.ensl.org - # config.session_store :cookie_store, key: '_ENSL_session_key', expire_after: 30.days.to_i, domain: "gathers.ensl.org" + config.session_store :cookie_store, key: "_ENSL_session_key", expire_after: 30.days.to_i, domain: ".ensl.org" end \ No newline at end of file From 8ed82671643e82e2b32e74e757f5fa3b5233e376 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Thu, 20 Aug 2015 13:56:07 +0100 Subject: [PATCH 189/305] Prevent crawls of large data files --- public/robots.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/public/robots.txt b/public/robots.txt index 085187f..8958fb4 100644 --- a/public/robots.txt +++ b/public/robots.txt @@ -1,5 +1,7 @@ # See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file # # To ban all spiders from the entire site uncomment the next two lines: -# User-Agent: * -# Disallow: / +User-Agent: * +Disallow: /data_files +Disallow: /directories +Disallow: /movies \ No newline at end of file From d4acc8ea3c182706a9945d3d9df15a382b120e9e Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Thu, 20 Aug 2015 15:48:19 +0100 Subject: [PATCH 190/305] Add initial forum tests --- spec/factories/forum.rb | 6 ++++++ spec/models/forum_spec.rb | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 spec/factories/forum.rb create mode 100644 spec/models/forum_spec.rb diff --git a/spec/factories/forum.rb b/spec/factories/forum.rb new file mode 100644 index 0000000..3ad7213 --- /dev/null +++ b/spec/factories/forum.rb @@ -0,0 +1,6 @@ +FactoryGirl.define do + factory :forum do + sequence(:title) { |n| "Forum Title #{n}" } + sequence(:description) { |n| "Forum Description #{n}" } + end +end \ No newline at end of file diff --git a/spec/models/forum_spec.rb b/spec/models/forum_spec.rb new file mode 100644 index 0000000..211c244 --- /dev/null +++ b/spec/models/forum_spec.rb @@ -0,0 +1,29 @@ +# == Schema Information +# +# Table name: forums +# +# id :integer not null, primary key +# title :string(255) +# description :string(255) +# category_id :integer +# created_at :datetime +# updated_at :datetime +# position :integer +# + +require "spec_helper" + +describe Forum do + let!(:user) { create :user } + + describe "create" do + let(:forum) { build :forum } + + it "creates a new forum" do + expect(forum.valid?).to eq(true) + expect do + forum.save! + end.to change(Forum, :count).by(1) + end + end +end From d9b2df06a428ff0105e6d0d978fbcfe6d1af5fe5 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Thu, 20 Aug 2015 15:49:42 +0100 Subject: [PATCH 191/305] Add initial topic tests --- spec/factories/topic.rb | 5 +++++ spec/models/topic_spec.rb | 30 ++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 spec/factories/topic.rb create mode 100644 spec/models/topic_spec.rb diff --git a/spec/factories/topic.rb b/spec/factories/topic.rb new file mode 100644 index 0000000..159059b --- /dev/null +++ b/spec/factories/topic.rb @@ -0,0 +1,5 @@ +FactoryGirl.define do + factory :topic do + sequence(:title) { |n| "Forum Title #{n}" } + end +end \ No newline at end of file diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb new file mode 100644 index 0000000..5cd81d1 --- /dev/null +++ b/spec/models/topic_spec.rb @@ -0,0 +1,30 @@ +# == Schema Information +# +# Table name: topics +# +# id :integer not null, primary key +# title :string(255) +# user_id :integer +# forum_id :integer +# created_at :datetime +# updated_at :datetime +# state :integer default(0), not null +# + +require "spec_helper" + +describe Topic do + let!(:user) { create :user } + let!(:forum) { create :forum } + + describe "create" do + let(:topic) { build :topic, user: user, forum: forum } + + it "creates a new topic" do + topic.first_post = "Foo" + expect do + topic.save! + end.to change(Topic, :count).by(1) + end + end +end From afa96bd2f5a91d3b631976aab8d4af7a9d2a4d4f Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Thu, 20 Aug 2015 15:57:29 +0100 Subject: [PATCH 192/305] Add initial tests for posts --- spec/factories/post.rb | 7 +++++++ spec/models/post_spec.rb | 30 ++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 spec/factories/post.rb create mode 100644 spec/models/post_spec.rb diff --git a/spec/factories/post.rb b/spec/factories/post.rb new file mode 100644 index 0000000..ec0de0b --- /dev/null +++ b/spec/factories/post.rb @@ -0,0 +1,7 @@ +FactoryGirl.define do + factory :post do + sequence(:text) { |n| "Post Body #{n}" } + topic + user + end +end \ No newline at end of file diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb new file mode 100644 index 0000000..9ef6175 --- /dev/null +++ b/spec/models/post_spec.rb @@ -0,0 +1,30 @@ +# == Schema Information +# +# Table name: posts +# +# id :integer not null, primary key +# text :text +# topic_id :integer +# user_id :integer +# created_at :datetime +# updated_at :datetime +# text_parsed :text +# + +require "spec_helper" + +describe Post do + let!(:user) { create :user } + + describe "create" do + let(:post) { build :post } + + it "creates a new post" do + # expect(post.valid?).to eq(true) + post.topic = create :topic + expect do + post.save! + end.to change(Post, :count).by(1) + end + end +end From f20d5294b9e11bbdb94363ff0d7705322a048dd3 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Thu, 20 Aug 2015 15:58:10 +0100 Subject: [PATCH 193/305] Fix --- spec/factories/topic.rb | 5 +++++ spec/models/user_spec.rb | 1 + 2 files changed, 6 insertions(+) diff --git a/spec/factories/topic.rb b/spec/factories/topic.rb index 159059b..1eb1820 100644 --- a/spec/factories/topic.rb +++ b/spec/factories/topic.rb @@ -1,5 +1,10 @@ FactoryGirl.define do factory :topic do sequence(:title) { |n| "Forum Title #{n}" } + forum + user + before(:create) do |topic| + topic.first_post = "My first post on the topic" + end end end \ No newline at end of file diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 0931978..49f261c 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -19,6 +19,7 @@ # time_zone :string(255) # version :integer # public_email :boolean default(FALSE), not null +# salt :string(255) # require 'spec_helper' From 46b0084e818d43793bfbb287ad9adc64f9d18e28 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Thu, 20 Aug 2015 16:20:40 +0100 Subject: [PATCH 194/305] Add more efficient recent topics class method --- app/models/topic.rb | 4 ++++ spec/models/topic_spec.rb | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/app/models/topic.rb b/app/models/topic.rb index 3d85a00..ba0ddbb 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -47,6 +47,10 @@ class Topic < ActiveRecord::Base acts_as_readable + def self.recent_topics + Post.order('id desc').select('DISTINCT topic_id').limit(5).map(&:topic) + end + def to_s title end diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb index 5cd81d1..536c50b 100644 --- a/spec/models/topic_spec.rb +++ b/spec/models/topic_spec.rb @@ -27,4 +27,20 @@ describe Topic do end.to change(Topic, :count).by(1) end end + + describe ".recent_topics" do + before(:all) do + 5.times do + topic = create :topic + 3.times do + post = create :post, topic: topic + end + end + end + it "returns 5 unique, most recently posted topics" do + recent_topics = Topic.recent_topics + expect(recent_topics.length).to eq(5) + expect(recent_topics.map(&:id).uniq.length).to eq(5) + end + end end From 67999187dcf65eaffda49878b2842f92a3c60db9 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Thu, 20 Aug 2015 16:20:50 +0100 Subject: [PATCH 195/305] Swap out old recent topics method --- app/views/topics/_index.html.erb | 2 +- app/views/widgets/_posts.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/topics/_index.html.erb b/app/views/topics/_index.html.erb index 4363ecd..d412ce5 100644 --- a/app/views/topics/_index.html.erb +++ b/app/views/topics/_index.html.erb @@ -1,5 +1,5 @@
    - <% Topic.basic.recent.latest_page(page).each do |topic| %> + <% Topic.recent_topics.each do |topic| %>
  1. <%= link_to (h topic), lastpost(topic) %>
    2. diff --git a/app/views/widgets/_posts.html.erb b/app/views/widgets/_posts.html.erb index 9a333cf..6639986 100644 --- a/app/views/widgets/_posts.html.erb +++ b/app/views/widgets/_posts.html.erb @@ -4,7 +4,7 @@
    Latest forum posts
      - <% Topic.basic.recent.latest_page(1).each do |topic| %> + <% Topic.recent_topics.each do |topic| %>
    1. <%= link_to shorten(topic, 28), lastpost(topic) %>
      2. From 8074f0c3aa80a7f9072a13ac0475bfdec0a2a8b6 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Thu, 20 Aug 2015 16:35:25 +0100 Subject: [PATCH 196/305] Style fix --- app/models/topic.rb | 2 +- spec/factories/forum.rb | 2 +- spec/factories/post.rb | 2 +- spec/factories/topic.rb | 4 ++-- spec/models/topic_spec.rb | 4 +--- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/models/topic.rb b/app/models/topic.rb index ba0ddbb..be52570 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -48,7 +48,7 @@ class Topic < ActiveRecord::Base acts_as_readable def self.recent_topics - Post.order('id desc').select('DISTINCT topic_id').limit(5).map(&:topic) + Post.order("id desc").select("DISTINCT topic_id").limit(5).map(&:topic) end def to_s diff --git a/spec/factories/forum.rb b/spec/factories/forum.rb index 3ad7213..a5bbe09 100644 --- a/spec/factories/forum.rb +++ b/spec/factories/forum.rb @@ -3,4 +3,4 @@ FactoryGirl.define do sequence(:title) { |n| "Forum Title #{n}" } sequence(:description) { |n| "Forum Description #{n}" } end -end \ No newline at end of file +end diff --git a/spec/factories/post.rb b/spec/factories/post.rb index ec0de0b..e557bbb 100644 --- a/spec/factories/post.rb +++ b/spec/factories/post.rb @@ -4,4 +4,4 @@ FactoryGirl.define do topic user end -end \ No newline at end of file +end diff --git a/spec/factories/topic.rb b/spec/factories/topic.rb index 1eb1820..39637c0 100644 --- a/spec/factories/topic.rb +++ b/spec/factories/topic.rb @@ -4,7 +4,7 @@ FactoryGirl.define do forum user before(:create) do |topic| - topic.first_post = "My first post on the topic" + topic.first_post = "My first post on the topic" end end -end \ No newline at end of file +end diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb index 536c50b..836e9cb 100644 --- a/spec/models/topic_spec.rb +++ b/spec/models/topic_spec.rb @@ -32,9 +32,7 @@ describe Topic do before(:all) do 5.times do topic = create :topic - 3.times do - post = create :post, topic: topic - end + 3.times { create :post, topic: topic } end end it "returns 5 unique, most recently posted topics" do From a68bdd3de78dc2ab10c0281f042fde15c8e09bc6 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Thu, 20 Aug 2015 17:01:42 +0100 Subject: [PATCH 197/305] Remove inefficient scope --- app/models/topic.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/models/topic.rb b/app/models/topic.rb index be52570..502a35d 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -32,10 +32,6 @@ class Topic < ActiveRecord::Base scope :basic, :include => [:latest, { forum: :forumer }, :user] scope :ordered, :order => "state DESC, posts.id DESC" - scope :recent, - :conditions => "forumers.id IS NULL AND posts.id = (SELECT id FROM posts AS P WHERE P.topic_id = topics.id ORDER BY id DESC LIMIT 1)", - :order => "posts.id DESC", - :group => "topics.id" scope :latest_page, lambda { |page| {:limit => "#{(page-1)*LATEST_PER_PAGE}, #{(page-1)*LATEST_PER_PAGE+LATEST_PER_PAGE}"} } From 53110c9aa469abb736851bbadef8a33723279970 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Thu, 20 Aug 2015 17:21:56 +0100 Subject: [PATCH 198/305] Scope no longer used --- app/models/topic.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/models/topic.rb b/app/models/topic.rb index 502a35d..e34e64f 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -32,8 +32,6 @@ class Topic < ActiveRecord::Base scope :basic, :include => [:latest, { forum: :forumer }, :user] scope :ordered, :order => "state DESC, posts.id DESC" - scope :latest_page, - lambda { |page| {:limit => "#{(page-1)*LATEST_PER_PAGE}, #{(page-1)*LATEST_PER_PAGE+LATEST_PER_PAGE}"} } validates_presence_of :user_id, :forum_id validates_length_of :title, :in => 1..50 From e34d21dd0068247b6789538e63d39d1ea7b6ffed Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Thu, 20 Aug 2015 18:11:29 +0100 Subject: [PATCH 199/305] Added initial forumer test --- spec/factories/forumer.rb | 7 +++++++ spec/models/forumer_spec.rb | 27 +++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 spec/factories/forumer.rb create mode 100644 spec/models/forumer_spec.rb diff --git a/spec/factories/forumer.rb b/spec/factories/forumer.rb new file mode 100644 index 0000000..50988a3 --- /dev/null +++ b/spec/factories/forumer.rb @@ -0,0 +1,7 @@ +FactoryGirl.define do + factory :forumer do + forum + group + access Forumer::ACCESS_TOPIC + end +end diff --git a/spec/models/forumer_spec.rb b/spec/models/forumer_spec.rb new file mode 100644 index 0000000..7c04f29 --- /dev/null +++ b/spec/models/forumer_spec.rb @@ -0,0 +1,27 @@ +# == Schema Information +# +# Table name: forums +# +# id :integer not null, primary key +# title :string(255) +# description :string(255) +# category_id :integer +# created_at :datetime +# updated_at :datetime +# position :integer +# + +require "spec_helper" + +describe Forumer do + describe "create" do + let(:forumer) { build :forumer } + + it "creates a new forumer" do + expect(forumer.valid?).to eq(true) + expect do + forumer.save! + end.to change(Forumer, :count).by(1) + end + end +end From 5f5389375645b623273337ecffa6943169ce152d Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Thu, 20 Aug 2015 19:33:22 +0100 Subject: [PATCH 200/305] Added forumer exclusion on recent_topics --- app/models/topic.rb | 8 +++++++- spec/models/topic_spec.rb | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/models/topic.rb b/app/models/topic.rb index e34e64f..31800ab 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -42,7 +42,13 @@ class Topic < ActiveRecord::Base acts_as_readable def self.recent_topics - Post.order("id desc").select("DISTINCT topic_id").limit(5).map(&:topic) + Post.joins("LEFT OUTER JOIN topics ON topics.id = posts.topic_id") + .joins("LEFT OUTER JOIN forums on forums.id = topics.forum_id") + .joins("LEFT OUTER JOIN forumers on forums.id = forumers.forum_id") + .order("posts.id desc") + .where("forumers.id IS NULL") + .select("DISTINCT topic_id") + .limit(5).map(&:topic) end def to_s diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb index 836e9cb..e9f740c 100644 --- a/spec/models/topic_spec.rb +++ b/spec/models/topic_spec.rb @@ -29,7 +29,7 @@ describe Topic do end describe ".recent_topics" do - before(:all) do + before(:each) do 5.times do topic = create :topic 3.times { create :post, topic: topic } @@ -40,5 +40,11 @@ describe Topic do expect(recent_topics.length).to eq(5) expect(recent_topics.map(&:id).uniq.length).to eq(5) end + it "does not return posts from restricted forums" do + restricted_topic = create :topic, title: "Restricted" + create :forumer, forum: restricted_topic.forum + create :post, topic: restricted_topic + expect(Topic.recent_topics).to_not include(restricted_topic) + end end end From a0318805e7543807c3894d46b000a8bf35371670 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Thu, 20 Aug 2015 19:36:01 +0100 Subject: [PATCH 201/305] Annotate & fix style --- app/models/topic.rb | 15 ++++++++------- spec/models/forumer_spec.rb | 15 +++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/models/topic.rb b/app/models/topic.rb index 31800ab..d1b1fe1 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -42,13 +42,14 @@ class Topic < ActiveRecord::Base acts_as_readable def self.recent_topics - Post.joins("LEFT OUTER JOIN topics ON topics.id = posts.topic_id") - .joins("LEFT OUTER JOIN forums on forums.id = topics.forum_id") - .joins("LEFT OUTER JOIN forumers on forums.id = forumers.forum_id") - .order("posts.id desc") - .where("forumers.id IS NULL") - .select("DISTINCT topic_id") - .limit(5).map(&:topic) + Post.joins("LEFT OUTER JOIN topics ON topics.id = posts.topic_id"). + joins("LEFT OUTER JOIN forums on forums.id = topics.forum_id"). + joins("LEFT OUTER JOIN forumers on forums.id = forumers.forum_id"). + order("posts.id desc"). + where("forumers.id IS NULL"). + select("DISTINCT topic_id"). + limit(5). + map(&:topic) end def to_s diff --git a/spec/models/forumer_spec.rb b/spec/models/forumer_spec.rb index 7c04f29..c66b284 100644 --- a/spec/models/forumer_spec.rb +++ b/spec/models/forumer_spec.rb @@ -1,14 +1,13 @@ # == Schema Information # -# Table name: forums +# Table name: forumers # -# id :integer not null, primary key -# title :string(255) -# description :string(255) -# category_id :integer -# created_at :datetime -# updated_at :datetime -# position :integer +# id :integer not null, primary key +# forum_id :integer +# group_id :integer +# access :integer +# created_at :datetime +# updated_at :datetime # require "spec_helper" From f3f3e46a8f13203354b8b465b3c0e5efeec137cf Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Thu, 20 Aug 2015 23:37:26 +0100 Subject: [PATCH 202/305] Add missing index on forumers table --- .../20150820223313_add_index_to_forumers.rb | 6 + db/schema.rb | 141 ++++++++++++++++-- 2 files changed, 134 insertions(+), 13 deletions(-) create mode 100644 db/migrate/20150820223313_add_index_to_forumers.rb diff --git a/db/migrate/20150820223313_add_index_to_forumers.rb b/db/migrate/20150820223313_add_index_to_forumers.rb new file mode 100644 index 0000000..f3684e7 --- /dev/null +++ b/db/migrate/20150820223313_add_index_to_forumers.rb @@ -0,0 +1,6 @@ +class AddIndexToForumers < ActiveRecord::Migration + def change + add_index :forumers, :forum_id + add_index :forumers, :group_id + end +end diff --git a/db/schema.rb b/db/schema.rb index 5422b4f..7f203e9 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,21 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20150701233306) do +ActiveRecord::Schema.define(:version => 20150820223313) do + + create_table "admin_requests", :force => true do |t| + t.string "addr" + t.string "pwd" + t.integer "server_id" + t.string "player" + t.integer "user_id" + t.string "msg" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "admin_requests", ["server_id"], :name => "index_admin_requests_on_server_id" + add_index "admin_requests", ["user_id"], :name => "index_admin_requests_on_user_id" create_table "article_versions", :force => true do |t| t.integer "article_id" @@ -200,6 +214,16 @@ ActiveRecord::Schema.define(:version => 20150701233306) do add_index "data_files", ["directory_id"], :name => "index_data_files_on_directory_id" add_index "data_files", ["related_id"], :name => "index_data_files_on_related_id" + create_table "deleteds", :force => true do |t| + t.integer "deletable_id" + t.string "deletable_type" + t.integer "user_id" + t.text "reason" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "related_id" + end + create_table "directories", :force => true do |t| t.string "name" t.string "description" @@ -212,6 +236,21 @@ ActiveRecord::Schema.define(:version => 20150701233306) do add_index "directories", ["parent_id"], :name => "index_directories_on_parent_id" + create_table "firms", :force => true do |t| + t.string "name" + t.string "y_code" + t.string "email" + t.string "website" + t.string "phone" + t.string "address" + t.integer "zipcode" + t.string "town" + t.integer "owner" + t.string "opentime" + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "forumers", :force => true do |t| t.integer "forum_id" t.integer "group_id" @@ -220,6 +259,9 @@ ActiveRecord::Schema.define(:version => 20150701233306) do t.datetime "updated_at" end + add_index "forumers", ["forum_id"], :name => "index_forumers_on_forum_id" + add_index "forumers", ["group_id"], :name => "index_forumers_on_group_id" + create_table "forums", :force => true do |t| t.string "title" t.string "description" @@ -340,6 +382,44 @@ ActiveRecord::Schema.define(:version => 20150701233306) do add_index "locks", ["lockable_id", "lockable_type"], :name => "index_locks_on_lockable_id_and_lockable_type" + create_table "log_events", :force => true do |t| + t.string "name" + t.string "description" + t.integer "team" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "log_files", :force => true do |t| + t.string "name" + t.string "md5" + t.integer "size" + t.integer "server_id" + t.datetime "updated_at" + end + + add_index "log_files", ["server_id"], :name => "index_log_files_on_server_id" + + create_table "logs", :force => true do |t| + t.integer "server_id" + t.text "text" + t.integer "domain" + t.datetime "created_at" + t.integer "round_id" + t.string "details" + t.integer "actor_id" + t.integer "target_id" + t.string "specifics1" + t.string "specifics2" + t.integer "log_file_id" + end + + add_index "logs", ["actor_id"], :name => "index_logs_on_actor_id" + add_index "logs", ["log_file_id"], :name => "index_logs_on_log_file_id" + add_index "logs", ["round_id"], :name => "index_logs_on_round_id" + add_index "logs", ["server_id"], :name => "index_logs_on_server_id" + add_index "logs", ["target_id"], :name => "index_logs_on_target_id" + create_table "maps", :force => true do |t| t.string "name" t.string "download" @@ -441,6 +521,13 @@ ActiveRecord::Schema.define(:version => 20150701233306) do add_index "movies", ["status"], :name => "index_movies_on_status" add_index "movies", ["user_id"], :name => "index_movies_on_user_id" + create_table "nodes", :force => true do |t| + t.string "name" + t.integer "foreign_key" + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "options", :force => true do |t| t.string "option" t.integer "poll_id" @@ -583,6 +670,42 @@ ActiveRecord::Schema.define(:version => 20150701233306) do add_index "readings", ["user_id", "readable_id", "readable_type"], :name => "index_readings_on_user_id_and_readable_id_and_readable_type" add_index "readings", ["user_id"], :name => "index_readings_on_user_id" + create_table "rounders", :force => true do |t| + t.integer "round_id" + t.integer "user_id" + t.integer "team" + t.string "roles" + t.integer "kills" + t.integer "deaths" + t.string "name" + t.string "steamid" + t.integer "team_id" + end + + add_index "rounders", ["round_id"], :name => "index_rounders_on_round_id" + add_index "rounders", ["team_id"], :name => "index_rounders_on_team_id" + add_index "rounders", ["user_id"], :name => "index_rounders_on_user_id" + + create_table "rounds", :force => true do |t| + t.integer "server_id" + t.datetime "start" + t.datetime "end" + t.integer "winner" + t.integer "match_id" + t.integer "commander_id" + t.integer "team1_id" + t.integer "team2_id" + t.string "map_name" + t.integer "map_id" + end + + add_index "rounds", ["commander_id"], :name => "index_rounds_on_commander_id" + add_index "rounds", ["map_id"], :name => "index_rounds_on_map_id" + add_index "rounds", ["match_id"], :name => "index_rounds_on_match_id" + add_index "rounds", ["server_id"], :name => "index_rounds_on_server_id" + add_index "rounds", ["team1_id"], :name => "index_rounds_on_team1_id" + add_index "rounds", ["team2_id"], :name => "index_rounds_on_team2_id" + create_table "server_versions", :force => true do |t| t.integer "server_id" t.integer "version" @@ -638,18 +761,6 @@ ActiveRecord::Schema.define(:version => 20150701233306) do add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id" add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at" - create_table "shoutmsg_archive", :force => true do |t| - t.integer "user_id" - t.string "text" - t.datetime "created_at" - t.datetime "updated_at" - t.string "shoutable_type" - t.integer "shoutable_id" - end - - add_index "shoutmsg_archive", ["shoutable_type", "shoutable_id"], :name => "index_shoutmsgs_on_shoutable_type_and_shoutable_id" - add_index "shoutmsg_archive", ["user_id"], :name => "index_shoutmsgs_on_user_id" - create_table "shoutmsgs", :force => true do |t| t.integer "user_id" t.string "text" @@ -744,9 +855,13 @@ ActiveRecord::Schema.define(:version => 20150701233306) do t.string "time_zone" t.integer "version" t.boolean "public_email", :default => false, :null => false + t.string "salt" end + add_index "users", ["email"], :name => "index_users_on_email" + add_index "users", ["password"], :name => "index_users_on_password" add_index "users", ["team_id"], :name => "index_users_on_team_id" + add_index "users", ["username"], :name => "index_users_on_username" create_table "versions", :force => true do |t| t.string "item_type", :null => false From 5ccdafba2da50d81aab3fbc576a3759a77fdec01 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Thu, 20 Aug 2015 23:38:21 +0100 Subject: [PATCH 203/305] Fix style --- db/migrate/20150820223313_add_index_to_forumers.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/migrate/20150820223313_add_index_to_forumers.rb b/db/migrate/20150820223313_add_index_to_forumers.rb index f3684e7..15ad4cd 100644 --- a/db/migrate/20150820223313_add_index_to_forumers.rb +++ b/db/migrate/20150820223313_add_index_to_forumers.rb @@ -1,6 +1,6 @@ class AddIndexToForumers < ActiveRecord::Migration def change - add_index :forumers, :forum_id - add_index :forumers, :group_id + add_index :forumers, :forum_id + add_index :forumers, :group_id end end From 9ba7f4b0d11c75b0801ee0066a00d0b5daca2b5c Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Sat, 22 Aug 2015 10:48:08 +0100 Subject: [PATCH 204/305] Add filter to recent topics --- app/models/topic.rb | 23 +++++++++++++++-------- spec/factories/topic.rb | 2 +- spec/models/topic_spec.rb | 13 +++++++------ 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/app/models/topic.rb b/app/models/topic.rb index d1b1fe1..deb1cdb 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -42,14 +42,21 @@ class Topic < ActiveRecord::Base acts_as_readable def self.recent_topics - Post.joins("LEFT OUTER JOIN topics ON topics.id = posts.topic_id"). - joins("LEFT OUTER JOIN forums on forums.id = topics.forum_id"). - joins("LEFT OUTER JOIN forumers on forums.id = forumers.forum_id"). - order("posts.id desc"). - where("forumers.id IS NULL"). - select("DISTINCT topic_id"). - limit(5). - map(&:topic) + self.find_by_sql %q{ + SELECT DISTINCT topics.* + FROM (SELECT id, topic_id + FROM posts + ORDER BY id DESC + LIMIT 20) AS T + INNER JOIN topics + ON T.topic_id = topics.id + INNER JOIN forums + ON forums.id = topics.forum_id + LEFT OUTER JOIN forumers + ON forumers.forum_id = forums.id + WHERE forumers.id IS NULL + LIMIT 5 + } end def to_s diff --git a/spec/factories/topic.rb b/spec/factories/topic.rb index 39637c0..fde6d83 100644 --- a/spec/factories/topic.rb +++ b/spec/factories/topic.rb @@ -1,6 +1,6 @@ FactoryGirl.define do factory :topic do - sequence(:title) { |n| "Forum Title #{n}" } + sequence(:title) { |n| "Topic Title #{n}" } forum user before(:create) do |topic| diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb index e9f740c..718315a 100644 --- a/spec/models/topic_spec.rb +++ b/spec/models/topic_spec.rb @@ -29,16 +29,17 @@ describe Topic do end describe ".recent_topics" do - before(:each) do - 5.times do + it "returns 5 unique, most recently posted topics" do + topics = [] + 6.times do topic = create :topic + topics << topic 3.times { create :post, topic: topic } end - end - it "returns 5 unique, most recently posted topics" do recent_topics = Topic.recent_topics - expect(recent_topics.length).to eq(5) - expect(recent_topics.map(&:id).uniq.length).to eq(5) + topics.last(5).each do |topic| + expect(recent_topics).to include(topic) + end end it "does not return posts from restricted forums" do restricted_topic = create :topic, title: "Restricted" From eecabbf1e67060db79f133a94715b58759fd69c0 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Sat, 22 Aug 2015 11:53:26 +0100 Subject: [PATCH 205/305] Hound --- app/models/topic.rb | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/models/topic.rb b/app/models/topic.rb index deb1cdb..845d87b 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -42,20 +42,20 @@ class Topic < ActiveRecord::Base acts_as_readable def self.recent_topics - self.find_by_sql %q{ - SELECT DISTINCT topics.* + find_by_sql %q{ + SELECT DISTINCT topics.* FROM (SELECT id, topic_id - FROM posts - ORDER BY id DESC - LIMIT 20) AS T - INNER JOIN topics - ON T.topic_id = topics.id - INNER JOIN forums - ON forums.id = topics.forum_id - LEFT OUTER JOIN forumers - ON forumers.forum_id = forums.id - WHERE forumers.id IS NULL - LIMIT 5 + FROM posts + ORDER BY id DESC + LIMIT 20) AS T + INNER JOIN topics + ON T.topic_id = topics.id + INNER JOIN forums + ON forums.id = topics.forum_id + LEFT OUTER JOIN forumers + ON forumers.forum_id = forums.id + WHERE forumers.id IS NULL + LIMIT 5 } end From 83dc747a51c62dff4680d5076805203db1f13286 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Mon, 24 Aug 2015 16:02:55 +0100 Subject: [PATCH 206/305] Account goes to user profile --- app/views/widgets/_logged.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/widgets/_logged.html.erb b/app/views/widgets/_logged.html.erb index 3a49932..c6f7842 100644 --- a/app/views/widgets/_logged.html.erb +++ b/app/views/widgets/_logged.html.erb @@ -9,7 +9,7 @@ <% end %>
    2. - <%= link_to edit_user_path(cuser) do %> + <%= link_to user_path(cuser) do %> Account <%= icon 'user' %> <% end %>
      3. From 8032c8e93ed2343f27e3613c80271ddd8d77bba9 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Mon, 24 Aug 2015 16:02:55 +0100 Subject: [PATCH 207/305] Account goes to user profile --- app/views/widgets/_logged.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/widgets/_logged.html.erb b/app/views/widgets/_logged.html.erb index 3a49932..c6f7842 100644 --- a/app/views/widgets/_logged.html.erb +++ b/app/views/widgets/_logged.html.erb @@ -9,7 +9,7 @@ <% end %>
    3. - <%= link_to edit_user_path(cuser) do %> + <%= link_to user_path(cuser) do %> Account <%= icon 'user' %> <% end %>
      4. From f05f072f1c60ea74542db8e5fc52f16c0cbfb4b3 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Thu, 27 Aug 2015 11:58:30 +0100 Subject: [PATCH 208/305] Return server name --- app/controllers/api/v1/servers_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/v1/servers_controller.rb b/app/controllers/api/v1/servers_controller.rb index fe5a6cf..e2b39ee 100644 --- a/app/controllers/api/v1/servers_controller.rb +++ b/app/controllers/api/v1/servers_controller.rb @@ -6,9 +6,10 @@ class Api::V1::ServersController < Api::V1::BaseController private def active_servers - Server.active.map do |s| + Server.active.map do |s| { id: s.id, + name: s.name, description: s.description, dns: s.dns, ip: s.ip, From 3694832277c20c2733e7c1523ee2066ed703a7af Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Thu, 27 Aug 2015 18:47:26 +0100 Subject: [PATCH 209/305] Show stream information on user page --- app/views/users/_general.html.erb | 3 +++ spec/features/users/stream_spec.rb | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 spec/features/users/stream_spec.rb diff --git a/app/views/users/_general.html.erb b/app/views/users/_general.html.erb index 4dfb4c6..793668e 100644 --- a/app/views/users/_general.html.erb +++ b/app/views/users/_general.html.erb @@ -15,6 +15,9 @@ <%= link_to "Search for Steam Account" %>
    +
    Stream
    +
    <%= @user.profile.stream.blank? ? "No Stream Provided" : @user.profile.stream %>
    +

    Contact

    diff --git a/spec/features/users/stream_spec.rb b/spec/features/users/stream_spec.rb new file mode 100644 index 0000000..88ed1cf --- /dev/null +++ b/spec/features/users/stream_spec.rb @@ -0,0 +1,28 @@ +require 'spec_helper' + +feature 'User Stream Information' do + let(:password) { "foobar" } + let!(:user) { create :user, raw_password: password } + + feature 'stream administration' do + scenario 'user updates their stream' do + visit user_path(user) + expect(page).to have_content("No Stream Provided") + fill_login_form(user, password) + click_button submit(:user, :login) + visit edit_user_path(user) + stream_url = "twitch.tv/gold_n" + expect(page).to have_content("Stream") + fill_in "user_profile_attributes_stream", with: stream_url + click_button "Update Profile" + expect(page).to have_content(I18n.t(:users_update)) + visit user_path(user) + expect(page).to have_content(stream_url) + end + end + + def fill_login_form(user, password) + fill_in "login_username", with: user.username + fill_in "login_password", with: password + end +end From fc0d62d11050a0efd9d2a8e4fb93d8155f5602ab Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Thu, 27 Aug 2015 18:49:47 +0100 Subject: [PATCH 210/305] Fix style --- spec/features/users/stream_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/features/users/stream_spec.rb b/spec/features/users/stream_spec.rb index 88ed1cf..136dfb0 100644 --- a/spec/features/users/stream_spec.rb +++ b/spec/features/users/stream_spec.rb @@ -1,11 +1,11 @@ -require 'spec_helper' +require "spec_helper" -feature 'User Stream Information' do +feature "User Stream Information" do let(:password) { "foobar" } let!(:user) { create :user, raw_password: password } - feature 'stream administration' do - scenario 'user updates their stream' do + feature "stream administration" do + scenario "user updates their stream" do visit user_path(user) expect(page).to have_content("No Stream Provided") fill_login_form(user, password) From 66fc2c322055e8caef9e9a4d152cb033cae4a893 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Sun, 30 Aug 2015 15:58:06 +0100 Subject: [PATCH 211/305] Return steamid to users api --- app/controllers/api/v1/users_controller.rb | 1 + spec/controllers/api/v1/users_controller_spec.rb | 2 ++ 2 files changed, 3 insertions(+) diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb index 69af4ba..161772b 100644 --- a/app/controllers/api/v1/users_controller.rb +++ b/app/controllers/api/v1/users_controller.rb @@ -15,6 +15,7 @@ class Api::V1::UsersController < Api::V1::BaseController avatar: @user.profile.avatar.url, admin: @user.admin?, steam: { + id: @user.steamid, url: @steam.nil? ? nil : @steam.base_url, nickname: @steam.nil? ? nil : @steam.nickname }, diff --git a/spec/controllers/api/v1/users_controller_spec.rb b/spec/controllers/api/v1/users_controller_spec.rb index 2701f7a..f9e362b 100644 --- a/spec/controllers/api/v1/users_controller_spec.rb +++ b/spec/controllers/api/v1/users_controller_spec.rb @@ -20,6 +20,7 @@ describe Api::V1::UsersController do expect(json["time_zone"]).to eq(@user.time_zone) expect(json["admin"]).to eq(@user.admin?) expect(json).to have_key("steam") + expect(json["steam"]).to have_key("id") expect(json["steam"]).to have_key("url") expect(json["steam"]).to have_key("nickname") expect(json["bans"]["mute"]).to eq(false) @@ -35,6 +36,7 @@ describe Api::V1::UsersController do get :show, id: @user.id expect(response).to be_success + expect(json["steam"]["id"]).to_not be_nil expect(json["steam"]["url"]).to be_nil expect(json["steam"]["nickname"]).to be_nil end From 9ee0de54061c27d344db923d80b63c9d0dc260ea Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Mon, 31 Aug 2015 16:18:14 +0100 Subject: [PATCH 212/305] Remove salt --- db/schema.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 7f203e9..6214a8c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -855,7 +855,6 @@ ActiveRecord::Schema.define(:version => 20150820223313) do t.string "time_zone" t.integer "version" t.boolean "public_email", :default => false, :null => false - t.string "salt" end add_index "users", ["email"], :name => "index_users_on_email" From eaf20e298f39b26dad5797487b2dabcf4d73a049 Mon Sep 17 00:00:00 2001 From: Luke Barratt Date: Mon, 31 Aug 2015 16:18:51 +0100 Subject: [PATCH 213/305] Removed legacy NewRelic initializer since we're no longer using Unicorn --- config/initializers/newrelic.rb | 1 - 1 file changed, 1 deletion(-) delete mode 100644 config/initializers/newrelic.rb diff --git a/config/initializers/newrelic.rb b/config/initializers/newrelic.rb deleted file mode 100644 index aca5879..0000000 --- a/config/initializers/newrelic.rb +++ /dev/null @@ -1 +0,0 @@ -NewRelic::Agent.after_fork(:force_reconnect => true) if defined? Unicorn From da28408cb82984cfb649bac5a5083691158c1a5f Mon Sep 17 00:00:00 2001 From: Luke Barratt Date: Mon, 31 Aug 2015 16:19:03 +0100 Subject: [PATCH 214/305] Bumped NewRelic gem version --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 8bfe310..ab68d70 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ gem 'bbcoder', '~> 1.0.1' gem 'sanitize', '~> 2.1.0' gem 'carrierwave', '~> 0.10.0' gem 'bluecloth', '~> 2.2.0' -gem 'newrelic_rpm', '~> 3.7.2.195' +gem 'newrelic_rpm', '~> 3.13.0.299' gem 'will_paginate', '~> 3.0.5' gem 'dynamic_form', '~> 1.1.4' gem 'country_code_select', '~> 1.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index 99f2468..869ee88 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -144,7 +144,7 @@ GEM net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (2.9.0) - newrelic_rpm (3.7.2.195) + newrelic_rpm (3.13.0.299) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) oj (2.5.5) @@ -295,7 +295,7 @@ DEPENDENCIES jquery-rails (~> 2.0.2) mysql2 (~> 0.3.15) neat (~> 1.6.0) - newrelic_rpm (~> 3.7.2.195) + newrelic_rpm (~> 3.13.0.299) nokogiri (~> 1.6.1) oj (~> 2.5.5) poltergeist (~> 1.6.0) @@ -320,4 +320,4 @@ DEPENDENCIES will_paginate (~> 3.0.5) BUNDLED WITH - 1.10.5 + 1.10.6 From a8cdbb932e4f3764e47d78268512afa2dc015bc0 Mon Sep 17 00:00:00 2001 From: Luke Barratt Date: Mon, 31 Aug 2015 16:21:06 +0100 Subject: [PATCH 215/305] Replace crazy NewRelic config template with a simple one --- config/newrelic.yml | 220 +++++--------------------------------------- 1 file changed, 21 insertions(+), 199 deletions(-) diff --git a/config/newrelic.yml b/config/newrelic.yml index 0709a55..0ad0256 100644 --- a/config/newrelic.yml +++ b/config/newrelic.yml @@ -1,225 +1,47 @@ # -# This file configures the New Relic Agent. New Relic monitors -# Ruby, Java, .NET, PHP, and Python applications with deep visibility and low overhead. -# For more information, visit www.newrelic.com. +# This file configures the New Relic Agent. New Relic monitors Ruby, Java, +# .NET, PHP, Python and Node applications with deep visibility and low +# overhead. For more information, visit www.newrelic.com. # -# Generated <%= Time.now.strftime('%B %d, %Y') %>, for version <%= NewRelic::VERSION::STRING %> +# Generated August 31, 2015 # -# <%= generated_for_user %> +# This configuration file is custom generated for ENSL +# +# For full documentation of agent configuration options, please refer to +# https://docs.newrelic.com/docs/agents/ruby-agent/installation-configuration/ruby-agent-configuration - -# Here are the settings that are common to all environments common: &default_settings - # ============================== LICENSE KEY =============================== + # Required license key associated with your New Relic account. + license_key: <%= ENV["NEW_RELIC_LICENSE_KEY"] %> - # You must specify the license key associated with your New Relic - # account. This key binds your Agent's data to your account in the - # New Relic service. - license_key: '<%= ENV["NEW_RELIC_LICENSE_KEY"] %>' - - # Agent Enabled (Ruby/Rails Only) - # Use this setting to force the agent to run or not run. - # Default is 'auto' which means the agent will install and run only - # if a valid dispatcher such as Mongrel is running. This prevents - # it from running with Rake or the console. Set to false to - # completely turn the agent off regardless of the other settings. - # Valid values are true, false and auto. - # - # agent_enabled: auto - - # Application Name Set this to be the name of your application as - # you'd like it show up in New Relic. The service will then auto-map - # instances of your application into an "application" on your - # dashboard page. If you want to map this instance into multiple - # apps, like "AJAX Requests" and "All UI" then specify a semicolon - # separated list of up to three distinct names, or a yaml list. - # Defaults to the capitalized RAILS_ENV or RACK_ENV (i.e., - # Production, Staging, etc) - # - # Example: - # - # app_name: - # - Ajax Service - # - All Services - # + # Your application name. Renaming here affects where data displays in New + # Relic. For more details, see https://docs.newrelic.com/docs/apm/new-relic-apm/maintenance/renaming-applications app_name: <%= ENV['NEW_RELIC_APP_NAME'] %> - # When "true", the agent collects performance data about your - # application and reports this data to the New Relic service at - # newrelic.com. This global switch is normally overridden for each - # environment below. (formerly called 'enabled') - monitor_mode: true + # To disable the agent regardless of other settings, uncomment the following: + # agent_enabled: false - # Developer mode should be off in every environment but - # development as it has very high overhead in memory. - developer_mode: false - - # The newrelic agent generates its own log file to keep its logging - # information separate from that of your application. Specify its - # log level here. + # Logging level for log/newrelic_agent.log log_level: info - # Optionally set the path to the log file This is expanded from the - # root directory (may be relative or absolute, e.g. 'log/' or - # '/var/log/') The agent will attempt to create this directory if it - # does not exist. - # log_file_path: 'log' - # Optionally set the name of the log file, defaults to 'newrelic_agent.log' - # log_file_name: 'newrelic_agent.log' - - # The newrelic agent communicates with the service via https by default. This - # prevents eavesdropping on the performance metrics transmitted by the agent. - # The encryption required by SSL introduces a nominal amount of CPU overhead, - # which is performed asynchronously in a background thread. If you'd prefer - # to send your metrics over http uncomment the following line. - # ssl: false - - #============================== Browser Monitoring =============================== - # New Relic Real User Monitoring gives you insight into the performance real users are - # experiencing with your website. This is accomplished by measuring the time it takes for - # your users' browsers to download and render your web pages by injecting a small amount - # of JavaScript code into the header and footer of each page. - browser_monitoring: - # By default the agent automatically injects the monitoring JavaScript - # into web pages. Set this attribute to false to turn off this behavior. - auto_instrument: true - - # Proxy settings for connecting to the New Relic server. - # - # If a proxy is used, the host setting is required. Other settings - # are optional. Default port is 8080. - # - # proxy_host: hostname - # proxy_port: 8080 - # proxy_user: - # proxy_pass: - - # The agent can optionally log all data it sends to New Relic servers to a - # separate log file for human inspection and auditing purposes. To enable this - # feature, change 'enabled' below to true. - # See: https://newrelic.com/docs/ruby/audit-log - audit_log: - enabled: false - - # Tells transaction tracer and error collector (when enabled) - # whether or not to capture HTTP params. When true, frameworks can - # exclude HTTP parameters from being captured. - # Rails: the RoR filter_parameter_logging excludes parameters - # Java: create a config setting called "ignored_params" and set it to - # a comma separated list of HTTP parameter names. - # ex: ignored_params: credit_card, ssn, password - capture_params: false - - # Transaction tracer captures deep information about slow - # transactions and sends this to the New Relic service once a - # minute. Included in the transaction is the exact call sequence of - # the transactions including any SQL statements issued. - transaction_tracer: - - # Transaction tracer is enabled by default. Set this to false to - # turn it off. This feature is only available at the Professional - # and above product levels. - enabled: true - - # Threshold in seconds for when to collect a transaction - # trace. When the response time of a controller action exceeds - # this threshold, a transaction trace will be recorded and sent to - # New Relic. Valid values are any float value, or (default) "apdex_f", - # which will use the threshold for an dissatisfying Apdex - # controller action - four times the Apdex T value. - transaction_threshold: apdex_f - - # When transaction tracer is on, SQL statements can optionally be - # recorded. The recorder has three modes, "off" which sends no - # SQL, "raw" which sends the SQL statement in its original form, - # and "obfuscated", which strips out numeric and string literals. - record_sql: obfuscated - - # Threshold in seconds for when to collect stack trace for a SQL - # call. In other words, when SQL statements exceed this threshold, - # then capture and send to New Relic the current stack trace. This is - # helpful for pinpointing where long SQL calls originate from. - stack_trace_threshold: 0.500 - - # Determines whether the agent will capture query plans for slow - # SQL queries. Only supported in mysql and postgres. Should be - # set to false when using other adapters. - # explain_enabled: true - - # Threshold for query execution time below which query plans will - # not be captured. Relevant only when `explain_enabled` is true. - # explain_threshold: 0.5 - - # Error collector captures information about uncaught exceptions and - # sends them to New Relic for viewing - error_collector: - - # Error collector is enabled by default. Set this to false to turn - # it off. This feature is only available at the Professional and above - # product levels. - enabled: true - - # Rails Only - tells error collector whether or not to capture a - # source snippet around the place of the error when errors are View - # related. - capture_source: true - - # To stop specific errors from reporting to New Relic, set this property - # to comma-separated values. Default is to ignore routing errors, - # which are how 404's get triggered. - ignore_errors: "ActionController::RoutingError,Sinatra::NotFound" - - # If you're interested in capturing memcache keys as though they - # were SQL uncomment this flag. Note that this does increase - # overhead slightly on every memcached call, and can have security - # implications if your memcached keys are sensitive - # capture_memcache_keys: true - -# Application Environments -# ------------------------------------------ # Environment-specific settings are in this section. -# For Rails applications, RAILS_ENV is used to determine the environment. -# For Java applications, pass -Dnewrelic.environment to set -# the environment. - -# NOTE if your application has other named environments, you should -# provide newrelic configuration settings for these environments here. - +# RAILS_ENV or RACK_ENV (as appropriate) is used to determine the environment. +# If your application has other named environments, configure them here. development: <<: *default_settings - # Turn on communication to New Relic service in development mode - monitor_mode: true - app_name: <%= ENV['NEW_RELIC_APP_NAME'] %> (Development) - # Rails Only - when running in Developer Mode, the New Relic Agent will - # present performance information on the last 100 transactions you have - # executed since starting the mongrel. # NOTE: There is substantial overhead when running in developer mode. # Do not use for production or load testing. developer_mode: true - # Enable textmate links - # textmate: true - test: <<: *default_settings - # It almost never makes sense to turn on the agent when running - # unit, functional or integration tests or the like. + # It doesn't make sense to report to New Relic from automated test runs. monitor_mode: false -# Turn on the agent in production for 24x7 monitoring. NewRelic -# testing shows an average performance impact of < 5 ms per -# transaction, you can leave this on all the time without -# incurring any user-visible performance degradation. -production: - <<: *default_settings - monitor_mode: true - -# Many applications have a staging environment which behaves -# identically to production. Support for that environment is provided -# here. By default, the staging environment has the agent turned on. staging: <<: *default_settings - monitor_mode: true - app_name: <%= ENV['NEW_RELIC_APP_NAME'] %> (Staging) + +production: + <<: *default_settings From bafb67f702dd3f6038436e47f80cd18dec9bc0b3 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Sat, 5 Sep 2015 16:23:50 +0100 Subject: [PATCH 216/305] Rewrite recent_topic sql to return unique topics on subquery --- app/models/topic.rb | 9 +++++---- spec/models/topic_spec.rb | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/models/topic.rb b/app/models/topic.rb index 845d87b..ea3cd43 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -43,11 +43,12 @@ class Topic < ActiveRecord::Base def self.recent_topics find_by_sql %q{ - SELECT DISTINCT topics.* - FROM (SELECT id, topic_id + SELECT topics.* + FROM (SELECT max(id) as max_id, topic_id FROM posts - ORDER BY id DESC - LIMIT 20) AS T + GROUP BY topic_id + ORDER BY max_id DESC + LIMIT 10) AS T INNER JOIN topics ON T.topic_id = topics.id INNER JOIN forums diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb index 718315a..592de27 100644 --- a/spec/models/topic_spec.rb +++ b/spec/models/topic_spec.rb @@ -31,7 +31,7 @@ describe Topic do describe ".recent_topics" do it "returns 5 unique, most recently posted topics" do topics = [] - 6.times do + 10.times do topic = create :topic topics << topic 3.times { create :post, topic: topic } From fc7dd7286efe48465d327a3eff6c162191acfdc7 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Sat, 5 Sep 2015 17:09:20 +0100 Subject: [PATCH 217/305] Return distinct topics --- app/models/topic.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/topic.rb b/app/models/topic.rb index ea3cd43..4434206 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -43,7 +43,7 @@ class Topic < ActiveRecord::Base def self.recent_topics find_by_sql %q{ - SELECT topics.* + SELECT DISTINCT topics.* FROM (SELECT max(id) as max_id, topic_id FROM posts GROUP BY topic_id From d4db1aafdfd55f88a1ee62adae826dc726362914 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Sat, 5 Sep 2015 19:16:14 +0100 Subject: [PATCH 218/305] Limit by 200 --- app/models/topic.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/topic.rb b/app/models/topic.rb index 4434206..464ad29 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -48,7 +48,7 @@ class Topic < ActiveRecord::Base FROM posts GROUP BY topic_id ORDER BY max_id DESC - LIMIT 10) AS T + LIMIT 200) AS T INNER JOIN topics ON T.topic_id = topics.id INNER JOIN forums From 6fe08003b2d7acf27092e27bca9962e2efd04795 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Fri, 18 Sep 2015 13:35:17 +0100 Subject: [PATCH 219/305] Add helper method for new gathers url --- app/helpers/application_helper.rb | 8 ++++++++ app/views/application/_navigation.html.erb | 22 +++++++++++++++++++--- app/views/gathers/show.html.erb | 4 ++++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9b9d542..561202d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -189,4 +189,12 @@ module ApplicationHelper def latest_rules article_path(Article::RULES) end + + def gathers_url + if Rails.env.production? + "http://gathers.ensl.org" + else + "http://gathers.staging.ensl.org" + end + end end diff --git a/app/views/application/_navigation.html.erb b/app/views/application/_navigation.html.erb index ad687f7..ea46bd0 100644 --- a/app/views/application/_navigation.html.erb +++ b/app/views/application/_navigation.html.erb @@ -25,14 +25,19 @@
  2. - <%= active_link_to Gather.last, class: 'gathers' do %> + <%= link_to gathers_url, class: 'gathers', target: "_blank" do %> Gathers - <%= Gather.player_count_for_game('NS2') %>/<%= Gather::FULL %> + <% end %> -
    • <%= link_to "Introduction", article_url(464) %>
    • <%= link_to "Archives", "/gathers/" %>
      • +
    • + <%= active_link_to Gather.last, class: 'gathers' do %> + Fallback + <%= Gather.player_count_for_game('NS2') %>/<%= Gather::FULL %> + <% end %> +
  3. @@ -73,3 +78,14 @@
+ \ No newline at end of file diff --git a/app/views/gathers/show.html.erb b/app/views/gathers/show.html.erb index 930cf74..4403bc6 100644 --- a/app/views/gathers/show.html.erb +++ b/app/views/gathers/show.html.erb @@ -143,6 +143,10 @@ <% end %>
+

+ Gathers have moved to <%= link_to "gathers.ensl.org", gathers_url, target: "_blank" %>. This app is just a fallback in case something goes wrong +

+ <% if @gather and @gather.status != Gather::STATE_FINISHED %>
From f28d1e2f84fc850c36162094c61e6f2573de39f9 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Fri, 18 Sep 2015 14:42:57 +0100 Subject: [PATCH 220/305] Fix topic spec --- spec/models/topic_spec.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb index 592de27..437c409 100644 --- a/spec/models/topic_spec.rb +++ b/spec/models/topic_spec.rb @@ -32,9 +32,8 @@ describe Topic do it "returns 5 unique, most recently posted topics" do topics = [] 10.times do - topic = create :topic - topics << topic - 3.times { create :post, topic: topic } + topic = create :topic, first_post: "Foo" + topics.push(topic) end recent_topics = Topic.recent_topics topics.last(5).each do |topic| From 03538de3907646bff9a3d2c5bf92bd4183c052ef Mon Sep 17 00:00:00 2001 From: Prommah Date: Thu, 24 Sep 2015 01:32:16 +0100 Subject: [PATCH 221/305] Stricter SteamID validation --- app/models/ban.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/ban.rb b/app/models/ban.rb index 44fa7e1..ef68856 100644 --- a/app/models/ban.rb +++ b/app/models/ban.rb @@ -35,7 +35,8 @@ class Ban < ActiveRecord::Base validate :validate_type validate :validate_ventban - validates_format_of :steamid, with: /\A([0-9]{1,10}:){2}[0-9]{1,10}\Z/, allow_blank: true + validates_length_of :steamid, maximum: 14, allow_blank: true + validates_format_of :steamid, with: /\A0:[01]:[0-9]{1,10}\Z/, allow_blank: true validates_format_of :addr, with: /\A([0-9]{1,3}\.){3}[0-9]{1,3}:?[0-9]{0,5}\z/, allow_blank: true validates_length_of :reason, maximum: 255, allow_nil: true, allow_blank: true From 3948541f1072a9341393ee7826ae3f56aaa1a7a7 Mon Sep 17 00:00:00 2001 From: Prommah Date: Thu, 24 Sep 2015 01:35:30 +0100 Subject: [PATCH 222/305] Stricter SteamID validation --- app/models/user.rb | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 12554f6..04465fd 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -100,7 +100,8 @@ class User < ActiveRecord::Base scope :idle, :conditions => ["lastvisit < ?", 30.minutes.ago.utc] - validates_uniqueness_of :username, :email, :steamid + validates_uniqueness_of :username, :email + validates_uniqueness_of :steamid, :allow_nil => true validates_length_of :firstname, :in => 1..15, :allow_blank => true validates_length_of :lastname, :in => 1..25, :allow_blank => true validates_length_of :username, :in => 2..20 @@ -108,8 +109,9 @@ class User < ActiveRecord::Base validates_presence_of :raw_password, :on => :create validates_length_of :email, :maximum => 50 validates_format_of :email, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i - validates_length_of :steamid, :maximum => 30 - validates_format_of :steamid, :with => /\A([0-9]{1,10}:){2}[0-9]{1,10}\Z/ + validates_length_of :steamid, :maximum => 14 + validates :steamid, presence: true, on: :create + validate :validate_steamid validates_length_of :time_zone, :maximum => 100, :allow_blank => true, :allow_nil => true validates_inclusion_of [:public_email], :in => [true, false], :allow_nil => true validate :validate_team @@ -117,6 +119,8 @@ class User < ActiveRecord::Base before_create :init_variables before_validation :update_password + before_save :correct_steamid_universe + accepts_nested_attributes_for :profile acts_as_versioned @@ -238,6 +242,18 @@ class User < ActiveRecord::Base issues.unread_by(self) end + def validate_steamid + if !(self.steamid.nil? || (m = self.steamid.match(/\A([01]):([01]):(\d{1,10})\Z/) and accid = (m[3].to_i<<1)+m[2].to_i and accid > 0 and accid <= 4294967295)) + errors.add :steamid + end + end + + def correct_steamid_universe + if self.steamid + self.steamid[0] = "0" + end + end + def validate_team if team and !active_teams.exists?({:id => team.id}) errors.add :team From ff1061272cd79ff9208e7c03d762e5eced3ac511 Mon Sep 17 00:00:00 2001 From: Prommah Date: Thu, 24 Sep 2015 03:16:35 +0100 Subject: [PATCH 223/305] Return null steam data for previously invalid SteamIDs --- app/controllers/api/v1/users_controller.rb | 2 +- spec/controllers/api/v1/users_controller_spec.rb | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) mode change 100644 => 100755 app/controllers/api/v1/users_controller.rb mode change 100644 => 100755 spec/controllers/api/v1/users_controller_spec.rb diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb old mode 100644 new mode 100755 index 161772b..7c992d2 --- a/app/controllers/api/v1/users_controller.rb +++ b/app/controllers/api/v1/users_controller.rb @@ -14,7 +14,7 @@ class Api::V1::UsersController < Api::V1::BaseController time_zone: @user.time_zone, avatar: @user.profile.avatar.url, admin: @user.admin?, - steam: { + steam: @user.steamid.nil? ? nil : { id: @user.steamid, url: @steam.nil? ? nil : @steam.base_url, nickname: @steam.nil? ? nil : @steam.nickname diff --git a/spec/controllers/api/v1/users_controller_spec.rb b/spec/controllers/api/v1/users_controller_spec.rb old mode 100644 new mode 100755 index f9e362b..c2a7059 --- a/spec/controllers/api/v1/users_controller_spec.rb +++ b/spec/controllers/api/v1/users_controller_spec.rb @@ -29,16 +29,14 @@ describe Api::V1::UsersController do expect(json["team"]).to be_nil end - it "returns data for users with invalid steam ids" do - @user.steamid = "0:0:000" + it "returns nulled steam data for users who had invalid steam ids" do + @user.steamid = nil @user.save! get :show, id: @user.id expect(response).to be_success - expect(json["steam"]["id"]).to_not be_nil - expect(json["steam"]["url"]).to be_nil - expect(json["steam"]["nickname"]).to be_nil + expect(json["steam"]).to be_nil end it "returns 404 if user does not exist" do From 07a22ce0f3865211922b10ce2647a23cd0f50022 Mon Sep 17 00:00:00 2001 From: Prommah Date: Thu, 24 Sep 2015 04:03:24 +0100 Subject: [PATCH 224/305] Skip unnecessary condenser lookups --- app/controllers/api/v1/users_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb index 7c992d2..accc35f 100755 --- a/app/controllers/api/v1/users_controller.rb +++ b/app/controllers/api/v1/users_controller.rb @@ -5,7 +5,9 @@ class Api::V1::UsersController < Api::V1::BaseController def show @user = User.find(params[:id]) - @steam = steam_profile @user + if @user.steamid.present? + @steam = steam_profile @user + end render json: { id: @user.id, From a52ce6fb9abb9392694e599731dd8f4e9b9fe926 Mon Sep 17 00:00:00 2001 From: Prommah Date: Thu, 24 Sep 2015 06:58:21 +0100 Subject: [PATCH 225/305] Add SteamID range spec --- spec/features/users/user_signs_up_spec.rb | 9 +++++++++ 1 file changed, 9 insertions(+) mode change 100644 => 100755 spec/features/users/user_signs_up_spec.rb diff --git a/spec/features/users/user_signs_up_spec.rb b/spec/features/users/user_signs_up_spec.rb old mode 100644 new mode 100755 index e73e0e3..51de9ba --- a/spec/features/users/user_signs_up_spec.rb +++ b/spec/features/users/user_signs_up_spec.rb @@ -43,6 +43,15 @@ feature 'Visitor signs up', js: :true do expect(page).to have_content(error_message('steamid.invalid')) end + scenario 'with out of range Steam ID' do + within registration_form do + fill_form(:user, user.slice(*sign_up_attributes).merge({ steamid: "0:0:2147483648" })) + click_button submit(:user, :create) + end + + expect(page).to have_content(error_message('steamid.invalid')) + end + def sign_up_attributes [:username, :email, :raw_password, :steamid] end From a42abfa4300b39a7463391fab9923d88d82e17d7 Mon Sep 17 00:00:00 2001 From: Prommah Date: Thu, 24 Sep 2015 07:15:49 +0100 Subject: [PATCH 226/305] Add test for nil SteamID --- spec/features/users/user_signs_up_spec.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/spec/features/users/user_signs_up_spec.rb b/spec/features/users/user_signs_up_spec.rb index 51de9ba..ff098f6 100755 --- a/spec/features/users/user_signs_up_spec.rb +++ b/spec/features/users/user_signs_up_spec.rb @@ -52,6 +52,15 @@ feature 'Visitor signs up', js: :true do expect(page).to have_content(error_message('steamid.invalid')) end + scenario 'with nil Steam ID' do + within registration_form do + fill_form(:user, user.slice(*sign_up_attributes).merge({ steamid: nil })) + click_button submit(:user, :create) + end + + expect(page).to have_content(error_message('steamid.invalid')) + end + def sign_up_attributes [:username, :email, :raw_password, :steamid] end From 65cf350231e94f42fa9709e1a81d6adb69e32f39 Mon Sep 17 00:00:00 2001 From: Prommah Date: Thu, 24 Sep 2015 07:23:05 +0100 Subject: [PATCH 227/305] Improve & clean SteamID validation --- app/models/user.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) mode change 100644 => 100755 app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb old mode 100644 new mode 100755 index 04465fd..4d50141 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -243,13 +243,14 @@ class User < ActiveRecord::Base end def validate_steamid - if !(self.steamid.nil? || (m = self.steamid.match(/\A([01]):([01]):(\d{1,10})\Z/) and accid = (m[3].to_i<<1)+m[2].to_i and accid > 0 and accid <= 4294967295)) - errors.add :steamid - end + errors.add :steamid unless self.steamid.nil? || + (m = self.steamid.match(/\A([01]):([01]):(\d{1,10})\Z/)) && + (id = m[3].to_i) && + id >= 1 && id <= 2147483647 end def correct_steamid_universe - if self.steamid + if self.steamid.present? self.steamid[0] = "0" end end From 27aebc2a29e66b34c94ab58582d10f96a515f8ae Mon Sep 17 00:00:00 2001 From: Prommah Date: Thu, 24 Sep 2015 10:19:00 +0100 Subject: [PATCH 228/305] Fix styling and tidy validations --- app/models/ban.rb | 11 +++---- app/models/user.rb | 33 +++++++++----------- spec/features/users/user_signs_up_spec.rb | 38 +++++++++++------------ 3 files changed, 39 insertions(+), 43 deletions(-) mode change 100644 => 100755 app/models/ban.rb diff --git a/app/models/ban.rb b/app/models/ban.rb old mode 100644 new mode 100755 index ef68856..2d07a1f --- a/app/models/ban.rb +++ b/app/models/ban.rb @@ -33,14 +33,13 @@ class Ban < ActiveRecord::Base scope :effective, conditions: "expiry > UTC_TIMESTAMP()" scope :ineffective, conditions: "expiry < UTC_TIMESTAMP()" + before_validation :check_user + validate :validate_type validate :validate_ventban - validates_length_of :steamid, maximum: 14, allow_blank: true - validates_format_of :steamid, with: /\A0:[01]:[0-9]{1,10}\Z/, allow_blank: true - validates_format_of :addr, with: /\A([0-9]{1,3}\.){3}[0-9]{1,3}:?[0-9]{0,5}\z/, allow_blank: true - validates_length_of :reason, maximum: 255, allow_nil: true, allow_blank: true - - before_validation :check_user + validates :steamid, length: {maximum: 14}, format: /\A0:[01]:[0-9]{1,10}\Z/, allow_blank: true + validates :addr, format: /\A([0-9]{1,3}\.){3}[0-9]{1,3}:?[0-9]{0,5}\z/, allow_blank: true + validates :reason, length: {maximum: 255}, allow_blank: true belongs_to :user belongs_to :server diff --git a/app/models/user.rb b/app/models/user.rb index 4d50141..13d0407 100755 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -100,24 +100,20 @@ class User < ActiveRecord::Base scope :idle, :conditions => ["lastvisit < ?", 30.minutes.ago.utc] - validates_uniqueness_of :username, :email - validates_uniqueness_of :steamid, :allow_nil => true - validates_length_of :firstname, :in => 1..15, :allow_blank => true - validates_length_of :lastname, :in => 1..25, :allow_blank => true - validates_length_of :username, :in => 2..20 - validates_format_of :username, :with => /\A[A-Za-z0-9_\-\+]{2,20}\Z/ - validates_presence_of :raw_password, :on => :create - validates_length_of :email, :maximum => 50 - validates_format_of :email, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i - validates_length_of :steamid, :maximum => 14 - validates :steamid, presence: true, on: :create + before_validation :update_password + + validates :username, uniqueness: true, length: {in: 2..20}, format: /\A[A-Za-z0-9_\-\+]{2,20}\Z/ + validates :firstname, length: {in: 1..15}, allow_blank: true + validates :lastname, length: {in: 1..25}, allow_blank: true + validates :raw_password, presence: {on: :create} + validates :email, uniqueness: true, length: {maximum: 50}, format: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i + validates :steamid, uniqueness: {allow_nil: true}, length: {maximum: 14}, presence: {on: :create} validate :validate_steamid - validates_length_of :time_zone, :maximum => 100, :allow_blank => true, :allow_nil => true - validates_inclusion_of [:public_email], :in => [true, false], :allow_nil => true + validates :time_zone, length: {maximum: 100}, allow_blank: true + validates :public_email, inclusion: [true, false], allow_nil: true validate :validate_team before_create :init_variables - before_validation :update_password before_save :correct_steamid_universe @@ -243,15 +239,16 @@ class User < ActiveRecord::Base end def validate_steamid - errors.add :steamid unless self.steamid.nil? || - (m = self.steamid.match(/\A([01]):([01]):(\d{1,10})\Z/)) && + errors.add :steamid unless + steamid.nil? || + (m = steamid.match(/\A([01]):([01]):(\d{1,10})\Z/)) && (id = m[3].to_i) && id >= 1 && id <= 2147483647 end def correct_steamid_universe - if self.steamid.present? - self.steamid[0] = "0" + if steamid.present? + steamid[0] = "0" end end diff --git a/spec/features/users/user_signs_up_spec.rb b/spec/features/users/user_signs_up_spec.rb index ff098f6..2d5b2e7 100755 --- a/spec/features/users/user_signs_up_spec.rb +++ b/spec/features/users/user_signs_up_spec.rb @@ -1,64 +1,64 @@ -require 'spec_helper' +require "spec_helper" -feature 'Visitor signs up', js: :true do +feature "Visitor signs up", js: :true do let(:user) { attributes_for(:user) } before do visit new_user_path end - scenario 'with valid Username, Email, Password and Steam ID' do + scenario "with valid Username, Email, Password and Steam ID" do within registration_form do fill_form(:user, user.slice(*sign_up_attributes)) click_button submit(:user, :create) end - expect(user_status).to have_content('ACCOUNT') + expect(user_status).to have_content("ACCOUNT") end - scenario 'with invalid Email' do + scenario "with invalid Email" do within registration_form do - fill_form(:user, user.slice(*sign_up_attributes).merge({ email: "invalid" })) + fill_form(:user, user.slice(*sign_up_attributes).merge(email: "invalid")) click_button submit(:user, :create) end - expect(page).to have_content(error_message('email.invalid')) + expect(page).to have_content(error_message("email.invalid")) end - scenario 'with blank Password' do + scenario "with blank Password" do within registration_form do - fill_form(:user, user.slice(*sign_up_attributes).merge({ raw_password: "" })) + fill_form(:user, user.slice(*sign_up_attributes).merge(raw_password: "")) click_button submit(:user, :create) end - expect(page).to have_content(error_message('raw_password.blank')) + expect(page).to have_content(error_message("raw_password.blank")) end - scenario 'with invalid Steam ID' do + scenario "with invalid Steam ID" do within registration_form do - fill_form(:user, user.slice(*sign_up_attributes).merge({ steamid: "invalid" })) + fill_form(:user, user.slice(*sign_up_attributes).merge(steamid: "invalid")) click_button submit(:user, :create) end - expect(page).to have_content(error_message('steamid.invalid')) + expect(page).to have_content(error_message("steamid.invalid")) end - scenario 'with out of range Steam ID' do + scenario "with out of range Steam ID" do within registration_form do - fill_form(:user, user.slice(*sign_up_attributes).merge({ steamid: "0:0:2147483648" })) + fill_form(:user, user.slice(*sign_up_attributes).merge(steamid: "0:0:2147483648")) click_button submit(:user, :create) end - expect(page).to have_content(error_message('steamid.invalid')) + expect(page).to have_content(error_message("steamid.invalid")) end - scenario 'with nil Steam ID' do + scenario "with nil Steam ID" do within registration_form do - fill_form(:user, user.slice(*sign_up_attributes).merge({ steamid: nil })) + fill_form(:user, user.slice(*sign_up_attributes).merge(steamid: nil)) click_button submit(:user, :create) end - expect(page).to have_content(error_message('steamid.invalid')) + expect(page).to have_content(error_message("steamid.invalid")) end def sign_up_attributes From 76492ff0729ae10976bf187ddc3671d7f76964c2 Mon Sep 17 00:00:00 2001 From: Prommah Date: Thu, 24 Sep 2015 15:04:45 +0100 Subject: [PATCH 229/305] Add hound & ruby style config --- .hound.yml | 2 + config/styles/ruby.yml | 1065 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1067 insertions(+) create mode 100644 .hound.yml create mode 100755 config/styles/ruby.yml diff --git a/.hound.yml b/.hound.yml new file mode 100644 index 0000000..1460f06 --- /dev/null +++ b/.hound.yml @@ -0,0 +1,2 @@ +ruby: + config/styles/ruby.yml diff --git a/config/styles/ruby.yml b/config/styles/ruby.yml new file mode 100755 index 0000000..8183a0d --- /dev/null +++ b/config/styles/ruby.yml @@ -0,0 +1,1065 @@ +AllCops: + Include: + - "**/*.gemspec" + - "**/*.podspec" + - "**/*.jbuilder" + - "**/*.rake" + - "**/*.opal" + - "**/Gemfile" + - "**/Rakefile" + - "**/Capfile" + - "**/Guardfile" + - "**/Podfile" + - "**/Thorfile" + - "**/Vagrantfile" + - "**/Berksfile" + - "**/Cheffile" + - "**/Vagabondfile" + Exclude: + - "vendor/**/*" + - "db/schema.rb" + RunRailsCops: false + DisplayCopNames: false + StyleGuideCopsOnly: false +Style/AccessModifierIndentation: + Description: Check indentation of private/protected visibility modifiers. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#indent-public-private-protected + Enabled: true + EnforcedStyle: indent + SupportedStyles: + - outdent + - indent +Style/AlignHash: + Description: Align the elements of a hash literal if they span more than one line. + Enabled: true + EnforcedHashRocketStyle: key + EnforcedColonStyle: key + EnforcedLastArgumentHashStyle: always_inspect + SupportedLastArgumentHashStyles: + - always_inspect + - always_ignore + - ignore_implicit + - ignore_explicit +Style/AlignParameters: + Description: Align the parameters of a method call if they span more than one line. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-double-indent + Enabled: true + EnforcedStyle: with_first_parameter + SupportedStyles: + - with_first_parameter + - with_fixed_indentation +Style/AndOr: + Description: Use &&/|| instead of and/or. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-and-or-or + Enabled: true + EnforcedStyle: always + SupportedStyles: + - always + - conditionals +Style/BarePercentLiterals: + Description: Checks if usage of %() or %Q() matches configuration. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-q-shorthand + Enabled: true + EnforcedStyle: bare_percent + SupportedStyles: + - percent_q + - bare_percent +Style/BracesAroundHashParameters: + Description: Enforce braces style around hash parameters. + Enabled: true + EnforcedStyle: no_braces + SupportedStyles: + - braces + - no_braces + - context_dependent +Style/CaseIndentation: + Description: Indentation of when in a case/when/[else/]end. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#indent-when-to-case + Enabled: true + IndentWhenRelativeTo: case + SupportedStyles: + - case + - end + IndentOneStep: false +Style/ClassAndModuleChildren: + Description: Checks style of children classes and modules. + Enabled: false + EnforcedStyle: nested + SupportedStyles: + - nested + - compact +Style/ClassCheck: + Description: Enforces consistent use of `Object#is_a?` or `Object#kind_of?`. + Enabled: true + EnforcedStyle: is_a? + SupportedStyles: + - is_a? + - kind_of? +Style/CollectionMethods: + Description: Preferred collection methods. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#map-find-select-reduce-size + Enabled: true + PreferredMethods: + collect: map + collect!: map! + find: detect + find_all: select + reduce: inject +Style/CommentAnnotation: + Description: Checks formatting of special comments (TODO, FIXME, OPTIMIZE, HACK, + REVIEW). + StyleGuide: https://github.com/bbatsov/ruby-style-guide#annotate-keywords + Enabled: false + Keywords: + - TODO + - FIXME + - OPTIMIZE + - HACK + - REVIEW +Style/DotPosition: + Description: Checks the position of the dot in multi-line method calls. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-multi-line-chains + Enabled: true + EnforcedStyle: trailing + SupportedStyles: + - leading + - trailing +Style/EmptyLineBetweenDefs: + Description: Use empty lines between defs. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#empty-lines-between-methods + Enabled: true + AllowAdjacentOneLineDefs: false +Style/EmptyLinesAroundBlockBody: + Description: Keeps track of empty lines around block bodies. + Enabled: true + EnforcedStyle: no_empty_lines + SupportedStyles: + - empty_lines + - no_empty_lines +Style/EmptyLinesAroundClassBody: + Description: Keeps track of empty lines around class bodies. + Enabled: true + EnforcedStyle: no_empty_lines + SupportedStyles: + - empty_lines + - no_empty_lines +Style/EmptyLinesAroundModuleBody: + Description: Keeps track of empty lines around module bodies. + Enabled: true + EnforcedStyle: no_empty_lines + SupportedStyles: + - empty_lines + - no_empty_lines +Style/Encoding: + Description: Use UTF-8 as the source file encoding. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#utf-8 + Enabled: false + EnforcedStyle: always + SupportedStyles: + - when_needed + - always +Style/FileName: + Description: Use snake_case for source file names. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#snake-case-files + Enabled: false + Exclude: [] +Style/FirstParameterIndentation: + Description: Checks the indentation of the first parameter in a method call. + Enabled: true + EnforcedStyle: special_for_inner_method_call_in_parentheses + SupportedStyles: + - consistent + - special_for_inner_method_call + - special_for_inner_method_call_in_parentheses +Style/For: + Description: Checks use of for or each in multiline loops. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-for-loops + Enabled: true + EnforcedStyle: each + SupportedStyles: + - for + - each +Style/FormatString: + Description: Enforce the use of Kernel#sprintf, Kernel#format or String#%. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#sprintf + Enabled: false + EnforcedStyle: format + SupportedStyles: + - format + - sprintf + - percent +Style/GlobalVars: + Description: Do not introduce global variables. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#instance-vars + Enabled: false + AllowedVariables: [] +Style/GuardClause: + Description: Check for conditionals that can be replaced with guard clauses + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-nested-conditionals + Enabled: false + MinBodyLength: 1 +Style/HashSyntax: + Description: 'Prefer Ruby 1.9 hash syntax { a: 1, b: 2 } over 1.8 syntax { :a => + 1, :b => 2 }.' + StyleGuide: https://github.com/bbatsov/ruby-style-guide#hash-literals + Enabled: true + EnforcedStyle: ruby19 + SupportedStyles: + - ruby19 + - hash_rockets +Style/IfUnlessModifier: + Description: Favor modifier if/unless usage when you have a single-line body. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#if-as-a-modifier + Enabled: false + MaxLineLength: 80 +Style/IndentationWidth: + Description: Use 2 spaces for indentation. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#spaces-indentation + Enabled: true + Width: 2 +Style/IndentHash: + Description: Checks the indentation of the first key in a hash literal. + Enabled: true + EnforcedStyle: special_inside_parentheses + SupportedStyles: + - special_inside_parentheses + - consistent +Style/LambdaCall: + Description: Use lambda.call(...) instead of lambda.(...). + StyleGuide: https://github.com/bbatsov/ruby-style-guide#proc-call + Enabled: false + EnforcedStyle: call + SupportedStyles: + - call + - braces +Style/Next: + Description: Use `next` to skip iteration instead of a condition at the end. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-nested-conditionals + Enabled: false + EnforcedStyle: skip_modifier_ifs + MinBodyLength: 3 + SupportedStyles: + - skip_modifier_ifs + - always +Style/NonNilCheck: + Description: Checks for redundant nil checks. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-non-nil-checks + Enabled: true + IncludeSemanticChanges: false +Style/MethodDefParentheses: + Description: Checks if the method definitions have or don't have parentheses. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#method-parens + Enabled: true + EnforcedStyle: require_parentheses + SupportedStyles: + - require_parentheses + - require_no_parentheses +Style/MethodName: + Description: Use the configured style when naming methods. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#snake-case-symbols-methods-vars + Enabled: true + EnforcedStyle: snake_case + SupportedStyles: + - snake_case + - camelCase +Style/MultilineOperationIndentation: + Description: Checks indentation of binary operations that span more than one line. + Enabled: true + EnforcedStyle: aligned + SupportedStyles: + - aligned + - indented +Style/NumericLiterals: + Description: Add underscores to large numeric literals to improve their readability. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#underscores-in-numerics + Enabled: false + MinDigits: 5 +Style/ParenthesesAroundCondition: + Description: Don't use parentheses around the condition of an if/unless/while. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-parens-if + Enabled: true + AllowSafeAssignment: true +Style/PercentLiteralDelimiters: + Description: Use `%`-literal delimiters consistently + StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-literal-braces + Enabled: false + PreferredDelimiters: + "%": "()" + "%i": "()" + "%q": "()" + "%Q": "()" + "%r": "{}" + "%s": "()" + "%w": "()" + "%W": "()" + "%x": "()" +Style/PercentQLiterals: + Description: Checks if uses of %Q/%q match the configured preference. + Enabled: true + EnforcedStyle: lower_case_q + SupportedStyles: + - lower_case_q + - upper_case_q +Style/PredicateName: + Description: Check the names of predicate methods. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#bool-methods-qmark + Enabled: true + NamePrefix: + - is_ + - has_ + - have_ + NamePrefixBlacklist: + - is_ + Exclude: + - spec/**/* +Style/RaiseArgs: + Description: Checks the arguments passed to raise/fail. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#exception-class-messages + Enabled: false + EnforcedStyle: exploded + SupportedStyles: + - compact + - exploded +Style/RedundantReturn: + Description: Don't use return where it's not required. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-explicit-return + Enabled: true + AllowMultipleReturnValues: false +Style/RegexpLiteral: + Description: Use %r for regular expressions matching more than `MaxSlashes` '/' + characters. Use %r only for regular expressions matching more than `MaxSlashes` + '/' character. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-r + Enabled: false + MaxSlashes: 1 +Style/Semicolon: + Description: Don't use semicolons to terminate expressions. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-semicolon + Enabled: true + AllowAsExpressionSeparator: false +Style/SignalException: + Description: Checks for proper usage of fail and raise. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#fail-method + Enabled: false + EnforcedStyle: semantic + SupportedStyles: + - only_raise + - only_fail + - semantic +Style/SingleLineBlockParams: + Description: Enforces the names of some block params. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#reduce-blocks + Enabled: false + Methods: + - reduce: + - a + - e + - inject: + - a + - e +Style/SingleLineMethods: + Description: Avoid single-line methods. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-single-line-methods + Enabled: false + AllowIfMethodIsEmpty: true +Style/StringLiterals: + Description: Checks if uses of quotes match the configured preference. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-string-literals + Enabled: true + EnforcedStyle: double_quotes + SupportedStyles: + - single_quotes + - double_quotes +Style/StringLiteralsInInterpolation: + Description: Checks if uses of quotes inside expressions in interpolated strings + match the configured preference. + Enabled: true + EnforcedStyle: single_quotes + SupportedStyles: + - single_quotes + - double_quotes +Style/SpaceAroundBlockParameters: + Description: Checks the spacing inside and after block parameters pipes. + Enabled: true + EnforcedStyleInsidePipes: no_space + SupportedStyles: + - space + - no_space +Style/SpaceAroundEqualsInParameterDefault: + Description: Checks that the equals signs in parameter default assignments have + or don't have surrounding space depending on configuration. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#spaces-around-equals + Enabled: true + EnforcedStyle: space + SupportedStyles: + - space + - no_space +Style/SpaceBeforeBlockBraces: + Description: Checks that the left block brace has or doesn't have space before it. + Enabled: true + EnforcedStyle: space + SupportedStyles: + - space + - no_space +Style/SpaceInsideBlockBraces: + Description: Checks that block braces have or don't have surrounding space. For + blocks taking parameters, checks that the left brace has or doesn't have trailing + space. + Enabled: true + EnforcedStyle: space + SupportedStyles: + - space + - no_space + EnforcedStyleForEmptyBraces: no_space + SpaceBeforeBlockParameters: true +Style/SpaceInsideHashLiteralBraces: + Description: Use spaces inside hash literal braces - or don't. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#spaces-operators + Enabled: true + EnforcedStyle: space + EnforcedStyleForEmptyBraces: no_space + SupportedStyles: + - space + - no_space +Style/SymbolProc: + Description: Use symbols as procs instead of blocks when possible. + Enabled: true + IgnoredMethods: + - respond_to +Style/TrailingBlankLines: + Description: Checks trailing blank lines and final newline. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#newline-eof + Enabled: true + EnforcedStyle: final_newline + SupportedStyles: + - final_newline + - final_blank_line +Style/TrailingComma: + Description: Checks for trailing comma in parameter lists and literals. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas + Enabled: false + EnforcedStyleForMultiline: no_comma + SupportedStyles: + - comma + - no_comma +Style/TrivialAccessors: + Description: Prefer attr_* methods to trivial readers/writers. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#attr_family + Enabled: false + ExactNameMatch: false + AllowPredicates: false + AllowDSLWriters: false + Whitelist: + - to_ary + - to_a + - to_c + - to_enum + - to_h + - to_hash + - to_i + - to_int + - to_io + - to_open + - to_path + - to_proc + - to_r + - to_regexp + - to_str + - to_s + - to_sym +Style/VariableName: + Description: Use the configured style when naming variables. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#snake-case-symbols-methods-vars + Enabled: true + EnforcedStyle: snake_case + SupportedStyles: + - snake_case + - camelCase +Style/WhileUntilModifier: + Description: Favor modifier while/until usage when you have a single-line body. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#while-as-a-modifier + Enabled: false + MaxLineLength: 80 +Style/WordArray: + Description: Use %w or %W for arrays of words. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-w + Enabled: false + MinSize: 0 + WordRegex: !ruby/regexp /\A[\p{Word}]+\z/ +Metrics/AbcSize: + Description: A calculated magnitude based on number of assignments, branches, and + conditions. + Enabled: true + Max: 15 +Metrics/BlockNesting: + Description: Avoid excessive block nesting + StyleGuide: https://github.com/bbatsov/ruby-style-guide#three-is-the-number-thou-shalt-count + Enabled: false + Max: 3 +Metrics/ClassLength: + Description: Avoid classes longer than 100 lines of code. + Enabled: false + CountComments: false + Max: 100 +Metrics/CyclomaticComplexity: + Description: A complexity metric that is strongly correlated to the number of test + cases needed to validate a method. + Enabled: false + Max: 6 +Metrics/LineLength: + Description: Limit lines to 100 characters. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#80-character-limits + Enabled: true + Max: 100 + AllowURI: true + URISchemes: + - http + - https +Metrics/MethodLength: + Description: Avoid methods longer than 10 lines of code. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#short-methods + Enabled: false + CountComments: false + Max: 10 +Metrics/ParameterLists: + Description: Avoid parameter lists longer than three or four parameters. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#too-many-params + Enabled: false + Max: 5 + CountKeywordArgs: true +Metrics/PerceivedComplexity: + Description: A complexity metric geared towards measuring complexity for a human + reader. + Enabled: false + Max: 7 +Lint/AssignmentInCondition: + Description: Don't use assignment in conditions. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#safe-assignment-in-condition + Enabled: false + AllowSafeAssignment: true +Lint/EndAlignment: + Description: Align ends correctly. + Enabled: true + AlignWith: keyword + SupportedStyles: + - keyword + - variable +Lint/DefEndAlignment: + Description: Align ends corresponding to defs correctly. + Enabled: true + AlignWith: start_of_line + SupportedStyles: + - start_of_line + - def +Rails/ActionFilter: + Description: Enforces consistent use of action filter methods. + Enabled: false + EnforcedStyle: action + SupportedStyles: + - action + - filter + Include: + - app/controllers/**/*.rb +Rails/DefaultScope: + Description: Checks if the argument passed to default_scope is a block. + Enabled: true + Include: + - app/models/**/*.rb +Rails/HasAndBelongsToMany: + Description: Prefer has_many :through to has_and_belongs_to_many. + Enabled: true + Include: + - app/models/**/*.rb +Rails/Output: + Description: Checks for calls to puts, print, etc. + Enabled: true + Include: + - app/**/*.rb + - config/**/*.rb + - db/**/*.rb + - lib/**/*.rb +Rails/ReadWriteAttribute: + Description: Checks for read_attribute(:attr) and write_attribute(:attr, val). + Enabled: true + Include: + - app/models/**/*.rb +Rails/ScopeArgs: + Description: Checks the arguments of ActiveRecord scopes. + Enabled: true + Include: + - app/models/**/*.rb +Rails/Validation: + Description: Use validates :attribute, hash of validations. + Enabled: true + Include: + - app/models/**/*.rb +Style/InlineComment: + Description: Avoid inline comments. + Enabled: false +Style/MethodCalledOnDoEndBlock: + Description: Avoid chaining a method call on a do...end block. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#single-line-blocks + Enabled: false +Style/SymbolArray: + Description: Use %i or %I for arrays of symbols. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-i + Enabled: false +Style/ExtraSpacing: + Description: Do not use unnecessary spacing. + Enabled: true +Style/AccessorMethodName: + Description: Check the naming of accessor methods for get_/set_. + Enabled: false +Style/Alias: + Description: Use alias_method instead of alias. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#alias-method + Enabled: false +Style/AlignArray: + Description: Align the elements of an array literal if they span more than one line. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#align-multiline-arrays + Enabled: true +Style/ArrayJoin: + Description: Use Array#join instead of Array#*. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#array-join + Enabled: false +Style/AsciiComments: + Description: Use only ascii symbols in comments. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#english-comments + Enabled: false +Style/AsciiIdentifiers: + Description: Use only ascii symbols in identifiers. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#english-identifiers + Enabled: false +Style/Attr: + Description: Checks for uses of Module#attr. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#attr + Enabled: false +Style/BeginBlock: + Description: Avoid the use of BEGIN blocks. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-BEGIN-blocks + Enabled: true +Style/BlockComments: + Description: Do not use block comments. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-block-comments + Enabled: true +Style/BlockEndNewline: + Description: Put end statement of multiline block on its own line. + Enabled: true +Style/Blocks: + Description: Avoid using {...} for multi-line blocks (multiline chaining is always + ugly). Prefer {...} over do...end for single-line blocks. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#single-line-blocks + Enabled: true +Style/CaseEquality: + Description: Avoid explicit use of the case equality operator(===). + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-case-equality + Enabled: false +Style/CharacterLiteral: + Description: Checks for uses of character literals. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-character-literals + Enabled: false +Style/ClassAndModuleCamelCase: + Description: Use CamelCase for classes and modules. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#camelcase-classes + Enabled: true +Style/ClassMethods: + Description: Use self when defining module/class methods. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#def-self-singletons + Enabled: true +Style/ClassVars: + Description: Avoid the use of class variables. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-class-vars + Enabled: false +Style/ColonMethodCall: + Description: 'Do not use :: for method call.' + StyleGuide: https://github.com/bbatsov/ruby-style-guide#double-colons + Enabled: false +Style/CommentIndentation: + Description: Indentation of comments. + Enabled: true +Style/ConstantName: + Description: Constants should use SCREAMING_SNAKE_CASE. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#screaming-snake-case + Enabled: true +Style/DefWithParentheses: + Description: Use def with parentheses when there are arguments. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#method-parens + Enabled: true +Style/DeprecatedHashMethods: + Description: Checks for use of deprecated Hash methods. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#hash-key + Enabled: false +Style/Documentation: + Description: Document classes and non-namespace modules. + Enabled: false +Style/DoubleNegation: + Description: Checks for uses of double negation (!!). + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-bang-bang + Enabled: false +Style/EachWithObject: + Description: Prefer `each_with_object` over `inject` or `reduce`. + Enabled: false +Style/ElseAlignment: + Description: Align elses and elsifs correctly. + Enabled: true +Style/EmptyElse: + Description: Avoid empty else-clauses. + Enabled: true +Style/EmptyLines: + Description: Don't use several empty lines in a row. + Enabled: true +Style/EmptyLinesAroundAccessModifier: + Description: Keep blank lines around access modifiers. + Enabled: true +Style/EmptyLinesAroundMethodBody: + Description: Keeps track of empty lines around method bodies. + Enabled: true +Style/EmptyLiteral: + Description: Prefer literals to Array.new/Hash.new/String.new. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#literal-array-hash + Enabled: false +Style/EndBlock: + Description: Avoid the use of END blocks. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-END-blocks + Enabled: true +Style/EndOfLine: + Description: Use Unix-style line endings. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#crlf + Enabled: true +Style/EvenOdd: + Description: Favor the use of Fixnum#even? && Fixnum#odd? + StyleGuide: https://github.com/bbatsov/ruby-style-guide#predicate-methods + Enabled: false +Style/FlipFlop: + Description: Checks for flip flops + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-flip-flops + Enabled: false +Style/IfWithSemicolon: + Description: Do not use if x; .... Use the ternary operator instead. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-semicolon-ifs + Enabled: false +Style/IndentationConsistency: + Description: Keep indentation straight. + Enabled: true +Style/IndentArray: + Description: Checks the indentation of the first element in an array literal. + Enabled: true +Style/InfiniteLoop: + Description: Use Kernel#loop for infinite loops. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#infinite-loop + Enabled: true +Style/Lambda: + Description: Use the new lambda literal syntax for single-line blocks. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#lambda-multi-line + Enabled: false +Style/LeadingCommentSpace: + Description: Comments should start with a space. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#hash-space + Enabled: true +Style/LineEndConcatenation: + Description: Use \ instead of + or << to concatenate two string literals at line + end. + Enabled: false +Style/MethodCallParentheses: + Description: Do not use parentheses for method calls with no arguments. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-args-no-parens + Enabled: true +Style/ModuleFunction: + Description: Checks for usage of `extend self` in modules. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#module-function + Enabled: false +Style/MultilineBlockChain: + Description: Avoid multi-line chains of blocks. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#single-line-blocks + Enabled: true +Style/MultilineBlockLayout: + Description: Ensures newlines after multiline block do statements. + Enabled: true +Style/MultilineIfThen: + Description: Do not use then for multi-line if/unless. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-then + Enabled: true +Style/MultilineTernaryOperator: + Description: 'Avoid multi-line ?: (the ternary operator); use if/unless instead.' + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-multiline-ternary + Enabled: true +Style/NegatedIf: + Description: Favor unless over if for negative conditions (or control flow or). + StyleGuide: https://github.com/bbatsov/ruby-style-guide#unless-for-negatives + Enabled: false +Style/NegatedWhile: + Description: Favor until over while for negative conditions. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#until-for-negatives + Enabled: false +Style/NestedTernaryOperator: + Description: Use one expression per branch in a ternary operator. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-nested-ternary + Enabled: true +Style/NilComparison: + Description: Prefer x.nil? to x == nil. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#predicate-methods + Enabled: false +Style/Not: + Description: Use ! instead of not. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#bang-not-not + Enabled: false +Style/OneLineConditional: + Description: Favor the ternary operator(?:) over if/then/else/end constructs. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#ternary-operator + Enabled: false +Style/OpMethod: + Description: When defining binary operators, name the argument other. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#other-arg + Enabled: false +Style/PerlBackrefs: + Description: Avoid Perl-style regex back references. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-perl-regexp-last-matchers + Enabled: false +Style/Proc: + Description: Use proc instead of Proc.new. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#proc + Enabled: false +Style/RedundantBegin: + Description: Don't use begin blocks when they are not needed. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#begin-implicit + Enabled: true +Style/RedundantException: + Description: Checks for an obsolete RuntimeException argument in raise/fail. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-explicit-runtimeerror + Enabled: true +Style/RedundantSelf: + Description: Don't use self where it's not needed. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-self-unless-required + Enabled: true +Style/RescueModifier: + Description: Avoid using rescue in its modifier form. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-rescue-modifiers + Enabled: true +Style/SelfAssignment: + Description: Checks for places where self-assignment shorthand should have been + used. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#self-assignment + Enabled: false +Style/SingleSpaceBeforeFirstArg: + Description: Checks that exactly one space is used between a method name and the + first argument for method calls without parentheses. + Enabled: true +Style/SpaceAfterColon: + Description: Use spaces after colons. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#spaces-operators + Enabled: true +Style/SpaceAfterComma: + Description: Use spaces after commas. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#spaces-operators + Enabled: true +Style/SpaceAfterControlKeyword: + Description: Use spaces after if/elsif/unless/while/until/case/when. + Enabled: true +Style/SpaceAfterMethodName: + Description: Do not put a space between a method name and the opening parenthesis + in a method definition. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#parens-no-spaces + Enabled: true +Style/SpaceAfterNot: + Description: Tracks redundant space after the ! operator. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-space-bang + Enabled: true +Style/SpaceAfterSemicolon: + Description: Use spaces after semicolons. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#spaces-operators + Enabled: true +Style/SpaceBeforeComma: + Description: No spaces before commas. + Enabled: true +Style/SpaceBeforeComment: + Description: Checks for missing space between code and a comment on the same line. + Enabled: true +Style/SpaceBeforeSemicolon: + Description: No spaces before semicolons. + Enabled: true +Style/SpaceAroundOperators: + Description: Use spaces around operators. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#spaces-operators + Enabled: true +Style/SpaceBeforeModifierKeyword: + Description: Put a space before the modifier keyword. + Enabled: true +Style/SpaceInsideBrackets: + Description: No spaces after [ or before ]. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-spaces-braces + Enabled: true +Style/SpaceInsideParens: + Description: No spaces after ( or before ). + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-spaces-braces + Enabled: true +Style/SpaceInsideRangeLiteral: + Description: No spaces inside range literals. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-space-inside-range-literals + Enabled: true +Style/SpecialGlobalVars: + Description: Avoid Perl-style global variables. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-cryptic-perlisms + Enabled: false +Style/StructInheritance: + Description: Checks for inheritance from Struct.new. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-extend-struct-new + Enabled: true +Style/Tab: + Description: No hard tabs. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#spaces-indentation + Enabled: true +Style/TrailingWhitespace: + Description: Avoid trailing whitespace. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-trailing-whitespace + Enabled: true +Style/UnlessElse: + Description: Do not use unless with else. Rewrite these with the positive case first. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-else-with-unless + Enabled: true +Style/UnneededCapitalW: + Description: Checks for %W when interpolation is not needed. + Enabled: true +Style/UnneededPercentQ: + Description: Checks for %q/%Q when single quotes or double quotes would do. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-q + Enabled: true +Style/UnneededPercentX: + Description: Checks for %x when `` would do. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-x + Enabled: true +Style/VariableInterpolation: + Description: Don't interpolate global, instance and class variables directly in + strings. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#curlies-interpolate + Enabled: false +Style/WhenThen: + Description: Use when x then ... for one-line cases. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#one-line-cases + Enabled: false +Style/WhileUntilDo: + Description: Checks for redundant do after while or until. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-multiline-while-do + Enabled: true +Lint/AmbiguousOperator: + Description: Checks for ambiguous operators in the first argument of a method invocation + without parentheses. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#parens-as-args + Enabled: false +Lint/AmbiguousRegexpLiteral: + Description: Checks for ambiguous regexp literals in the first argument of a method + invocation without parenthesis. + Enabled: false +Lint/BlockAlignment: + Description: Align block ends correctly. + Enabled: true +Lint/ConditionPosition: + Description: Checks for condition placed in a confusing position relative to the + keyword. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#same-line-condition + Enabled: false +Lint/Debugger: + Description: Check for debugger calls. + Enabled: true +Lint/DeprecatedClassMethods: + Description: Check for deprecated class method calls. + Enabled: false +Lint/DuplicateMethods: + Description: Check for duplicate methods calls. + Enabled: true +Lint/ElseLayout: + Description: Check for odd code arrangement in an else block. + Enabled: false +Lint/EmptyEnsure: + Description: Checks for empty ensure block. + Enabled: true +Lint/EmptyInterpolation: + Description: Checks for empty string interpolation. + Enabled: true +Lint/EndInMethod: + Description: END blocks should not be placed inside method definitions. + Enabled: true +Lint/EnsureReturn: + Description: Do not use return in an ensure block. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-return-ensure + Enabled: true +Lint/Eval: + Description: The use of eval represents a serious security risk. + Enabled: true +Lint/HandleExceptions: + Description: Don't suppress exception. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions + Enabled: false +Lint/InvalidCharacterLiteral: + Description: Checks for invalid character literals with a non-escaped whitespace + character. + Enabled: false +Lint/LiteralInCondition: + Description: Checks of literals used in conditions. + Enabled: false +Lint/LiteralInInterpolation: + Description: Checks for literals used in interpolation. + Enabled: false +Lint/Loop: + Description: Use Kernel#loop with break rather than begin/end/until or begin/end/while + for post-loop tests. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#loop-with-break + Enabled: false +Lint/ParenthesesAsGroupedExpression: + Description: Checks for method calls with a space before the opening parenthesis. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#parens-no-spaces + Enabled: false +Lint/RequireParentheses: + Description: Use parentheses in the method call to avoid confusion about precedence. + Enabled: false +Lint/RescueException: + Description: Avoid rescuing the Exception class. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-blind-rescues + Enabled: true +Lint/ShadowingOuterLocalVariable: + Description: Do not use the same name as outer local variable for block arguments + or block local variables. + Enabled: true +Lint/SpaceBeforeFirstArg: + Description: Put a space between a method name and the first argument in a method + call without parentheses. + Enabled: true +Lint/StringConversionInInterpolation: + Description: Checks for Object#to_s usage in string interpolation. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-to-s + Enabled: true +Lint/UnderscorePrefixedVariableName: + Description: Do not use prefix `_` for a variable that is used. + Enabled: false +Lint/UnusedBlockArgument: + Description: Checks for unused block arguments. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars + Enabled: true +Lint/UnusedMethodArgument: + Description: Checks for unused method arguments. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars + Enabled: true +Lint/UnreachableCode: + Description: Unreachable code. + Enabled: true +Lint/UselessAccessModifier: + Description: Checks for useless access modifiers. + Enabled: true +Lint/UselessAssignment: + Description: Checks for useless assignment to a local variable. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars + Enabled: true +Lint/UselessComparison: + Description: Checks for comparison of something with itself. + Enabled: true +Lint/UselessElseWithoutRescue: + Description: Checks for useless `else` in `begin..end` without `rescue`. + Enabled: true +Lint/UselessSetterCall: + Description: Checks for useless setter call to a local variable. + Enabled: true +Lint/Void: + Description: Possible use of operator/literal/variable in void context. + Enabled: false +Rails/Delegate: + Description: Prefer delegate method for delegations. + Enabled: false From 95deb32e05a49d579909bddce8261e58983d50b5 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Tue, 20 Oct 2015 18:04:50 +0100 Subject: [PATCH 230/305] Added moderator group --- app/models/group.rb | 1 + app/models/user.rb | 4 ++++ spec/factories/group.rb | 5 +++++ spec/models/user_spec.rb | 12 ++++++++++++ 4 files changed, 22 insertions(+) diff --git a/app/models/group.rb b/app/models/group.rb index 734ea38..367185d 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -21,6 +21,7 @@ class Group < ActiveRecord::Base CHAMPIONS = 7 PREDICTORS = 8 STAFF = 10 + GATHER_MODERATORS = 14 attr_protected :id, :updated_at, :created_at, :founder_id validates_length_of :name, :maximum => 20 diff --git a/app/models/user.rb b/app/models/user.rb index 13d0407..1d28615 100755 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -205,6 +205,10 @@ class User < ActiveRecord::Base groups.exists? :id => Group::CASTERS end + def gather_moderator? + groups.exists? id: Group::GATHER_MODERATORS + end + def verified? # created_at < DateTime.now.ago(VERIFICATION_TIME) true diff --git a/spec/factories/group.rb b/spec/factories/group.rb index bf72ae2..68cec21 100644 --- a/spec/factories/group.rb +++ b/spec/factories/group.rb @@ -19,4 +19,9 @@ FactoryGirl.define do name "Donors" id Group::DONORS end + + trait :gather_moderator do + name "Gather Moderator" + id Group::GATHER_MODERATORS + end end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 49f261c..0258344 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -48,4 +48,16 @@ describe User do expect(user.banned? Ban::TYPE_MUTE).to be_truthy end end + + describe "#gather_moderator?" do + let!(:group) { create :group, :gather_moderator } + + it "returns true if gather moderator" do + create :grouper, group: group, user: user + expect(user.gather_moderator?).to eq(true) + end + it "returns false if not gather moderator" do + expect(user.gather_moderator?).to eq(false) + end + end end From bfc79cddcb65a47a2e0c6f2522a0a44dacb94467 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Tue, 20 Oct 2015 18:11:46 +0100 Subject: [PATCH 231/305] Return moderator status with users api --- app/controllers/api/v1/users_controller.rb | 1 + spec/controllers/api/v1/users_controller_spec.rb | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb index accc35f..acbb10e 100755 --- a/app/controllers/api/v1/users_controller.rb +++ b/app/controllers/api/v1/users_controller.rb @@ -16,6 +16,7 @@ class Api::V1::UsersController < Api::V1::BaseController time_zone: @user.time_zone, avatar: @user.profile.avatar.url, admin: @user.admin?, + moderator: @user.gather_moderator?, steam: @user.steamid.nil? ? nil : { id: @user.steamid, url: @steam.nil? ? nil : @steam.base_url, diff --git a/spec/controllers/api/v1/users_controller_spec.rb b/spec/controllers/api/v1/users_controller_spec.rb index c2a7059..7bf091e 100755 --- a/spec/controllers/api/v1/users_controller_spec.rb +++ b/spec/controllers/api/v1/users_controller_spec.rb @@ -19,6 +19,7 @@ describe Api::V1::UsersController do expect(json["country"]).to eq(@user.country) expect(json["time_zone"]).to eq(@user.time_zone) expect(json["admin"]).to eq(@user.admin?) + expect(json["moderator"]).to eq(@user.gather_moderator?) expect(json).to have_key("steam") expect(json["steam"]).to have_key("id") expect(json["steam"]).to have_key("url") @@ -39,6 +40,13 @@ describe Api::V1::UsersController do expect(json["steam"]).to be_nil end + it "returns gather moderator status" do + group = create :group, :gather_moderator + create :grouper, user: @user, group: group + get :show, id: @user.id + expect(json["moderator"]).to eq(true) + end + it "returns 404 if user does not exist" do expect { get :show, id: -1 From a96949340aceadfc2473acc5f437d5869e74d6b1 Mon Sep 17 00:00:00 2001 From: Prommah Date: Wed, 28 Oct 2015 02:32:45 +0000 Subject: [PATCH 232/305] Don't show anything for blank profile values. --- app/views/users/_general.html.erb | 24 +++++++++++++++++------- spec/features/users/stream_spec.rb | 3 ++- 2 files changed, 19 insertions(+), 8 deletions(-) mode change 100644 => 100755 app/views/users/_general.html.erb mode change 100644 => 100755 spec/features/users/stream_spec.rb diff --git a/app/views/users/_general.html.erb b/app/views/users/_general.html.erb old mode 100644 new mode 100755 index 793668e..c4507cb --- a/app/views/users/_general.html.erb +++ b/app/views/users/_general.html.erb @@ -4,10 +4,17 @@
Age
<%= @user.age %>
-
Country
-
<%= @user.country %>
-
Town
-
<%= @user.profile.town %>
+ + <% if !@user.country.blank? %> +
Country
+
<%= @user.country %>
+ <% end %> + + <% if !@user.profile.town.blank? %> +
Town
+
<%= @user.profile.town %>
+ <% end %> +
SteamID

<%= @user.steamid %>

@@ -15,9 +22,12 @@ <%= link_to "Search for Steam Account" %>
-
Stream
-
<%= @user.profile.stream.blank? ? "No Stream Provided" : @user.profile.stream %>
- + + <% if !@user.profile.stream.blank? %> +
Stream
+
<%= @user.profile.stream %>
+ + <% end %>

Contact

diff --git a/spec/features/users/stream_spec.rb b/spec/features/users/stream_spec.rb old mode 100644 new mode 100755 index 136dfb0..4983ed6 --- a/spec/features/users/stream_spec.rb +++ b/spec/features/users/stream_spec.rb @@ -7,7 +7,7 @@ feature "User Stream Information" do feature "stream administration" do scenario "user updates their stream" do visit user_path(user) - expect(page).to have_content("No Stream Provided") + expect(page.html).to_not include("
Stream
") fill_login_form(user, password) click_button submit(:user, :login) visit edit_user_path(user) @@ -17,6 +17,7 @@ feature "User Stream Information" do click_button "Update Profile" expect(page).to have_content(I18n.t(:users_update)) visit user_path(user) + expect(page.html).to include("
Stream
") expect(page).to have_content(stream_url) end end From f4e8ecdcd65288c5df901ac05a795bd1ae2533f7 Mon Sep 17 00:00:00 2001 From: Prommah Date: Wed, 28 Oct 2015 02:40:38 +0000 Subject: [PATCH 233/305] Don't show any SteamID stuff if that's blank too --- app/views/users/_general.html.erb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/views/users/_general.html.erb b/app/views/users/_general.html.erb index c4507cb..872373d 100755 --- a/app/views/users/_general.html.erb +++ b/app/views/users/_general.html.erb @@ -15,13 +15,15 @@
<%= @user.profile.town %>
<% end %> -
SteamID
-
-

<%= @user.steamid %>

- -
+ <% if !@user.steamid.blank? %> +
SteamID
+
+

<%= @user.steamid %>

+ +
+ <% end %> <% if !@user.profile.stream.blank? %>
Stream
From 87701f10eb80d566a7693f1aa24a5f0f0bd0e3bf Mon Sep 17 00:00:00 2001 From: Prommah Date: Wed, 28 Oct 2015 02:51:49 +0000 Subject: [PATCH 234/305] Update hound config --- .hound.yml | 2 +- config/styles/ruby.yml | 875 ++--------------------------------------- 2 files changed, 28 insertions(+), 849 deletions(-) diff --git a/.hound.yml b/.hound.yml index 1460f06..39fa972 100644 --- a/.hound.yml +++ b/.hound.yml @@ -1,2 +1,2 @@ ruby: - config/styles/ruby.yml + config_file: config/styles/ruby.yml diff --git a/config/styles/ruby.yml b/config/styles/ruby.yml index 8183a0d..2d6dc0f 100755 --- a/config/styles/ruby.yml +++ b/config/styles/ruby.yml @@ -1,100 +1,8 @@ AllCops: - Include: - - "**/*.gemspec" - - "**/*.podspec" - - "**/*.jbuilder" - - "**/*.rake" - - "**/*.opal" - - "**/Gemfile" - - "**/Rakefile" - - "**/Capfile" - - "**/Guardfile" - - "**/Podfile" - - "**/Thorfile" - - "**/Vagrantfile" - - "**/Berksfile" - - "**/Cheffile" - - "**/Vagabondfile" Exclude: - - "vendor/**/*" - - "db/schema.rb" - RunRailsCops: false - DisplayCopNames: false - StyleGuideCopsOnly: false -Style/AccessModifierIndentation: - Description: Check indentation of private/protected visibility modifiers. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#indent-public-private-protected - Enabled: true - EnforcedStyle: indent - SupportedStyles: - - outdent - - indent -Style/AlignHash: - Description: Align the elements of a hash literal if they span more than one line. - Enabled: true - EnforcedHashRocketStyle: key - EnforcedColonStyle: key - EnforcedLastArgumentHashStyle: always_inspect - SupportedLastArgumentHashStyles: - - always_inspect - - always_ignore - - ignore_implicit - - ignore_explicit -Style/AlignParameters: - Description: Align the parameters of a method call if they span more than one line. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-double-indent - Enabled: true - EnforcedStyle: with_first_parameter - SupportedStyles: - - with_first_parameter - - with_fixed_indentation -Style/AndOr: - Description: Use &&/|| instead of and/or. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-and-or-or - Enabled: true - EnforcedStyle: always - SupportedStyles: - - always - - conditionals -Style/BarePercentLiterals: - Description: Checks if usage of %() or %Q() matches configuration. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-q-shorthand - Enabled: true - EnforcedStyle: bare_percent - SupportedStyles: - - percent_q - - bare_percent -Style/BracesAroundHashParameters: - Description: Enforce braces style around hash parameters. - Enabled: true - EnforcedStyle: no_braces - SupportedStyles: - - braces - - no_braces - - context_dependent -Style/CaseIndentation: - Description: Indentation of when in a case/when/[else/]end. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#indent-when-to-case - Enabled: true - IndentWhenRelativeTo: case - SupportedStyles: - - case - - end - IndentOneStep: false -Style/ClassAndModuleChildren: - Description: Checks style of children classes and modules. - Enabled: false - EnforcedStyle: nested - SupportedStyles: - - nested - - compact -Style/ClassCheck: - Description: Enforces consistent use of `Object#is_a?` or `Object#kind_of?`. - Enabled: true - EnforcedStyle: is_a? - SupportedStyles: - - is_a? - - kind_of? + - "vendor/**/*" + - "db/schema.rb" + UseCache: false Style/CollectionMethods: Description: Preferred collection methods. StyleGuide: https://github.com/bbatsov/ruby-style-guide#map-find-select-reduce-size @@ -105,17 +13,6 @@ Style/CollectionMethods: find: detect find_all: select reduce: inject -Style/CommentAnnotation: - Description: Checks formatting of special comments (TODO, FIXME, OPTIMIZE, HACK, - REVIEW). - StyleGuide: https://github.com/bbatsov/ruby-style-guide#annotate-keywords - Enabled: false - Keywords: - - TODO - - FIXME - - OPTIMIZE - - HACK - - REVIEW Style/DotPosition: Description: Checks the position of the dot in multi-line method calls. StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-multi-line-chains @@ -124,161 +21,24 @@ Style/DotPosition: SupportedStyles: - leading - trailing -Style/EmptyLineBetweenDefs: - Description: Use empty lines between defs. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#empty-lines-between-methods - Enabled: true - AllowAdjacentOneLineDefs: false -Style/EmptyLinesAroundBlockBody: - Description: Keeps track of empty lines around block bodies. - Enabled: true - EnforcedStyle: no_empty_lines - SupportedStyles: - - empty_lines - - no_empty_lines -Style/EmptyLinesAroundClassBody: - Description: Keeps track of empty lines around class bodies. - Enabled: true - EnforcedStyle: no_empty_lines - SupportedStyles: - - empty_lines - - no_empty_lines -Style/EmptyLinesAroundModuleBody: - Description: Keeps track of empty lines around module bodies. - Enabled: true - EnforcedStyle: no_empty_lines - SupportedStyles: - - empty_lines - - no_empty_lines -Style/Encoding: - Description: Use UTF-8 as the source file encoding. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#utf-8 - Enabled: false - EnforcedStyle: always - SupportedStyles: - - when_needed - - always Style/FileName: Description: Use snake_case for source file names. StyleGuide: https://github.com/bbatsov/ruby-style-guide#snake-case-files Enabled: false Exclude: [] -Style/FirstParameterIndentation: - Description: Checks the indentation of the first parameter in a method call. - Enabled: true - EnforcedStyle: special_for_inner_method_call_in_parentheses - SupportedStyles: - - consistent - - special_for_inner_method_call - - special_for_inner_method_call_in_parentheses -Style/For: - Description: Checks use of for or each in multiline loops. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-for-loops - Enabled: true - EnforcedStyle: each - SupportedStyles: - - for - - each -Style/FormatString: - Description: Enforce the use of Kernel#sprintf, Kernel#format or String#%. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#sprintf - Enabled: false - EnforcedStyle: format - SupportedStyles: - - format - - sprintf - - percent -Style/GlobalVars: - Description: Do not introduce global variables. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#instance-vars - Enabled: false - AllowedVariables: [] Style/GuardClause: Description: Check for conditionals that can be replaced with guard clauses StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-nested-conditionals Enabled: false MinBodyLength: 1 -Style/HashSyntax: - Description: 'Prefer Ruby 1.9 hash syntax { a: 1, b: 2 } over 1.8 syntax { :a => - 1, :b => 2 }.' - StyleGuide: https://github.com/bbatsov/ruby-style-guide#hash-literals - Enabled: true - EnforcedStyle: ruby19 - SupportedStyles: - - ruby19 - - hash_rockets Style/IfUnlessModifier: Description: Favor modifier if/unless usage when you have a single-line body. StyleGuide: https://github.com/bbatsov/ruby-style-guide#if-as-a-modifier Enabled: false MaxLineLength: 80 -Style/IndentationWidth: - Description: Use 2 spaces for indentation. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#spaces-indentation - Enabled: true - Width: 2 -Style/IndentHash: - Description: Checks the indentation of the first key in a hash literal. - Enabled: true - EnforcedStyle: special_inside_parentheses - SupportedStyles: - - special_inside_parentheses - - consistent -Style/LambdaCall: - Description: Use lambda.call(...) instead of lambda.(...). - StyleGuide: https://github.com/bbatsov/ruby-style-guide#proc-call +Style/OptionHash: + Description: Don't use option hashes when you can use keyword arguments. Enabled: false - EnforcedStyle: call - SupportedStyles: - - call - - braces -Style/Next: - Description: Use `next` to skip iteration instead of a condition at the end. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-nested-conditionals - Enabled: false - EnforcedStyle: skip_modifier_ifs - MinBodyLength: 3 - SupportedStyles: - - skip_modifier_ifs - - always -Style/NonNilCheck: - Description: Checks for redundant nil checks. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-non-nil-checks - Enabled: true - IncludeSemanticChanges: false -Style/MethodDefParentheses: - Description: Checks if the method definitions have or don't have parentheses. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#method-parens - Enabled: true - EnforcedStyle: require_parentheses - SupportedStyles: - - require_parentheses - - require_no_parentheses -Style/MethodName: - Description: Use the configured style when naming methods. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#snake-case-symbols-methods-vars - Enabled: true - EnforcedStyle: snake_case - SupportedStyles: - - snake_case - - camelCase -Style/MultilineOperationIndentation: - Description: Checks indentation of binary operations that span more than one line. - Enabled: true - EnforcedStyle: aligned - SupportedStyles: - - aligned - - indented -Style/NumericLiterals: - Description: Add underscores to large numeric literals to improve their readability. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#underscores-in-numerics - Enabled: false - MinDigits: 5 -Style/ParenthesesAroundCondition: - Description: Don't use parentheses around the condition of an if/unless/while. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-parens-if - Enabled: true - AllowSafeAssignment: true Style/PercentLiteralDelimiters: Description: Use `%`-literal delimiters consistently StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-literal-braces @@ -293,13 +53,6 @@ Style/PercentLiteralDelimiters: "%w": "()" "%W": "()" "%x": "()" -Style/PercentQLiterals: - Description: Checks if uses of %Q/%q match the configured preference. - Enabled: true - EnforcedStyle: lower_case_q - SupportedStyles: - - lower_case_q - - upper_case_q Style/PredicateName: Description: Check the names of predicate methods. StyleGuide: https://github.com/bbatsov/ruby-style-guide#bool-methods-qmark @@ -320,23 +73,6 @@ Style/RaiseArgs: SupportedStyles: - compact - exploded -Style/RedundantReturn: - Description: Don't use return where it's not required. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-explicit-return - Enabled: true - AllowMultipleReturnValues: false -Style/RegexpLiteral: - Description: Use %r for regular expressions matching more than `MaxSlashes` '/' - characters. Use %r only for regular expressions matching more than `MaxSlashes` - '/' character. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-r - Enabled: false - MaxSlashes: 1 -Style/Semicolon: - Description: Don't use semicolons to terminate expressions. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-semicolon - Enabled: true - AllowAsExpressionSeparator: false Style/SignalException: Description: Checks for proper usage of fail and raise. StyleGuide: https://github.com/bbatsov/ruby-style-guide#fail-method @@ -378,62 +114,6 @@ Style/StringLiteralsInInterpolation: SupportedStyles: - single_quotes - double_quotes -Style/SpaceAroundBlockParameters: - Description: Checks the spacing inside and after block parameters pipes. - Enabled: true - EnforcedStyleInsidePipes: no_space - SupportedStyles: - - space - - no_space -Style/SpaceAroundEqualsInParameterDefault: - Description: Checks that the equals signs in parameter default assignments have - or don't have surrounding space depending on configuration. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#spaces-around-equals - Enabled: true - EnforcedStyle: space - SupportedStyles: - - space - - no_space -Style/SpaceBeforeBlockBraces: - Description: Checks that the left block brace has or doesn't have space before it. - Enabled: true - EnforcedStyle: space - SupportedStyles: - - space - - no_space -Style/SpaceInsideBlockBraces: - Description: Checks that block braces have or don't have surrounding space. For - blocks taking parameters, checks that the left brace has or doesn't have trailing - space. - Enabled: true - EnforcedStyle: space - SupportedStyles: - - space - - no_space - EnforcedStyleForEmptyBraces: no_space - SpaceBeforeBlockParameters: true -Style/SpaceInsideHashLiteralBraces: - Description: Use spaces inside hash literal braces - or don't. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#spaces-operators - Enabled: true - EnforcedStyle: space - EnforcedStyleForEmptyBraces: no_space - SupportedStyles: - - space - - no_space -Style/SymbolProc: - Description: Use symbols as procs instead of blocks when possible. - Enabled: true - IgnoredMethods: - - respond_to -Style/TrailingBlankLines: - Description: Checks trailing blank lines and final newline. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#newline-eof - Enabled: true - EnforcedStyle: final_newline - SupportedStyles: - - final_newline - - final_blank_line Style/TrailingComma: Description: Checks for trailing comma in parameter lists and literals. StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas @@ -442,79 +122,26 @@ Style/TrailingComma: SupportedStyles: - comma - no_comma -Style/TrivialAccessors: - Description: Prefer attr_* methods to trivial readers/writers. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#attr_family - Enabled: false - ExactNameMatch: false - AllowPredicates: false - AllowDSLWriters: false - Whitelist: - - to_ary - - to_a - - to_c - - to_enum - - to_h - - to_hash - - to_i - - to_int - - to_io - - to_open - - to_path - - to_proc - - to_r - - to_regexp - - to_str - - to_s - - to_sym -Style/VariableName: - Description: Use the configured style when naming variables. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#snake-case-symbols-methods-vars - Enabled: true - EnforcedStyle: snake_case - SupportedStyles: - - snake_case - - camelCase -Style/WhileUntilModifier: - Description: Favor modifier while/until usage when you have a single-line body. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#while-as-a-modifier - Enabled: false - MaxLineLength: 80 -Style/WordArray: - Description: Use %w or %W for arrays of words. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-w - Enabled: false - MinSize: 0 - WordRegex: !ruby/regexp /\A[\p{Word}]+\z/ Metrics/AbcSize: Description: A calculated magnitude based on number of assignments, branches, and conditions. - Enabled: true - Max: 15 -Metrics/BlockNesting: - Description: Avoid excessive block nesting - StyleGuide: https://github.com/bbatsov/ruby-style-guide#three-is-the-number-thou-shalt-count Enabled: false - Max: 3 + Max: 15 Metrics/ClassLength: Description: Avoid classes longer than 100 lines of code. Enabled: false CountComments: false Max: 100 +Metrics/ModuleLength: + CountComments: false + Max: 100 + Description: Avoid modules longer than 100 lines of code. + Enabled: false Metrics/CyclomaticComplexity: Description: A complexity metric that is strongly correlated to the number of test cases needed to validate a method. Enabled: false Max: 6 -Metrics/LineLength: - Description: Limit lines to 100 characters. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#80-character-limits - Enabled: true - Max: 100 - AllowURI: true - URISchemes: - - http - - https Metrics/MethodLength: Description: Avoid methods longer than 10 lines of code. StyleGuide: https://github.com/bbatsov/ruby-style-guide#short-methods @@ -537,76 +164,9 @@ Lint/AssignmentInCondition: StyleGuide: https://github.com/bbatsov/ruby-style-guide#safe-assignment-in-condition Enabled: false AllowSafeAssignment: true -Lint/EndAlignment: - Description: Align ends correctly. - Enabled: true - AlignWith: keyword - SupportedStyles: - - keyword - - variable -Lint/DefEndAlignment: - Description: Align ends corresponding to defs correctly. - Enabled: true - AlignWith: start_of_line - SupportedStyles: - - start_of_line - - def -Rails/ActionFilter: - Description: Enforces consistent use of action filter methods. - Enabled: false - EnforcedStyle: action - SupportedStyles: - - action - - filter - Include: - - app/controllers/**/*.rb -Rails/DefaultScope: - Description: Checks if the argument passed to default_scope is a block. - Enabled: true - Include: - - app/models/**/*.rb -Rails/HasAndBelongsToMany: - Description: Prefer has_many :through to has_and_belongs_to_many. - Enabled: true - Include: - - app/models/**/*.rb -Rails/Output: - Description: Checks for calls to puts, print, etc. - Enabled: true - Include: - - app/**/*.rb - - config/**/*.rb - - db/**/*.rb - - lib/**/*.rb -Rails/ReadWriteAttribute: - Description: Checks for read_attribute(:attr) and write_attribute(:attr, val). - Enabled: true - Include: - - app/models/**/*.rb -Rails/ScopeArgs: - Description: Checks the arguments of ActiveRecord scopes. - Enabled: true - Include: - - app/models/**/*.rb -Rails/Validation: - Description: Use validates :attribute, hash of validations. - Enabled: true - Include: - - app/models/**/*.rb Style/InlineComment: Description: Avoid inline comments. Enabled: false -Style/MethodCalledOnDoEndBlock: - Description: Avoid chaining a method call on a do...end block. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#single-line-blocks - Enabled: false -Style/SymbolArray: - Description: Use %i or %I for arrays of symbols. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-i - Enabled: false -Style/ExtraSpacing: - Description: Do not use unnecessary spacing. - Enabled: true Style/AccessorMethodName: Description: Check the naming of accessor methods for get_/set_. Enabled: false @@ -614,81 +174,6 @@ Style/Alias: Description: Use alias_method instead of alias. StyleGuide: https://github.com/bbatsov/ruby-style-guide#alias-method Enabled: false -Style/AlignArray: - Description: Align the elements of an array literal if they span more than one line. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#align-multiline-arrays - Enabled: true -Style/ArrayJoin: - Description: Use Array#join instead of Array#*. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#array-join - Enabled: false -Style/AsciiComments: - Description: Use only ascii symbols in comments. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#english-comments - Enabled: false -Style/AsciiIdentifiers: - Description: Use only ascii symbols in identifiers. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#english-identifiers - Enabled: false -Style/Attr: - Description: Checks for uses of Module#attr. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#attr - Enabled: false -Style/BeginBlock: - Description: Avoid the use of BEGIN blocks. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-BEGIN-blocks - Enabled: true -Style/BlockComments: - Description: Do not use block comments. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-block-comments - Enabled: true -Style/BlockEndNewline: - Description: Put end statement of multiline block on its own line. - Enabled: true -Style/Blocks: - Description: Avoid using {...} for multi-line blocks (multiline chaining is always - ugly). Prefer {...} over do...end for single-line blocks. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#single-line-blocks - Enabled: true -Style/CaseEquality: - Description: Avoid explicit use of the case equality operator(===). - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-case-equality - Enabled: false -Style/CharacterLiteral: - Description: Checks for uses of character literals. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-character-literals - Enabled: false -Style/ClassAndModuleCamelCase: - Description: Use CamelCase for classes and modules. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#camelcase-classes - Enabled: true -Style/ClassMethods: - Description: Use self when defining module/class methods. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#def-self-singletons - Enabled: true -Style/ClassVars: - Description: Avoid the use of class variables. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-class-vars - Enabled: false -Style/ColonMethodCall: - Description: 'Do not use :: for method call.' - StyleGuide: https://github.com/bbatsov/ruby-style-guide#double-colons - Enabled: false -Style/CommentIndentation: - Description: Indentation of comments. - Enabled: true -Style/ConstantName: - Description: Constants should use SCREAMING_SNAKE_CASE. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#screaming-snake-case - Enabled: true -Style/DefWithParentheses: - Description: Use def with parentheses when there are arguments. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#method-parens - Enabled: true -Style/DeprecatedHashMethods: - Description: Checks for use of deprecated Hash methods. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#hash-key - Enabled: false Style/Documentation: Description: Document classes and non-namespace modules. Enabled: false @@ -699,234 +184,31 @@ Style/DoubleNegation: Style/EachWithObject: Description: Prefer `each_with_object` over `inject` or `reduce`. Enabled: false -Style/ElseAlignment: - Description: Align elses and elsifs correctly. - Enabled: true -Style/EmptyElse: - Description: Avoid empty else-clauses. - Enabled: true -Style/EmptyLines: - Description: Don't use several empty lines in a row. - Enabled: true -Style/EmptyLinesAroundAccessModifier: - Description: Keep blank lines around access modifiers. - Enabled: true -Style/EmptyLinesAroundMethodBody: - Description: Keeps track of empty lines around method bodies. - Enabled: true Style/EmptyLiteral: Description: Prefer literals to Array.new/Hash.new/String.new. StyleGuide: https://github.com/bbatsov/ruby-style-guide#literal-array-hash Enabled: false -Style/EndBlock: - Description: Avoid the use of END blocks. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-END-blocks - Enabled: true -Style/EndOfLine: - Description: Use Unix-style line endings. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#crlf - Enabled: true -Style/EvenOdd: - Description: Favor the use of Fixnum#even? && Fixnum#odd? - StyleGuide: https://github.com/bbatsov/ruby-style-guide#predicate-methods - Enabled: false -Style/FlipFlop: - Description: Checks for flip flops - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-flip-flops - Enabled: false -Style/IfWithSemicolon: - Description: Do not use if x; .... Use the ternary operator instead. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-semicolon-ifs - Enabled: false -Style/IndentationConsistency: - Description: Keep indentation straight. - Enabled: true -Style/IndentArray: - Description: Checks the indentation of the first element in an array literal. - Enabled: true -Style/InfiniteLoop: - Description: Use Kernel#loop for infinite loops. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#infinite-loop - Enabled: true -Style/Lambda: - Description: Use the new lambda literal syntax for single-line blocks. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#lambda-multi-line - Enabled: false -Style/LeadingCommentSpace: - Description: Comments should start with a space. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#hash-space - Enabled: true -Style/LineEndConcatenation: - Description: Use \ instead of + or << to concatenate two string literals at line - end. - Enabled: false -Style/MethodCallParentheses: - Description: Do not use parentheses for method calls with no arguments. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-args-no-parens - Enabled: true Style/ModuleFunction: Description: Checks for usage of `extend self` in modules. StyleGuide: https://github.com/bbatsov/ruby-style-guide#module-function Enabled: false -Style/MultilineBlockChain: - Description: Avoid multi-line chains of blocks. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#single-line-blocks - Enabled: true -Style/MultilineBlockLayout: - Description: Ensures newlines after multiline block do statements. - Enabled: true -Style/MultilineIfThen: - Description: Do not use then for multi-line if/unless. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-then - Enabled: true -Style/MultilineTernaryOperator: - Description: 'Avoid multi-line ?: (the ternary operator); use if/unless instead.' - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-multiline-ternary - Enabled: true -Style/NegatedIf: - Description: Favor unless over if for negative conditions (or control flow or). - StyleGuide: https://github.com/bbatsov/ruby-style-guide#unless-for-negatives - Enabled: false -Style/NegatedWhile: - Description: Favor until over while for negative conditions. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#until-for-negatives - Enabled: false -Style/NestedTernaryOperator: - Description: Use one expression per branch in a ternary operator. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-nested-ternary - Enabled: true -Style/NilComparison: - Description: Prefer x.nil? to x == nil. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#predicate-methods - Enabled: false -Style/Not: - Description: Use ! instead of not. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#bang-not-not - Enabled: false Style/OneLineConditional: Description: Favor the ternary operator(?:) over if/then/else/end constructs. StyleGuide: https://github.com/bbatsov/ruby-style-guide#ternary-operator Enabled: false -Style/OpMethod: - Description: When defining binary operators, name the argument other. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#other-arg - Enabled: false Style/PerlBackrefs: Description: Avoid Perl-style regex back references. StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-perl-regexp-last-matchers Enabled: false -Style/Proc: - Description: Use proc instead of Proc.new. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#proc +Style/Send: + Description: Prefer `Object#__send__` or `Object#public_send` to `send`, as `send` + may overlap with existing methods. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#prefer-public-send Enabled: false -Style/RedundantBegin: - Description: Don't use begin blocks when they are not needed. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#begin-implicit - Enabled: true -Style/RedundantException: - Description: Checks for an obsolete RuntimeException argument in raise/fail. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-explicit-runtimeerror - Enabled: true -Style/RedundantSelf: - Description: Don't use self where it's not needed. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-self-unless-required - Enabled: true -Style/RescueModifier: - Description: Avoid using rescue in its modifier form. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-rescue-modifiers - Enabled: true -Style/SelfAssignment: - Description: Checks for places where self-assignment shorthand should have been - used. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#self-assignment - Enabled: false -Style/SingleSpaceBeforeFirstArg: - Description: Checks that exactly one space is used between a method name and the - first argument for method calls without parentheses. - Enabled: true -Style/SpaceAfterColon: - Description: Use spaces after colons. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#spaces-operators - Enabled: true -Style/SpaceAfterComma: - Description: Use spaces after commas. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#spaces-operators - Enabled: true -Style/SpaceAfterControlKeyword: - Description: Use spaces after if/elsif/unless/while/until/case/when. - Enabled: true -Style/SpaceAfterMethodName: - Description: Do not put a space between a method name and the opening parenthesis - in a method definition. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#parens-no-spaces - Enabled: true -Style/SpaceAfterNot: - Description: Tracks redundant space after the ! operator. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-space-bang - Enabled: true -Style/SpaceAfterSemicolon: - Description: Use spaces after semicolons. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#spaces-operators - Enabled: true -Style/SpaceBeforeComma: - Description: No spaces before commas. - Enabled: true -Style/SpaceBeforeComment: - Description: Checks for missing space between code and a comment on the same line. - Enabled: true -Style/SpaceBeforeSemicolon: - Description: No spaces before semicolons. - Enabled: true -Style/SpaceAroundOperators: - Description: Use spaces around operators. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#spaces-operators - Enabled: true -Style/SpaceBeforeModifierKeyword: - Description: Put a space before the modifier keyword. - Enabled: true -Style/SpaceInsideBrackets: - Description: No spaces after [ or before ]. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-spaces-braces - Enabled: true -Style/SpaceInsideParens: - Description: No spaces after ( or before ). - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-spaces-braces - Enabled: true -Style/SpaceInsideRangeLiteral: - Description: No spaces inside range literals. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-space-inside-range-literals - Enabled: true Style/SpecialGlobalVars: Description: Avoid Perl-style global variables. StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-cryptic-perlisms Enabled: false -Style/StructInheritance: - Description: Checks for inheritance from Struct.new. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-extend-struct-new - Enabled: true -Style/Tab: - Description: No hard tabs. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#spaces-indentation - Enabled: true -Style/TrailingWhitespace: - Description: Avoid trailing whitespace. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-trailing-whitespace - Enabled: true -Style/UnlessElse: - Description: Do not use unless with else. Rewrite these with the positive case first. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-else-with-unless - Enabled: true -Style/UnneededCapitalW: - Description: Checks for %W when interpolation is not needed. - Enabled: true -Style/UnneededPercentQ: - Description: Checks for %q/%Q when single quotes or double quotes would do. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-q - Enabled: true -Style/UnneededPercentX: - Description: Checks for %x when `` would do. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-x - Enabled: true Style/VariableInterpolation: Description: Don't interpolate global, instance and class variables directly in strings. @@ -936,130 +218,27 @@ Style/WhenThen: Description: Use when x then ... for one-line cases. StyleGuide: https://github.com/bbatsov/ruby-style-guide#one-line-cases Enabled: false -Style/WhileUntilDo: - Description: Checks for redundant do after while or until. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-multiline-while-do - Enabled: true -Lint/AmbiguousOperator: - Description: Checks for ambiguous operators in the first argument of a method invocation - without parentheses. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#parens-as-args - Enabled: false -Lint/AmbiguousRegexpLiteral: - Description: Checks for ambiguous regexp literals in the first argument of a method - invocation without parenthesis. - Enabled: false -Lint/BlockAlignment: - Description: Align block ends correctly. - Enabled: true -Lint/ConditionPosition: - Description: Checks for condition placed in a confusing position relative to the - keyword. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#same-line-condition - Enabled: false -Lint/Debugger: - Description: Check for debugger calls. - Enabled: true -Lint/DeprecatedClassMethods: - Description: Check for deprecated class method calls. - Enabled: false -Lint/DuplicateMethods: - Description: Check for duplicate methods calls. - Enabled: true -Lint/ElseLayout: - Description: Check for odd code arrangement in an else block. - Enabled: false -Lint/EmptyEnsure: - Description: Checks for empty ensure block. - Enabled: true -Lint/EmptyInterpolation: - Description: Checks for empty string interpolation. - Enabled: true -Lint/EndInMethod: - Description: END blocks should not be placed inside method definitions. - Enabled: true -Lint/EnsureReturn: - Description: Do not use return in an ensure block. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-return-ensure - Enabled: true -Lint/Eval: - Description: The use of eval represents a serious security risk. +Lint/EachWithObjectArgument: + Description: Check for immutable argument given to each_with_object. Enabled: true Lint/HandleExceptions: Description: Don't suppress exception. StyleGuide: https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions Enabled: false -Lint/InvalidCharacterLiteral: - Description: Checks for invalid character literals with a non-escaped whitespace - character. - Enabled: false Lint/LiteralInCondition: Description: Checks of literals used in conditions. Enabled: false Lint/LiteralInInterpolation: Description: Checks for literals used in interpolation. Enabled: false -Lint/Loop: - Description: Use Kernel#loop with break rather than begin/end/until or begin/end/while - for post-loop tests. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#loop-with-break - Enabled: false -Lint/ParenthesesAsGroupedExpression: - Description: Checks for method calls with a space before the opening parenthesis. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#parens-no-spaces - Enabled: false -Lint/RequireParentheses: - Description: Use parentheses in the method call to avoid confusion about precedence. - Enabled: false -Lint/RescueException: - Description: Avoid rescuing the Exception class. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-blind-rescues + +Metrics/LineLength: + Description: Limit lines to 100 characters. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#80-character-limits Enabled: true -Lint/ShadowingOuterLocalVariable: - Description: Do not use the same name as outer local variable for block arguments - or block local variables. - Enabled: true -Lint/SpaceBeforeFirstArg: - Description: Put a space between a method name and the first argument in a method - call without parentheses. - Enabled: true -Lint/StringConversionInInterpolation: - Description: Checks for Object#to_s usage in string interpolation. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-to-s - Enabled: true -Lint/UnderscorePrefixedVariableName: - Description: Do not use prefix `_` for a variable that is used. - Enabled: false -Lint/UnusedBlockArgument: - Description: Checks for unused block arguments. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars - Enabled: true -Lint/UnusedMethodArgument: - Description: Checks for unused method arguments. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars - Enabled: true -Lint/UnreachableCode: - Description: Unreachable code. - Enabled: true -Lint/UselessAccessModifier: - Description: Checks for useless access modifiers. - Enabled: true -Lint/UselessAssignment: - Description: Checks for useless assignment to a local variable. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars - Enabled: true -Lint/UselessComparison: - Description: Checks for comparison of something with itself. - Enabled: true -Lint/UselessElseWithoutRescue: - Description: Checks for useless `else` in `begin..end` without `rescue`. - Enabled: true -Lint/UselessSetterCall: - Description: Checks for useless setter call to a local variable. - Enabled: true -Lint/Void: - Description: Possible use of operator/literal/variable in void context. - Enabled: false -Rails/Delegate: - Description: Prefer delegate method for delegations. - Enabled: false + Max: 100 + AllowURI: true + URISchemes: + - http + - https + \ No newline at end of file From 1449f45321d753f2d34f11cbd5222f74c4ea910e Mon Sep 17 00:00:00 2001 From: Prommah Date: Wed, 28 Oct 2015 14:31:05 +0000 Subject: [PATCH 235/305] Add support for querying users via steamid in the user API --- app/controllers/api/v1/users_controller.rb | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb index acbb10e..6c02b0b 100755 --- a/app/controllers/api/v1/users_controller.rb +++ b/app/controllers/api/v1/users_controller.rb @@ -4,7 +4,19 @@ class Api::V1::UsersController < Api::V1::BaseController end def show - @user = User.find(params[:id]) + if params[:format].nil? || params[:format] == "id" + @user = User.find(params[:id]) + elsif params[:format] == "steamid" + steamid_i = params[:id].to_i + @user = User.first(conditions: { steamid: format("0:%d:%d", steamid_i % 2, steamid_i >> 1) }) + elsif params[:format] == "steamidstr" + @user = User.first(conditions: { steamid: params[:id] }) + end + + if @user.nil? + raise ActionController::RoutingError.new("User Not Found") + end + if @user.steamid.present? @steam = steam_profile @user end @@ -16,6 +28,8 @@ class Api::V1::UsersController < Api::V1::BaseController time_zone: @user.time_zone, avatar: @user.profile.avatar.url, admin: @user.admin?, + referee: @user.ref?, + caster: @user.caster?, moderator: @user.gather_moderator?, steam: @user.steamid.nil? ? nil : { id: @user.steamid, @@ -30,7 +44,7 @@ class Api::V1::UsersController < Api::V1::BaseController team: @user.team.present? ? { id: @user.team.id, name: @user.team.name } : nil } rescue ActiveRecord::RecordNotFound - raise ActionController::RoutingError.new('User Not Found') + raise ActionController::RoutingError.new("User Not Found") end private From dcab4355c11e668892f3b359ef5389bd4f398d9e Mon Sep 17 00:00:00 2001 From: Prommah Date: Wed, 28 Oct 2015 16:11:01 +0000 Subject: [PATCH 236/305] Update user API spec for new values & SteamID queries --- .../api/v1/users_controller_spec.rb | 49 +++++++++++++++---- 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/spec/controllers/api/v1/users_controller_spec.rb b/spec/controllers/api/v1/users_controller_spec.rb index 7bf091e..f802ae4 100755 --- a/spec/controllers/api/v1/users_controller_spec.rb +++ b/spec/controllers/api/v1/users_controller_spec.rb @@ -10,16 +10,16 @@ describe Api::V1::UsersController do @user = create :user, :chris end - it "returns user data" do - get :show, id: @user.id - + def user_expectation(json, user) expect(response).to be_success - expect(json["id"]).to eq(@user.id) - expect(json["username"]).to eq(@user.username) - expect(json["country"]).to eq(@user.country) - expect(json["time_zone"]).to eq(@user.time_zone) - expect(json["admin"]).to eq(@user.admin?) - expect(json["moderator"]).to eq(@user.gather_moderator?) + expect(json["id"]).to eq(user.id) + expect(json["username"]).to eq(user.username) + expect(json["country"]).to eq(user.country) + expect(json["time_zone"]).to eq(user.time_zone) + expect(json["admin"]).to eq(user.admin?) + expect(json["referee"]).to eq(user.ref?) + expect(json["caster"]).to eq(user.caster?) + expect(json["moderator"]).to eq(user.gather_moderator?) expect(json).to have_key("steam") expect(json["steam"]).to have_key("id") expect(json["steam"]).to have_key("url") @@ -30,6 +30,37 @@ describe Api::V1::UsersController do expect(json["team"]).to be_nil end + it "returns user data" do + get :show, id: @user.id + + expect(response).to be_success + user_expectation(json, @user) + end + + it "returns user data for query with id specified as format" do + get :show, id: @user.id, format: "id" + + expect(response).to be_success + user_expectation(json, @user) + end + + it "returns user data for a numeric steamid query" do + m = @user.steamid.match(/\A0:([01]):(\d{1,10})\Z/) + steamid = (m[2].to_i << 1) + m[1].to_i + + get :show, id: steamid, format: "steamid" + + expect(response).to be_success + user_expectation(json, @user) + end + + it "returns user data for a string steamid query" do + get :show, id: @user.steamid, format: "steamidstr" + + expect(response).to be_success + user_expectation(json, @user) + end + it "returns nulled steam data for users who had invalid steam ids" do @user.steamid = nil @user.save! From 86fb1b46d82b83d2f52a201c3deaa8823eaeb63f Mon Sep 17 00:00:00 2001 From: Prommah Date: Wed, 28 Oct 2015 16:44:00 +0000 Subject: [PATCH 237/305] Update users_controller_spec.rb --- spec/controllers/api/v1/users_controller_spec.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/controllers/api/v1/users_controller_spec.rb b/spec/controllers/api/v1/users_controller_spec.rb index f802ae4..2dd4380 100755 --- a/spec/controllers/api/v1/users_controller_spec.rb +++ b/spec/controllers/api/v1/users_controller_spec.rb @@ -11,7 +11,6 @@ describe Api::V1::UsersController do end def user_expectation(json, user) - expect(response).to be_success expect(json["id"]).to eq(user.id) expect(json["username"]).to eq(user.username) expect(json["country"]).to eq(user.country) From 2fa7c03a51b8d4b0b7d1be499dfac923d98bb8c8 Mon Sep 17 00:00:00 2001 From: Prommah Date: Thu, 29 Oct 2015 06:43:02 +0000 Subject: [PATCH 238/305] Removed unpopular non-default style rule --- config/styles/ruby.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/config/styles/ruby.yml b/config/styles/ruby.yml index 2d6dc0f..c97ef12 100755 --- a/config/styles/ruby.yml +++ b/config/styles/ruby.yml @@ -13,14 +13,6 @@ Style/CollectionMethods: find: detect find_all: select reduce: inject -Style/DotPosition: - Description: Checks the position of the dot in multi-line method calls. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-multi-line-chains - Enabled: true - EnforcedStyle: trailing - SupportedStyles: - - leading - - trailing Style/FileName: Description: Use snake_case for source file names. StyleGuide: https://github.com/bbatsov/ruby-style-guide#snake-case-files From d976acb759bec55aabe5408b15e81125a78920e0 Mon Sep 17 00:00:00 2001 From: Prommah Date: Thu, 29 Oct 2015 22:02:29 +0000 Subject: [PATCH 239/305] Update deprecated spec_helper code & styling --- spec/spec_helper.rb | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) mode change 100644 => 100755 spec/spec_helper.rb diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb old mode 100644 new mode 100755 index 85567d0..9aa57cb --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,20 +1,21 @@ -ENV["RAILS_ENV"] ||= 'test' +ENV["RAILS_ENV"] ||= "test" -require 'codeclimate-test-reporter' -require 'simplecov' +require "codeclimate-test-reporter" +require "simplecov" CodeClimate::TestReporter.start -SimpleCov.start 'rails' +SimpleCov.start "rails" require File.expand_path("../../config/environment", __FILE__) -require 'rspec/rails' -require 'capybara/rspec' -require 'capybara/poltergeist' +require "rspec/rails" +require "capybara/rspec" +require "capybara/poltergeist" Capybara.default_wait_time = 5 Capybara.register_driver :poltergeist do |app| - Capybara::Poltergeist::Driver.new(app, + Capybara::Poltergeist::Driver.new( + app, timeout: 30, - phantomjs_logger: File.open('/dev/null') + phantomjs_logger: File.open("/dev/null") ) end @@ -30,16 +31,16 @@ RSpec.configure do |config| config.include Features::SessionHelpers, type: :feature config.fixture_path = "#{::Rails.root}/spec/fixtures" - config.order = 'random' + config.order = "random" config.use_transactional_fixtures = false config.color = true config.formatter = :documentation config.infer_spec_type_from_file_location! config.before(:each) do - events_list_json = JSON.parse(File.read(Rails.root.join('spec/fixtures/google_calendar.json'))) + events_list_json = JSON.parse(File.read(Rails.root.join("spec/fixtures/google_calendar.json"))) - GoogleCalendar::Request.stub(:events_list) do + allow(GoogleCalendar::Request).to receive(:events_list) do GoogleCalendar::EventList.new(events_list_json, Time.zone.name) end end From 9b2ba68551af16fa719e8165befd727179ad7c77 Mon Sep 17 00:00:00 2001 From: Prommah Date: Tue, 3 Nov 2015 07:50:14 +0000 Subject: [PATCH 240/305] Add new user API spec --- .../api/v1/users_controller_spec.rb | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/spec/controllers/api/v1/users_controller_spec.rb b/spec/controllers/api/v1/users_controller_spec.rb index 2dd4380..da03ea8 100755 --- a/spec/controllers/api/v1/users_controller_spec.rb +++ b/spec/controllers/api/v1/users_controller_spec.rb @@ -78,9 +78,23 @@ describe Api::V1::UsersController do end it "returns 404 if user does not exist" do - expect { - get :show, id: -1 - }.to raise_error(ActionController::RoutingError) + expect { get :show, id: -1 }.to raise_error(ActionController::RoutingError) + end + + it "returns 404 if user does not exist by steamid" do + expect { get :show, id: -1, format: "steamid" }.to raise_error(ActionController::RoutingError) + end + + it "queries the steam condenser for an invalid steamid" do + @user.update_attribute(:steamid, "0:0:0") + + get :show, id: @user.id + + expect(response).to be_success + expect(json["steam"]).to_not be_nil + expect(json["steam"]["id"]).to eq(@user.steamid) + expect(json["steam"]["url"]).to be_nil + expect(json["steam"]["nickname"]).to be_nil end it "returns correct ban if user muted" do From a460020a3e42aaae21e34c71304a0f90cbf863ef Mon Sep 17 00:00:00 2001 From: Prommah Date: Tue, 3 Nov 2015 08:41:25 +0000 Subject: [PATCH 241/305] Clean up Verification lib --- lib/verification.rb | 101 +++++++++++++++++++++----------------------- 1 file changed, 49 insertions(+), 52 deletions(-) mode change 100644 => 100755 lib/verification.rb diff --git a/lib/verification.rb b/lib/verification.rb old mode 100644 new mode 100755 index 1820152..1d6063d --- a/lib/verification.rb +++ b/lib/verification.rb @@ -1,63 +1,60 @@ module Verification - def Verification.verify input - md5 = Digest::MD5.hexdigest("9WvcZ9hX" + input + "KF7L4luQ").upcase.split(//) - chars = ["A", "B", "C", "D", "E", "F"] - nums = [] - lastPos = md5[31].to_i - result = "" + def self.verify(input) + md5 = Digest::MD5.hexdigest("9WvcZ9hX" + input + "KF7L4luQ").upcase.split(//) + chars = %w[A B C D E F] + nums = [] + last_pos = md5[31].to_i + result = "" - for i in 0..9 - pos = md5[i].to_i + (0..9).each do |i| + pos = md5[i].to_i - if pos == 0 - pos = lastPos ** (i % 4) - elsif (pos % 4) == 0 - pos = pos * lastPos + i - elsif (pos % 3) == 0 - pos = pos ** (i % 4) - elsif (pos % 2) == 0 - pos = pos * i + pos - end + if pos == 0 + pos = last_pos**(i % 4) + elsif (pos % 4) == 0 + pos = pos * last_pos + i + elsif (pos % 3) == 0 + pos **= (i % 4) + elsif pos.even? + pos = pos * i + pos + end - pos = (pos > 31) ? (pos % 32) : pos - curChar = md5[31 - pos] - curNum = curChar.to_i + pos = (pos > 31) ? (pos % 32) : pos + cur_char = md5[31 - pos] + cur_num = cur_char.to_i - if nums.include? curNum - if curNum == 0 - curChar = chars[pos % 6] - else - curChar = (pos % 10).to_s - end - curNum = curChar.to_i - end + if nums.include? cur_num + if cur_num == 0 + cur_char = chars[pos % 6] + else + cur_char = (pos % 10).to_s + end + cur_num = cur_char.to_i + end - nums << curNum - result << curChar - lastPos = pos - end + nums << cur_num + result << cur_char + last_pos = pos + end - return result - end + result + end - def Verification.uncrap str - str.to_s.gsub(/[^A-Za-z0-9_\-]/, "") - end + def self.uncrap(str) + str.to_s.gsub(/[^A-Za-z0-9_\-]/, "") + end - def Verification.random_string len - chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a - str = "" - 1.upto(len) do |i| - str << chars[rand(chars.size-1)] - end - return str - end + def self.random_string(len) + chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a + str = "" + 1.upto(len) do + str << chars[rand(chars.size - 1)] + end + str + end # TODO: rikki? - def Verification.contain params, filter - (params.instance_of?(Array) ? params : params.keys).each do |key| - return false unless filter.include? key.to_sym - end - return true - end -end \ No newline at end of file + def self.contain(params, filter) + params.instance_of?(Array) ? (filter - params).empty? : filter.all? { |s| params.key? s } + end +end From 0b347baee7f7c35e7736ff52c355ed273bf3ceb6 Mon Sep 17 00:00:00 2001 From: Prommah Date: Tue, 3 Nov 2015 11:46:11 +0000 Subject: [PATCH 242/305] Revert Verification.contain --- lib/verification.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/verification.rb b/lib/verification.rb index 1d6063d..5b70264 100755 --- a/lib/verification.rb +++ b/lib/verification.rb @@ -54,7 +54,11 @@ module Verification end # TODO: rikki? + # Returns true if params (or its keys) are a subset of filter def self.contain(params, filter) - params.instance_of?(Array) ? (filter - params).empty? : filter.all? { |s| params.key? s } + (params.instance_of?(Array) ? params : params.keys).each do |key| + return false unless filter.include? key.to_sym + end + true end end From 9ef8b7a24bf34fd22cbae69a301f1c10d5db114d Mon Sep 17 00:00:00 2001 From: Prommah Date: Wed, 4 Nov 2015 14:17:57 +0000 Subject: [PATCH 243/305] Remove disused & hidden match score page --- app/controllers/matches_controller.rb | 6 ----- app/views/matches/score.html.erb | 37 --------------------------- 2 files changed, 43 deletions(-) mode change 100644 => 100755 app/controllers/matches_controller.rb delete mode 100644 app/views/matches/score.html.erb diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb old mode 100644 new mode 100755 index 5066916..8e0ea0c --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -24,12 +24,6 @@ class MatchesController < ApplicationController def extra end - def score - raise AccessError unless @match.can_update? cuser, [:matchers_attributes] - @contester = @match.contester1.team.is_leader?(cuser) ? @match.contester1 : @match.contester2 - @n = 0 - end - def ref raise AccessError unless @match.can_update? cuser, [:report] @n = 0 diff --git a/app/views/matches/score.html.erb b/app/views/matches/score.html.erb deleted file mode 100644 index ff1d9a0..0000000 --- a/app/views/matches/score.html.erb +++ /dev/null @@ -1,37 +0,0 @@ -

- <%= namelink @match.contester1.team %> vs <%= namelink @match.contester2.team %> -

- -
-

- Lineup -

- <%= form_for @match do |f| %> - <%= render :partial => "lineup", :locals => {:contester => @contester} %> -

- <%= f.submit "Save" %> -

- <% end %> -
- -<% if @match.can_update? cuser, [:score1, :score2] %> -
- <%= form_for(@match) do |f| %> -

- Scoring -

- - <%= f.error_messages %> -

- <%= f.label :score1, "Score" %>
- <%= f.text_field :score1, :size => 1 %> - <%= f.text_field :score2, :size => 1 %> -

-

- <%= f.submit 'Submit' %> -

- <% end %> -
-<% end %> - -<%= link_to "Back", @match %> From 7bbb1a1fb18b7d041488242393d3a8445d760229 Mon Sep 17 00:00:00 2001 From: Prommah Date: Wed, 4 Nov 2015 14:26:32 +0000 Subject: [PATCH 244/305] Clean up Verification.contain --- lib/verification.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/verification.rb b/lib/verification.rb index 5b70264..ebab58c 100755 --- a/lib/verification.rb +++ b/lib/verification.rb @@ -56,9 +56,6 @@ module Verification # TODO: rikki? # Returns true if params (or its keys) are a subset of filter def self.contain(params, filter) - (params.instance_of?(Array) ? params : params.keys).each do |key| - return false unless filter.include? key.to_sym - end - true + ((params.instance_of?(Array) ? params : params.keys) - filter).empty? end end From a4f4f074aea1a1b55dec6979ddb84219556c03ca Mon Sep 17 00:00:00 2001 From: Prommah Date: Thu, 5 Nov 2015 07:57:55 +0000 Subject: [PATCH 245/305] Cleaned up match model --- app/models/match.rb | 264 +++++++++++++++++++++++--------------------- 1 file changed, 137 insertions(+), 127 deletions(-) mode change 100644 => 100755 app/models/match.rb diff --git a/app/models/match.rb b/app/models/match.rb old mode 100644 new mode 100755 index 1059d07..50f2dc1 --- a/app/models/match.rb +++ b/app/models/match.rb @@ -38,119 +38,118 @@ class Match < ActiveRecord::Base attr_accessor :lineup, :method, :motm_name, :friendly attr_protected :id, :updated_at, :created_at, :diff, :points1, :points2 - has_many :matchers, :dependent => :destroy - has_many :users, :through => :matchers - has_many :predictions, :dependent => :destroy - has_many :comments, :as => :commentable, :order => "created_at", :dependent => :destroy + has_many :matchers, dependent: :destroy + has_many :users, through: :matchers + has_many :predictions, dependent: :destroy + has_many :comments, as: :commentable, order: "created_at", dependent: :destroy belongs_to :challenge belongs_to :contest - belongs_to :contester1, :class_name => "Contester", :include => 'team' - belongs_to :contester2, :class_name => "Contester", :include => 'team' - belongs_to :map1, :class_name => "Map" - belongs_to :map2, :class_name => "Map" + belongs_to :contester1, class_name: "Contester", include: "team" + belongs_to :contester2, class_name: "Contester", include: "team" + belongs_to :map1, class_name: "Map" + belongs_to :map2, class_name: "Map" belongs_to :server - belongs_to :referee, :class_name => "User" - belongs_to :motm, :class_name => "User" - belongs_to :demo, :class_name => "DataFile" + belongs_to :referee, class_name: "User" + belongs_to :motm, class_name: "User" + belongs_to :demo, class_name: "DataFile" belongs_to :week - belongs_to :hltv, :class_name => "Server" - belongs_to :stream, :class_name => "Movie" - belongs_to :caster, :class_name => "User" + belongs_to :hltv, class_name: "Server" + belongs_to :stream, class_name: "Movie" + belongs_to :caster, class_name: "User" - scope :future, :conditions => ["match_time > UTC_TIMESTAMP()"] - scope :future5, :conditions => ["match_time > UTC_TIMESTAMP()"], :limit => 5 - scope :finished, :conditions => ["score1 != 0 OR score2 != 0"] - scope :realfinished, :conditions => ["score1 IS NOT NULL AND score2 IS NOT NULL"] - scope :unfinished, :conditions => ["score1 IS NULL AND score2 IS NULL"] - scope :unreffed, :conditions => ["referee_id IS NULL"] - scope :ordered, :order => "match_time DESC" - scope :chrono, :order => "match_time ASC" - scope :recent, :limit => "8" - scope :bigrecent, :limit => "50" - scope :active, :conditions => ["contest_id IN (?)", Contest.active] + scope :future, conditions: ["match_time > UTC_TIMESTAMP()"] + scope :future5, conditions: ["match_time > UTC_TIMESTAMP()"], limit: 5 + scope :finished, conditions: ["score1 != 0 OR score2 != 0"] + scope :realfinished, conditions: ["score1 IS NOT NULL AND score2 IS NOT NULL"] + scope :unfinished, conditions: ["score1 IS NULL AND score2 IS NULL"] + scope :unreffed, conditions: ["referee_id IS NULL"] + scope :ordered, order: "match_time DESC" + scope :chrono, order: "match_time ASC" + scope :recent, limit: "8" + scope :bigrecent, limit: "50" + scope :active, conditions: ["contest_id IN (?)", Contest.active] scope :on_day, - lambda { |day| { - :conditions => ["match_time > ? and match_time < ?", day.beginning_of_day, day.end_of_day]} } + ->(day) { where("match_time > ? and match_time < ?", day.beginning_of_day, day.end_of_day) } scope :on_week, - lambda { |time| { - :conditions => ["match_time > ? and match_time < ?", time.beginning_of_week, time.end_of_week]} } + lambda { |time| + where("match_time > ? and match_time < ?", time.beginning_of_week, time.end_of_week) + } scope :of_contester, - lambda { |contester| { - :conditions => ["contester1_id = ? OR contester2_id = ?", contester.id, contester.id]} } + ->contester { where("contester1_id = ? OR contester2_id = ?", contester.id, contester.id) } scope :of_user, - lambda { |user| { - :include => :matchers, - :conditions => ["matchers.user_id = ?", user.id]} } + ->user { includes(:matchers).where("matchers.user_id = ?", user.id) } scope :of_team, - lambda { |team| { - :include => {:contester1 => :team, - :contester2 => :team}, :conditions => ["teams.id = ? OR teams_contesters.id = ?", team.id, team.id]} } + lambda { |team| + includes(contester1: :team, contester2: :team) + .where("teams.id = ? OR teams_contesters.id = ?", team.id, team.id) + } scope :of_userteam, - lambda { |user, team| { - :include => {:matchers => {:contester => :team}}, - :conditions => ["teams.id = ? AND matchers.user_id = ?", team.id, user.id]} } + lambda { |user, team| + includes(matchers: { contester: :team }) + .where("teams.id = ? AND matchers.user_id = ?", team.id, user.id) + } scope :within_time, - lambda { |from, to| { - :conditions => ["match_time > ? AND match_time < ?", from.utc, to.utc]} } + ->(from, to) { where("match_time > ? AND match_time < ?", from.utc, to.utc) } scope :around, - lambda { |time| { - :conditions => ["match_time > ? AND match_time < ?", time.ago(MATCH_LENGTH).utc, time.ago(-MATCH_LENGTH).utc]} } + lambda { |time| + where("match_time > ? AND match_time < ?", + time.ago(MATCH_LENGTH).utc, time.ago(-MATCH_LENGTH).utc) + } scope :after, - lambda { |time| { - :conditions => ["match_time > ? AND match_time < ?", time.utc, time.ago(-MATCH_LENGTH).utc]} } + ->time { where("match_time > ? AND match_time < ?", time.utc, time.ago(-MATCH_LENGTH).utc) } scope :map_stats, - :select => "map1_id, COUNT(*) as num, maps.name", - :joins => "LEFT JOIN maps ON maps.id = map1_id", - :group => "map1_id", - :having => "map1_id is not null", - :order => "num DESC" + select: "map1_id, COUNT(*) as num, maps.name", + joins: "LEFT JOIN maps ON maps.id = map1_id", + group: "map1_id", + having: "map1_id is not null", + order: "num DESC" scope :year_stats, - :select => "id, DATE_FORMAT(match_time, '%Y') as year, COUNT(*) as num", - :conditions => "match_time > '2000-01-01 01:01:01'", - :group => "year", - :order => "num DESC" + select: "id, DATE_FORMAT(match_time, '%Y') as year, COUNT(*) as num", + conditions: "match_time > '2000-01-01 01:01:01'", + group: "year", + order: "num DESC" scope :month_stats, - :select => "id, DATE_FORMAT(match_time, '%m') as month_n, - DATE_FORMAT(match_time, '%M') as month, - COUNT(*) as num", - :conditions => "match_time > '2000-01-01 01:01:01'", - :group => "month", - :order => "month_n" + select: "id, DATE_FORMAT(match_time, '%m') as month_n, + DATE_FORMAT(match_time, '%M') as month, + COUNT(*) as num", + conditions: "match_time > '2000-01-01 01:01:01'", + group: "month", + order: "month_n" validates_presence_of :contester1, :contester2, :contest - validates_format_of [:score1, :score2], :with => /\A[0-9]\z/, :allow_nil => true - validates_length_of :report, :maximum => 64000, :allow_blank => true + validates_format_of [:score1, :score2], with: /\A[0-9]\z/, allow_nil: true + validates_length_of :report, maximum: 64_000, allow_blank: true before_create :set_hltv after_create :send_notifications - before_save :set_motm, :if => Proc.new {|match| match.motm_name and !match.motm_name.empty?} - before_update :reset_contest, :if => Proc.new {|match| match.score1_changed? or match.score2_changed?} + before_save :set_motm, if: proc { |match| match.motm_name && !match.motm_name.empty? } + before_update :reset_contest, if: proc { |match| match.score1_changed? || match.score2_changed? } before_destroy :reset_contest - after_save :recalculate, :if => Proc.new {|match| match.score1_changed? or match.score2_changed?} - after_save :set_predictions, :if => Proc.new {|match| match.score1_changed? or match.score2_changed?} + after_save :recalculate, if: proc { |match| match.score1_changed? || match.score2_changed? } + after_save :set_predictions, if: proc { |match| match.score1_changed? || match.score2_changed? } - accepts_nested_attributes_for :matchers, :allow_destroy => true + accepts_nested_attributes_for :matchers, allow_destroy: true def to_s contester1.to_s + " vs " + contester2.to_s end def score_color - return "black" if score1.nil? or score2.nil? or contester1.nil? or contester2.nil? + return "black" if score1.nil? || score2.nil? || contester1.nil? || contester2.nil? return "yellow" if score1 == score2 - return "green" if contester1.team == friendly and score1 > score2 - return "green" if contester2.team == friendly and score2 > score1 - return "red" if contester1.team == friendly and score1 < score2 - "red" if contester2.team == friendly and score2 < score1 + return "green" if contester1.team == friendly && score1 > score2 + return "green" if contester2.team == friendly && score2 > score1 + return "red" if contester1.team == friendly && score1 < score2 + "red" if contester2.team == friendly && score2 < score1 end - def preds contester - perc = Prediction.count(:conditions => ["match_id = ? AND score#{contester} > 2", id]) - perc != 0 ? (perc/predictions.count.to_f*100).round : 0 + def preds(contester) + perc = Prediction.count(conditions: ["match_id = ? AND score#{contester} > 2", id]) + perc != 0 ? (perc / predictions.count.to_f * 100).round : 0 end - def mercs contester - matchers.all :conditions => {:merc => true, :contester_id => contester.id} + def mercs(contester) + matchers.all conditions: { merc: true, contester_id: contester.id } end def get_hltv @@ -158,18 +157,18 @@ class Match < ActiveRecord::Base end def demo_name - Verification.uncrap(contest.short_name + "-" + self.id.to_s + "_" + contester1.to_s + "-vs-" + contester2.to_s) + Verification.uncrap("#{contest.short_name}-#{id}_#{contester1}-vs-#{contester2}") end def team1_lineup - matchers.all(:conditions => {:contester_id => contester1_id}) + matchers.all(conditions: { contester_id: contester1_id }) end def team2_lineup - matchers.all(:conditions => {:contester_id => contester2_id}) + matchers.all(conditions: { contester_id: contester2_id }) end - def get_friendly param = nil + def get_friendly(param = nil) if param.nil? friendly == contester1.team ? contester1 : contester2 elsif param == :score @@ -179,7 +178,7 @@ class Match < ActiveRecord::Base end end - def get_opponent param = nil + def get_opponent(param = nil) if param.nil? friendly == contester1.team ? contester2 : contester1 elsif param == :score @@ -194,7 +193,7 @@ class Match < ActiveRecord::Base end def send_notifications - Profile.all(:include => :user, :conditions => "notify_any_match = 1").each do |p| + Profile.all(include: :user, conditions: "notify_any_match = 1").each do |p| Notifications.match p.user, self if p.user end contester2.team.teamers.active.each do |teamer| @@ -218,10 +217,11 @@ class Match < ActiveRecord::Base contest.recalculate end - #Since ladders are broken anyway, they are not handled here + # Since ladders are broken anyway, they are not handled here def reset_contest - return if score1_was.nil? or score2_was.nil? - return if contest.contest_type == Contest::TYPE_LEAGUE and !contester2.active or !contester1.active + return if score1_was.nil? || score2_was.nil? + return if contest.contest_type == Contest::TYPE_LEAGUE && + !contester2.active || !contester1.active if score1_was == score2_was contester1.draw = contester1.draw - 1 @@ -235,16 +235,17 @@ class Match < ActiveRecord::Base end unless contest.contest_type == Contest::TYPE_BRACKET - contester1.score = contester1.score-score1_was - contester2.score = contester2.score-score2_was + contester1.score = contester1.score - score1_was + contester2.score = contester2.score - score2_was contester1.save! contester2.save! end end def recalculate - return if score1.nil? or score2.nil? - return if contest.contest_type == Contest::TYPE_LEAGUE and !contester2.active or !contester1.active + return if score1.nil? || score2.nil? + return if contest.contest_type == Contest::TYPE_LEAGUE && + !contester2.active || !contester1.active if score1 == score2 contester1.draw = contester1.draw + 1 @@ -263,7 +264,7 @@ class Match < ActiveRecord::Base contester2.trend = Contester::TREND_UP end - self.diff = diff ? diff : (contester2.score-contester1.score) + self.diff = diff ? diff : (contester2.score - contester1.score) if contest.contest_type == Contest::TYPE_LADDER self.points1 = contest.elo_score score1, score2, diff @@ -274,23 +275,24 @@ class Match < ActiveRecord::Base end if contest.contest_type == Contest::TYPE_LADDER - contester1.extra = contester1.extra + contest.modulus_base/10 - contester2.extra = contester2.extra + contest.modulus_base/10 + contester1.extra = contester1.extra + contest.modulus_base / 10 + contester2.extra = contester2.extra + contest.modulus_base / 10 end unless contest.contest_type == Contest::TYPE_BRACKET - contester1.score = contester1.score+points1 < 0 ? 0 : contester1.score+points1 - contester2.score = contester2.score+points2 < 0 ? 0 : contester2.score+points2 + contester1.score = contester1.score + points1 < 0 ? 0 : contester1.score + points1 + contester2.score = contester2.score + points2 < 0 ? 0 : contester2.score + points2 contester1.save! contester2.save! end end - def hltv_record addr, pwd - if (match_time - MATCH_LENGTH*10) > DateTime.now or (match_time + MATCH_LENGTH*10) < DateTime.now + def hltv_record(addr, pwd) + if (match_time - MATCH_LENGTH * 10) > DateTime.now || + (match_time + MATCH_LENGTH * 10) < DateTime.now raise Error, I18n.t(:hltv_request_20) end - if hltv and hltv.recording + if hltv && hltv.recording raise Error, I18n.t(:hltv_already) + hltv.addr end unless get_hltv @@ -304,47 +306,55 @@ class Match < ActiveRecord::Base hltv.save! end - def hltv_move addr, pwd - raise Error, I18n.t(:hltv_notset) if hltv.nil? or hltv.recording.nil? + def hltv_move(addr, pwd) + raise Error, I18n.t(:hltv_notset) if hltv.nil? || hltv.recording.nil? Server.move hltv.reservation, addr, pwd end def hltv_stop - raise Error, I18n.t(:hltv_notset) if hltv.nil? or hltv.recording.nil? + raise Error, I18n.t(:hltv_notset) if hltv.nil? || hltv.recording.nil? Server.stop hltv.reservation end - def can_create? cuser - cuser and cuser.admin? + def can_create?(cuser) + cuser && cuser.admin? end - def can_update? cuser, params = {} + def can_update?(cuser, params = {}) return false unless cuser return true if cuser.admin? - return true if cuser.caster? and Verification.contain params, [:caster_id] \ - and (params[:caster_id] && params[:caster_id].to_i == cuser.id && caster_id.blank?) \ - or (params[:caster_id].blank? && caster_id == cuser.id) - return true if cuser.ref? and Verification.contain params, [:referee_id] \ - and (params[:referee_id] && params[:referee_id].to_i == cuser.id && referee_id.blank?) \ - or (params[:referee_id].blank? && referee_id == cuser.id) - return true if cuser.ref? and referee == cuser \ - and Verification.contain params, [:score1, :score2, :forfeit, :report, :demo_id, :motm_name, :matchers_attributes, :server_id] - return true if match_time.past? and !score1 and !score2 and !forfeit \ - and Verification.contain(params, [:score1, :score2]) \ - and (contester1.team.is_leader? cuser or contester2.team.is_leader? cuser) - return true if match_time.today? \ - and Verification.contain(params, [:stream_id]) \ - and (contester1.team.is_leader? cuser or contester2.team.is_leader? cuser) - return true if match_time.past? \ - and Verification.contain(params, [:matchers_attributes]) \ - and (contester1.team.is_leader? cuser or contester2.team.is_leader? cuser) - return true if (cuser.ref? and referee == cuser) \ - and Verification.contain(params, [:hltv]) \ - and !demo + + if cuser.ref? + if referee == cuser + return true if Verification.contain(params, + [:score1, :score2, :forfeit, :report, :demo_id, + :motm_name, :matchers_attributes, :server_id]) + return true if Verification.contain(params, [:hltv]) && !demo + end + if Verification.contain(params, [:referee_id]) + return true if (params[:referee_id].to_i == cuser.id && referee_id.blank?) || + (params[:referee_id].blank? && referee_id == cuser.id) + end + end + + if contester1.team.is_leader?(cuser) || contester2.team.is_leader?(cuser) + if match_time.past? + return true if Verification.contain(params, [:score1, :score2]) && + !score1 && !score2 && !forfeit + return true if Verification.contain(params, [:matchers_attributes]) + end + return true if match_time.today? && Verification.contain(params, [:stream_id]) + end + + if cuser.caster? && Verification.contain(params, [:caster_id]) + return true if (params[:caster_id].to_i == cuser.id && caster_id.blank?) || + (params[:caster_id].blank? && caster_id == cuser.id) + end + false end - def can_destroy? cuser - cuser and cuser.admin? + def can_destroy?(cuser) + cuser && cuser.admin? end end From 67f603789f0a74e499947b3d4a3331bd0813981d Mon Sep 17 00:00:00 2001 From: Prommah Date: Thu, 5 Nov 2015 07:59:52 +0000 Subject: [PATCH 246/305] Fixed caster selection --- app/views/matches/admin.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 app/views/matches/admin.html.haml diff --git a/app/views/matches/admin.html.haml b/app/views/matches/admin.html.haml old mode 100644 new mode 100755 index a0e589e..047c69d --- a/app/views/matches/admin.html.haml +++ b/app/views/matches/admin.html.haml @@ -34,7 +34,7 @@ - elsif match.can_update?(cuser, {:caster_id => cuser.id}) = form_for match do |f| - if cuser.admin? - = f.collection_select :caster_id, Group.casters, :id, :username, {:include_blank => true}, {:class => "autosubmit"} + = f.collection_select :caster_id, User.casters, :id, :username, {:include_blank => true}, {:class => "autosubmit"} - else = f.hidden_field :caster_id, {:value => cuser.id} = link_to "Take!", "#form_submit" From 71424d9207ceaa5e2b00ffff3b6eb274edac3e02 Mon Sep 17 00:00:00 2001 From: Prommah Date: Thu, 5 Nov 2015 08:25:54 +0000 Subject: [PATCH 247/305] Fix rubocop offenses --- app/models/match.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/models/match.rb b/app/models/match.rb index 50f2dc1..c31806a 100755 --- a/app/models/match.rb +++ b/app/models/match.rb @@ -116,9 +116,9 @@ class Match < ActiveRecord::Base group: "month", order: "month_n" - validates_presence_of :contester1, :contester2, :contest - validates_format_of [:score1, :score2], with: /\A[0-9]\z/, allow_nil: true - validates_length_of :report, maximum: 64_000, allow_blank: true + validates :contester1, :contester2, :contest, presence: true + validates :score1, :score2, format: /\A[0-9]\z/, allow_nil: true + validates :report, length: { maximum: 64_000 }, allow_blank: true before_create :set_hltv after_create :send_notifications @@ -193,7 +193,7 @@ class Match < ActiveRecord::Base end def send_notifications - Profile.all(include: :user, conditions: "notify_any_match = 1").each do |p| + Profile.all(include: :user, conditions: "notify_any_match = 1").find_each do |p| Notifications.match p.user, self if p.user end contester2.team.teamers.active.each do |teamer| @@ -288,8 +288,8 @@ class Match < ActiveRecord::Base end def hltv_record(addr, pwd) - if (match_time - MATCH_LENGTH * 10) > DateTime.now || - (match_time + MATCH_LENGTH * 10) < DateTime.now + if (match_time - MATCH_LENGTH * 10) > DateTime.now.utc || + (match_time + MATCH_LENGTH * 10) < DateTime.now.utc raise Error, I18n.t(:hltv_request_20) end if hltv && hltv.recording From 099d1eb7ddcd399bf51e7404d215735217a88dd4 Mon Sep 17 00:00:00 2001 From: Prommah Date: Thu, 5 Nov 2015 23:32:22 +0000 Subject: [PATCH 248/305] Fix hound rubocop rules (hopefully) --- config/styles/ruby.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/config/styles/ruby.yml b/config/styles/ruby.yml index c97ef12..6e9d1ee 100755 --- a/config/styles/ruby.yml +++ b/config/styles/ruby.yml @@ -13,6 +13,14 @@ Style/CollectionMethods: find: detect find_all: select reduce: inject +Style/DotPosition: + Description: Checks the position of the dot in multi-line method calls. + StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-multi-line-chains + Enabled: true + EnforcedStyle: leading + SupportedStyles: + - leading + - trailing Style/FileName: Description: Use snake_case for source file names. StyleGuide: https://github.com/bbatsov/ruby-style-guide#snake-case-files @@ -27,7 +35,7 @@ Style/IfUnlessModifier: Description: Favor modifier if/unless usage when you have a single-line body. StyleGuide: https://github.com/bbatsov/ruby-style-guide#if-as-a-modifier Enabled: false - MaxLineLength: 80 + MaxLineLength: 100 Style/OptionHash: Description: Don't use option hashes when you can use keyword arguments. Enabled: false @@ -223,14 +231,11 @@ Lint/LiteralInCondition: Lint/LiteralInInterpolation: Description: Checks for literals used in interpolation. Enabled: false - Metrics/LineLength: Description: Limit lines to 100 characters. - StyleGuide: https://github.com/bbatsov/ruby-style-guide#80-character-limits Enabled: true Max: 100 AllowURI: true URISchemes: - http - https - \ No newline at end of file From 1faed511fcf342694f9456731c9d94dc5a0deece Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Fri, 6 Nov 2015 15:23:50 +0000 Subject: [PATCH 249/305] Add EU flag to teams --- app/views/teams/edit.html.erb | 2 +- app/views/teams/new.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/teams/edit.html.erb b/app/views/teams/edit.html.erb index 6d31784..d93f92c 100644 --- a/app/views/teams/edit.html.erb +++ b/app/views/teams/edit.html.erb @@ -29,7 +29,7 @@
<%= f.label :country %> - <%= country_code_select :team, :country %> + <%= country_code_select :team, :country, [['EU', 'EU']] %>
<%= f.label :comment %> diff --git a/app/views/teams/new.html.erb b/app/views/teams/new.html.erb index 07dc6f2..463fa5f 100644 --- a/app/views/teams/new.html.erb +++ b/app/views/teams/new.html.erb @@ -21,7 +21,7 @@
<%= f.label :country %> - <%= country_code_select :team, :country %> + <%= country_code_select :team, :country, [['EU', 'EU']] %>
<%= f.label :comment %> From dbad31fddcf658b9681d6868589b8340fc23cc95 Mon Sep 17 00:00:00 2001 From: Prommah Date: Fri, 6 Nov 2015 19:43:30 +0000 Subject: [PATCH 250/305] Merge lineup forms --- .../themes/default/pages/_matches.scss | 48 +++++-------------- .../themes/flat/pages/_matches.scss | 48 +++++-------------- app/views/matches/_lineup.html.erb | 6 ++- app/views/matches/ref.html.erb | 38 ++++++--------- 4 files changed, 45 insertions(+), 95 deletions(-) mode change 100644 => 100755 app/assets/stylesheets/themes/default/pages/_matches.scss mode change 100644 => 100755 app/assets/stylesheets/themes/flat/pages/_matches.scss mode change 100644 => 100755 app/views/matches/_lineup.html.erb mode change 100644 => 100755 app/views/matches/ref.html.erb diff --git a/app/assets/stylesheets/themes/default/pages/_matches.scss b/app/assets/stylesheets/themes/default/pages/_matches.scss old mode 100644 new mode 100755 index 7c02079..1cf2924 --- a/app/assets/stylesheets/themes/default/pages/_matches.scss +++ b/app/assets/stylesheets/themes/default/pages/_matches.scss @@ -156,6 +156,7 @@ div#match { .team-1, .team-2 { position: relative; + margin-bottom: 20px; .player { @include span-columns(12); @@ -167,21 +168,8 @@ div#match { position: relative; } - .controls { - top: 0; - position: absolute; - z-index: 100; - - input { - margin: 0; - } - } - - form { - - label.checkbox { - padding: 0; - } + label.checkbox { + padding: 0; } } @@ -193,16 +181,9 @@ div#match { margin: 0 0 0 10px; } - .controls { - left: 0; - } - - form { - - label.checkbox { - float: right; - margin-left: 1em; - } + label.checkbox { + float: right; + margin-left: 1em; } } @@ -210,16 +191,9 @@ div#match { @include span-columns(6); @include omega; - .controls { - right: 0; - } - - form { - - label.checkbox { - float: left; - margin-right: 1em; - } + label.checkbox { + float: left; + margin-right: 1em; } } @@ -234,6 +208,10 @@ div#match { margin: 0; } } + + form .controls { + clear: both; + } } .scoring { diff --git a/app/assets/stylesheets/themes/flat/pages/_matches.scss b/app/assets/stylesheets/themes/flat/pages/_matches.scss old mode 100644 new mode 100755 index 8ce9e99..92d98cc --- a/app/assets/stylesheets/themes/flat/pages/_matches.scss +++ b/app/assets/stylesheets/themes/flat/pages/_matches.scss @@ -155,6 +155,7 @@ div#match { .team-1, .team-2 { position: relative; + margin-bottom: 20px; .player { @include span-columns(12); @@ -166,21 +167,8 @@ div#match { position: relative; } - .controls { - top: 0; - position: absolute; - z-index: 100; - - input { - margin: 0; - } - } - - form { - - label.checkbox { - padding: 0; - } + label.checkbox { + padding: 0; } } @@ -192,16 +180,9 @@ div#match { margin: 0 0 0 10px; } - .controls { - left: 0; - } - - form { - - label.checkbox { - float: right; - margin-left: 1em; - } + label.checkbox { + float: right; + margin-left: 1em; } } @@ -209,16 +190,9 @@ div#match { @include span-columns(6); @include omega; - .controls { - right: 0; - } - - form { - - label.checkbox { - float: left; - margin-right: 1em; - } + label.checkbox { + float: left; + margin-right: 1em; } } @@ -233,6 +207,10 @@ div#match { margin: 0; } } + + form .controls { + clear: both; + } } .scoring { diff --git a/app/views/matches/_lineup.html.erb b/app/views/matches/_lineup.html.erb old mode 100644 new mode 100755 index 0f9ba3a..b610794 --- a/app/views/matches/_lineup.html.erb +++ b/app/views/matches/_lineup.html.erb @@ -1,7 +1,7 @@
<% contester.lineup.each do |teamer| %>
- <% if matcher = @match.matchers.first(conditions: { user_id: teamer.user_id }) %> + <% if matcher = @match.matchers.first(conditions: { user_id: teamer.user_id, contester_id: contester.id }) %> <%= hidden_field_tag "match[matchers_attributes][#{@n}][id]", matcher.id %> <% end %> @@ -9,7 +9,7 @@ <%= hidden_field_tag "match[matchers_attributes][#{@n}][contester_id]", contester.id %> <%= hidden_field_tag "match[matchers_attributes][#{@n}][match_id]", @match.id %> <%= hidden_field_tag "match[matchers_attributes][#{@n}][merc]", false %> - <%= check_box_tag "match[matchers_attributes][#{@n}][_destroy]", "keep", @match.users.exists?(teamer.user), { id: "player_#{@n}" } %> + <%= check_box_tag "match[matchers_attributes][#{@n}][_destroy]", "keep", !matcher.nil?, { id: "player_#{@n}" } %> <%= label_tag "player_#{@n}", '', class: 'checkbox' %> @@ -45,5 +45,7 @@ <%= hidden_field_tag "match[matchers_attributes][#{@n}][_destroy]", "keep" %> <%= text_field_tag "match[matchers_attributes][#{@n}][user_id]", '', placeholder: 'Mercenary' %> + + <% @n = @n + 1 %>
diff --git a/app/views/matches/ref.html.erb b/app/views/matches/ref.html.erb old mode 100644 new mode 100755 index 5e8a0aa..fe0fa40 --- a/app/views/matches/ref.html.erb +++ b/app/views/matches/ref.html.erb @@ -16,33 +16,25 @@

Lineups

-
- <%= form_for @match do |f| %> - <%= f.error_messages %> - -
- <%= f.submit 'Save Lineup' %> -
+ <%= form_for @match do |f| %> + <%= f.error_messages %> +
<% [@match.contester1].each do |contester| %> - <%= render partial: "lineup", locals: { contester: contester } %> + <%= render partial: "lineup", locals: { contester: contester } %> <% end %> - <% end %> -
- -
- <%= form_for @match do |f| %> - <%= f.error_messages %> - -
- <%= f.submit 'Save Lineup' %> -
- +
+ +
<% [@match.contester2].each do |contester| %> - <%= render partial: "lineup", locals: { contester: contester } %> + <%= render partial: "lineup", locals: { contester: contester } %> <% end %> - <% end %> -
+
+ +
+ <%= f.submit 'Save Lineups' %> +
+ <% end %>
@@ -83,7 +75,7 @@
- <%= f.submit 'Save Scores' %> + <%= f.submit 'Save Scoring' %>
<% end %>
From 97f93664031e5d99ecba061d532f06687a769508 Mon Sep 17 00:00:00 2001 From: Prommah Date: Sat, 7 Nov 2015 06:11:26 +0000 Subject: [PATCH 251/305] Fixed profle query error when there are zero results --- app/models/match.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/match.rb b/app/models/match.rb index c31806a..4626848 100755 --- a/app/models/match.rb +++ b/app/models/match.rb @@ -193,7 +193,7 @@ class Match < ActiveRecord::Base end def send_notifications - Profile.all(include: :user, conditions: "notify_any_match = 1").find_each do |p| + Profile.includes(:user).where(notify_any_match: 1).find_each do |p| Notifications.match p.user, self if p.user end contester2.team.teamers.active.each do |teamer| From b55ff01ff574eaceea386f77eef7889dbdcdca94 Mon Sep 17 00:00:00 2001 From: Prommah Date: Sat, 7 Nov 2015 06:21:09 +0000 Subject: [PATCH 252/305] Add match-related factories --- spec/factories/contest.rb | 10 ++++++++++ spec/factories/contester.rb | 8 ++++++++ spec/factories/group.rb | 26 +++++++++++++++++++------- spec/factories/match.rb | 13 +++++++++++++ spec/factories/user.rb | 14 ++++++++++++++ 5 files changed, 64 insertions(+), 7 deletions(-) create mode 100755 spec/factories/contest.rb create mode 100755 spec/factories/contester.rb mode change 100644 => 100755 spec/factories/group.rb create mode 100755 spec/factories/match.rb mode change 100644 => 100755 spec/factories/user.rb diff --git a/spec/factories/contest.rb b/spec/factories/contest.rb new file mode 100755 index 0000000..98695b2 --- /dev/null +++ b/spec/factories/contest.rb @@ -0,0 +1,10 @@ +FactoryGirl.define do + factory :contest do + sequence(:name) { |n| "Contest ##{n}" } + + start Date.yesterday + self.end Date.tomorrow + status Contest::STATUS_PROGRESS + default_time "12:00:00" + end +end diff --git a/spec/factories/contester.rb b/spec/factories/contester.rb new file mode 100755 index 0000000..fe87ae7 --- /dev/null +++ b/spec/factories/contester.rb @@ -0,0 +1,8 @@ +FactoryGirl.define do + factory :contester do + contest + team do + create(:user_with_team).team + end + end +end diff --git a/spec/factories/group.rb b/spec/factories/group.rb old mode 100644 new mode 100755 index 68cec21..d0f0742 --- a/spec/factories/group.rb +++ b/spec/factories/group.rb @@ -1,27 +1,39 @@ FactoryGirl.define do factory :group do - sequence(:id) { |n| n + 100 } # Preserve first 100 + sequence(:id) { |n| n + 100 } # Preserve first 100 sequence(:name) { |n| "Group#{n}" } association :founder, factory: :user + + initialize_with { Group.find_or_create_by_id(id) } end trait :admin do - name "Admins" - id Group::ADMINS + name "Admins" + id Group::ADMINS + end + + trait :caster do + name "Shoutcasters" + id Group::CASTERS end trait :champions do - name "Champions" - id Group::CHAMPIONS + name "Champions" + id Group::CHAMPIONS end trait :donors do - name "Donors" - id Group::DONORS + name "Donors" + id Group::DONORS end trait :gather_moderator do name "Gather Moderator" id Group::GATHER_MODERATORS end + + trait :ref do + name "Referees" + id Group::REFEREES + end end diff --git a/spec/factories/match.rb b/spec/factories/match.rb new file mode 100755 index 0000000..be17db9 --- /dev/null +++ b/spec/factories/match.rb @@ -0,0 +1,13 @@ +FactoryGirl.define do + factory :match do + contest + contester1 do + create(:contester, contest: contest) + end + contester2 do + create(:contester, contest: contest) + end + + match_time 1.hour.from_now + end +end diff --git a/spec/factories/user.rb b/spec/factories/user.rb old mode 100644 new mode 100755 index 74942ac..2cf98a7 --- a/spec/factories/user.rb +++ b/spec/factories/user.rb @@ -20,6 +20,20 @@ FactoryGirl.define do end end + trait :caster do + after(:create) do |user| + group = create(:group, :caster) + create :grouper, user: user, group: group + end + end + + trait :ref do + after(:create) do |user| + group = create(:group, :ref) + create :grouper, user: user, group: group + end + end + trait :chris do steamid "0:1:58097444" end From dd899cddb0f0d3050f8e3419a6b99b306ba4ca23 Mon Sep 17 00:00:00 2001 From: Prommah Date: Sat, 7 Nov 2015 06:21:31 +0000 Subject: [PATCH 253/305] Spec tidying --- spec/factories/article.rb | 4 ++-- spec/factories/ban.rb | 6 +++--- spec/factories/category.rb | 6 +++--- spec/factories/gather.rb | 4 ++-- spec/factories/grouper.rb | 8 ++++---- spec/factories/issue.rb | 14 +++++++------- spec/factories/message.rb | 16 ++++++++-------- spec/factories/server.rb | 2 +- spec/factories/team.rb | 4 ++-- spec/models/user_spec.rb | 6 +++--- 10 files changed, 35 insertions(+), 35 deletions(-) mode change 100644 => 100755 spec/factories/article.rb mode change 100644 => 100755 spec/factories/ban.rb mode change 100644 => 100755 spec/factories/category.rb mode change 100644 => 100755 spec/factories/gather.rb mode change 100644 => 100755 spec/factories/grouper.rb mode change 100644 => 100755 spec/factories/issue.rb mode change 100644 => 100755 spec/factories/message.rb mode change 100644 => 100755 spec/factories/server.rb mode change 100644 => 100755 spec/factories/team.rb mode change 100644 => 100755 spec/models/user_spec.rb diff --git a/spec/factories/article.rb b/spec/factories/article.rb old mode 100644 new mode 100755 index 8e03ad7..b937dac --- a/spec/factories/article.rb +++ b/spec/factories/article.rb @@ -1,6 +1,6 @@ FactoryGirl.define do factory :article do sequence(:title) { |n| "Article #{n}" } - sequence(:text) { |n| (0..100).map{ (0...8).map { (65 + rand(26)).chr }.join }.join(" ") } + sequence(:text) { (0..100).map { (0...8).map { (65 + rand(26)).chr }.join }.join(" ") } end -end \ No newline at end of file +end diff --git a/spec/factories/ban.rb b/spec/factories/ban.rb old mode 100644 new mode 100755 index 0f998be..d477915 --- a/spec/factories/ban.rb +++ b/spec/factories/ban.rb @@ -1,13 +1,13 @@ FactoryGirl.define do factory :ban do ban_type Ban::TYPE_SITE - expiry Date.today + 1 + expiry Time.now.utc.to_date + 1 # Hack because of the awkward way bans are created (requires user_name) before(:create) do |ban| if ban.user.nil? user = create :user ban.user_name = user.username - else + else ban.user_name = ban.user.username end end @@ -28,4 +28,4 @@ FactoryGirl.define do trait :expired do expiry Date.yesterday - 1 end -end \ No newline at end of file +end diff --git a/spec/factories/category.rb b/spec/factories/category.rb old mode 100644 new mode 100755 index 14dd5ef..f94392d --- a/spec/factories/category.rb +++ b/spec/factories/category.rb @@ -5,10 +5,10 @@ FactoryGirl.define do end trait :news do - domain Category::DOMAIN_NEWS + domain Category::DOMAIN_NEWS end trait :game do - domain Category::DOMAIN_GAMES + domain Category::DOMAIN_GAMES end -end \ No newline at end of file +end diff --git a/spec/factories/gather.rb b/spec/factories/gather.rb old mode 100644 new mode 100755 index a7b1d0a..0316a7b --- a/spec/factories/gather.rb +++ b/spec/factories/gather.rb @@ -4,10 +4,10 @@ FactoryGirl.define do end trait :running do - status Gather::STATE_RUNNING + status Gather::STATE_RUNNING end trait :picking do - status Gather::STATE_PICKING + status Gather::STATE_PICKING end end diff --git a/spec/factories/grouper.rb b/spec/factories/grouper.rb old mode 100644 new mode 100755 index 54c492b..3e172bb --- a/spec/factories/grouper.rb +++ b/spec/factories/grouper.rb @@ -1,5 +1,5 @@ FactoryGirl.define do - factory :grouper do - sequence(:task) { |n| "Task#{n}" } - end -end \ No newline at end of file + factory :grouper do + sequence(:task) { |n| "Task#{n}" } + end +end diff --git a/spec/factories/issue.rb b/spec/factories/issue.rb old mode 100644 new mode 100755 index f7a9d4d..3f51961 --- a/spec/factories/issue.rb +++ b/spec/factories/issue.rb @@ -1,8 +1,8 @@ FactoryGirl.define do - factory :issue do - sequence(:title) { |n| "Issue title #{n}" } - sequence(:text) { |n| "Issue Text #{n}" } - status Issue::STATUS_OPEN - association :author, factory: :user - end -end \ No newline at end of file + factory :issue do + sequence(:title) { |n| "Issue title #{n}" } + sequence(:text) { |n| "Issue Text #{n}" } + status Issue::STATUS_OPEN + association :author, factory: :user + end +end diff --git a/spec/factories/message.rb b/spec/factories/message.rb old mode 100644 new mode 100755 index 1f44662..bb88f6f --- a/spec/factories/message.rb +++ b/spec/factories/message.rb @@ -1,9 +1,9 @@ FactoryGirl.define do - factory :message do - association :sender, factory: :user - association :recipient, factory: :user - sequence(:text) { |n| "text-#{n}" } - sequence(:title) { |n| "title-#{n}" } - sequence(:text_parsed) { |n| "text-#{n}" } - end -end \ No newline at end of file + factory :message do + association :sender, factory: :user + association :recipient, factory: :user + sequence(:text) { |n| "text-#{n}" } + sequence(:title) { |n| "title-#{n}" } + sequence(:text_parsed) { |n| "text-#{n}" } + end +end diff --git a/spec/factories/server.rb b/spec/factories/server.rb old mode 100644 new mode 100755 index e5cb877..81440a7 --- a/spec/factories/server.rb +++ b/spec/factories/server.rb @@ -13,4 +13,4 @@ FactoryGirl.define do active false end end -end \ No newline at end of file +end diff --git a/spec/factories/team.rb b/spec/factories/team.rb old mode 100644 new mode 100755 index 1a3902b..7a23a48 --- a/spec/factories/team.rb +++ b/spec/factories/team.rb @@ -1,11 +1,11 @@ FactoryGirl.define do factory :team do sequence(:name) { |n| "Team ##{n}" } - + irc "#team" web "http://team.com" tag "[TEAM]" country "EU" comment "We are a team" end -end \ No newline at end of file +end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb old mode 100644 new mode 100755 index 0258344..b67632e --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -22,7 +22,7 @@ # salt :string(255) # -require 'spec_helper' +require "spec_helper" describe User do let!(:user) { create :user } @@ -34,7 +34,7 @@ describe User do it "returns true if user is banned" do Ban.create!(ban_type: Ban::TYPE_SITE, - expiry: Time.now + 10.days, + expiry: Time.now.utc + 10.days, user_name: user.username) expect(user.banned?).to be_truthy @@ -42,7 +42,7 @@ describe User do it "returns true for specific bans" do Ban.create!(ban_type: Ban::TYPE_MUTE, - expiry: Time.now + 10.days, + expiry: Time.now.utc + 10.days, user_name: user.username) expect(user.banned? Ban::TYPE_MUTE).to be_truthy From 080619ba546cf8a675da7a667f56d96ae3b251d5 Mon Sep 17 00:00:00 2001 From: Prommah Date: Sun, 8 Nov 2015 07:27:49 +0000 Subject: [PATCH 254/305] Fix Verification.contain not processing string keys --- lib/verification.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/verification.rb b/lib/verification.rb index ebab58c..4b86ec6 100755 --- a/lib/verification.rb +++ b/lib/verification.rb @@ -54,8 +54,9 @@ module Verification end # TODO: rikki? - # Returns true if params (or its keys) are a subset of filter + # Returns true if params (or its keys if a hash) are a subset of filter def self.contain(params, filter) - ((params.instance_of?(Array) ? params : params.keys) - filter).empty? + keys = (params.instance_of?(Array) ? params : params.keys).map { |k| k.to_sym } + (keys - filter).empty? end end From c68ee2efe5aa13dadc0d3954afd6ecbb2481a2ab Mon Sep 17 00:00:00 2001 From: Prommah Date: Sun, 8 Nov 2015 09:02:13 +0000 Subject: [PATCH 255/305] Bug fixes, improved consistency & cleanliness --- app/controllers/matches_controller.rb | 28 ++++--- app/views/matches/show.html.erb | 4 +- config/routes.rb | 109 +++++++++++++------------- 3 files changed, 74 insertions(+), 67 deletions(-) mode change 100644 => 100755 app/views/matches/show.html.erb mode change 100644 => 100755 config/routes.rb diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index 8e0ea0c..2125ac3 100755 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -6,7 +6,7 @@ class MatchesController < ApplicationController end def show - @ownpred = @match.predictions.first conditions: {user_id: cuser.id} if cuser + @ownpred = @match.predictions.first conditions: { user_id: cuser.id } if cuser @newpred = @match.predictions.build end @@ -17,8 +17,9 @@ class MatchesController < ApplicationController end def admin - @matches = Match.active.includes(:contest, :contester1, :contester2, :map1, :map2, :referee).all.group_by {|t| t.week.to_s }.to_a.reverse - render :layout => "full" + @matches = Match.active.includes(:contest, :contester1, :contester2, :map1, :map2, :referee). + all.group_by { |t| t.week.to_s }.to_a.reverse + render layout: "full" end def extra @@ -39,7 +40,7 @@ class MatchesController < ApplicationController if @match.save flash[:notice] = t(:matches_create) - redirect_to controller: 'contests', action: 'edit', id: @match.contest + redirect_to edit_contest_path(@match.contest) else render :new end @@ -49,11 +50,11 @@ class MatchesController < ApplicationController raise AccessError unless @match.can_update? cuser, params[:match] if params[:match][:matchers_attributes] params[:match][:matchers_attributes].each do |key, matcher| - matcher['_destroy'] = matcher['_destroy'] == "keep" ? false : true - if matcher['user_id'] == "" + matcher["_destroy"] = matcher["_destroy"] == "keep" ? false : true + if matcher["user_id"] == "" params[:match][:matchers_attributes].delete key - elsif matcher['user_id'].to_i == 0 - matcher['user_id'] = User.find_by_username(matcher['user_id']).id + elsif matcher["user_id"].to_i == 0 + matcher["user_id"] = User.find_by_username(matcher["user_id"]).id end end end @@ -71,7 +72,12 @@ class MatchesController < ApplicationController end end else - render :edit + if URI(request.referer).path == match_ref_path(@match) + ref + render :ref + else + render :edit + end end end @@ -90,13 +96,13 @@ class MatchesController < ApplicationController @match.hltv_stop flash[:notice] = t(:hltv_stopped) end - redirect_to action: 'show' + redirect_to action: "show" end def destroy raise AccessError unless @match.can_destroy? cuser @match.destroy - redirect_to controller: 'contests', action: 'edit', id: @match.contest + redirect_to edit_contest_path(@match.contest) end private diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb old mode 100644 new mode 100755 index eb99448..0a62dd4 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -117,9 +117,9 @@
<% end %> - <% if cuser and @match.can_update? cuser, referee_id: cuser.id %> + <% if cuser and @match.can_update? cuser, [:report] %>
- <%= link_to "Referee Admin", { controller: :matches, action: 'ref', id: @match }, class: 'button' %> + <%= link_to "Referee Admin", match_ref_path(@match), class: 'button' %>
<% end %>
diff --git a/config/routes.rb b/config/routes.rb old mode 100644 new mode 100755 index 1442471..80f0f11 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ -Ensl::Application.routes.draw do +Ensl::Application.routes.draw do %w(403 404 422 500).each do |code| - get code, to: 'errors#show', code: code + get code, to: "errors#show", code: code end namespace :api do @@ -17,12 +17,12 @@ Ensl::Application.routes.draw do resources :versions end - match 'contests/del_map' - match 'contests/scores' - match 'contests/historical', to: "contests#historical" + match "contests/del_map" + match "contests/scores" + match "contests/historical", to: "contests#historical" resources :contests do - get 'current', on: :collection + get "current", on: :collection end resources :log_events @@ -30,7 +30,7 @@ Ensl::Application.routes.draw do resources :options resources :polls - match 'comments/quote' + match "comments/quote" resources :comments resources :shoutmsgs @@ -43,8 +43,8 @@ Ensl::Application.routes.draw do resources :forumers resources :topics - match 'forums/up' - match 'forums/down' + match "forums/up" + match "forums/down" resources :forums resources :users @@ -55,9 +55,10 @@ Ensl::Application.routes.draw do resources :servers resources :predictions resources :rounds - resources :matches do |m| + + get "matches/ref/:id" => "matches#ref", as: :match_ref + resources :matches do get :admin, to: "matches#admin", on: :collection - get :ref, to: "matches#ref" end resources :maps @@ -73,66 +74,66 @@ Ensl::Application.routes.draw do resources :bans resources :tweets resources :issues - - match 'posts/quote' + + match "posts/quote" resources :posts resources :brackets - match 'about/action' - match 'about/staff' - match 'about/statistics' + match "about/action" + match "about/staff" + match "about/statistics" - match 'refresh', to: "application#refresh" - match 'search', to: "application#search" + match "refresh", to: "application#refresh" + match "search", to: "application#search" - match 'news', to: "articles#news_index" - match 'news/archive', to: "articles#news_archive" - match 'news/admin', to: "articles#admin" - match 'articles/cleanup' + match "news", to: "articles#news_index" + match "news/archive", to: "articles#news_archive" + match "news/admin", to: "articles#admin" + match "articles/cleanup" - match 'data_files/admin' - match 'data_files/addFile' - match 'data_files/delFile' - match 'data_files/trash' + match "data_files/admin" + match "data_files/addFile" + match "data_files/delFile" + match "data_files/trash" - match 'contesters/recalc' + match "contesters/recalc" - match 'directories', to: "directories#show", id: 1 + match "directories", to: "directories#show", id: 1 - match 'gathers/refresh' - match 'gathers/latest/:game', to: "gathers#latest", via: :get - match 'gather', to: "gathers#latest", game: "ns2", via: :get + match "gathers/refresh" + match "gathers/latest/:game", to: "gathers#latest", via: :get + match "gather", to: "gathers#latest", game: "ns2", via: :get - match 'gatherers/:id/status', to: "gatherers#status", via: :post + match "gatherers/:id/status", to: "gatherers#status", via: :post - match 'groups/addUser' - match 'groups/delUser' + match "groups/addUser" + match "groups/delUser" - match 'movies/download' - match 'movies/preview' - match 'movies/snapshot' + match "movies/download" + match "movies/preview" + match "movies/snapshot" - match 'plugin/user' + match "plugin/user" - match 'users/forgot' - match 'users/recover' - match 'users/agenda' - match 'users/logout' - match 'users/login' + match "users/forgot" + match "users/recover" + match "users/agenda" + match "users/logout" + match "users/login" - match 'users/agenda' - match 'users/login' - match 'users/logout' - match 'users/popup' - match 'users/forgot', to: "users#forgot" + match "users/agenda" + match "users/login" + match "users/logout" + match "users/popup" + match "users/forgot", to: "users#forgot" - match 'votes/create' + match "votes/create" - match ':controller/:action', requirements: { action: /A-Za-z/ } - match ':controller/:action/:id' - match ':controller/:action/:id.:format' - match ':controller/:action/:id/:id2' + match ":controller/:action", requirements: { action: /A-Za-z/ } + match ":controller/:action/:id" + match ":controller/:action/:id.:format" + match ":controller/:action/:id/:id2" - match 'teamers/replace', to: 'teamers#replace', as: 'teamers_replace' + match "teamers/replace", to: "teamers#replace", as: "teamers_replace" end From 66fe8c07260621052a3637f655cb044ee964185f Mon Sep 17 00:00:00 2001 From: Prommah Date: Sun, 8 Nov 2015 09:41:11 +0000 Subject: [PATCH 256/305] Fix styling --- app/controllers/matches_controller.rb | 4 +- lib/verification.rb | 2 +- .../api/v1/maps_controller_spec.rb | 14 ++--- .../api/v1/servers_controller_spec.rb | 14 ++--- .../plugin/plugin_controller_spec.rb | 14 ++--- spec/features/shoutbox/shoutbox_spec.rb | 58 +++++++++---------- .../users/case_insensitive_login_spec.rb | 22 +++---- spec/features/users/user_signs_up_spec.rb | 2 +- spec/services/api/v1/users_collection_spec.rb | 2 +- spec/support/features/form_helpers.rb | 2 +- spec/support/features/server_helpers.rb | 54 ++++++++--------- spec/support/features/session_helpers.rb | 12 ++-- 12 files changed, 100 insertions(+), 100 deletions(-) mode change 100644 => 100755 spec/controllers/api/v1/maps_controller_spec.rb mode change 100644 => 100755 spec/controllers/api/v1/servers_controller_spec.rb mode change 100644 => 100755 spec/controllers/plugin/plugin_controller_spec.rb mode change 100644 => 100755 spec/features/shoutbox/shoutbox_spec.rb mode change 100644 => 100755 spec/features/users/case_insensitive_login_spec.rb mode change 100644 => 100755 spec/services/api/v1/users_collection_spec.rb mode change 100644 => 100755 spec/support/features/form_helpers.rb mode change 100644 => 100755 spec/support/features/server_helpers.rb mode change 100644 => 100755 spec/support/features/session_helpers.rb diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index 2125ac3..690d622 100755 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -17,8 +17,8 @@ class MatchesController < ApplicationController end def admin - @matches = Match.active.includes(:contest, :contester1, :contester2, :map1, :map2, :referee). - all.group_by { |t| t.week.to_s }.to_a.reverse + @matches = Match.active.includes(:contest, :contester1, :contester2, :map1, :map2, :referee) + .all.group_by { |t| t.week.to_s }.to_a.reverse render layout: "full" end diff --git a/lib/verification.rb b/lib/verification.rb index 4b86ec6..f307ea4 100755 --- a/lib/verification.rb +++ b/lib/verification.rb @@ -56,7 +56,7 @@ module Verification # TODO: rikki? # Returns true if params (or its keys if a hash) are a subset of filter def self.contain(params, filter) - keys = (params.instance_of?(Array) ? params : params.keys).map { |k| k.to_sym } + keys = (params.instance_of?(Array) ? params : params.keys).map(&:to_sym) (keys - filter).empty? end end diff --git a/spec/controllers/api/v1/maps_controller_spec.rb b/spec/controllers/api/v1/maps_controller_spec.rb old mode 100644 new mode 100755 index 689f7c3..523b54c --- a/spec/controllers/api/v1/maps_controller_spec.rb +++ b/spec/controllers/api/v1/maps_controller_spec.rb @@ -1,19 +1,19 @@ -require 'spec_helper' +require "spec_helper" describe Api::V1::MapsController do before do - request.accept = 'application/json' + request.accept = "application/json" end - describe '#index' do + describe "#index" do let!(:map) { create :map } - it 'returns a list of maps' do + it "returns a list of maps" do get :index expect(response).to be_success - expect(json['maps'].length).to eq(1) - json_map = json['maps'][0] - expect(json_map['id']).to eq(map.id) + expect(json["maps"].length).to eq(1) + json_map = json["maps"][0] + expect(json_map["id"]).to eq(map.id) end end end diff --git a/spec/controllers/api/v1/servers_controller_spec.rb b/spec/controllers/api/v1/servers_controller_spec.rb old mode 100644 new mode 100755 index 1e3437f..6930853 --- a/spec/controllers/api/v1/servers_controller_spec.rb +++ b/spec/controllers/api/v1/servers_controller_spec.rb @@ -1,20 +1,20 @@ -require 'spec_helper' +require "spec_helper" describe Api::V1::ServersController do before do - request.accept = 'application/json' + request.accept = "application/json" end - describe '#index' do + describe "#index" do let!(:server) { create :server, :active } let!(:inactive_server) { create :server, :inactive } - it 'returns a list of servers' do + it "returns a list of servers" do get :index expect(response).to be_success - expect(json['servers'].length).to eq(1) - json_server = json['servers'][0] - expect(json_server['id']).to eq(server.id) + expect(json["servers"].length).to eq(1) + json_server = json["servers"][0] + expect(json_server["id"]).to eq(server.id) end end end diff --git a/spec/controllers/plugin/plugin_controller_spec.rb b/spec/controllers/plugin/plugin_controller_spec.rb old mode 100644 new mode 100755 index e9585af..42efd7a --- a/spec/controllers/plugin/plugin_controller_spec.rb +++ b/spec/controllers/plugin/plugin_controller_spec.rb @@ -1,9 +1,9 @@ -require 'spec_helper' +require "spec_helper" describe PluginController do render_views - describe '#user' do + describe "#user" do before do create :group, :donors create :group, :champions @@ -11,19 +11,19 @@ describe PluginController do let!(:user) { create :user_with_team } - it 'returns user data' do + it "returns user data" do get :user, id: user.steamid expect(response).to be_success expect(response.body).to include(user.username) end - it 'definitely does not return IP address' do - last_ip = '127.0.0.1' + it "definitely does not return IP address" do + last_ip = "127.0.0.1" user.lastip = last_ip user.save! get :user, id: user.steamid expect(response).to be_success - expect(response).to_not include(last_ip) + expect(response).to_not include(last_ip) end end -end \ No newline at end of file +end diff --git a/spec/features/shoutbox/shoutbox_spec.rb b/spec/features/shoutbox/shoutbox_spec.rb old mode 100644 new mode 100755 index 5a40b6e..662bbc2 --- a/spec/features/shoutbox/shoutbox_spec.rb +++ b/spec/features/shoutbox/shoutbox_spec.rb @@ -1,34 +1,34 @@ -require 'spec_helper' +require "spec_helper" -feature 'Shoutbox', js: true do - let!(:user) { create :user } +feature "Shoutbox", js: true do + let!(:user) { create :user } - background do - sign_in_as user - end + background do + sign_in_as user + end - scenario 'creating a valid shout' do - visit root_path - shout = rand(100000).to_s - fill_in 'shoutbox_text', with: shout - click_button 'Shout!' - expect(page).to have_content(shout) - end + scenario "creating a valid shout" do + visit root_path + shout = rand(100_000).to_s + fill_in "shoutbox_text", with: shout + click_button "Shout!" + expect(page).to have_content(shout) + end - scenario 'enter more than 100 characters' do - valid_shout = 100.times.map { "a" }.join - invalid_shout = 101.times.map { "a" }.join - visit root_path - expect(page).to_not have_content("Maximum shout length exceeded") - fill_in 'shoutbox_text', with: invalid_shout - expect(page).to have_content("Maximum shout length exceeded") - fill_in 'shoutbox_text', with: valid_shout - expect(page).to_not have_content("Maximum shout length exceeded") - end + scenario "enter more than 100 characters" do + valid_shout = 100.times.map { "a" }.join + invalid_shout = 101.times.map { "a" }.join + visit root_path + expect(page).to_not have_content("Maximum shout length exceeded") + fill_in "shoutbox_text", with: invalid_shout + expect(page).to have_content("Maximum shout length exceeded") + fill_in "shoutbox_text", with: valid_shout + expect(page).to_not have_content("Maximum shout length exceeded") + end - scenario 'creating shout while banned' do - Ban.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now + 10.days, user_name: user.username - visit root_path - expect(find("#sidebar")).to have_content "You have been muted." - end -end \ No newline at end of file + scenario "creating shout while banned" do + Ban.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now.utc + 10.days, user_name: user.username + visit root_path + expect(find("#sidebar")).to have_content "You have been muted." + end +end diff --git a/spec/features/users/case_insensitive_login_spec.rb b/spec/features/users/case_insensitive_login_spec.rb old mode 100644 new mode 100755 index e9c9ea1..dbbd62a --- a/spec/features/users/case_insensitive_login_spec.rb +++ b/spec/features/users/case_insensitive_login_spec.rb @@ -1,6 +1,6 @@ -require 'spec_helper' +require "spec_helper" -feature 'Case insensitive login', js: :true do +feature "Case insensitive login", js: :true do let(:username) { "CaSe_InSeNsItIvE" } let(:password) { "passwordABC123" } let!(:user) { create(:user, username: username, raw_password: password) } @@ -9,23 +9,23 @@ feature 'Case insensitive login', js: :true do visit root_path end - feature 'when a user with mixed-case username signs in' do - scenario 'with a matching case allows the user to sign in' do + feature "when a user with mixed-case username signs in" do + scenario "with a matching case allows the user to sign in" do fill_login_form(username) click_button submit(:user, :login) - - expect(page).to have_content(I18n.t('login_successful')) - + + expect(page).to have_content(I18n.t("login_successful")) + within user_status do expect(page).to have_content(account_link) end end - scenario 'with a non-matching case allows the user to sign in' do + scenario "with a non-matching case allows the user to sign in" do fill_login_form("CASE_INSENSITIVE") click_button submit(:user, :login) - - expect(page).to have_content(I18n.t('login_successful')) + + expect(page).to have_content(I18n.t("login_successful")) within user_status do expect(page).to have_content(account_link) @@ -39,6 +39,6 @@ feature 'Case insensitive login', js: :true do end def account_link - 'ACCOUNT' + "ACCOUNT" end end diff --git a/spec/features/users/user_signs_up_spec.rb b/spec/features/users/user_signs_up_spec.rb index 2d5b2e7..ca80ec7 100755 --- a/spec/features/users/user_signs_up_spec.rb +++ b/spec/features/users/user_signs_up_spec.rb @@ -12,7 +12,7 @@ feature "Visitor signs up", js: :true do fill_form(:user, user.slice(*sign_up_attributes)) click_button submit(:user, :create) end - + expect(user_status).to have_content("ACCOUNT") end diff --git a/spec/services/api/v1/users_collection_spec.rb b/spec/services/api/v1/users_collection_spec.rb old mode 100644 new mode 100755 index 66437e9..f2b0fbc --- a/spec/services/api/v1/users_collection_spec.rb +++ b/spec/services/api/v1/users_collection_spec.rb @@ -28,4 +28,4 @@ describe Api::V1::UsersCollection do end end end -end \ No newline at end of file +end diff --git a/spec/support/features/form_helpers.rb b/spec/support/features/form_helpers.rb old mode 100644 new mode 100755 index 390b409..671bbad --- a/spec/support/features/form_helpers.rb +++ b/spec/support/features/form_helpers.rb @@ -2,7 +2,7 @@ module Features module FormHelpers def fill_form(model, hash) hash.each do |attribute, value| - fill_in attribute_translation(model, attribute), :with => value + fill_in attribute_translation(model, attribute), with: value end end diff --git a/spec/support/features/server_helpers.rb b/spec/support/features/server_helpers.rb old mode 100644 new mode 100755 index 446f34c..e4b67a1 --- a/spec/support/features/server_helpers.rb +++ b/spec/support/features/server_helpers.rb @@ -1,24 +1,24 @@ module Features module ServerHelpers def test_server_creation_and_editing - dns = 'ServerDns.com' - ip = '192.168.1.1' - port = '8000' - password = 'secret' - name = 'MyNsServer' - description = 'My NS Server' - irc = '#some_channel' + dns = "ServerDns.com" + ip = "192.168.1.1" + port = "8000" + password = "secret" + name = "MyNsServer" + description = "My NS Server" + irc = "#some_channel" visit new_server_path - fill_in 'Dns', with: dns - fill_in 'server_ip', with: ip - fill_in 'server_port', with: port - fill_in 'Password', with: password - fill_in 'Name', with: name - fill_in 'Description', with: description - fill_in 'Irc', with: irc - check 'Available for officials?' - click_button 'Save' + fill_in "Dns", with: dns + fill_in "server_ip", with: ip + fill_in "server_port", with: port + fill_in "Password", with: password + fill_in "Name", with: name + fill_in "Description", with: description + fill_in "Irc", with: irc + check "Available for officials?" + click_button "Save" expect(page).to have_content(dns) expect(page).to have_content("#{ip}:#{port}") @@ -26,17 +26,17 @@ module Features expect(page).to have_content(irc) expect(page).to have_content(description) - click_link 'Edit Server' + click_link "Edit Server" - fill_in 'Dns', with: "#{dns}2" - fill_in 'server_ip', with: "192.168.1.2" - fill_in 'server_port', with: "8001" - fill_in 'Password', with: "#{password}2" - fill_in 'Name', with: "#{name}2" - fill_in 'Description', with: "#{description}2" - fill_in 'Irc', with: "#{irc}2" - check 'Available for officials?' - click_button 'Save' + fill_in "Dns", with: "#{dns}2" + fill_in "server_ip", with: "192.168.1.2" + fill_in "server_port", with: "8001" + fill_in "Password", with: "#{password}2" + fill_in "Name", with: "#{name}2" + fill_in "Description", with: "#{description}2" + fill_in "Irc", with: "#{irc}2" + check "Available for officials?" + click_button "Save" expect(page).to have_content("192.168.1.2:8001") expect(page).to have_content("#{dns}2") @@ -45,4 +45,4 @@ module Features expect(page).to have_content("#{description}2") end end -end \ No newline at end of file +end diff --git a/spec/support/features/session_helpers.rb b/spec/support/features/session_helpers.rb old mode 100644 new mode 100755 index 64a44aa..f7188d7 --- a/spec/support/features/session_helpers.rb +++ b/spec/support/features/session_helpers.rb @@ -1,21 +1,21 @@ module Features module SessionHelpers - def sign_in_as(user) + def sign_in_as(user) visit root_path fill_in "login_username", with: user.username fill_in "login_password", with: user.raw_password - click_button I18n.t('helpers.submit.user.login') + click_button I18n.t("helpers.submit.user.login") end def change_timezone_for(user, timezone) visit edit_user_path(user.id) - click_link I18n.t('profile.locals') + click_link I18n.t("profile.locals") find("option[value='#{timezone}']").select_option - - click_button I18n.t('helpers.submit.user.update') + + click_button I18n.t("helpers.submit.user.update") end def user_status @@ -26,4 +26,4 @@ module Features find "#new_user" end end -end \ No newline at end of file +end From 9aa8d3169e564cda8c40c2a68e18cec7868636ff Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Thu, 31 Dec 2015 00:30:48 +0000 Subject: [PATCH 257/305] Add gather category to issues --- db/seeds.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/db/seeds.rb b/db/seeds.rb index 204dd1c..39d2b36 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -25,6 +25,7 @@ Category.create!(name: "ENSL Guides", domain: Category::DOMAIN_ARTICLES) Category.create!(name: "Website", domain: Category::DOMAIN_ISSUES) Category.create!(name: "ENSL Plugin", domain: Category::DOMAIN_ISSUES) Category.create!(name: "League", domain: Category::DOMAIN_ISSUES) +Category.create!(name: "Gather", domain: Category::DOMAIN_ISSUES) Category.create!(name: "Regional", domain: Category::DOMAIN_SITES) Category.create!(name: "Public", domain: Category::DOMAIN_SITES) Category.create!(name: "Competetive", domain: Category::DOMAIN_SITES) From b74f187306138ef746c7ab17d99a58bd21b303f8 Mon Sep 17 00:00:00 2001 From: Ari Timonen Date: Fri, 29 Jan 2016 00:29:09 +0200 Subject: [PATCH 258/305] Add sublime files to gitignore --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e76151e..4cea2a7 100644 --- a/.gitignore +++ b/.gitignore @@ -43,4 +43,7 @@ rerun.txt pickle-email-*.html # Direnv -.envrc \ No newline at end of file +.envrc + +# Sublime +*.sublime* From 5be50c11392f6993c3102b1440419f6be3b6a2c4 Mon Sep 17 00:00:00 2001 From: Ari Timonen Date: Fri, 29 Jan 2016 00:32:03 +0200 Subject: [PATCH 259/305] Add more files to gitignore --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index 4cea2a7..ad1e9f2 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,10 @@ pickle-email-*.html # Sublime *.sublime* + +# Gemtags +*.tags +*.gemtags + +# Staging files +tmp/*.tar.gz From b63c2f607ff7f93c3b8ea2a1c9007bfa37deb309 Mon Sep 17 00:00:00 2001 From: Ari Timonen Date: Fri, 29 Jan 2016 00:33:08 +0200 Subject: [PATCH 260/305] Add more files to gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ad1e9f2..c9d3f82 100644 --- a/.gitignore +++ b/.gitignore @@ -53,4 +53,4 @@ pickle-email-*.html *.gemtags # Staging files -tmp/*.tar.gz +tmp/*.gz From ba556ca1fe6010c69ec31e5ad09d4a4b088878b3 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Fri, 5 Feb 2016 16:58:10 +0000 Subject: [PATCH 261/305] Please forgive me --- app/services/google_calendar.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/services/google_calendar.rb b/app/services/google_calendar.rb index 5996844..a965a12 100644 --- a/app/services/google_calendar.rb +++ b/app/services/google_calendar.rb @@ -39,7 +39,7 @@ end class GoogleCalendar class Request - BASE_URL = "https://www.googleapis.com/calendar/v3/calendars" + BASE_URL = "https://www.googleapis.com/" EVENTS_ENDPOINT = "events" def self.events_list(id, timezone_offset) @@ -61,7 +61,12 @@ class GoogleCalendar def get_data Rails.cache.fetch(cache_key, expires_in: 5.minutes) do - Faraday.get(request_url) + if Rails.env.development? + conn = Faraday.new(BASE_URL, ssl: {verify: false}) + else + conn = Faraday.new(BASE_URL) + end + conn.get(request_url) end end @@ -76,7 +81,7 @@ class GoogleCalendar #that is longer ago then 7 days. #Alternative: maxResults=2500 time_min = (Time.now - 7.days).utc.iso8601 - "#{BASE_URL}/#{@id}/#{@endpoint}/?key=#{ENV['GOOGLE_API_KEY']}&timeMin=#{time_min}" + "calendar/v3/calendars/#{@id}/#{@endpoint}/?key=#{ENV['GOOGLE_API_KEY']}&timeMin=#{time_min}" end end From 24c825e2c9815f1cb8338b73f9df8091ff75d4a8 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Sun, 17 Apr 2016 00:05:18 +0100 Subject: [PATCH 262/305] Add teams api --- app/controllers/api/v1/teams_controller.rb | 23 ++++++++++++ config/routes.rb | 1 + .../api/v1/teams_controller_spec.rb | 35 +++++++++++++++++++ 3 files changed, 59 insertions(+) create mode 100644 app/controllers/api/v1/teams_controller.rb create mode 100644 spec/controllers/api/v1/teams_controller_spec.rb diff --git a/app/controllers/api/v1/teams_controller.rb b/app/controllers/api/v1/teams_controller.rb new file mode 100644 index 0000000..27479dc --- /dev/null +++ b/app/controllers/api/v1/teams_controller.rb @@ -0,0 +1,23 @@ +class Api::V1::TeamsController < Api::V1::BaseController + def index + render json: Api::V1::UsersCollection.as_json + end + + def show + @team = Team.find params[:id] + render json: { + id: @team.id, + name: @team.name, + logo: @team.logo, + members: @team.teamers.active.map do |m| + { + id: m.user.id, + username: m.user.username, + steamid: m.user.steamid + } + end + } + rescue ActiveRecord::RecordNotFound + raise ActionController::RoutingError.new("User Not Found") + end +end diff --git a/config/routes.rb b/config/routes.rb index 80f0f11..d1d98fb 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,6 +6,7 @@ Ensl::Application.routes.draw do namespace :api do namespace :v1 do resources :users, only: [:show, :index] + resources :teams, only: [:show] resources :servers, only: [:index] resources :maps, only: [:index] end diff --git a/spec/controllers/api/v1/teams_controller_spec.rb b/spec/controllers/api/v1/teams_controller_spec.rb new file mode 100644 index 0000000..2388787 --- /dev/null +++ b/spec/controllers/api/v1/teams_controller_spec.rb @@ -0,0 +1,35 @@ +require "spec_helper" + +describe Api::V1::TeamsController do + before do + request.accept = "application/json" + end + + describe "#show" do + before(:each) do + @founder = create :user + @team_member = create :user + @ex_team_member = create :user + @team = create :team, founder: @founder + Teamer.create user: @team_member, team: @team, rank: Teamer::RANK_MEMBER + Teamer.create user: @ex_team_member, team: @team, rank: Teamer::RANK_REMOVED + end + + it "returns team data" do + get :show, id: @team.id + expect(response).to be_success + expect(json["id"]).to eq(@team.id) + expect(json["name"]).to eq(@team.name) + + json["members"].each do |member| + expect(@team.teamers.active.map(&:user_id)).to include(member["id"]) + end + end + + it "returns 404 if team not found" do + expect { + get :show, id: Team.last.id + 1 + }.to raise_error(ActionController::RoutingError) + end + end +end From 8ca9dfb7fe8aae37f65f2052132448ae2b05359c Mon Sep 17 00:00:00 2001 From: Ari Timonen Date: Tue, 2 Aug 2016 00:29:36 +0200 Subject: [PATCH 263/305] Update Ruby to 2.2.3 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index ab68d70..6612e61 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -ruby '2.2.2' +ruby '2.2.3' gem 'dotenv-rails', '~> 0.10.0' gem 'rails', '~> 3.2.22' From ac2e95799cc3be7336701d84aa05589eb873dac4 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Wed, 21 Dec 2016 18:30:12 +0100 Subject: [PATCH 264/305] periodic gather count update Made it so the page updates the gather fill status in the navigation periodicaly (every 10 seconds) --- app/views/application/_navigation.html.erb | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/app/views/application/_navigation.html.erb b/app/views/application/_navigation.html.erb index ea46bd0..93c6eb2 100644 --- a/app/views/application/_navigation.html.erb +++ b/app/views/application/_navigation.html.erb @@ -80,12 +80,15 @@ \ No newline at end of file + From be6d5ec461c0b890fd731009c41b597682c349aa Mon Sep 17 00:00:00 2001 From: Absurdon Date: Mon, 2 Jan 2017 13:47:08 +0100 Subject: [PATCH 265/305] fallback gather link as fixed redirect link changing the fallback gather link to point to "http://www.ensl.org/gathers/latest/ns2" to make sure it points to the correct gather even without the user having to reload the page first requested by mega Jan 01 2017 --- app/views/application/_navigation.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/application/_navigation.html.erb b/app/views/application/_navigation.html.erb index 93c6eb2..48cc4df 100644 --- a/app/views/application/_navigation.html.erb +++ b/app/views/application/_navigation.html.erb @@ -33,7 +33,7 @@
  • <%= link_to "Introduction", article_url(464) %>
  • <%= link_to "Archives", "/gathers/" %>
  • - <%= active_link_to Gather.last, class: 'gathers' do %> + <%= link_to "/gathers/latest/ns2", class: 'gathers' do %> Fallback <%= Gather.player_count_for_game('NS2') %>/<%= Gather::FULL %> <% end %> From 0f397f9e7c3f310c8145f3bd12b51dccb0cbe530 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Sat, 14 Jan 2017 20:16:26 +0100 Subject: [PATCH 266/305] added link to comp mod article --- app/models/article.rb | 1 + app/views/application/_navigation.html.erb | 1 + 2 files changed, 2 insertions(+) diff --git a/app/models/article.rb b/app/models/article.rb index 979b8ea..3a2dcf3 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -34,6 +34,7 @@ class Article < ActiveRecord::Base EXTRA = 428 SB_RULES = 450 G_RULES = 464 + COMPMOD = 998 attr_protected :id, :updated_at, :created_at, :user_id, :version diff --git a/app/views/application/_navigation.html.erb b/app/views/application/_navigation.html.erb index 48cc4df..031efc7 100644 --- a/app/views/application/_navigation.html.erb +++ b/app/views/application/_navigation.html.erb @@ -19,6 +19,7 @@ <% end %>
    • <%= link_to "Rules", latest_rules %>
      • +
    • <%= link_to "Hall of Fame", article_url(Article::COMPMOD) %>
    • <%= link_to "Historical", "/contests" %>
    • <%= link_to "NS1 History", "/contests/historical/NS1" %>
    • <%= link_to "NS2 History", "/contests/historical/NS2" %>
      • From 91cc27fb787aaf46949d56b113d6a17939c262bb Mon Sep 17 00:00:00 2001 From: virtual-user Date: Sun, 12 Feb 2017 21:38:27 +0100 Subject: [PATCH 267/305] Change back to 2.2.2 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 6612e61..ab68d70 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -ruby '2.2.3' +ruby '2.2.2' gem 'dotenv-rails', '~> 0.10.0' gem 'rails', '~> 3.2.22' From 04b2638ebd8978c8843570eb20289e28a7f00bb5 Mon Sep 17 00:00:00 2001 From: Ari Timonen Date: Sun, 12 Feb 2017 21:39:54 +0100 Subject: [PATCH 268/305] Change capistrano version --- config/deploy.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/deploy.rb b/config/deploy.rb index f49dc72..45f4d3b 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,4 +1,4 @@ -lock '3.1.0' +#lock '3.1.0' set :application, 'ensl' set :deploy_via, :remote_cache From f89771ffafdfdd08edaed7bb6e4bf4548625451d Mon Sep 17 00:00:00 2001 From: Luchs Date: Thu, 2 Feb 2017 15:07:24 +0100 Subject: [PATCH 269/305] Also return users without a team on UserCollection service --- app/services/api/v1/users_collection.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/services/api/v1/users_collection.rb b/app/services/api/v1/users_collection.rb index 2630913..fdd8e29 100644 --- a/app/services/api/v1/users_collection.rb +++ b/app/services/api/v1/users_collection.rb @@ -39,7 +39,6 @@ class Api::V1::UsersCollection < Api::V1::Collection .project(columns) .join(teams_table, Arel::Nodes::OuterJoin) .on(joins) - .where(users_table[:team_id].not_eq(nil)) .order(users_table[:id]) end From e7f41948d3cb7c789f4e3235467cd5ad5a5a9c06 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Sun, 12 Feb 2017 21:54:22 +0100 Subject: [PATCH 270/305] Fixed Comp Mod link lable --- app/views/application/_navigation.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/application/_navigation.html.erb b/app/views/application/_navigation.html.erb index 031efc7..d0eed43 100644 --- a/app/views/application/_navigation.html.erb +++ b/app/views/application/_navigation.html.erb @@ -19,7 +19,7 @@ <% end %>
      • <%= link_to "Rules", latest_rules %>
        • -
      • <%= link_to "Hall of Fame", article_url(Article::COMPMOD) %>
        • +
      • <%= link_to "Comp Mod Changes", article_url(Article::COMPMOD) %>
      • <%= link_to "Historical", "/contests" %>
      • <%= link_to "NS1 History", "/contests/historical/NS1" %>
      • <%= link_to "NS2 History", "/contests/historical/NS2" %>
        • From d066dcc303bafeed607c918de737c67421933ad1 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Mon, 13 Feb 2017 00:00:06 +0100 Subject: [PATCH 271/305] fixed gathercount not getting loaded immediatly --- app/views/application/_navigation.html.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/application/_navigation.html.erb b/app/views/application/_navigation.html.erb index d0eed43..ed51c1b 100644 --- a/app/views/application/_navigation.html.erb +++ b/app/views/application/_navigation.html.erb @@ -80,16 +80,16 @@
    • From cdb77d27a7995a9260489d5a3406d51794a7819f Mon Sep 17 00:00:00 2001 From: Absurdon Date: Thu, 16 Feb 2017 01:41:36 +0100 Subject: [PATCH 272/305] Fixed new PMs not highlighted --- app/assets/stylesheets/themes/default/mixins/_flashes.scss | 4 ++++ app/views/messages/index.html.erb | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/themes/default/mixins/_flashes.scss b/app/assets/stylesheets/themes/default/mixins/_flashes.scss index 820eb04..ccb5ed0 100644 --- a/app/assets/stylesheets/themes/default/mixins/_flashes.scss +++ b/app/assets/stylesheets/themes/default/mixins/_flashes.scss @@ -44,4 +44,8 @@ display: inline-block; font-style: italic; padding: 0 3px; + + a { + color: white; + } } diff --git a/app/views/messages/index.html.erb b/app/views/messages/index.html.erb index 1d9ed26..1f41e64 100644 --- a/app/views/messages/index.html.erb +++ b/app/views/messages/index.html.erb @@ -18,7 +18,11 @@
    <% if cuser.received_messages.any? %> <% cuser.received_messages.reverse_each do |message| %> -
    + <% if cuser.new_messages.include?(message) %> +
    + <% else %> +
    + <% end %> <%= render partial: 'message', locals: { message: message } %>
    <% end %> From e0710c9efce783302c6e507a408fee66be79e8a4 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Thu, 16 Feb 2017 01:41:36 +0100 Subject: [PATCH 273/305] Fixed new PMs not highlighted --- app/assets/stylesheets/themes/default/mixins/_flashes.scss | 4 ++++ app/views/messages/index.html.erb | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/themes/default/mixins/_flashes.scss b/app/assets/stylesheets/themes/default/mixins/_flashes.scss index 820eb04..ccb5ed0 100644 --- a/app/assets/stylesheets/themes/default/mixins/_flashes.scss +++ b/app/assets/stylesheets/themes/default/mixins/_flashes.scss @@ -44,4 +44,8 @@ display: inline-block; font-style: italic; padding: 0 3px; + + a { + color: white; + } } diff --git a/app/views/messages/index.html.erb b/app/views/messages/index.html.erb index 1d9ed26..1f41e64 100644 --- a/app/views/messages/index.html.erb +++ b/app/views/messages/index.html.erb @@ -18,7 +18,11 @@
    <% if cuser.received_messages.any? %> <% cuser.received_messages.reverse_each do |message| %> -
    + <% if cuser.new_messages.include?(message) %> +
    + <% else %> +
    + <% end %> <%= render partial: 'message', locals: { message: message } %>
    <% end %> From 38ac72f01e4edce71d99425294d0a3be07ce7662 Mon Sep 17 00:00:00 2001 From: Michael Senn Date: Fri, 24 Feb 2017 17:49:40 +0100 Subject: [PATCH 274/305] Adjust user API specs to expect users without assigned teams. In d5d804a56f416f3637cfa32b0129142f8a82ecd8, the user API was changed to also return users without an assigned team, but specs were not adjusted. --- spec/services/api/v1/users_collection_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/services/api/v1/users_collection_spec.rb b/spec/services/api/v1/users_collection_spec.rb index f2b0fbc..694478b 100755 --- a/spec/services/api/v1/users_collection_spec.rb +++ b/spec/services/api/v1/users_collection_spec.rb @@ -9,8 +9,8 @@ describe Api::V1::UsersCollection do 3.times { create(:user) } end - it "returns 0 results" do - expect(collection.execute_query.size).to eq(0) + it "returns 3 results" do + expect(collection.execute_query.size).to eq(3) end end From f17af42bfd646ed93b03ded97c113bb5a327790b Mon Sep 17 00:00:00 2001 From: Absurdon Date: Mon, 27 Feb 2017 23:21:59 +0100 Subject: [PATCH 275/305] Update to new rules and updated categories --- app/models/article.rb | 2 +- app/models/category.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/article.rb b/app/models/article.rb index 3a2dcf3..789e438 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -24,7 +24,7 @@ class Article < ActiveRecord::Base STATUS_PUBLISHED = 0 STATUS_DRAFT = 1 - RULES = 913 + RULES = 1007 HISTORY = 401 HOF = 402 SPONSORS = 403 diff --git a/app/models/category.rb b/app/models/category.rb index 263b7aa..8f0097b 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -16,7 +16,7 @@ class Category < ActiveRecord::Base MAIN = 1 SPECIAL = 10 INTERVIEWS = 11 - RULES = 36 + RULES = 61 DOMAIN_NEWS = 0 DOMAIN_ARTICLES = 1 From f3baf7e8960fab0bfe07e7b9267d2a88480579fc Mon Sep 17 00:00:00 2001 From: Absurdon Date: Fri, 3 Mar 2017 14:09:14 +0100 Subject: [PATCH 276/305] Fixed issue#97 --- app/controllers/teamers_controller.rb | 2 ++ app/views/teams/show.html.erb | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/controllers/teamers_controller.rb b/app/controllers/teamers_controller.rb index 28302fe..9f3d84e 100644 --- a/app/controllers/teamers_controller.rb +++ b/app/controllers/teamers_controller.rb @@ -1,11 +1,13 @@ class TeamersController < ApplicationController def create + @old_application = (cuser.teamers.joining.count == 0) ? nil : cuser.teamers.joining.first @teamer = Teamer.new params[:teamer] raise AccessError unless @teamer.can_create? cuser, params[:teamer] @teamer.user = cuser unless cuser.admin? if @teamer.save flash[:notice] = t(:applying_team) + @teamer.team.to_s + @old_application && @old_application.destroy else flash[:error] = @teamer.errors.full_messages.to_s end diff --git a/app/views/teams/show.html.erb b/app/views/teams/show.html.erb index f0e2deb..083cbec 100644 --- a/app/views/teams/show.html.erb +++ b/app/views/teams/show.html.erb @@ -10,18 +10,19 @@ <% end %> <% if cuser && cuser.teamers %> - <% if cuser.teamers.joining.count == 0 && @team.active %> - <%= form_for @teamer do |f| %> - <%= f.error_messages %> - <%= f.hidden_field :user_id, :value => cuser.id %> - <%= f.hidden_field :team_id, :value => @team.id %> - + <%= form_for @teamer do |f| %> + <%= f.error_messages %> + <%= f.hidden_field :user_id, :value => cuser.id %> + <%= f.hidden_field :team_id, :value => @team.id %> + <% if cuser.teamers.joining.count == 0 && @team.active %>
    - <%= f.submit "Request To Join", class: 'button' %> + <%= f.submit "Request To Join", class: 'button' %> +
    + <% elsif cuser.teamers.joining.first.team != @team %> +
    + <%= f.submit "Request To Join", class: 'button', data: { confirm: "You have already requested to join #{cuser.teamers.joining.first.team}. Do you want to request to join #{@team} instead?" } %>
    <% end %> - <% elsif cuser.teamers.joining.first.team != @team %> - <%= link_to 'Request To Join', edit_teamer_path("teamer" => cuser.teamers.joining.first), method: :get,confirm: "You have already requested to join #{cuser.teamers.joining.first.team}. Do you want to request to join #{@team} instead?", class: 'button' %> <% end %> <% end %> From 9a0d2c6a255abed6be8cb8c5bc311e4fba346c05 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Sat, 4 Mar 2017 22:45:05 +0100 Subject: [PATCH 277/305] Added creator to ban modell --- app/controllers/bans_controller.rb | 1 + app/models/ban.rb | 4 +++- db/migrate/20170304191254_add_creator_to_bans.rb | 6 ++++++ db/schema.rb | 4 +++- 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20170304191254_add_creator_to_bans.rb diff --git a/app/controllers/bans_controller.rb b/app/controllers/bans_controller.rb index 83496c5..c94dd0d 100644 --- a/app/controllers/bans_controller.rb +++ b/app/controllers/bans_controller.rb @@ -20,6 +20,7 @@ class BansController < ApplicationController def create @ban = Ban.new(params[:ban]) raise AccessError unless @ban.can_create? cuser + @ban.creator = cuser if @ban.save flash[:notice] = t(:bans_create) diff --git a/app/models/ban.rb b/app/models/ban.rb index 2d07a1f..936173e 100755 --- a/app/models/ban.rb +++ b/app/models/ban.rb @@ -13,7 +13,7 @@ # updated_at :datetime # ban_type :integer # ip :string(255) -# +# creator_id :integer class Ban < ActiveRecord::Base include Extra @@ -44,6 +44,8 @@ class Ban < ActiveRecord::Base belongs_to :user belongs_to :server + belongs_to :creator, foreign_key: 'creator_id', class_name: 'User' + def color expiry.past? ? "green" : "red" end diff --git a/db/migrate/20170304191254_add_creator_to_bans.rb b/db/migrate/20170304191254_add_creator_to_bans.rb new file mode 100644 index 0000000..5a09793 --- /dev/null +++ b/db/migrate/20170304191254_add_creator_to_bans.rb @@ -0,0 +1,6 @@ +class AddCreatorToBans < ActiveRecord::Migration + def change + add_column :bans, :creator_id, :integer + add_index :bans, :creator_id + end +end diff --git a/db/schema.rb b/db/schema.rb index 6214a8c..649d7e2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20150820223313) do +ActiveRecord::Schema.define(:version => 20170304191254) do create_table "admin_requests", :force => true do |t| t.string "addr" @@ -69,8 +69,10 @@ ActiveRecord::Schema.define(:version => 20150820223313) do t.datetime "updated_at" t.integer "ban_type" t.string "ip" + t.integer "creator_id" end + add_index "bans", ["creator_id"], :name => "index_bans_on_creator_id" add_index "bans", ["server_id"], :name => "index_bans_on_server_id" add_index "bans", ["user_id"], :name => "index_bans_on_user_id" From 5fac74f71581be217218e221ca61eef8d6244c72 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Sat, 4 Mar 2017 22:50:36 +0100 Subject: [PATCH 278/305] added creator field to ban/show.html.erb --- app/views/bans/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/bans/show.html.erb b/app/views/bans/show.html.erb index 2413c2a..be6cf33 100644 --- a/app/views/bans/show.html.erb +++ b/app/views/bans/show.html.erb @@ -3,7 +3,7 @@
    - <%= cascade @ban, ["steamid", :user, "addr", :server, "expiry", "reason_b", "created_at"] %> + <%= cascade @ban, ["steamid", :user, "addr", :server, "expiry", "reason_b", "created_at", :creator] %>
    <%= link_to "Back", bans_url %> From 569122862fb546975d8049470c8c076190c2ebdb Mon Sep 17 00:00:00 2001 From: Absurdon Date: Mon, 6 Mar 2017 02:33:12 +0100 Subject: [PATCH 279/305] Gave Gathermods simple banning permissions --- app/models/ban.rb | 13 ++++++++++--- app/models/user.rb | 4 ++++ app/views/bans/_list.html.erb | 4 ++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/app/models/ban.rb b/app/models/ban.rb index 936173e..b0f721d 100755 --- a/app/models/ban.rb +++ b/app/models/ban.rb @@ -37,6 +37,7 @@ class Ban < ActiveRecord::Base validate :validate_type validate :validate_ventban + validate :validate_permission validates :steamid, length: {maximum: 14}, format: /\A0:[01]:[0-9]{1,10}\Z/, allow_blank: true validates :addr, format: /\A([0-9]{1,3}\.){3}[0-9]{1,3}:?[0-9]{0,5}\z/, allow_blank: true validates :reason, length: {maximum: 255}, allow_blank: true @@ -69,6 +70,12 @@ class Ban < ActiveRecord::Base end end + def validate_permission + unless creator.admin? or (creator.gather_moderator? and self.ban_type == TYPE_GATHER) + errors.add :ban_type, 'Gather Moderators can only create gather bans' + end + end + def check_user if user_name self.user = User.find_by_username(user_name) @@ -79,14 +86,14 @@ class Ban < ActiveRecord::Base end def can_create? cuser - cuser and cuser.admin? + cuser and cuser.allowed_to_ban? end def can_update? cuser - cuser and cuser.admin? + cuser and (cuser.admin? or (self.creator == cuser and cuser.allowed_to_ban?)) end def can_destroy? cuser - cuser and cuser.admin? + cuser and (cuser.admin? or (self.creator == cuser and cuser.allowed_to_ban?)) end end diff --git a/app/models/user.rb b/app/models/user.rb index 1d28615..db83fea 100755 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -209,6 +209,10 @@ class User < ActiveRecord::Base groups.exists? id: Group::GATHER_MODERATORS end + def allowed_to_ban? + admin? or gather_moderator? + end + def verified? # created_at < DateTime.now.ago(VERIFICATION_TIME) true diff --git a/app/views/bans/_list.html.erb b/app/views/bans/_list.html.erb index f3d7ddd..52ad151 100644 --- a/app/views/bans/_list.html.erb +++ b/app/views/bans/_list.html.erb @@ -4,7 +4,7 @@ Type Expiry Reason - <% if cuser and cuser.admin? %> + <% if cuser and cuser.allowed_to_ban? %> <% end %> @@ -21,7 +21,7 @@ <%= ban.types[ban.ban_type] %> <%= shorttime ban.expiry %> <%= shorten ban.reason, 30 %> - <% if cuser and cuser.admin? %> + <% if cuser and cuser.allowed_to_ban? %> <% if ban.can_update? cuser %> <%= link_to icon('pencil'), edit_ban_path(ban) %> From 91d585f37847a0031b0670539a97e82518b08344 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Tue, 7 Mar 2017 01:45:39 +0100 Subject: [PATCH 280/305] Added Button to show user history for admins --- app/views/users/show.html.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 732b463..9890008 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -43,5 +43,8 @@ <%= link_to 'Edit', edit_user_path(@user), class: 'button' %> <%= link_to 'My Agenda', "/users/agenda/#{cuser.id}", class: 'button' %> <% end %> + <% if cuser and cuser.admin? %> + <%= link_to 'Show History', "/users/history/#{@user.id}", class: 'button' %> + <% end %>
    From 035f15648a7f77b1b9a43cf7167c0ddeeb8bc8b8 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Wed, 8 Mar 2017 01:45:33 +0100 Subject: [PATCH 281/305] fixed error for old bans that don't have a creator validation failed on editing older bans that do not have a creator. Added a check to make sure this is still working. --- app/models/ban.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/ban.rb b/app/models/ban.rb index b0f721d..645e1d9 100755 --- a/app/models/ban.rb +++ b/app/models/ban.rb @@ -71,7 +71,7 @@ class Ban < ActiveRecord::Base end def validate_permission - unless creator.admin? or (creator.gather_moderator? and self.ban_type == TYPE_GATHER) + unless creator and (creator.admin? or (creator.gather_moderator? and self.ban_type == TYPE_GATHER)) errors.add :ban_type, 'Gather Moderators can only create gather bans' end end From 9989e840aad1132e796a316eccfbe18b6be85535 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Wed, 8 Mar 2017 02:21:49 +0100 Subject: [PATCH 282/305] fixed logical flaw in last commit --- app/models/ban.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/ban.rb b/app/models/ban.rb index 645e1d9..5911abd 100755 --- a/app/models/ban.rb +++ b/app/models/ban.rb @@ -71,7 +71,7 @@ class Ban < ActiveRecord::Base end def validate_permission - unless creator and (creator.admin? or (creator.gather_moderator? and self.ban_type == TYPE_GATHER)) + unless creator.nil? or creator.admin? or (creator.gather_moderator? and self.ban_type == TYPE_GATHER) errors.add :ban_type, 'Gather Moderators can only create gather bans' end end From b1e451030ca03b33c7cc87b9ea3bdbc01ab7b85f Mon Sep 17 00:00:00 2001 From: Absurdon Date: Wed, 8 Mar 2017 20:31:10 +0100 Subject: [PATCH 283/305] fixed reactivating teams in a contest failed --- app/controllers/contesters_controller.rb | 4 ++-- app/views/contests/edit.html.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/contesters_controller.rb b/app/controllers/contesters_controller.rb index 5c8f376..115ca3f 100644 --- a/app/controllers/contesters_controller.rb +++ b/app/controllers/contesters_controller.rb @@ -26,11 +26,11 @@ class ContestersController < ApplicationController @contester.score = @contester.contest.contesters.active.count + 1 end - if @contester.save + if @contester.save! flash[:notice] = t(:contests_join) redirect_to contest_path(@contester.contest_id) else - flash[:error] = t(:errors) + @contester.errors.full_messages.to_s + flash[:error] = @contester.errors.full_messages.to_s #t(:errors) + @contester.errors.full_messages.to_s redirect_to_back end end diff --git a/app/views/contests/edit.html.erb b/app/views/contests/edit.html.erb index ea4e40c..bee8782 100644 --- a/app/views/contests/edit.html.erb +++ b/app/views/contests/edit.html.erb @@ -177,7 +177,7 @@ <%= form_for contester do |c| %> <%= c.hidden_field :active, { value: 1 } %> <%= link_to icon('pencil'), edit_contester_path(contester) %> - <%= link_to_function icon('rotate-left'), "$('edit_contester_#{contester.id}').submit()" %> + <%= link_to_function icon('rotate-left'), "$('#edit_contester_#{contester.id}').submit()" %> <% end %> <% end %> From 4ebb95ca3a777304b8c2f647e3d747fdbd4bde22 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Wed, 15 Mar 2017 13:53:18 +0100 Subject: [PATCH 284/305] Fixed link formatting error --- app/helpers/application_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 561202d..b62ef42 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -35,9 +35,9 @@ module ApplicationHelper end str = model.to_s if length and str.length > length - link_to raw(str.to_s[0, length] + "..."), model, class: model.class.to_s.downcase + link_to str.to_s[0, length] + "...", model, class: model.class.to_s.downcase else - link_to raw(str), model, class: model.class.to_s.downcase + link_to str, model, class: model.class.to_s.downcase end end From e50ba391fecac1566b3b77425d3c202ba8b03d8f Mon Sep 17 00:00:00 2001 From: Absurdon Date: Sun, 19 Mar 2017 02:37:44 +0100 Subject: [PATCH 285/305] Updated the contact page --- app/views/issues/new.html.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb index 92fc96f..8b685eb 100644 --- a/app/views/issues/new.html.erb +++ b/app/views/issues/new.html.erb @@ -1,4 +1,6 @@

    <%= cuser ? "New Issue" : "Contact" %>

    +

    In case the contact form does not work write us on Steam (add the people from <%= link_to 'here', about_staff_path %>)

    +

    You can also reach us on our <%= link_to 'Official NSL Discord', 'https://discord.gg/tHte2pS', target: '_blank' %> or on the <%= link_to 'forums', forums_path %>

    Please do not forget to include contact details, such as an email address or a Steam account in the case that you do not have an ENSL account.

    From 4e319ed5e919ac3720780dc3c635dadf53d3d82b Mon Sep 17 00:00:00 2001 From: Absurdon Date: Tue, 21 Mar 2017 16:01:30 +0100 Subject: [PATCH 286/305] Disabled Google calender as it seems broken right now --- app/views/layouts/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 81ba9a4..d4a1dc3 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -22,7 +22,7 @@
    From 624da53bb655de9494c5071400006a414ec3742e Mon Sep 17 00:00:00 2001 From: Absurdon Date: Fri, 24 Mar 2017 00:07:39 +0100 Subject: [PATCH 287/305] Added possibility for Admins to check on votes wo querying the database manually --- app/controllers/polls_controller.rb | 4 ++++ app/views/polls/show.html.erb | 5 ++++- app/views/polls/showvotes.html.erb | 16 ++++++++++++++++ config/routes.rb | 1 + 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 app/views/polls/showvotes.html.erb diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb index c5d327b..aad35b2 100644 --- a/app/controllers/polls_controller.rb +++ b/app/controllers/polls_controller.rb @@ -48,6 +48,10 @@ class PollsController < ApplicationController redirect_to polls_url end + def showvotes + raise AccessError unless cuser.admin? + end + private def get_poll diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index 44552ee..eebdaa6 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -1 +1,4 @@ -<%= render :partial => "show" %> \ No newline at end of file +<%= render :partial => "show" %> +<% if cuser && cuser.admin? %> + <%= link_to "Show votes", polls_showvotes_url(@poll) ,class: "button" %> +<% end %> \ No newline at end of file diff --git a/app/views/polls/showvotes.html.erb b/app/views/polls/showvotes.html.erb new file mode 100644 index 0000000..f644c7e --- /dev/null +++ b/app/views/polls/showvotes.html.erb @@ -0,0 +1,16 @@ +
    +

    <%= @poll.question %>

    + + + + + + + <% @poll.real_votes.reverse_each do |vote| %> + + + + + <% end %> +
    Playervoted forTime
    <%= namelink vote.user %><%= vote.votable%>
    +
    \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index d1d98fb..c0c9665 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -130,6 +130,7 @@ Ensl::Application.routes.draw do match "users/forgot", to: "users#forgot" match "votes/create" + match "polls/showvotes/:id", to: "polls#showvotes", as: "polls_showvotes" match ":controller/:action", requirements: { action: /A-Za-z/ } match ":controller/:action/:id" From 6d5536ea942fd9848aa2bf0183781bc4e8e1f339 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Sun, 2 Apr 2017 19:35:50 +0200 Subject: [PATCH 288/305] Added Google API gem --- Gemfile | 3 ++- Gemfile.lock | 58 +++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index ab68d70..5eceb52 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ ruby '2.2.2' gem 'dotenv-rails', '~> 0.10.0' gem 'rails', '~> 3.2.22' -gem 'mysql2', '~> 0.3.15' +gem 'mysql2', '~> 0.3.17' gem 'dalli', '~> 2.7.0' gem 'puma', '~> 2.11.1' @@ -24,6 +24,7 @@ gem 'active_link_to', '~> 1.0.2' gem 'rmagick', '~> 2.13.4', require: false gem 'steam-condenser', github: 'koraktor/steam-condenser-ruby' gem 'test-unit', '~> 3.1.3' +gem 'google-api-client', '~> 0.10.3' # Please install nodejs locally. gem 'therubyracer', '~> 0.12.1' if RUBY_PLATFORM == 'x86_64-linux' diff --git a/Gemfile.lock b/Gemfile.lock index 869ee88..d6bba31 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,6 +38,8 @@ GEM activesupport (3.2.22) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) + addressable (2.5.1) + public_suffix (~> 2.0, >= 2.0.2) annotate (2.6.3) activerecord (>= 2.3.0) rake (>= 0.8.7) @@ -100,6 +102,8 @@ GEM database_cleaner (1.2.0) debug_inspector (0.0.2) debugger-linecache (1.2.0) + declarative (0.0.9) + declarative-option (0.1.0) diff-lcs (1.2.5) dotenv (0.10.0) dotenv-rails (0.10.0) @@ -119,25 +123,51 @@ GEM ffi (1.9.3) font-awesome-sass (4.1.0) sass (~> 3.2) + google-api-client (0.10.3) + addressable (~> 2.3) + googleauth (~> 0.5) + httpclient (~> 2.7) + hurley (~> 0.1) + memoist (~> 0.11) + mime-types (>= 1.6) + representable (~> 3.0) + retriable (>= 2.0, < 4.0) + googleauth (0.5.1) + faraday (~> 0.9) + jwt (~> 1.4) + logging (~> 2.0) + memoist (~> 0.12) + multi_json (~> 1.11) + os (~> 0.9) + signet (~> 0.7) haml (4.0.5) tilt hike (1.2.3) + httpclient (2.8.3) + hurley (0.2) i18n (0.7.0) journey (1.0.4) jquery-rails (2.0.3) railties (>= 3.1.0, < 5.0) thor (~> 0.14) json (1.8.3) + jwt (1.5.6) + libv8 (3.16.14.19) + little-plugger (1.1.4) + logging (2.2.0) + little-plugger (~> 1.1) + multi_json (~> 1.10) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) + memoist (0.15.0) method_source (0.8.2) mime-types (1.25.1) mini_portile (0.6.2) multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.3.15) + mysql2 (0.3.21) neat (1.6.0) bourbon (>= 3.1) sass (>= 3.3) @@ -148,6 +178,7 @@ GEM nokogiri (1.6.6.2) mini_portile (~> 0.6.0) oj (2.5.5) + os (0.9.6) poltergeist (1.6.0) capybara (~> 2.1) cliver (~> 0.3.1) @@ -162,6 +193,7 @@ GEM pry-byebug (1.3.2) byebug (~> 2.7) pry (~> 0.9.12) + public_suffix (2.0.5) puma (2.11.1) rack (>= 1.1, < 2.0) quiet_assets (1.0.2) @@ -193,6 +225,12 @@ GEM rake (10.4.2) rdoc (3.12.2) json (~> 1.4) + ref (2.0.0) + representable (3.0.3) + declarative (< 0.1.0) + declarative-option (< 0.2.0) + uber (< 0.2.0) + retriable (3.0.1) rmagick (2.13.4) rspec-core (3.3.2) rspec-support (~> 3.3.0) @@ -224,6 +262,11 @@ GEM multi_json (~> 1.0) rubyzip (~> 1.0) websocket (~> 1.0.4) + signet (0.7.3) + addressable (~> 2.3) + faraday (~> 0.9) + jwt (~> 1.5) + multi_json (~> 1.10) simplecov (0.7.1) multi_json (~> 1.0) simplecov-html (~> 0.7.1) @@ -242,6 +285,9 @@ GEM tins (~> 1.0) test-unit (3.1.3) power_assert + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) + ref thor (0.19.1) tilt (1.4.1) timecop (0.7.1) @@ -252,6 +298,7 @@ GEM polyglot polyglot (>= 0.3.1) tzinfo (0.3.44) + uber (0.1.0) uglifier (2.5.0) execjs (>= 0.3.0) json (>= 1.8.0) @@ -291,9 +338,10 @@ DEPENDENCIES factory_girl_rails (~> 4.4.1) faraday (~> 0.9.0) font-awesome-sass (~> 4.1.0.0) + google-api-client (~> 0.10.3) haml (~> 4.0.5) jquery-rails (~> 2.0.2) - mysql2 (~> 0.3.15) + mysql2 (~> 0.3.17) neat (~> 1.6.0) newrelic_rpm (~> 3.13.0.299) nokogiri (~> 1.6.1) @@ -314,10 +362,14 @@ DEPENDENCIES sprockets (~> 2.2.1) steam-condenser! test-unit (~> 3.1.3) + therubyracer (~> 0.12.1) timecop (~> 0.7.1) tinymce-rails (~> 3.5.9) uglifier (~> 2.5.0) will_paginate (~> 3.0.5) +RUBY VERSION + ruby 2.2.2p95 + BUNDLED WITH - 1.10.6 + 1.14.6 From b411f559b8fd38e618c7977755565afe8fa0908e Mon Sep 17 00:00:00 2001 From: Absurdon Date: Mon, 3 Apr 2017 01:02:09 +0200 Subject: [PATCH 289/305] Made Calendar Integration failsafe and use google-api-client gem --- app/helpers/application_helper.rb | 17 +-- app/services/google_calendar.rb | 150 +++++-------------------- app/views/layouts/application.html.erb | 2 +- app/views/widgets/_calendar.html.erb | 20 ++-- 4 files changed, 46 insertions(+), 143 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b62ef42..2ce2609 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -171,19 +171,20 @@ module ApplicationHelper end end + def calendar + @calendar ||= GoogleCalendar.new(ENV['GOOGLE_CALENDAR_ID'], timezone_offset) + end + + def event_start_time event + event.start.date_time.to_datetime.in_time_zone(timezone_offset) + end def upcoming_matches - GoogleCalendar.new(ENV['GOOGLE_CALENDAR_ID'], timezone_offset). - upcoming.sort_by do |event| - event.start - end + calendar.upcoming || [] end def upcoming_nsltv - GoogleCalendar.new(ENV['GOOGLE_CALENDAR_ID'], timezone_offset). - upcoming_nsltv.sort_by do |event| - event.start - end + calendar.upcoming_nsltv || [] end def latest_rules diff --git a/app/services/google_calendar.rb b/app/services/google_calendar.rb index a965a12..1c9be13 100644 --- a/app/services/google_calendar.rb +++ b/app/services/google_calendar.rb @@ -1,144 +1,46 @@ +require 'google/apis/calendar_v3' + +CALENDAR = Google::Apis::CalendarV3 + class GoogleCalendar - attr_accessor :timezone - def initialize(id, timezone_offset = Time.zone.name) - @id = id + def initialize (calendar_id, timezone_offset = Time.zone.name) + @id = calendar_id @timezone_offset = timezone_offset + @events = nil + @service = CALENDAR::CalendarService.new + #@service.authorization = CALENDAR::AUTH_CALENDAR # change this if write access needed + @service.key = ENV['GOOGLE_API_KEY'] + query_events end - def summary - list.summary - end - - def timezone - list.timezone - end - - def events - list.events - end def upcoming - events.select do |event| - event.start >= (Time.zone.now - 2.hours) && - (not event.nsltv_regex =~ event.summary) + @events && @events.select do |event| + (not nsltv_regex =~ event.summary) end end def upcoming_nsltv - events.select do |event| - event.start >= (Time.zone.now - 2.hours) && - event.nsltv_regex =~ (event.summary) + @events && @events.select do |event| + (nsltv_regex =~ event.summary) end end - def list - @list ||= GoogleCalendar::Request.events_list(@id, @timezone_offset) - end -end - -class GoogleCalendar - class Request - BASE_URL = "https://www.googleapis.com/" - EVENTS_ENDPOINT = "events" - - def self.events_list(id, timezone_offset) - request = self.new(id, EVENTS_ENDPOINT) - GoogleCalendar::EventList.new(request.parsed_response, timezone_offset) - end - - def initialize(id, endpoint) - @id = id - @endpoint = endpoint - @response = get_data - end - - def parsed_response - JSON.parse(@response.body) - end - - private - - def get_data - Rails.cache.fetch(cache_key, expires_in: 5.minutes) do - if Rails.env.development? - conn = Faraday.new(BASE_URL, ssl: {verify: false}) - else - conn = Faraday.new(BASE_URL) - end - conn.get(request_url) + def query_events + list = nil + @events.nil? and @service.list_events(@id, time_zone: ActiveSupport::TimeZone::MAPPING[@timezone_offset], time_min: (2.hours.ago).utc.iso8601 ) {|result, err| + if err + puts err.inspect + else + list = result end - end - - def cache_key - "/google_calendar/#{@id}/#{@endpoint}" - end - - def request_url - #The default number of events pulled is 250. - #We reached that number and events didn't show any more. - #So now I filter all events that have a start time - #that is longer ago then 7 days. - #Alternative: maxResults=2500 - time_min = (Time.now - 7.days).utc.iso8601 - "calendar/v3/calendars/#{@id}/#{@endpoint}/?key=#{ENV['GOOGLE_API_KEY']}&timeMin=#{time_min}" - end + } + @events = (list) ? list.items : nil end - class EventList - attr_reader :summary, :events, :timezone - - def initialize(list, timezone_offset) - @list = list - @timezone_offset = timezone_offset - - parse_list - parse_events - end - - private - - def parse_list - @summary = @list["summary"] - @timezone = @list["timeZone"] - end - - def parse_events - @events = @list["items"].map do |item| - GoogleCalendar::Event.new(item, @timezone_offset) - end - end + def nsltv_regex + /\[NSLTV\]/i end - class Event - def initialize(entry, timezone_offset) - @entry = entry - @timezone_offset = timezone_offset - end - - def start - @entry["start"]["dateTime"].to_datetime.in_time_zone(@timezone_offset) - end - - def end - @entry["end"]["dateTime"].to_datetime.in_time_zone(@timezone_offset) - end - - def nsltv_regex - /\[NSLTV\]/i - end - - def formatted_summary - summary.gsub(/(http\:\/\/)(.*[^)])/i, '\2'). - gsub(nsltv_regex, '').html_safe - end - - def [](key) - @entry[key] - end - - def method_missing(method) - self[method.to_s] - end - end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d4a1dc3..2d49571 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -22,7 +22,7 @@
    diff --git a/app/views/widgets/_calendar.html.erb b/app/views/widgets/_calendar.html.erb index 90ab71d..c6794aa 100644 --- a/app/views/widgets/_calendar.html.erb +++ b/app/views/widgets/_calendar.html.erb @@ -3,14 +3,14 @@

    <%= t('widget.schedule') %>

    - <% upcoming_matches.group_by{ |e| e.start.month }.each do |month, events| %> - <% events.group_by { |e| e.start.day }.each do |day, day_events| %> -
    <%= day_events.first.start.strftime("%A, %e %B") %>
    + <% upcoming_matches.group_by{ |e| e.start.date_time.month }.each do |month, events| %> + <% events.group_by { |e| e.start.date_time.day }.each do |day, day_events| %> +
    <%= event_start_time(day_events.first).strftime("%A, %e %B") %>
    <% day_events.each do |event| %>

    - <%= event.start.strftime("%H:%M %Z") %> - <%= event.formatted_summary %> + <%= event_start_time(event).strftime("%H:%M %Z") %> + <%= event.summary %>

    <% end %> @@ -24,14 +24,14 @@

    NSLTV

    - <% upcoming_nsltv.group_by{ |e| e.start.month }.each do |month, events| %> - <% events.group_by { |e| e.start.day }.each do |day, day_events| %> -
    <%= day_events.first.start.strftime("%A, %e %B") %>
    + <% upcoming_nsltv.group_by{ |e| e.start.date_time.month }.each do |month, events| %> + <% events.group_by { |e| e.start.date_time.day }.each do |day, day_events| %> +
    <%= event_start_time(day_events.first).strftime("%A, %e %B") %>
    <% day_events.each do |event| %>

    - <%= event.start.strftime("%H:%M %Z") %> - <%= event.formatted_summary %> + <%= event_start_time(event).strftime("%H:%M %Z") %> + <%= event.summary %>

    <% end %> From 6eae7330dd124de0c81b6af3ce81c8e663a7a9e2 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Mon, 3 Apr 2017 02:10:38 +0200 Subject: [PATCH 290/305] disabling calendar tests for now as they dont fit the new implementation anymore --- spec/features/calendar/google_calendar_widget_spec.rb | 1 + spec/spec_helper.rb | 3 +++ 2 files changed, 4 insertions(+) diff --git a/spec/features/calendar/google_calendar_widget_spec.rb b/spec/features/calendar/google_calendar_widget_spec.rb index c9082fb..1d8828b 100644 --- a/spec/features/calendar/google_calendar_widget_spec.rb +++ b/spec/features/calendar/google_calendar_widget_spec.rb @@ -2,6 +2,7 @@ require 'spec_helper' feature 'Google Calendar widget', js: :true do before do + skip # disabling calendar tests for now as they dont fit the new implementation anymore visit root_path end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9aa57cb..447a01e 100755 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -37,6 +37,8 @@ RSpec.configure do |config| config.formatter = :documentation config.infer_spec_type_from_file_location! +# disabling calendar tests for now as they dont fit the new implementation anymore +=begin config.before(:each) do events_list_json = JSON.parse(File.read(Rails.root.join("spec/fixtures/google_calendar.json"))) @@ -44,4 +46,5 @@ RSpec.configure do |config| GoogleCalendar::EventList.new(events_list_json, Time.zone.name) end end +=end end From eb43c87f00a6476eab24056caa9add27f8493ac2 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Tue, 4 Apr 2017 12:11:36 +0200 Subject: [PATCH 291/305] made streamlinks from event description show as link in calendar widget --- app/views/widgets/_calendar.html.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/widgets/_calendar.html.erb b/app/views/widgets/_calendar.html.erb index c6794aa..89f5f7b 100644 --- a/app/views/widgets/_calendar.html.erb +++ b/app/views/widgets/_calendar.html.erb @@ -10,7 +10,11 @@

    <%= event_start_time(event).strftime("%H:%M %Z") %> - <%= event.summary %> + <%= event.summary %><% if event.description %> + <%= link_to event.description, event.description %> + <% else %> + (no caster yet) + <% end %>

    <% end %> From 0c18e7f9bada7b541e2e1cc714c9de5b846dca46 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Tue, 4 Apr 2017 12:16:32 +0200 Subject: [PATCH 292/305] added correct linking to nsltv events --- app/views/widgets/_calendar.html.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/widgets/_calendar.html.erb b/app/views/widgets/_calendar.html.erb index 89f5f7b..6bf015b 100644 --- a/app/views/widgets/_calendar.html.erb +++ b/app/views/widgets/_calendar.html.erb @@ -35,7 +35,11 @@

    <%= event_start_time(event).strftime("%H:%M %Z") %> - <%= event.summary %> + <%= event.summary %><% if event.description %> + <%= link_to event.description, event.description %> + <% else %> + (no caster yet) + <% end %>

    <% end %> From 4508e112709d456102b52030a2a4451778c0061e Mon Sep 17 00:00:00 2001 From: Absurdon Date: Tue, 4 Apr 2017 17:24:37 +0200 Subject: [PATCH 293/305] Fixed calendar widget entries showin in wrong order --- app/services/google_calendar.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/google_calendar.rb b/app/services/google_calendar.rb index 1c9be13..b3b3ddb 100644 --- a/app/services/google_calendar.rb +++ b/app/services/google_calendar.rb @@ -36,7 +36,7 @@ class GoogleCalendar list = result end } - @events = (list) ? list.items : nil + @events = (list) ? list.items.sort_by { |event| event.start.date_time } : nil end def nsltv_regex From f6ecbb9f4dec239db3661c9337b318c870e74bf3 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Thu, 13 Apr 2017 19:32:07 +0200 Subject: [PATCH 294/305] gave referees a possibility to signup for matches --- app/views/matches/show.html.erb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb index 0a62dd4..0592286 100755 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -122,6 +122,14 @@ <%= link_to "Referee Admin", match_ref_path(@match), class: 'button' %>
    <% end %> + <% if cuser and @match.referee.nil? and cuser.ref? %> +
    + <%= form_for @match do |f| %> + <%= f.hidden_field :referee_id, value: cuser.id %> + <%= f.submit "Signup as referee", class: 'button' %> + <% end %> +
    + <% end %>
    <%= add_comments @match %> From bb5bd6c824ddce51e6770d3aad70b37c01a96ee0 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Tue, 18 Apr 2017 00:04:18 +0200 Subject: [PATCH 295/305] Switched gathers url to use https --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2ce2609..0eb7d82 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -193,7 +193,7 @@ module ApplicationHelper def gathers_url if Rails.env.production? - "http://gathers.ensl.org" + "https://gathers.ensl.org" else "http://gathers.staging.ensl.org" end From 925001b73d18a40730020720739bb33de53d8932 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Tue, 18 Apr 2017 16:01:36 +0200 Subject: [PATCH 296/305] Updated all links to use https --- README.md | 2 +- .../stylesheets/themes/default/layout/_typography.scss | 4 ++-- app/assets/stylesheets/themes/flat/layout/_typography.scss | 4 ++-- app/helpers/application_helper.rb | 2 +- app/views/gathers/show.html.erb | 2 +- app/views/layouts/notifications.html.erb | 6 +++--- app/views/movies/vlc.html.erb | 2 +- app/views/notifications/article.html.erb | 2 +- app/views/notifications/gather.html.erb | 2 +- app/views/notifications/match.html.erb | 6 +++--- app/views/notifications/news.html.erb | 2 +- app/views/notifications/pm.html.erb | 2 +- app/views/users/forgot.html.erb | 2 +- script/shell/frequently.sh | 4 ++-- script/shell/hourly.sh | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index efe83c8..8a67c87 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # ENSL Website -This is the source code of ENSL website. Currently deployed on [ensl.org](http://www.ensl.org). +This is the source code of ENSL website. Currently deployed on [ensl.org](https://www.ensl.org). Features: diff --git a/app/assets/stylesheets/themes/default/layout/_typography.scss b/app/assets/stylesheets/themes/default/layout/_typography.scss index f59e16d..ffacd36 100644 --- a/app/assets/stylesheets/themes/default/layout/_typography.scss +++ b/app/assets/stylesheets/themes/default/layout/_typography.scss @@ -2,8 +2,8 @@ Typography */ -@import url(http://fonts.googleapis.com/css?family=Russo+One); -@import url(http://fonts.googleapis.com/css?family=Open+Sans); +@import url(https://fonts.googleapis.com/css?family=Russo+One); +@import url(https://fonts.googleapis.com/css?family=Open+Sans); body { color: $base-font-color; diff --git a/app/assets/stylesheets/themes/flat/layout/_typography.scss b/app/assets/stylesheets/themes/flat/layout/_typography.scss index a9490e8..63db069 100644 --- a/app/assets/stylesheets/themes/flat/layout/_typography.scss +++ b/app/assets/stylesheets/themes/flat/layout/_typography.scss @@ -2,8 +2,8 @@ Typography */ -@import url(http://fonts.googleapis.com/css?family=Montserrat:400,700); -@import url(http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700); +@import url(https://fonts.googleapis.com/css?family=Montserrat:400,700); +@import url(https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700); body { color: $base-font-color; diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 0eb7d82..f13e54d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -195,7 +195,7 @@ module ApplicationHelper if Rails.env.production? "https://gathers.ensl.org" else - "http://gathers.staging.ensl.org" + "https://gathers.staging.ensl.org" end end end diff --git a/app/views/gathers/show.html.erb b/app/views/gathers/show.html.erb index 4403bc6..f2d8796 100644 --- a/app/views/gathers/show.html.erb +++ b/app/views/gathers/show.html.erb @@ -37,7 +37,7 @@ $("#jplayer").jPlayer({ ready: function() { $(this).jPlayer("setMedia", { - mp3: "http://www.ensl.org/sounds/gather-1.mp3" + mp3: "https://www.ensl.org/sounds/gather-1.mp3" }).jPlayer("play"); var click = document.ontouchstart === undefined ? 'click' : 'touchstart'; diff --git a/app/views/layouts/notifications.html.erb b/app/views/layouts/notifications.html.erb index 7557b1c..6250656 100644 --- a/app/views/layouts/notifications.html.erb +++ b/app/views/layouts/notifications.html.erb @@ -1,9 +1,9 @@

    Hello <%= h @user.username %>,

    <%= yield %>

    -

    - ENSL Website

    +

    - ENSL Website

    - (To disable these: Log In - -> Profile + (To disable these: Log In + -> Profile -> Notifications)

    diff --git a/app/views/movies/vlc.html.erb b/app/views/movies/vlc.html.erb index 059b71c..b7ef82e 100644 --- a/app/views/movies/vlc.html.erb +++ b/app/views/movies/vlc.html.erb @@ -2,7 +2,7 @@ + target=https://ensl.org:29100" />
    If you cannot see the video, please install the <%= link_to "newest VLC", DataFile.find(855) %>, diff --git a/app/views/notifications/article.html.erb b/app/views/notifications/article.html.erb index 954d154..7d6bf6a 100644 --- a/app/views/notifications/article.html.erb +++ b/app/views/notifications/article.html.erb @@ -1 +1 @@ -There are is a new article on ENSL. Click <%= link_to "here", "http://www.ensl.org/articles/#{@article.id}" %> to read it. \ No newline at end of file +There are is a new article on ENSL. Click <%= link_to "here", "https://www.ensl.org/articles/#{@article.id}" %> to read it. \ No newline at end of file diff --git a/app/views/notifications/gather.html.erb b/app/views/notifications/gather.html.erb index 9d1de06..84d09fc 100644 --- a/app/views/notifications/gather.html.erb +++ b/app/views/notifications/gather.html.erb @@ -1,2 +1,2 @@ There are <%= Gather::NOTIFY %> persons in the gather.
    -Click <%= link_to "here", "http://www.ensl.org/gathers/#{@gather.id}" %> to join it. \ No newline at end of file +Click <%= link_to "here", "https://www.ensl.org/gathers/#{@gather.id}" %> to join it. \ No newline at end of file diff --git a/app/views/notifications/match.html.erb b/app/views/notifications/match.html.erb index 2b70cd8..79dbac5 100644 --- a/app/views/notifications/match.html.erb +++ b/app/views/notifications/match.html.erb @@ -1,9 +1,9 @@ -There are is a new <%= link_to "match", "http://www.ensl.org/matches/#{@match.id}" %> on ENSL.
    +There are is a new <%= link_to "match", "https://www.ensl.org/matches/#{@match.id}" %> on ENSL.

    -Contest: <%= link_to (h @match.contest), "http://www.ensl.org/contests/#{@match.contest.id}" %>
    +Contest: <%= link_to (h @match.contest), "https://www.ensl.org/contests/#{@match.contest.id}" %>
    Teams <%= h @match.to_s %>
    Date: <%= @match.match_time.strftime("%d %B %y %H:%M") %>

    <% if @match.hltv %> - HLTV: <%= h @match.hltv.addr %> (<%= link_to (h @match.hltv), "http://www.ensl.org/servers/#{@match.hltv.id}" %>) + HLTV: <%= h @match.hltv.addr %> (<%= link_to (h @match.hltv), "https://www.ensl.org/servers/#{@match.hltv.id}" %>) <% end %> diff --git a/app/views/notifications/news.html.erb b/app/views/notifications/news.html.erb index 495b7e2..cbffda9 100644 --- a/app/views/notifications/news.html.erb +++ b/app/views/notifications/news.html.erb @@ -1 +1 @@ -There are is a new article on ENSL: <%= link_to (h @news.title), "http://www.ensl.org/articles/#{@news.id}" %>
    \ No newline at end of file +There are is a new article on ENSL: <%= link_to (h @news.title), "https://www.ensl.org/articles/#{@news.id}" %>
    \ No newline at end of file diff --git a/app/views/notifications/pm.html.erb b/app/views/notifications/pm.html.erb index f91591a..170c283 100644 --- a/app/views/notifications/pm.html.erb +++ b/app/views/notifications/pm.html.erb @@ -1,2 +1,2 @@ You have received a new private message from: <%= h @pm.sender.to_s %>
    -Click <%= link_to "here", "http://www.ensl.org/messages/#{@pm.id}" %> to read it. \ No newline at end of file +Click <%= link_to "here", "https://www.ensl.org/messages/#{@pm.id}" %> to read it. \ No newline at end of file diff --git a/app/views/users/forgot.html.erb b/app/views/users/forgot.html.erb index 3d5695c..ae55799 100644 --- a/app/views/users/forgot.html.erb +++ b/app/views/users/forgot.html.erb @@ -1,6 +1,6 @@

    Password Recovery

    -

    If you do not receive your new password by email, please see the guide here.

    +

    If you do not receive your new password by email, please see the guide here.

    <%= form_tag({ controller: 'users', action: 'forgot' }, { class: 'square' }) do %> diff --git a/script/shell/frequently.sh b/script/shell/frequently.sh index 14bfa67..24c0d5a 100644 --- a/script/shell/frequently.sh +++ b/script/shell/frequently.sh @@ -1,3 +1,3 @@ #!/bin/bash -# wget -O /dev/null http://www.ensl.org/servers/refresh/1 -wget -O /dev/null http://www.ensl.org/tweets/refresh/1 +# wget -O /dev/null https://www.ensl.org/servers/refresh/1 +wget -O /dev/null https://www.ensl.org/tweets/refresh/1 diff --git a/script/shell/hourly.sh b/script/shell/hourly.sh index f0c7b17..fbe9c61 100644 --- a/script/shell/hourly.sh +++ b/script/shell/hourly.sh @@ -1,2 +1,2 @@ #!/bin/bash -wget -O /dev/null http://www.ensl.org/directories/refresh/1 +wget -O /dev/null https://www.ensl.org/directories/refresh/1 From df5c6b1a7a64ca107a633d90a0757b94e4896e99 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Mon, 12 Jun 2017 20:30:10 +0200 Subject: [PATCH 297/305] fixed parsed signatures might be bigger than allowed by database --- app/models/concerns/extra.rb | 2 +- ...24_change_type_of_profile_parsed_signature.rb | 5 +++++ db/schema.rb | 16 ++++++++++++++-- 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20170612182124_change_type_of_profile_parsed_signature.rb diff --git a/app/models/concerns/extra.rb b/app/models/concerns/extra.rb index 97189c3..6b46adb 100644 --- a/app/models/concerns/extra.rb +++ b/app/models/concerns/extra.rb @@ -26,7 +26,7 @@ module Extra end def bbcode_to_html(text) - Sanitize.clean(text.to_s).bbcode_to_html.gsub(/\r/, "
    ").html_safe + Sanitize.clean(text.to_s).bbcode_to_html.gsub(/\n|\r\n/, "
    ").html_safe end def move_up(scope, column = "position") diff --git a/db/migrate/20170612182124_change_type_of_profile_parsed_signature.rb b/db/migrate/20170612182124_change_type_of_profile_parsed_signature.rb new file mode 100644 index 0000000..fe2024a --- /dev/null +++ b/db/migrate/20170612182124_change_type_of_profile_parsed_signature.rb @@ -0,0 +1,5 @@ +class ChangeTypeOfProfileParsedSignature < ActiveRecord::Migration + def up + change_column :profiles, :signature_parsed, :text + end +end diff --git a/db/schema.rb b/db/schema.rb index 649d7e2..a464f43 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20170304191254) do +ActiveRecord::Schema.define(:version => 20170612182124) do create_table "admin_requests", :force => true do |t| t.string "addr" @@ -432,6 +432,18 @@ ActiveRecord::Schema.define(:version => 20170304191254) do t.integer "category_id" end + create_table "match_proposals", :force => true do |t| + t.integer "match_id" + t.integer "team_id" + t.integer "status" + t.datetime "proposed_time" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + add_index "match_proposals", ["match_id"], :name => "index_match_proposals_on_match_id" + add_index "match_proposals", ["team_id"], :name => "index_match_proposals_on_team_id" + create_table "matchers", :force => true do |t| t.integer "match_id", :null => false t.integer "user_id", :null => false @@ -637,7 +649,7 @@ ActiveRecord::Schema.define(:version => 20170304191254) do t.boolean "notify_challenge", :default => true, :null => false t.string "steam_profile" t.string "achievements_parsed" - t.string "signature_parsed" + t.text "signature_parsed" t.string "stream" t.string "layout" end From 313500c2572bdbc86be44aacf358384b8f3cf0e1 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Wed, 21 Jun 2017 09:39:30 +0200 Subject: [PATCH 298/305] added gather mod tab to staff page --- app/models/group.rb | 8 ++++++++ app/views/about/staff.html.erb | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/app/models/group.rb b/app/models/group.rb index 367185d..1b80099 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -86,4 +86,12 @@ class Group < ActiveRecord::Base end casters end + + def self.gathermods + gathermods = [] + (find(GATHER_MODERATORS).groupers).each do |g| + gathermods << g unless gathermods.include? g + end + gathermods + end end diff --git a/app/views/about/staff.html.erb b/app/views/about/staff.html.erb index ae75282..8a75512 100644 --- a/app/views/about/staff.html.erb +++ b/app/views/about/staff.html.erb @@ -6,7 +6,7 @@

    To contact us:

      -
    1. Use the <%= link_to "contact", new_issue_path() %> form (you must be logged in)
      2. +
    2. Use the <%= link_to "contact", new_issue_path %> form (you must be logged in)
    3. Visit our <%= link_to "IRC", article_path(408) %> channel <%= link_to "#ENSL", "irc://irc.quakenet.org/ensl" %> on Quakenet.
    4. Send email to the head admin as per the list below
    5. Contact other staff members directly, check below and click profile for contact details
      6. @@ -21,6 +21,7 @@
    6. Admins
    7. Referees
    8. Casters
      9. +
    9. Gather Mods
    10. Extras
    11. Support
      12. @@ -106,6 +107,33 @@ <% end %>
    +
    +

    GATHER MODERATORS

    + + + + + + + + + <% Group.gathermods.each do |grouper| %> + + + + + + + + <% end %> +
    UsernameEmailTaskAge
    <%= flag grouper.user.country %><%= namelink grouper.user %><%= h grouper.user.email_s %> + <% if grouper.task %> + <%= h grouper.task %> + <% else %> + <%= h grouper.group.name.singularize %> + <% end %> + <%= h grouper.user.age %>
    +

    Extras

    @@ -137,7 +165,7 @@

    Support

    • Unknown Worlds Entertainment
      • -
        +
      From 8579d0b56942725408e26c8838e6d2f970928623 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Sat, 24 Jun 2017 20:43:42 +0200 Subject: [PATCH 299/305] gave gathermods the possibility to respond to gather issues --- app/controllers/issues_controller.rb | 12 +++++++----- app/models/issue.rb | 24 +++++++++++++++++++++--- app/models/user.rb | 15 ++++++++++----- app/views/issues/_form.html.erb | 4 ++-- app/views/widgets/_logged.html.erb | 6 ++++++ 5 files changed, 46 insertions(+), 15 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 3fb04c9..40a3185 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -2,7 +2,7 @@ class IssuesController < ApplicationController before_filter :get_issue, only: [:show, :edit, :update, :destroy] def index - raise AccessError unless cuser and cuser.admin? + raise AccessError unless cuser and (cuser.admin? or cuser.moderator?) sort = case params['sort'] when "title" then "title" @@ -12,9 +12,11 @@ class IssuesController < ApplicationController else "created_at DESC" end - @open = Issue.with_status(Issue::STATUS_OPEN).all order: sort - @solved = Issue.with_status(Issue::STATUS_SOLVED).all order: sort - @rejected = Issue.with_status(Issue::STATUS_REJECTED).all order: sort + allowed = Issue::allowed_categories cuser + + @open = Issue.where(category_id: allowed).with_status(Issue::STATUS_OPEN).all order: sort + @solved = Issue.where(category_id: allowed).with_status(Issue::STATUS_SOLVED).all order: sort + @rejected = Issue.where(category_id: allowed).with_status(Issue::STATUS_REJECTED).all order: sort end def show @@ -49,7 +51,7 @@ class IssuesController < ApplicationController end def update - raise AccessError unless @issue.can_update? cuser + raise AccessError unless @issue.can_update?(cuser, params[:issue]) if @issue.update_attributes(params[:issue]) flash[:notice] = t(:issues_update) redirect_to(@issue) diff --git a/app/models/issue.rb b/app/models/issue.rb index 594ddb0..49af7f9 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -96,18 +96,36 @@ class Issue < ActiveRecord::Base end def can_show? cuser - cuser and !cuser.nil? and ((author == cuser) or cuser.admin?) + cuser and ((author == cuser) or (Issue::allowed_categories(cuser).include?(self.category_id))) end def can_create? cuser true end - def can_update? cuser - cuser and cuser.admin? + def can_update?(cuser, params = {}) + ret = cuser && Issue::allowed_categories(cuser).include?(self.category_id) + if ret && !cuser.admin? && params.member?(:category_id) + ret = (self.category_id.to_s == params[:category_id]) + end + + ret end def can_destroy? cuser cuser and cuser.admin? end + + # STATIC METHODS + + def self.allowed_categories cuser + allowed = [] + allowed << 54 if cuser.admin? || cuser.gather_moderator? # gather + allowed << 17 if cuser.admin? # website + allowed << 22 if cuser.admin? # league + allowed << 20 if cuser.admin? # ensl plugin + allowed + end + + end diff --git a/app/models/user.rb b/app/models/user.rb index db83fea..9cefd2b 100755 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -190,19 +190,24 @@ class User < ActiveRecord::Base end def admin? - groups.exists? :id => Group::ADMINS + groups.exists? id: Group::ADMINS end def ref? - groups.exists? :id => Group::REFEREES + groups.exists? id: Group::REFEREES end def staff? - groups.exists? :id => Group::STAFF + groups.exists? id: Group::STAFF end def caster? - groups.exists? :id => Group::CASTERS + groups.exists? id: Group::CASTERS + end + + # might seem redundant but allows for later extensions like forum moderators + def moderator? + groups.exists? id: Group::GATHER_MODERATORS end def gather_moderator? @@ -210,7 +215,7 @@ class User < ActiveRecord::Base end def allowed_to_ban? - admin? or gather_moderator? + admin? or moderator? end def verified? diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb index c39a114..5521c47 100644 --- a/app/views/issues/_form.html.erb +++ b/app/views/issues/_form.html.erb @@ -4,7 +4,7 @@ <%= f.label :title %> <%= f.text_field :title %> - <% if cuser and cuser.admin? %> + <% if cuser and Issue::allowed_categories(cuser).include?(@issue.category_id) %>
      <%= f.label :status %> <%= f.select :status, @issue.statuses.invert %> @@ -22,7 +22,7 @@ <%= f.label :text %> <%= f.text_area :text, rows: 7 %>
      - <% if cuser and cuser.admin? %> + <% if cuser and Issue::allowed_categories(cuser).include?(@issue.category_id) %>
      <%= f.label :solution %> <%= f.text_area :solution, rows: 7 %> diff --git a/app/views/widgets/_logged.html.erb b/app/views/widgets/_logged.html.erb index c6f7842..a54451b 100644 --- a/app/views/widgets/_logged.html.erb +++ b/app/views/widgets/_logged.html.erb @@ -7,6 +7,12 @@ Admin (<%= Issue.with_status(0).count %>) <%= icon 'wrench' %> <% end %> + <% elsif cuser.moderator? %> +
    • + <%= link_to issues_path, class: 'admin' do %> + Issues (<%= Issue.where(category_id: Issue.allowed_categories(cuser)).with_status(0).count %>) <%= icon 'wrench' %> + <% end %> +
      • <% end %>
    • <%= link_to user_path(cuser) do %> From 3edf8cc5e7173953d0b0a02001253b10c8217e63 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Sun, 2 Jul 2017 16:31:36 +0200 Subject: [PATCH 300/305] added comp mod council to staff page --- .../themes/default/components/_tabs.scss | 2 +- app/models/group.rb | 9 ++++++ app/views/about/staff.html.erb | 28 +++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/themes/default/components/_tabs.scss b/app/assets/stylesheets/themes/default/components/_tabs.scss index e1f5542..17a0660 100644 --- a/app/assets/stylesheets/themes/default/components/_tabs.scss +++ b/app/assets/stylesheets/themes/default/components/_tabs.scss @@ -5,7 +5,7 @@ .tabbed { $tabs-border-width: 1px; $tabs-border-colour: $light-blue; - $tabs-padding-horizontal: 16px; + $tabs-padding-horizontal: 13px; $tabs-height: 35px; ul.tabs { diff --git a/app/models/group.rb b/app/models/group.rb index 1b80099..f7d61ec 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -22,6 +22,7 @@ class Group < ActiveRecord::Base PREDICTORS = 8 STAFF = 10 GATHER_MODERATORS = 14 + COMP_MOD_COUNCIL = 16 attr_protected :id, :updated_at, :created_at, :founder_id validates_length_of :name, :maximum => 20 @@ -94,4 +95,12 @@ class Group < ActiveRecord::Base end gathermods end + + def self.compmodcouncil + compmodcouncil = [] + (find(COMP_MOD_COUNCIL).groupers).each do |g| + compmodcouncil << g unless compmodcouncil.include? g + end + compmodcouncil + end end diff --git a/app/views/about/staff.html.erb b/app/views/about/staff.html.erb index 8a75512..02c441a 100644 --- a/app/views/about/staff.html.erb +++ b/app/views/about/staff.html.erb @@ -22,6 +22,7 @@
    • Referees
    • Casters
    • Gather Mods
      • +
    • Comp. Mod Council
    • Extras
    • Support
    @@ -134,6 +135,33 @@ <% end %>
    +
    +

    COMP. MOD COUNCIL

    + + + + + + + + + <% Group.compmodcouncil.each do |grouper| %> + + + + + + + + <% end %> +
    UsernameEmailTaskAge
    <%= flag grouper.user.country %><%= namelink grouper.user %><%= h grouper.user.email_s %> + <% if grouper.task %> + <%= h grouper.task %> + <% else %> + <%= h grouper.group.name.singularize %> + <% end %> + <%= h grouper.user.age %>
    +

    Extras

    From f06dfc025ac2e5b7fdfe6253db505a95021498be Mon Sep 17 00:00:00 2001 From: Absurdon Date: Sun, 2 Jul 2017 17:14:07 +0200 Subject: [PATCH 301/305] show count for users signed in the last 30 days on users page --- app/models/user.rb | 2 ++ app/views/users/index.html.erb | 1 + db/migrate/20170702150454_add_lastvisit_index_to_users.rb | 5 +++++ 3 files changed, 8 insertions(+) create mode 100644 db/migrate/20170702150454_add_lastvisit_index_to_users.rb diff --git a/app/models/user.rb b/app/models/user.rb index 9cefd2b..c9349c6 100755 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -99,6 +99,8 @@ class User < ActiveRecord::Base :conditions => "bans.id IS NOT NULL" scope :idle, :conditions => ["lastvisit < ?", 30.minutes.ago.utc] + scope :lately, + :conditions => ["lastvisit > ?", 30.days.ago.utc] before_validation :update_password diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 6f890e1..2baba4f 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,4 +1,5 @@

    Listing Users

    +

    <%= User.lately.count %> players have signed in within the past 30 days.

    Search for users by name or Steam ID:

    diff --git a/db/migrate/20170702150454_add_lastvisit_index_to_users.rb b/db/migrate/20170702150454_add_lastvisit_index_to_users.rb new file mode 100644 index 0000000..6729c1e --- /dev/null +++ b/db/migrate/20170702150454_add_lastvisit_index_to_users.rb @@ -0,0 +1,5 @@ +class AddLastvisitIndexToUsers < ActiveRecord::Migration + def change + add_index :users, :lastvisit + end +end From 0bf5e74c38d36c734e4a8fed8cf7d81e2908295c Mon Sep 17 00:00:00 2001 From: Absurdon Date: Sun, 2 Jul 2017 18:34:19 +0200 Subject: [PATCH 302/305] added filter to show only users logged in lately --- app/controllers/users_controller.rb | 6 +++++- app/views/users/index.html.erb | 1 + db/schema.rb | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6550c67..e156a57 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3,7 +3,11 @@ class UsersController < ApplicationController respond_to :html, :js def index - @users = User.search(params[:search]).paginate(per_page: 40, page: params[:page]) + if params[:filter] == 'lately' + @users = User.search(params[:search]).lately.paginate(per_page: 40, page: params[:page]) + else + @users = User.search(params[:search]).paginate(per_page: 40, page: params[:page]) + end end def show diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 2baba4f..9ce4e05 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,5 +1,6 @@

    Listing Users

    <%= User.lately.count %> players have signed in within the past 30 days.

    +<%= link_to 'Show them', params.merge(filter: 'lately'), class: 'button' %>


    Search for users by name or Steam ID:

    diff --git a/db/schema.rb b/db/schema.rb index a464f43..a260857 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20170612182124) do +ActiveRecord::Schema.define(:version => 20170702150454) do create_table "admin_requests", :force => true do |t| t.string "addr" @@ -872,6 +872,7 @@ ActiveRecord::Schema.define(:version => 20170612182124) do end add_index "users", ["email"], :name => "index_users_on_email" + add_index "users", ["lastvisit"], :name => "index_users_on_lastvisit" add_index "users", ["password"], :name => "index_users_on_password" add_index "users", ["team_id"], :name => "index_users_on_team_id" add_index "users", ["username"], :name => "index_users_on_username" From 9312a9058559ccf011580a57c14fb8f041421423 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Sun, 2 Jul 2017 21:16:16 +0200 Subject: [PATCH 303/305] refined issue to have more clear permission logic --- app/models/issue.rb | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index 49af7f9..5087278 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -24,6 +24,11 @@ class Issue < ActiveRecord::Base STATUS_SOLVED = 1 STATUS_REJECTED = 2 + CATEGORY_WEBSITE = 17 + CATEGORY_NSLPLUGIN = 20 + CATEGORY_LEAGUE = 22 + CATEGORY_GATHER = 52 + attr_accessor :assigned_name attr_protected :id, :created_at, :updated_at @@ -96,7 +101,11 @@ class Issue < ActiveRecord::Base end def can_show? cuser - cuser and ((author == cuser) or (Issue::allowed_categories(cuser).include?(self.category_id))) + return false unless cuser + return true if cuser.admin? + + ((author == cuser) or (Issue::allowed_categories(cuser).include?(self.category_id))) + end def can_create? cuser @@ -104,12 +113,10 @@ class Issue < ActiveRecord::Base end def can_update?(cuser, params = {}) - ret = cuser && Issue::allowed_categories(cuser).include?(self.category_id) - if ret && !cuser.admin? && params.member?(:category_id) - ret = (self.category_id.to_s == params[:category_id]) - end - - ret + return false unless cuser + return true if cuser.admin? + return false unless Issue::allowed_categories(cuser).include?(self.category_id) + !(params.member?(:category_id) && (self.category_id.to_s != params[:category_id])) end def can_destroy? cuser @@ -120,10 +127,10 @@ class Issue < ActiveRecord::Base def self.allowed_categories cuser allowed = [] - allowed << 54 if cuser.admin? || cuser.gather_moderator? # gather - allowed << 17 if cuser.admin? # website - allowed << 22 if cuser.admin? # league - allowed << 20 if cuser.admin? # ensl plugin + allowed << CATEGORY_GATHER if cuser.admin? || cuser.gather_moderator? # gather + allowed << CATEGORY_WEBSITE if cuser.admin? # website + allowed << CATEGORY_LEAGUE if cuser.admin? # league + allowed << CATEGORY_NSLPLUGIN if cuser.admin? # ensl plugin allowed end From 784c5832cfaef4f6584cfbf3d0830ae0f6683974 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Sun, 2 Jul 2017 22:48:33 +0200 Subject: [PATCH 304/305] fixed issues with NULL category not showing --- app/controllers/issues_controller.rb | 7 ++++--- app/models/issue.rb | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 40a3185..36343bf 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -13,10 +13,11 @@ class IssuesController < ApplicationController end allowed = Issue::allowed_categories cuser + qstring = "category_id IN (?) OR category_id IS NULL" - @open = Issue.where(category_id: allowed).with_status(Issue::STATUS_OPEN).all order: sort - @solved = Issue.where(category_id: allowed).with_status(Issue::STATUS_SOLVED).all order: sort - @rejected = Issue.where(category_id: allowed).with_status(Issue::STATUS_REJECTED).all order: sort + @open = Issue.where(qstring, allowed).with_status(Issue::STATUS_OPEN).all order: sort + @solved = Issue.where(qstring, allowed).with_status(Issue::STATUS_SOLVED).all order: sort + @rejected = Issue.where(qstring, allowed).with_status(Issue::STATUS_REJECTED).all order: sort end def show diff --git a/app/models/issue.rb b/app/models/issue.rb index 5087278..0bf039b 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -27,7 +27,7 @@ class Issue < ActiveRecord::Base CATEGORY_WEBSITE = 17 CATEGORY_NSLPLUGIN = 20 CATEGORY_LEAGUE = 22 - CATEGORY_GATHER = 52 + CATEGORY_GATHER = 54 attr_accessor :assigned_name attr_protected :id, :created_at, :updated_at From f31668fb449e0256a1c026f1d72eab404619f515 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Mon, 3 Jul 2017 08:50:00 +0200 Subject: [PATCH 305/305] fixed more places where NULL category could cause problems when editing issues as admin --- app/controllers/issues_controller.rb | 3 ++- app/views/issues/_form.html.erb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 36343bf..c3563e9 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -13,7 +13,8 @@ class IssuesController < ApplicationController end allowed = Issue::allowed_categories cuser - qstring = "category_id IN (?) OR category_id IS NULL" + qstring = 'category_id IN (?)' + qstring += ' OR category_id IS NULL' if cuser.admin? @open = Issue.where(qstring, allowed).with_status(Issue::STATUS_OPEN).all order: sort @solved = Issue.where(qstring, allowed).with_status(Issue::STATUS_SOLVED).all order: sort diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb index 5521c47..199d7a7 100644 --- a/app/views/issues/_form.html.erb +++ b/app/views/issues/_form.html.erb @@ -4,7 +4,7 @@ <%= f.label :title %> <%= f.text_field :title %> - <% if cuser and Issue::allowed_categories(cuser).include?(@issue.category_id) %> + <% if cuser and (cuser.admin? or Issue::allowed_categories(cuser).include?(@issue.category_id)) %>
    <%= f.label :status %> <%= f.select :status, @issue.statuses.invert %> @@ -22,7 +22,7 @@ <%= f.label :text %> <%= f.text_area :text, rows: 7 %>
    - <% if cuser and Issue::allowed_categories(cuser).include?(@issue.category_id) %> + <% if cuser and (cuser.admin? or Issue::allowed_categories(cuser).include?(@issue.category_id)) %>
    <%= f.label :solution %> <%= f.text_area :solution, rows: 7 %>