Deleted dead code. Leaving the Event eval in place because it's entirely dependant on internal data, no outside user input

just3ws · just3ws · commit 093a173ace16 · 2014-05-09T22:46:54.000-05:00
diff --git a/app/models/event.rb b/app/models/event.rb
@@ -18,15 +18,12 @@ def generate_event(event_type, audience, data={}, drip_rate=:immediately)
       activity_feed_keys = channels.map { |channel| Audience.channel_to_key(channel) }
 
       if drip_rate == :immediately
-        #Rails.logger.debug("data=#{data.class.name},#{data.inspect}, #{extra_information(data)}, #{data[:user].inspect}, #{drip_rate}")
         channels.each do |channel|
           publish_event(channel, data)
         end
       else
         activity_feed_keys.each_with_index do |activity_feed_key, index|
           data.merge!({ channel: channels[index] }.with_indifferent_access)
-          #Rails.logger.debug("data=#{data.class.name},#{data.inspect}, #{extra_information(data)}, #{data[:user].inspect}, #{drip_rate}")
-          #last_event = REDIS.LINDEX(user.activity_feed_key, 0).collect{|event| Event.new(event)}.first
           score_for_event = Time.now.to_f
           REDIS.zadd(activity_feed_key, score_for_event.to_f, data)
           count = REDIS.zcard(activity_feed_key)
@@ -35,13 +32,6 @@ def generate_event(event_type, audience, data={}, drip_rate=:immediately)
       end
     end
 
-    def score_based_on_drip_rate(activity_feed_key, event_type, drip_rate)
-      time_difference_requested    = drip_rate_to_time(drip_rate)
-      last_similar_event_timestamp = last_similar_event_timestamp(activity_feed_key, event_type)
-      score_for_event              = last_similar_event_timestamp.to_f + time_difference_requested.to_f
-      score_for_event
-    end
-
     def send_admin_notifications(event_type, data, queue)
       unless queue.nil?
         if event_type.to_sym == :new_protip
@@ -53,48 +43,10 @@ def send_admin_notifications(event_type, data, queue)
     end
 
     def publish_event(channel, data)
-      #puts data.inspect
       data.merge!(timestamp: Time.now.to_i)
-
-      #puts "publish event #{data[:event_type]}"
-
       publish(channel, data.to_json)
     end
 
-    def drip_rate_to_time(drip_rate)
-      case drip_rate
-      when :immediately
-        Time.now
-      when :hourly
-        1.hour
-      when :daily
-        1.day
-      when :weekly
-        1.week
-      when :monthly
-        1.month
-      else
-        drip_rate
-      end
-    end
-
-    def last_similar_event_timestamp(activity_feed_key, event_type)
-      # we basically look at every event in the future (if any) and find the last event of same event type so we can space it from that. Otherwise, we
-      # just space it from now. it is not perfect because we miss the corner case that similar event was in the past but limits the searches.
-
-      i = 1
-      Hash[*REDIS.zrangebyscore(activity_feed_key, Time.now.to_f, "inf", withscores: true)].sort_by { |k, v| v }.reverse.each do |activity, score|
-
-        Rails.logger.warn("[EVAL:#{i}] Event#last_similar_event_timestamp(activity_feed_key = #{activity_feed_key.inspect}, event_type = #{event_type.inspect}) set to eval activity = #{activity.inspect}")
-        i += 1
-
-        if eval(activity)[:event_type] == event_type
-          return score
-        end
-      end
-      REDIS.zrange(activity_feed_key, 0, 0, withscores: true)[1] || Time.now.to_i
-    end
-
     def user_activity(user, from, to, limit, publish=false)
 
       activity_feed_keys = user.nil? ? Audience.to_key(Audience.all).to_a : user.subscribed_channels.map { |channel| Audience.channel_to_key(channel) }
@@ -104,15 +56,13 @@ def user_activity(user, from, to, limit, publish=false)
       activities         = []
 
       activity_feed_keys.each do |activity_feed_key|
-        #puts "activity_feed_key=#{activity_feed_key}, #{from}, #{to}, #{count}, #{limit}, #{publish}"
         i = 1
         REDIS.zrangebyscore(activity_feed_key, from, to).each do |activity|
 
           Rails.logger.warn("[EVAL:#{i}] Event#user_activity(user = #{user.inspect}, from = #{from.inspect}, limit = #{limit.inspect}, publish = #{publish.inspect}) set to eval activity = #{activity.inspect}")
           i += 1
 
           break if count == limit
-          #puts "PUBLISHING #{activity}"
           data    = eval(activity).with_indifferent_access
           channel = data[:channel]
           data.delete(:channel)
@@ -122,7 +72,6 @@ def user_activity(user, from, to, limit, publish=false)
           else
             activities << data.merge({ timestamp: (data[:event_id] || Time.now.to_i) })
           end
-          #REDIS.zrem(activity_feed_key, activity)
           count += 1
         end
       end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -853,10 +853,6 @@ def activity
   def refresh_github!
     unless github.blank?
       load_github_profile
-      # token = github_token || User.with_tokens.first.github_token
-      # client = Github.new(token)
-      # github_profile.refresh!(client)
-      # load_github_profile
     end
   end
 
diff --git a/lib/publisher.rb b/lib/publisher.rb
@@ -1,5 +1,4 @@
 module Publisher
-
   def agent
     @@pubnub ||= Pubnub.new(
         ENV['PUBNUB_PUBLISH_KEY'],
@@ -23,4 +22,4 @@ def agent_active?
     end
   end
 
-end
+end
