Merge remote-tracking branch 'origin/main' into accessories-shop

Author: mcfiredrill

app/controllers/api/admin/user_signups_controller.rb

@@ -0,0 +1,28 @@
+class Api::Admin::UserSignupsController < ApplicationController
+  def index
+    authorize! :admin, :dashboard
+
+    # Build query with optional date filtering
+    users_query = User.where("created_at >= ?", 1.year.ago)
+
+    # if filter_params[:start]
+    #   start_date = DateTime.parse(filter_params[:start])
+    #   users_query = users_query.where("created_at >= ?", start_date)
+    # end
+    #
+    # if filter_params[:end]
+    #   end_date = DateTime.parse(filter_params[:end])
+    #   users_query = users_query.where("created_at <= ?", end_date)
+    # end
+    #
+    user_signups = users_query.group_by { |m| m.created_at.beginning_of_month }.map {|k,v| [k.strftime("%B %Y"), v.count] }.to_h
+
+    render json: { user_signups: user_signups }
+  end
+
+  private
+
+  def filter_params
+    params.permit(:start, :end)
+  end
+end

app/controllers/api/shrimpos/end_shrimpos_controller.rb

@@ -2,9 +2,9 @@ class Api::Shrimpos::EndShrimposController < ApplicationController
   def create
     # TODO auth
     shrimpo = Shrimpo.friendly.find params[:shrimpo_id]
-    # if !shrimpo.voting? && (!current_user != shrimpo.user || !current_user.admin?)
-    #   render status: :unprocessable_entity
-    # end
+    if !shrimpo.voting? && (!current_user != shrimpo.user || !current_user.admin?)
+      render head: :forbidden
+    end
 
     if shrimpo.tally_results!
       ActiveSupport::Notifications.instrument 'shrimpo.ended', title: shrimpo.title

app/controllers/api/shrimpos_controller.rb

@@ -14,6 +14,13 @@ def create
     shrimpo.silver_trophy = Trophy.find_by(name: "silveren shrimpo")
     shrimpo.bronze_trophy = Trophy.find_by(name: "bronzeen shrimpo")
     shrimpo.consolation_trophy = Trophy.find_by(name: "good beverage")
+
+    if shrimpo.mega? && shrimpo_voting_categories_params
+      shrimpo_voting_categories_params.each do |category|
+        shrimpo.shrimpo_voting_categories.build name: category, emoji: ":#{category}:"
+      end
+    end
+
     if shrimpo.valid? && shrimpo.save_and_deposit_fruit_tickets!
       ActiveSupport::Notifications.instrument 'shrimpo.created', username: shrimpo.user.username, title: shrimpo.title
       render json: shrimpo

app/controllers/api/tracks_controller.rb

@@ -3,8 +3,22 @@ class Api::TracksController < ApplicationController
   before_action :current_radio_required
 
   def index
-    @tracks = @current_radio.tracks.where("id in (?)", params[:id])
+    @tracks = @current_radio.tracks.order("created_at DESC")
 
+    if params[:id]
+      @tracks = @current_radio.tracks.where("id in (?)", params[:id])
+    end
+
+    if params[:my] && !current_user.has_role?("admin")
+      @tracks = @tracks.where(uploaded_by: current_user)
+    end
+
+    if params[:term]
+      @tracks = @tracks.where("audio_file_name ilike (?) OR title ilike (?)", "%#{params.permit(:term)[:term]}%", "%#{params.permit(:term)[:term]}%")
+    end
+
+    @tracks = @tracks.page(params[:page])
+    meta = { page: params[:page], total_pages: @tracks.total_pages.to_i }
     render json: @tracks
   end
 

app/controllers/metadata_controller.rb

@@ -1,8 +1,8 @@
 class MetadataController < ApplicationController
   def create
     authorize! :update, :metadata
-    if MetadataUpdate.perform(@current_radio, metadata_params)
-      MetadataPublisher.perform @current_radio.name, metadata_params[:title]
+    if LiquidsoapMetadataUpdate.perform(@current_radio, metadata_params)
+      RedisMetadataPublisher.perform @current_radio.name, metadata_params[:title]
       head :ok
     else
       head :error

app/controllers/publish_metadata_controller.rb

@@ -2,8 +2,9 @@ class PublishMetadataController < ApplicationController
   before_action :current_radio_required
   def create
     if liq_authorized?
-      MetadataPublisher.perform @current_radio.name, params[:metadata]
-      MetadataUpdate.perform(@current_radio, { title: params[:metadata] })
+      RedisMetadataPublisher.perform @current_radio.name, params[:metadata]
+      LiquidsoapMetadataUpdate.perform(@current_radio, { title: params[:metadata] })
+      CanonicalMetadataSync.perform(@current_radio.id, params[:metadata] )
       head :ok
     else
       render json: "not permitted", status: :unauthorized

app/controllers/scheduled_shows_controller.rb

@@ -41,20 +41,8 @@ def next
 
   def current
     response.headers["Access-Control-Allow-Origin"] = "*" # This is a public API, maybe I should namespace it later
-    current = StreamPusher.redis.hgetall "#{@current_radio.name}:current_show"
-    # if no current show, return current archive + episode id info
-    if current.empty?
-      archive = StreamPusher.redis.hgetall "#{@current_radio.name}:current_archive"
-      show = ScheduledShow.friendly.find archive["episode"]
-      render json: show
-    # if no scheduled_show id, it's a renegade show B-)
-    elsif current["title"].present? && current["scheduled_show"].blank?
-      render json: { title: current["title"], renegade: true }
-    # otherwise its a live show and on the timetable, so return the show json
-    else
-      show = ScheduledShow.find current["scheduled_show"]
-      render json: show
-    end
+    current = StreamPusher.redis.hgetall "#{@current_radio.name}:canonical_metadata"
+    render json: current
   end
 
   def create

app/models/fruit_summon.rb

@@ -1,5 +1,24 @@
 class FruitSummon < ApplicationRecord
+  include RedisConnection
+
   belongs_to :fruit_ticket_transaction
   belongs_to :fruit_summon_entity
   belongs_to :user
+
+  after_create :maybe_trigger_hype_meter
+
+  private
+
+  def maybe_trigger_hype_meter
+    latest_fruit_summons = FruitSummon.where("created_at > ?", 10.minutes.ago)
+    if latest_fruit_summons.count >= 3
+      hype_meter_active = redis.get "datafruits:hype_meter_cooldown"
+      # only activate if not on cooldown or already active
+      if hype_meter_active.nil?
+        redis.set "datafruits:hype_meter_status", "active"
+        redis.set "datafruits:hype_meter_cooldown", true
+        redis.expire "datafruits:hype_meter_cooldown", 900
+      end
+    end
+  end
 end

app/models/notification.rb

@@ -104,10 +104,11 @@ def set_message
       "#{self.source.title} has a new comment!"
     when "patreon_sub"
       gif_url = GiphyTextAnimator.animate_text self.source.name
+      name = self.source.user&.username || self.source.name
       if gif_url.is_a? String
-        "#{self.source.name} subscribed to the #{self.source.tier_name} tier on patreon! #{gif_url} #{self.source.patreon_checkout_link}"
+        "#{name} subscribed to the #{self.source.tier_name} tier on patreon! #{gif_url} #{self.source.patreon_checkout_link}"
       else
-        "#{self.source.name} subscribed to the #{self.source.tier_name} tier on patreon! #{self.source.patreon_checkout_link}"
+        "#{name} subscribed to the #{self.source.tier_name} tier on patreon! #{self.source.patreon_checkout_link}"
       end
     when "new_thread"
       "New thread posted in da fruit standz: #{self.source.title}"

app/models/patreon_pledge.rb

@@ -1,5 +1,6 @@
 class PatreonPledge < ApplicationRecord
   after_create :add_role_to_user
+  belongs_to :user
 
   def tier_mappings
     # FIXME
@@ -47,7 +48,7 @@ def add_role_to_user
     user = User.find_by email: email
     # if we can't find the user by the email, will have to assign later manually
     if user.present? && tier_name.present?
-      user.add_role_to_user
+      self.update! user: user
       case tier_name
       # TODO make new badges for these??
       # when "it's just a website"