hackathon_manager 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc6e648015557244ac581d3ac19780801dfb05fc
-  data.tar.gz: 4e8514acedf9e573ae863235292cf71e6cbf9cbb
+  metadata.gz: ea3d1e2d6c44af3db8248c0c9443fafadfabfe33
+  data.tar.gz: 3ad9180c711134eecc531902e983ab62d53236bf
 SHA512:
-  metadata.gz: a5a80fdabe39840e91ef912fbe05ab239b5b3606f3f7abb4581557ce64243344b8add6fe03b8fff5b74cc61a9bca11e43972a4077ae2be1f34256cc340c1d2f7
-  data.tar.gz: db8bd628b1e79e940cf32aa7d97039abe7318ed7d7b85194d74d9f80a718a9444a1aec64d9b31f31df773ad7edc152cdd882f5c7a0efa89436707febe91530fb
+  metadata.gz: ed2920085d911996ab927d7f21e00395e8539bbab5503e929ea805bc2d4ca73ad938bd32c4873a7b7bf9d1930258b56838fb199150b5cccbe87b616465f6a48b
+  data.tar.gz: 8be287e281566f72a828af7418facafc065b0358f493df85f663c71b0e96deb3399b5057cabc08b670364fca735accf54b66cbc2f89b0dddae97240e1b39cb12

data/app/controllers/users/omniauth_callbacks_controller.rb

@@ -5,7 +5,6 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
       sign_in_and_redirect @user, event: :authentication # this will throw if @user is not activated
       session["devise.provider_data"] = request.env["omniauth.auth"]
       set_flash_message(:notice, :success, kind: "My MLH") if is_navigational_format?
-      @user.queue_reminder_email
     else
       redirect_to new_user_registration_url
     end

data/app/mailers/mailer.rb

@@ -5,32 +5,32 @@ class Mailer < ApplicationMailer
   default from: Rails.configuration.hackathon['email_from']
 
   def application_confirmation_email(questionnaire_id)
-    @questionnaire = Questionnaire.find(questionnaire_id)
+    @questionnaire = Questionnaire.find_by_id(questionnaire_id)
     return unless @questionnaire.present? && @questionnaire.user.present?
     mail_questionnaire("Application Received")
   end
 
   def rsvp_confirmation_email(questionnaire_id)
-    @questionnaire = Questionnaire.find(questionnaire_id)
+    @questionnaire = Questionnaire.find_by_id(questionnaire_id)
     return unless @questionnaire.present? && @questionnaire.user.present?
     mail_questionnaire("RSVP Confirmation")
   end
 
   def accepted_email(questionnaire_id)
-    @questionnaire = Questionnaire.find(questionnaire_id)
+    @questionnaire = Questionnaire.find_by_id(questionnaire_id)
     return unless @questionnaire.present? && @questionnaire.user.present?
     mail_questionnaire("You've been accepted!")
   end
 
   def denied_email(questionnaire_id)
-    @questionnaire = Questionnaire.find(questionnaire_id)
+    @questionnaire = Questionnaire.find_by_id(questionnaire_id)
     return unless @questionnaire.present? && @questionnaire.user.present?
     mail_questionnaire("Your application status")
   end
 
   def bulk_message_email(message_id, user_id)
-    @message = Message.find(message_id)
-    @user    = User.find(user_id)
+    @message = Message.find_by_id(message_id)
+    @user    = User.find_by_id(user_id)
     return if @user.blank? || @message.blank?
     mail(
       to: pretty_email(@user.full_name, @user.email),
@@ -39,8 +39,8 @@ class Mailer < ApplicationMailer
   end
 
   def incomplete_reminder_email(user_id)
-    @user = User.find(user_id)
-    return if @user.blank? || @user.questionnaire || Time.now.to_date > Rails.configuration.hackathon['last_day_to_apply']
+    @user = User.find_by_id(user_id)
+    return if @user.blank? || @user.admin || @user.questionnaire || Time.now.to_date > Rails.configuration.hackathon['last_day_to_apply']
     mail(
       to: @user.email,
       subject: "Incomplete Application"
@@ -48,21 +48,21 @@ class Mailer < ApplicationMailer
   end
 
   def bus_captain_confirmation_email(bus_list_id, user_id)
-    @user = User.find(user_id)
+    @user = User.find_by_id(user_id)
     @questionnaire = @user.questionnaire
-    @bus_list = BusList.find(bus_list_id)
+    @bus_list = BusList.find_by_id(bus_list_id)
     return if @user.blank? || @user.questionnaire.blank? || !@user.questionnaire.is_bus_captain? || @bus_list.blank?
     mail_questionnaire("You're a bus captain!")
   end
 
   def slack_invite_email(questionnaire_id)
-    @questionnaire = Questionnaire.find(questionnaire_id)
+    @questionnaire = Questionnaire.find_by_id(questionnaire_id)
     return if @questionnaire.blank?
     mail_questionnaire("Slack Invite!")
   end
 
   def bus_list_update_email(questionnaire_id)
-    @questionnaire = Questionnaire.find(questionnaire_id)
+    @questionnaire = Questionnaire.find_by_id(questionnaire_id)
     @bus_list = @questionnaire.bus_list
     return if @questionnaire.blank? || @questionnaire.user.blank? || @bus_list.blank?
     mail_questionnaire("Bus Update")

data/app/models/user.rb

@@ -1,10 +1,12 @@
 class User < ApplicationRecord
-  devise :database_authenticatable, :registerable,
+  devise :database_authenticatable, :registerable, :timeoutable,
          :recoverable, :rememberable, :trackable, :validatable,
          :omniauthable, omniauth_providers: [:mlh]
 
   has_one :questionnaire
 
+  after_create :queue_reminder_email
+
   def active_for_authentication?
     true
   end

data/app/views/layouts/hackathon_manager/_flashes.html.haml

@@ -3,4 +3,4 @@
     .container
       .form-container
         %span.fa.fa-info-circle.flashes__icon
-        = flash[:notice]
+        = flash[:notice].html_safe

data/app/workers/slack_invite_worker.rb

@@ -24,7 +24,7 @@ class SlackInviteWorker
   private
 
   def query_api(method, params = '')
-    response = HTTParty.post("https://brickhack3.slack.com/api/#{method}?token=#{ENV['SLACK_API_TOKEN']}#{params}")
+    response = HTTParty.post("https://#{ENV['SLACK_SUBDOMAIN']}.slack.com/api/#{method}?token=#{ENV['SLACK_API_TOKEN']}#{params}")
     json = JSON.parse(response.body, symbolize_names: true)
     raise "Could not read Slack response" unless json
     json

data/lib/hackathon_manager/version.rb

@@ -1,3 +1,3 @@
 module HackathonManager
-  VERSION = '0.5.7'.freeze
+  VERSION = '0.5.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackathon_manager
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Stuart Olivera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-06 00:00:00.000000000 Z
+date: 2018-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails