From dab9903fc5da0e6e6029f9b755d5898eb29c6271 Mon Sep 17 00:00:00 2001
From: Mahad Kalam <mahadkalam1234@gmail.com>
Date: Thu, 21 May 2026 14:06:09 +0100
Subject: [PATCH 1/5] Hide intervals for events you didn't do

---
 app/controllers/inertia_controller.rb         |  3 +-
 .../pages/Home/signedIn/IntervalSelect.svelte | 42 ++++++++---
 app/javascript/types/index.ts                 |  5 +-
 app/models/concerns/time_range_filterable.rb  | 71 +++++--------------
 config/events.json                            | 32 +++++++++
 tsconfig.json                                 |  3 +-
 vite.config.ts                                |  3 +
 7 files changed, 95 insertions(+), 64 deletions(-)
 create mode 100644 config/events.json

diff --git a/app/controllers/inertia_controller.rb b/app/controllers/inertia_controller.rb
index 01474006d..15b39f654 100644
--- a/app/controllers/inertia_controller.rb
+++ b/app/controllers/inertia_controller.rb
@@ -148,7 +148,8 @@ def inertia_nav_current_user
       country_code: current_user.country_code,
       country_name: country&.common_name,
       streak_days: current_user.streak_days,
-      admin_level: current_user.admin_level
+      admin_level: current_user.admin_level,
+      created_at: current_user.created_at&.iso8601
     }
   end
 
diff --git a/app/javascript/pages/Home/signedIn/IntervalSelect.svelte b/app/javascript/pages/Home/signedIn/IntervalSelect.svelte
index f00d84b2d..0693894b6 100644
--- a/app/javascript/pages/Home/signedIn/IntervalSelect.svelte
+++ b/app/javascript/pages/Home/signedIn/IntervalSelect.svelte
@@ -1,8 +1,18 @@
 <script lang="ts">
   import { Popover, RadioGroup } from "bits-ui";
+  import { page } from "@inertiajs/svelte";
   import Button from "../../../components/Button.svelte";
+  import eventsConfig from "$config/events.json";
 
-  const INTERVALS = [
+  type EventConfig = {
+    human_name: string;
+    starts_at: string;
+    ends_at: string;
+    timezone: string;
+  };
+  const EVENT_RANGES = eventsConfig as Record<string, EventConfig>;
+
+  const STANDARD_INTERVALS = [
     { key: "today", label: "Today" },
     { key: "yesterday", label: "Yesterday" },
     { key: "this_week", label: "This Week" },
@@ -11,13 +21,16 @@
     { key: "last_30_days", label: "Last 30 Days" },
     { key: "this_year", label: "This Year" },
     { key: "last_12_months", label: "Last 12 Months" },
-    { key: "flavortown", label: "Flavortown" },
-    { key: "summer_of_making", label: "Summer of Making" },
-    { key: "high_seas", label: "High Seas" },
-    { key: "low_skies", label: "Low Skies" },
-    { key: "scrapyard", label: "Scrapyard Global" },
+  ];
+  const EVENT_INTERVALS = Object.entries(EVENT_RANGES).map(([key, cfg]) => ({
+    key,
+    label: cfg.human_name,
+  }));
+  const INTERVALS = [
+    ...STANDARD_INTERVALS,
+    ...EVENT_INTERVALS,
     { key: "", label: "All Time" },
-  ] as const;
+  ];
 
   let {
     selected,
@@ -31,6 +44,19 @@
     onchange: (interval: string, from: string, to: string) => void;
   } = $props();
 
+  const userCreatedAt = Date.parse(
+    page.props.layout.nav.current_user!.created_at!,
+  );
+
+  const visibleIntervals = $derived(
+    INTERVALS.filter((interval) => {
+      const range = EVENT_RANGES[interval.key];
+      if (!range) return true;
+      if (interval.key === selected) return true;
+      return userCreatedAt <= Date.parse(range.ends_at);
+    }),
+  );
+
   let open = $state(false);
   let customFrom = $state("");
   let customTo = $state("");
@@ -132,7 +158,7 @@
             onValueChange={selectInterval}
             class="flex flex-col gap-1 overflow-hidden"
           >
-            {#each INTERVALS as interval}
+            {#each visibleIntervals as interval (interval.key)}
               <RadioGroup.Item
                 value={interval.key}
                 class="flex w-full items-center rounded-md px-3 py-2 text-left text-sm text-muted outline-none transition-all duration-150 hover:bg-surface-100/60 hover:text-surface-content data-[highlighted]:bg-surface-100/70 data-[state=checked]:bg-primary/12 data-[state=checked]:text-surface-content"
diff --git a/app/javascript/types/index.ts b/app/javascript/types/index.ts
index 1e032bddc..fb384380d 100644
--- a/app/javascript/types/index.ts
+++ b/app/javascript/types/index.ts
@@ -3,7 +3,9 @@ export type FlashData = {
   alert?: string;
 };
 
-export type SharedProps = {};
+export type SharedProps = {
+  layout: LayoutProps;
+};
 
 export type NavLink = {
   label: string;
@@ -29,6 +31,7 @@ export type NavCurrentUser = {
   country_name?: string | null;
   streak_days?: number | null;
   admin_level: AdminLevel;
+  created_at?: string | null;
 };
 
 export type LayoutNav = {
diff --git a/app/models/concerns/time_range_filterable.rb b/app/models/concerns/time_range_filterable.rb
index 42bbb43e8..66811ad58 100644
--- a/app/models/concerns/time_range_filterable.rb
+++ b/app/models/concerns/time_range_filterable.rb
@@ -1,7 +1,7 @@
 module TimeRangeFilterable
   extend ActiveSupport::Concern
 
-  RANGES = {
+  STANDARD_RANGES = {
     today: {
       human_name: "Today",
       calculate: -> { Time.current.beginning_of_day..Time.current.end_of_day }
@@ -33,63 +33,28 @@ module TimeRangeFilterable
     last_12_months: {
       human_name: "Last 12 Months",
       calculate: -> { (Time.current - 12.months).beginning_of_day..Time.current.end_of_day }
-    },
-    flavortown: {
-      human_name: "Flavortown",
-      calculate: -> {
-        timezone = "America/New_York"
-        Time.use_zone(timezone) do
-          from = Time.parse("2025-12-15").beginning_of_day
-          to = Time.parse("2026-04-30").end_of_day
-          from.beginning_of_day..to.end_of_day
-        end
-      }
-    },
-    summer_of_making: {
-      human_name: "Summer of Making",
-      calculate: -> {
-        timezone = "America/New_York"
-        Time.use_zone(timezone) do
-          from = Time.parse("2025-06-16").beginning_of_day
-          to = Time.parse("2025-09-30").end_of_day
-          from.beginning_of_day..to.end_of_day
-        end
-      }
-    },
-    high_seas: {
-      human_name: "High Seas",
-      calculate: -> {
-        timezone = "America/New_York"
-        Time.use_zone(timezone) do
-          from = Time.parse("2024-10-30").beginning_of_day
-          to = Time.parse("2025-01-31").end_of_day
-          from.beginning_of_day..to.end_of_day
-        end
-      }
-    },
-    low_skies: {
-      human_name: "Low Skies",
-      calculate: -> {
-        timezone = "America/New_York"
-        Time.use_zone(timezone) do
-          from = Time.parse("2024-10-3").beginning_of_day
-          to = Time.parse("2025-01-12").end_of_day
-          from.beginning_of_day..to.end_of_day
-        end
-      }
-    },
-    scrapyard: {
-      human_name: "Scrapyard Global",
+    }
+  }.freeze
+
+  EVENTS_CONFIG_PATH = Rails.root.join("config", "events.json").freeze
+
+  EVENT_DEFINITIONS = JSON.parse(File.read(EVENTS_CONFIG_PATH)).freeze
+
+  EVENT_RANGES = EVENT_DEFINITIONS.each_with_object({}) do |(key, cfg), memo|
+    timezone = cfg["timezone"]
+    starts_at = cfg["starts_at"]
+    ends_at = cfg["ends_at"]
+    memo[key.to_sym] = {
+      human_name: cfg["human_name"],
       calculate: -> {
-        timezone = "America/New_York"
         Time.use_zone(timezone) do
-          from = Time.parse("2025-03-14").beginning_of_day
-          to = Time.parse("2025-03-17").end_of_day
-          from.beginning_of_day..to.end_of_day
+          Time.zone.parse(starts_at).beginning_of_day..Time.zone.parse(ends_at).end_of_day
         end
       }
     }
-  }.freeze
+  end.freeze
+
+  RANGES = STANDARD_RANGES.merge(EVENT_RANGES).freeze
 
   class_methods do
     def time_range_filterable_field(field_name)
diff --git a/config/events.json b/config/events.json
new file mode 100644
index 000000000..33dea0a94
--- /dev/null
+++ b/config/events.json
@@ -0,0 +1,32 @@
+{
+  "flavortown": {
+    "human_name": "Flavortown",
+    "starts_at": "2025-12-15",
+    "ends_at": "2026-04-30",
+    "timezone": "America/New_York"
+  },
+  "summer_of_making": {
+    "human_name": "Summer of Making",
+    "starts_at": "2025-06-16",
+    "ends_at": "2025-09-30",
+    "timezone": "America/New_York"
+  },
+  "high_seas": {
+    "human_name": "High Seas",
+    "starts_at": "2024-10-30",
+    "ends_at": "2025-01-31",
+    "timezone": "America/New_York"
+  },
+  "low_skies": {
+    "human_name": "Low Skies",
+    "starts_at": "2024-10-03",
+    "ends_at": "2025-01-12",
+    "timezone": "America/New_York"
+  },
+  "scrapyard": {
+    "human_name": "Scrapyard Global",
+    "starts_at": "2025-03-14",
+    "ends_at": "2025-03-17",
+    "timezone": "America/New_York"
+  }
+}
diff --git a/tsconfig.json b/tsconfig.json
index f409c10cd..85c11ec36 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -19,7 +19,8 @@
     /* Aliases */
     "paths": {
       "@/*": ["./app/javascript/*"],
-      "~/*": ["./app/javascript/*"]
+      "~/*": ["./app/javascript/*"],
+      "$config/*": ["./config/*"]
     }
   },
 
diff --git a/vite.config.ts b/vite.config.ts
index 851ee560e..234736749 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -18,4 +18,7 @@ export default defineConfig({
     tailwindcss(),
     RubyPlugin(),
   ],
+  resolve: {
+    tsconfigPaths: true,
+  },
 });

From 1f23f845278341f6905cd616a9102c47beff1d34 Mon Sep 17 00:00:00 2001
From: Mahad Kalam <mahadkalam1234@gmail.com>
Date: Thu, 21 May 2026 14:57:34 +0100
Subject: [PATCH 2/5] add sexy new `event_participation` activeflag

---
 Gemfile                                       |  3 +
 Gemfile.lock                                  |  3 +
 app/controllers/inertia_controller.rb         |  3 +-
 .../pages/Home/signedIn/IntervalSelect.svelte | 18 ++++--
 app/javascript/types/index.ts                 |  2 +
 app/models/concerns/time_range_filterable.rb  |  4 ++
 app/models/user.rb                            |  4 ++
 app/services/heartbeat_ingest.rb              | 28 ++++++++-
 ...131313_add_event_participation_to_users.rb |  5 ++
 ...event_participation_backfilled_to_users.rb | 12 ++++
 db/schema.rb                                  | 62 ++++++++++++++++++-
 11 files changed, 134 insertions(+), 10 deletions(-)
 create mode 100644 db/migrate/20260521131313_add_event_participation_to_users.rb
 create mode 100644 db/migrate/20260521132654_add_event_participation_backfilled_to_users.rb

diff --git a/Gemfile b/Gemfile
index 4931ab7f7..d3ac60853 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,6 +41,9 @@ gem "sentry-rails"
 
 gem "good_job"
 
+# Bitmask flag column on AR models — used for User#event_participation.
+gem "active_flag"
+
 # Slack client
 gem "slack-ruby-client"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 816b0be70..e1fece8d1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,6 +47,8 @@ GEM
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
+    active_flag (2.1.1)
+      activerecord (>= 5)
     activejob (8.1.3)
       activesupport (= 8.1.3)
       globalid (>= 0.3.6)
@@ -659,6 +661,7 @@ PLATFORMS
   x86_64-linux-musl
 
 DEPENDENCIES
+  active_flag
   activerecord-import
   autotuner (~> 1.0)
   aws-sdk-s3
diff --git a/app/controllers/inertia_controller.rb b/app/controllers/inertia_controller.rb
index 15b39f654..80b477220 100644
--- a/app/controllers/inertia_controller.rb
+++ b/app/controllers/inertia_controller.rb
@@ -149,7 +149,8 @@ def inertia_nav_current_user
       country_name: country&.common_name,
       streak_days: current_user.streak_days,
       admin_level: current_user.admin_level,
-      created_at: current_user.created_at&.iso8601
+      created_at: current_user.created_at&.iso8601,
+      event_participation: current_user.event_participation_backfilled? ? current_user.event_participation.to_a.map(&:to_s) : nil
     }
   end
 
diff --git a/app/javascript/pages/Home/signedIn/IntervalSelect.svelte b/app/javascript/pages/Home/signedIn/IntervalSelect.svelte
index 0693894b6..9e17e125a 100644
--- a/app/javascript/pages/Home/signedIn/IntervalSelect.svelte
+++ b/app/javascript/pages/Home/signedIn/IntervalSelect.svelte
@@ -44,16 +44,26 @@
     onchange: (interval: string, from: string, to: string) => void;
   } = $props();
 
-  const userCreatedAt = Date.parse(
-    page.props.layout.nav.current_user!.created_at!,
-  );
+  const currentUser = page.props.layout.nav.current_user!;
+  const userCreatedAt = Date.parse(currentUser.created_at!);
+  // null = user hasn't been backfilled yet, so we can't trust the bitmap.
+  const participated = currentUser.event_participation
+    ? new Set(currentUser.event_participation)
+    : null;
 
   const visibleIntervals = $derived(
     INTERVALS.filter((interval) => {
       const range = EVENT_RANGES[interval.key];
       if (!range) return true;
       if (interval.key === selected) return true;
-      return userCreatedAt <= Date.parse(range.ends_at);
+      const endsAt = Date.parse(range.ends_at);
+      // Ended event + backfilled: show only if the user actually participated.
+      // Otherwise (active/future event, or not-yet-backfilled user) fall back
+      // to the cheap "did the user exist before the event ended" check.
+      if (endsAt < Date.now() && participated) {
+        return participated.has(interval.key);
+      }
+      return userCreatedAt <= endsAt;
     }),
   );
 
diff --git a/app/javascript/types/index.ts b/app/javascript/types/index.ts
index fb384380d..694b334cd 100644
--- a/app/javascript/types/index.ts
+++ b/app/javascript/types/index.ts
@@ -32,6 +32,8 @@ export type NavCurrentUser = {
   streak_days?: number | null;
   admin_level: AdminLevel;
   created_at?: string | null;
+  // null until the user has been backfilled — fall back to created_at then.
+  event_participation: string[] | null;
 };
 
 export type LayoutNav = {
diff --git a/app/models/concerns/time_range_filterable.rb b/app/models/concerns/time_range_filterable.rb
index 66811ad58..bf66c23bc 100644
--- a/app/models/concerns/time_range_filterable.rb
+++ b/app/models/concerns/time_range_filterable.rb
@@ -40,6 +40,10 @@ module TimeRangeFilterable
 
   EVENT_DEFINITIONS = JSON.parse(File.read(EVENTS_CONFIG_PATH)).freeze
 
+  # mahad says: NEVER remove entries from the events JSON
+  # if you need to get rid of an event, add a retired flag or something
+  EVENT_KEYS = EVENT_DEFINITIONS.keys.sort.map(&:to_sym).freeze
+
   EVENT_RANGES = EVENT_DEFINITIONS.each_with_object({}) do |(key, cfg), memo|
     timezone = cfg["timezone"]
     starts_at = cfg["starts_at"]
diff --git a/app/models/user.rb b/app/models/user.rb
index 472605f11..bc9690c2e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -9,6 +9,10 @@ class User < ApplicationRecord
 
   has_subscriptions
 
+  # Tracks which Hack Club events the user has coded during. EVENT_KEYS is
+  # sorted alphabetically so bit positions don't shift with events.json edits.
+  flag :event_participation, TimeRangeFilterable::EVENT_KEYS
+
   USERNAME_MAX_LENGTH = 21 # going over 21 overflows the navbar
 
   has_paper_trail
diff --git a/app/services/heartbeat_ingest.rb b/app/services/heartbeat_ingest.rb
index 2ab672464..704e5ef87 100644
--- a/app/services/heartbeat_ingest.rb
+++ b/app/services/heartbeat_ingest.rb
@@ -120,7 +120,10 @@ def persist_direct_heartbeat(attrs)
       @user.heartbeats.find_by!(fields_hash: fields_hash)
     end
 
-    self.class.schedule_rollup_refresh(user: @user) if result.any? && @schedule_rollup_refresh
+    if result.any?
+      record_event_participation([ attrs[:time] ])
+      self.class.schedule_rollup_refresh(user: @user) if @schedule_rollup_refresh
+    end
     [ persisted, !result.any? ]
   end
 
@@ -194,9 +197,30 @@ def flush_import_batch(seen_hashes)
       record.merge(created_at: timestamp, updated_at: timestamp)
     end
 
-    ActiveRecord::Base.logger.silence do
+    inserted = ActiveRecord::Base.logger.silence do
       Heartbeat.insert_all(records, unique_by: [ :fields_hash ]).length
     end
+    record_event_participation(records.map { |r| r[:time] })
+    inserted
+  end
+
+  # OR each touched event's bit into the user's event_participation. The
+  # in-memory `unset?` check short-circuits before issuing any SQL once the
+  # bit is set, which is the common case after the first heartbeat per event.
+  def record_event_participation(times)
+    return if times.blank?
+
+    TimeRangeFilterable::EVENT_RANGES.each do |key, cfg|
+      next if @user.event_participation.set?(key)
+
+      range = cfg[:calculate].call
+      from_i = range.begin.to_i
+      to_i = range.end.to_i
+      next unless times.any? { |t| t >= from_i && t <= to_i }
+
+      User.where(id: @user.id).event_participations.set_all!(key)
+      @user.event_participation.set(key) # keep in-memory copy in sync for subsequent calls
+    end
   end
 
   def parse_user_agent(user_agent)
diff --git a/db/migrate/20260521131313_add_event_participation_to_users.rb b/db/migrate/20260521131313_add_event_participation_to_users.rb
new file mode 100644
index 000000000..70003c145
--- /dev/null
+++ b/db/migrate/20260521131313_add_event_participation_to_users.rb
@@ -0,0 +1,5 @@
+class AddEventParticipationToUsers < ActiveRecord::Migration[8.1]
+  def change
+    add_column :users, :event_participation, :integer, default: 0, null: false
+  end
+end
diff --git a/db/migrate/20260521132654_add_event_participation_backfilled_to_users.rb b/db/migrate/20260521132654_add_event_participation_backfilled_to_users.rb
new file mode 100644
index 000000000..8faa50d7a
--- /dev/null
+++ b/db/migrate/20260521132654_add_event_participation_backfilled_to_users.rb
@@ -0,0 +1,12 @@
+class AddEventParticipationBackfilledToUsers < ActiveRecord::Migration[8.1]
+  def up
+    # Existing users start false (need backfill), future inserts default true
+    # (new users have no history to backfill)
+    add_column :users, :event_participation_backfilled, :boolean, default: false, null: false
+    change_column_default :users, :event_participation_backfilled, true
+  end
+
+  def down
+    remove_column :users, :event_participation_backfilled
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 134efc561..5c68b490a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2026_05_18_170142) do
+ActiveRecord::Schema[8.1].define(version: 2026_05_21_132654) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
   enable_extension "pg_stat_statements"
@@ -102,13 +102,14 @@
     t.datetime "cancelled_at"
     t.datetime "completed_at"
     t.datetime "created_at", null: false
-    t.text "reason"
+    t.string "reason"
     t.text "reason_details"
     t.datetime "requested_at", null: false
     t.datetime "scheduled_deletion_at"
     t.integer "status", default: 0, null: false
     t.datetime "updated_at", null: false
     t.bigint "user_id", null: false
+    t.index ["reason"], name: "index_deletion_requests_on_reason"
     t.index ["status"], name: "index_deletion_requests_on_status"
     t.index ["user_id", "status"], name: "index_deletion_requests_on_user_id_and_status"
     t.index ["user_id"], name: "index_deletion_requests_on_user_id"
@@ -152,6 +153,36 @@
     t.index ["feature_key", "key", "value"], name: "index_flipper_gates_on_feature_key_and_key_and_value", unique: true
   end
 
+  create_table "github_app_installations", force: :cascade do |t|
+    t.bigint "account_github_id"
+    t.string "account_login", null: false
+    t.string "account_type", null: false
+    t.datetime "created_at", null: false
+    t.bigint "installation_id", null: false
+    t.datetime "suspended_at"
+    t.datetime "updated_at", null: false
+    t.bigint "user_id"
+    t.index ["account_github_id"], name: "index_github_app_installations_on_account_github_id"
+    t.index ["installation_id"], name: "index_github_app_installations_on_installation_id", unique: true
+    t.index ["user_id"], name: "index_github_app_installations_on_user_id"
+  end
+
+  create_table "github_app_repositories", force: :cascade do |t|
+    t.boolean "archived", default: false, null: false
+    t.datetime "created_at", null: false
+    t.string "full_name", null: false
+    t.bigint "github_app_installation_id", null: false
+    t.bigint "github_repo_id", null: false
+    t.string "html_url", null: false
+    t.boolean "private", default: false, null: false
+    t.bigint "repository_id"
+    t.datetime "updated_at", null: false
+    t.index ["full_name"], name: "index_github_app_repositories_on_full_name"
+    t.index ["github_app_installation_id"], name: "index_github_app_repositories_on_github_app_installation_id"
+    t.index ["github_repo_id"], name: "index_github_app_repositories_on_github_repo_id", unique: true
+    t.index ["repository_id"], name: "index_github_app_repositories_on_repository_id"
+  end
+
   create_table "goals", force: :cascade do |t|
     t.datetime "created_at", null: false
     t.string "languages", default: [], null: false, array: true
@@ -300,6 +331,13 @@
     t.index ["user_id"], name: "index_heartbeat_import_sources_on_user_id", unique: true
   end
 
+  create_table "heartbeat_user_agents", primary_key: "user_agent", id: :text, force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.float "first_seen_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["user_agent"], name: "index_heartbeat_user_agents_trgm", opclass: :gin_trgm_ops, using: :gin
+  end
+
   create_table "heartbeats", force: :cascade do |t|
     t.string "branch"
     t.string "category"
@@ -339,6 +377,7 @@
     t.index ["time", "user_id"], name: "idx_heartbeats_time_user_active", where: "(deleted_at IS NULL)"
     t.index ["time"], name: "index_heartbeats_on_time_active_covering", where: "(deleted_at IS NULL)", include: ["source_type"]
     t.index ["time"], name: "index_heartbeats_on_time_imported", where: "(source_type <> 0)"
+    t.index ["user_agent", "time"], name: "index_heartbeats_on_user_agent_time", order: { time: :desc }
     t.index ["user_agent"], name: "index_heartbeats_on_user_agent"
     t.index ["user_agent"], name: "index_heartbeats_on_user_agent_trgm", opclass: :gin_trgm_ops, using: :gin
     t.index ["user_id", "category", "time"], name: "idx_heartbeats_user_category_time_incl_editor", where: "(deleted_at IS NULL)", include: ["editor"]
@@ -346,6 +385,7 @@
     t.index ["user_id", "id"], name: "index_heartbeats_on_user_id_with_ip", order: { id: :desc }, where: "((ip_address IS NOT NULL) AND (deleted_at IS NULL))"
     t.index ["user_id", "language", "time"], name: "idx_heartbeats_user_language_time", where: "(deleted_at IS NULL)"
     t.index ["user_id", "operating_system", "time"], name: "idx_heartbeats_user_operating_system_time", where: "(deleted_at IS NULL)"
+    t.index ["user_id", "project", "time", "id"], name: "idx_heartbeats_user_project_time_id_active", where: "(deleted_at IS NULL)"
     t.index ["user_id", "project", "time"], name: "idx_heartbeats_user_project_time_covering", where: "(deleted_at IS NULL)", include: ["category"]
     t.index ["user_id", "project", "time"], name: "idx_heartbeats_user_project_time_stats", where: "((deleted_at IS NULL) AND (project IS NOT NULL))"
     t.index ["user_id", "project"], name: "index_heartbeats_on_user_id_and_project", where: "(deleted_at IS NULL)"
@@ -355,7 +395,7 @@
     t.index ["user_id", "time", "project"], name: "idx_heartbeats_user_time_project_stats", where: "(deleted_at IS NULL)"
     t.index ["user_id", "time"], name: "idx_heartbeats_lb_eligible_user_time", where: "((deleted_at IS NULL) AND ((category)::text = 'coding'::text) AND ((editor IS NULL) OR (lower((editor)::text) <> ALL (ARRAY['arc'::text, 'brave'::text, 'chrome'::text, 'chromium'::text, 'edge'::text, 'firefox'::text, 'floorp'::text, 'librewolf'::text, 'microsoft-edge'::text, 'opera'::text, 'opera-gx'::text, 'safari'::text, 'vivaldi'::text, 'waterfox'::text, 'zen'::text]))))"
     t.index ["user_id", "time"], name: "idx_heartbeats_user_time_active", where: "(deleted_at IS NULL)"
-    t.index ["user_id", "time"], name: "idx_heartbeats_user_time_project_language", where: "((deleted_at IS NULL) AND (project IS NOT NULL) AND ((project)::text <> ''::text))", include: ["id", "project", "language"]
+    t.index ["user_id", "time"], name: "idx_heartbeats_user_time_project_language", where: "((deleted_at IS NULL) AND (project IS NOT NULL) AND ((project)::text <> ''::text) AND (language IS NOT NULL) AND ((language)::text <> ''::text))", include: ["project", "language"]
     t.index ["user_id"], name: "index_heartbeats_on_user_id"
   end
 
@@ -537,9 +577,12 @@
   end
 
   create_table "repositories", force: :cascade do |t|
+    t.boolean "archived"
     t.integer "commit_count"
     t.datetime "created_at", null: false
     t.text "description"
+    t.string "full_name"
+    t.bigint "github_repo_id"
     t.string "homepage"
     t.string "host"
     t.string "language"
@@ -548,9 +591,12 @@
     t.datetime "last_synced_at"
     t.string "name"
     t.string "owner"
+    t.boolean "private"
     t.integer "stars"
     t.datetime "updated_at", null: false
     t.string "url"
+    t.index ["full_name"], name: "index_repositories_on_full_name"
+    t.index ["github_repo_id"], name: "index_repositories_on_github_repo_id", unique: true
     t.index ["url"], name: "index_repositories_on_url", unique: true
   end
 
@@ -638,10 +684,16 @@
     t.boolean "default_timezone_leaderboard", default: true, null: false
     t.string "deprecated_name"
     t.string "display_name_override"
+    t.integer "event_participation", default: 0, null: false
+    t.boolean "event_participation_backfilled", default: true, null: false
     t.text "github_access_token"
     t.string "github_avatar_url"
     t.string "github_uid"
     t.string "github_username"
+    t.text "gitlab_access_token"
+    t.string "gitlab_avatar_url"
+    t.string "gitlab_uid"
+    t.string "gitlab_username"
     t.integer "hackatime_extension_text_type", default: 0, null: false
     t.string "hca_access_token"
     t.string "hca_id"
@@ -669,6 +721,7 @@
     t.boolean "weekly_summary_email_enabled", default: true, null: false
     t.index ["github_uid", "github_access_token"], name: "index_users_on_github_uid_and_access_token"
     t.index ["github_uid"], name: "index_users_on_github_uid"
+    t.index ["gitlab_uid", "gitlab_access_token"], name: "index_users_on_gitlab_uid_and_access_token"
     t.index ["slack_uid"], name: "index_users_on_slack_uid", unique: true
     t.index ["timezone", "trust_level"], name: "index_users_on_timezone_trust_level"
     t.index ["timezone"], name: "index_users_on_timezone"
@@ -713,6 +766,9 @@
   add_foreign_key "deletion_requests", "users", column: "admin_approved_by_id"
   add_foreign_key "email_addresses", "users"
   add_foreign_key "email_verification_requests", "users"
+  add_foreign_key "github_app_installations", "users"
+  add_foreign_key "github_app_repositories", "github_app_installations"
+  add_foreign_key "github_app_repositories", "repositories"
   add_foreign_key "goals", "users"
   add_foreign_key "heartbeat_import_runs", "users"
   add_foreign_key "heartbeat_import_sources", "users"

From e968fe53ad9874aa46b1606eda16e9d804b5dc92 Mon Sep 17 00:00:00 2001
From: Mahad Kalam <mahadkalam1234@gmail.com>
Date: Thu, 21 May 2026 14:57:42 +0100
Subject: [PATCH 3/5] fa

---
 app/javascript/pages/Home/signedIn/IntervalSelect.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/pages/Home/signedIn/IntervalSelect.svelte b/app/javascript/pages/Home/signedIn/IntervalSelect.svelte
index 9e17e125a..22db411ea 100644
--- a/app/javascript/pages/Home/signedIn/IntervalSelect.svelte
+++ b/app/javascript/pages/Home/signedIn/IntervalSelect.svelte
@@ -46,7 +46,7 @@
 
   const currentUser = page.props.layout.nav.current_user!;
   const userCreatedAt = Date.parse(currentUser.created_at!);
-  // null = user hasn't been backfilled yet, so we can't trust the bitmap.
+  // null = user hasn't been backfilled yet, so we can't trust the bitmap
   const participated = currentUser.event_participation
     ? new Set(currentUser.event_participation)
     : null;

From 34c7d3938e263191b892fe028f621f2f254ed44a Mon Sep 17 00:00:00 2001
From: Mahad Kalam <mahadkalam1234@gmail.com>
Date: Thu, 21 May 2026 15:10:48 +0100
Subject: [PATCH 4/5] rails is made by the idf

---
 app/models/concerns/time_range_filterable.rb | 16 +++++++++++++---
 app/services/heartbeat_ingest.rb             |  8 ++++----
 config/events.json                           | 15 ++++++++++-----
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/app/models/concerns/time_range_filterable.rb b/app/models/concerns/time_range_filterable.rb
index bf66c23bc..05e9cfbec 100644
--- a/app/models/concerns/time_range_filterable.rb
+++ b/app/models/concerns/time_range_filterable.rb
@@ -40,9 +40,19 @@ module TimeRangeFilterable
 
   EVENT_DEFINITIONS = JSON.parse(File.read(EVENTS_CONFIG_PATH)).freeze
 
-  # mahad says: NEVER remove entries from the events JSON
-  # if you need to get rid of an event, add a retired flag or something
-  EVENT_KEYS = EVENT_DEFINITIONS.keys.sort.map(&:to_sym).freeze
+  EVENT_KEYS = begin
+    pairs = EVENT_DEFINITIONS.map do |key, cfg|
+      bit = cfg["bit"]
+      raise "events.json: #{key} missing 'bit'" unless bit.is_a?(Integer) && bit >= 0
+      [ bit, key.to_sym ]
+    end.sort_by(&:first)
+
+    expected = (0...pairs.length).to_a
+    actual = pairs.map(&:first)
+    raise "events.json: bits must be contiguous 0..N (got #{actual.inspect})" unless actual == expected
+
+    pairs.map(&:last).freeze
+  end
 
   EVENT_RANGES = EVENT_DEFINITIONS.each_with_object({}) do |(key, cfg), memo|
     timezone = cfg["timezone"]
diff --git a/app/services/heartbeat_ingest.rb b/app/services/heartbeat_ingest.rb
index 704e5ef87..76762e357 100644
--- a/app/services/heartbeat_ingest.rb
+++ b/app/services/heartbeat_ingest.rb
@@ -197,11 +197,11 @@ def flush_import_batch(seen_hashes)
       record.merge(created_at: timestamp, updated_at: timestamp)
     end
 
-    inserted = ActiveRecord::Base.logger.silence do
-      Heartbeat.insert_all(records, unique_by: [ :fields_hash ]).length
+    result = ActiveRecord::Base.logger.silence do
+      Heartbeat.insert_all(records, unique_by: [ :fields_hash ], returning: [ "time" ])
     end
-    record_event_participation(records.map { |r| r[:time] })
-    inserted
+    record_event_participation(result.rows.flatten)
+    result.length
   end
 
   # OR each touched event's bit into the user's event_participation. The
diff --git a/config/events.json b/config/events.json
index 33dea0a94..603d1b6c7 100644
--- a/config/events.json
+++ b/config/events.json
@@ -3,30 +3,35 @@
     "human_name": "Flavortown",
     "starts_at": "2025-12-15",
     "ends_at": "2026-04-30",
-    "timezone": "America/New_York"
+    "timezone": "America/New_York",
+    "bit": 0
   },
   "summer_of_making": {
     "human_name": "Summer of Making",
     "starts_at": "2025-06-16",
     "ends_at": "2025-09-30",
-    "timezone": "America/New_York"
+    "timezone": "America/New_York",
+    "bit": 1
   },
   "high_seas": {
     "human_name": "High Seas",
     "starts_at": "2024-10-30",
     "ends_at": "2025-01-31",
-    "timezone": "America/New_York"
+    "timezone": "America/New_York",
+    "bit": 2
   },
   "low_skies": {
     "human_name": "Low Skies",
     "starts_at": "2024-10-03",
     "ends_at": "2025-01-12",
-    "timezone": "America/New_York"
+    "timezone": "America/New_York",
+    "bit": 3
   },
   "scrapyard": {
     "human_name": "Scrapyard Global",
     "starts_at": "2025-03-14",
     "ends_at": "2025-03-17",
-    "timezone": "America/New_York"
+    "timezone": "America/New_York",
+    "bit": 4
   }
 }

From b707c42d4a10a97cd25d240a1e7367347d909a09 Mon Sep 17 00:00:00 2001
From: Mahad Kalam <mahadkalam1234@gmail.com>
Date: Fri, 12 Jun 2026 14:52:40 +0100
Subject: [PATCH 5/5] Address event participation review nits

---
 .../Home/signedIn/IntervalSelectBody.svelte   |  4 ++-
 test/services/heartbeat_ingest_test.rb        | 25 +++++++++++++------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/javascript/pages/Home/signedIn/IntervalSelectBody.svelte b/app/javascript/pages/Home/signedIn/IntervalSelectBody.svelte
index c3f480f46..2bfe9eb74 100644
--- a/app/javascript/pages/Home/signedIn/IntervalSelectBody.svelte
+++ b/app/javascript/pages/Home/signedIn/IntervalSelectBody.svelte
@@ -53,7 +53,9 @@
   let customTo = $state(to);
 
   const currentUser = page.props.layout.nav.current_user!;
-  const userCreatedAt = Date.parse(currentUser.created_at!);
+  const userCreatedAt = currentUser.created_at
+    ? Date.parse(currentUser.created_at)
+    : 0;
   // null = user hasn't been backfilled yet, so we can't trust the bitmap
   const participated = currentUser.event_participation
     ? new Set(currentUser.event_participation)
diff --git a/test/services/heartbeat_ingest_test.rb b/test/services/heartbeat_ingest_test.rb
index 713992269..a9f7a432a 100644
--- a/test/services/heartbeat_ingest_test.rb
+++ b/test/services/heartbeat_ingest_test.rb
@@ -205,19 +205,30 @@ class HeartbeatIngestTest < ActiveSupport::TestCase
   test "import heartbeat ingest records event participation only for inserted heartbeats" do
     user = User.create!(timezone: "UTC")
     high_seas_time = Time.zone.parse("2024-12-15 12:00:00").to_f
+    heartbeat = {
+      entity: "/tmp/event.rb",
+      type: "file",
+      time: high_seas_time,
+      project: "hackatime",
+      language: "Ruby"
+    }
 
     HeartbeatIngest.call(
       user: user,
       mode: :import,
-      heartbeats: [ {
-        entity: "/tmp/event.rb",
-        type: "file",
-        time: high_seas_time,
-        project: "hackatime",
-        language: "Ruby"
-      } ]
+      heartbeats: [ heartbeat ]
     )
 
     assert user.reload.event_participation.set?(:high_seas)
+
+    user.update_column(:event_participation, 0)
+
+    HeartbeatIngest.call(
+      user: user,
+      mode: :import,
+      heartbeats: [ heartbeat ]
+    )
+
+    assert_not user.reload.event_participation.set?(:high_seas)
   end
 end