Merge branch 'master' into feat/borrel-weekoverzicht-location

Author: Quintus3

app/controllers/api/activities_controller.rb

@@ -12,12 +12,19 @@ def index
         params[:date],
         params[:date]
       ).order(:start_date).limit(params[:limit] ||= 10).offset(params[:offset] ||= 0)
-
     else
-      @activities = Activity.where('(end_date IS NULL AND start_date >= ?) OR end_date >= ?',
-                                   Date.today, Date.today).order(:start_date).where(is_viewable: true)
-      @activities.limit!(params[:limit]).offset(params[:offset] ||= 0) if params[:limit].present?
-      @activities = @activities.reject(&:ended?)
+      from = params[:from].present? ? Date.parse(params[:from]) : Date.today
+      @activities = Activity.where('start_date >= ?', from)
+                            .order(:start_date)
+                            .where(is_viewable: true)
+
+      # Allow nil to mean no limit on the end date
+      @activities = @activities.where('end_date <= ?', Date.parse(params[:to])) if params[:to].present?
+
+      @activities = @activities.limit!(params[:limit]).offset(params[:offset] ||= 0) if params[:limit].present?
+
+      @activities = @activities.reject(&:ended?) if params[:from].blank?
+      @activities
     end
   end
 

app/mailers/mailings/devise.rb

@@ -6,8 +6,6 @@ class Devise < ApplicationMailer
 
     def confirmation_instructions(record, token, _opts = {})
       url = confirmation_url(record, confirmation_token: token)
-      # FIXME: confirmation_url might occassionaly return an url to the activation page. We don't know why
-      url = url.sub("/activate", "/confirmation")
 
       if Rails.env.development?
         Rails.logger.debug { "Sending confirmation instructions to #{ record.credentials.name } <#{ record.unconfirmed_email }> with activation URL #{ url }" }
@@ -99,17 +97,6 @@ def activation_instructions(record, token, _opts = {})
       mail(record.email, nil, "#{ I18n.t('mailings.devise.activation_instructions.welcome') } | #{ I18n.t('mailings.devise.confirmation_instructions.activate_account') }", html, text)
     end
 
-    private
-
-    def whatsapp_promo_link
-      if I18n.locale == :en
-        "https://svsticky.nl/promochannel"
-      else
-        # Fallback is NL
-        "https://svsticky.nl/promokanaal"
-      end
-    end
-
     def reset_password_instructions(record, token, _opts = {})
       Rails.logger.debug(edit_password_url(record, reset_password_token: token)) if Rails.env.development?
 
@@ -133,6 +120,17 @@ def reset_password_instructions(record, token, _opts = {})
       return mail(record.email, nil, "#{ I18n.t('mailings.devise.reset_passwords_instructions.reset_password') } Sticky", html, text)
     end
 
+    private
+
+    def whatsapp_promo_link
+      if I18n.locale == :en
+        "https://svsticky.nl/promochannel"
+      else
+        # Fallback is NL
+        "https://svsticky.nl/promokanaal"
+      end
+    end
+
     def forced_confirm_email(record, current_user, _opts = {})
       if Rails.env.development?
         Rails.logger.debug { "#{ record.user.unconfirmed_email } #{ I18n.t('mailings.removed') }" }