Allow multiple Meetups on different services and link to them

Author: marcoroth

_includes/meetup.html

@@ -1,20 +1,52 @@
-<div class="list-item {{ meetup.date | date: '%Y%m' }} {% continent %}{{ meetup.location | split: ', ' | last }}{% endcontinent %}">
+{% comment %} Handle both single meetup and grouped meetups {% endcomment %}
+{% if meetup_group %}
+  {% assign meetups_to_display = meetup_group %}
+{% else %}
+  {% assign meetups_to_display = meetup | split: "" | push: meetup %}
+{% endif %}
+
+{% assign first_meetup = meetups_to_display | first %}
+
+<div class="list-item {{ first_meetup.date | date: '%Y%m' }} {% continent %}{{ first_meetup.location | split: ', ' | last }}{% endcontinent %}">
   <dt>
-    {% if meetup.url %}
-      <a href="{{ meetup.url }}">{{ meetup.name }}</a>
+    {% if first_meetup.url %}
+      <a href="{{ first_meetup.url }}">{{ first_meetup.name }}</a>
     {% else %}
-      <a>{{ meetup.name }}</a>
+      <a>{{ first_meetup.name }}</a>
     {% endif %}
 
-    {% if meetup.status %}
-      <div class="status" data-phrase="{{ meetup.status }}"></div>
+    {% if first_meetup.status %}
+      <div class="status" data-phrase="{{ first_meetup.status }}"></div>
     {% endif %}
   </dt>
 
   <dd>
     <ul>
-      <li>{{ meetup.date | date: "%B %-d, %Y" }}</li>
-      <li>{{ meetup.location }}</li>
+      <li>{{ first_meetup.date | date: "%B %-d, %Y" }}</li>
+      <li>{{ first_meetup.location }}</li>
+      {% if meetups_to_display.size > 1 %}
+        <li>
+          {% for m in meetups_to_display %}
+            {% assign detected_service = m.service %}
+            {% unless detected_service %}
+              {% if m.url contains "meetup.com" %}
+                {% assign detected_service = "meetup" %}
+              {% elsif m.url contains "lu.ma" or m.url contains "luma.com" %}
+                {% assign detected_service = "luma" %}
+              {% endif %}
+            {% endunless %}
+
+            {% if detected_service == "meetup" %}
+              <a href="{{ m.url }}">Meetup.com</a>
+            {% elsif detected_service == "luma" %}
+              <a href="{{ m.url }}">Luma.com</a>
+            {% else %}
+              <a href="{{ m.url }}">Link</a>
+            {% endif %}
+            {% unless forloop.last %} • {% endunless %}
+          {% endfor %}
+        </li>
+      {% endif %}
     </ul>
   </dd>
 </div>

meetups/index.html

@@ -9,10 +9,33 @@
 
     {% include filters.html %}
 
+    {% comment %} Group meetups by group name and date {% endcomment %}
+    {% assign processed = "" | split: "" %}
+
     {% for meetup in meetups %}
       {% assign date = meetup.date | date: "%s" | plus: 0 %}
       {% if date >= now %}
-        {% include meetup.html %}
+        {% assign group_name = meetup.name | split: " - " | first %}
+        {% assign key = group_name | append: "|" | append: meetup.date %}
+
+        {% unless processed contains key %}
+          {% assign processed = processed | push: key %}
+
+          {% comment %} Find all meetups for this group and date {% endcomment %}
+          {% assign group_meetups = "" | split: "" %}
+          {% for m in meetups %}
+            {% assign m_date = m.date | date: "%s" | plus: 0 %}
+            {% if m_date >= now %}
+              {% assign m_group = m.name | split: " - " | first %}
+              {% if m_group == group_name and m.date == meetup.date %}
+                {% assign group_meetups = group_meetups | push: m %}
+              {% endif %}
+            {% endif %}
+          {% endfor %}
+
+          {% assign meetup_group = group_meetups %}
+          {% include meetup.html %}
+        {% endunless %}
       {% endif %}
     {% endfor %}
   </dl>

src/data_file_validator.rb

@@ -37,13 +37,24 @@ def validate
     end
 
     if @type == :meetup
-      event_groups_by_date = events.map { |event| [event["name"].split(" - ").first, event["date"]] }
+      events_by_group_and_date = events.group_by { |event|
+        [event["name"].split(" - ").first, event["date"]]
+      }
 
-      duplicate_events = event_groups_by_date.tally.select { |group, count| count > 1 }
+      events_by_group_and_date.each do |(group, date), group_events|
+        next if group_events.size == 1
+
+        services = group_events.map { |event|
+          event["service"] || detect_service_from_url(event["url"])
+        }.compact
+
+        if services.uniq.size == services.size
+          next
+        end
 
-      duplicate_events.each do |(group, date), count|
         @duplicate_events_error = true
-        puts "Meetup Group '#{group}' has #{count} events on #{date.iso8601}"
+        duplicate_services = services.group_by { |s| s }.select { |_, v| v.size > 1 }.keys
+        puts "Meetup Group '#{group}' has multiple events on #{date.iso8601} from the same service(s): #{duplicate_services.join(', ')}"
       end
     end
   end
@@ -76,4 +87,17 @@ def required_keys(type = @type)
       raise "required_keys: unknown type '#{type}'"
     end
   end
+
+  def detect_service_from_url(url)
+    return nil unless url
+
+    case url
+    when /meetup\.com/
+      "meetup"
+    when /lu\.ma/, /luma\.com/
+      "luma"
+    else
+      nil
+    end
+  end
 end

src/events/luma_event.rb

@@ -36,6 +36,6 @@ def event_end_time
   end
 
   def event_url
-    object.description.scan(/https:\/\/lu.ma\/.+/).first
+    object.description.scan(/https:\/\/lu.ma\/.+/).first || object.description.scan(/https:\/\/luma\.com\/.+/).first
   end
 end

src/meetups_file_entry.rb

@@ -1,10 +1,11 @@
-MeetupsFileEntry = Data.define(:name, :location, :date, :start_time, :end_time, :url, :status) do
+MeetupsFileEntry = Data.define(:name, :location, :date, :start_time, :end_time, :url, :status, :service) do
   attr_reader :group
 
-  def initialize(name:, location:, date:, start_time:, end_time:, url:, status: nil, group: nil)
+  def initialize(name:, location:, date:, start_time:, end_time:, url:, status: nil, service: nil, group: nil)
     date = date.is_a?(Date) ? date : Date.parse(date)
     @group = group
-    super(name:, location:, date:, start_time:, end_time:, url:, status:)
+    service ||= detect_service(url)
+    super(name:, location:, date:, start_time:, end_time:, url:, status:, service:)
   end
 
   def self.from_yaml_item(hash)
@@ -16,14 +17,28 @@ def self.from_yaml_item(hash)
       end_time: hash["end_time"],
       url: hash["url"],
       group: hash["group"],
-      status: hash["status"]
+      status: hash["status"],
+      service: hash["service"]
     )
   end
 
   def service_id
     AbstractEvent.service_id_for_url(url)
   end
 
+  def detect_service(url)
+    return nil unless url
+
+    case url
+    when /meetup\.com/
+      "meetup"
+    when /lu\.ma/, /luma\.com/
+      "luma"
+    else
+      nil
+    end
+  end
+
   def to_hash
     hash = {
       "name" => name,
@@ -35,6 +50,7 @@ def to_hash
     }
 
     hash["status"] = status if status.present?
+    hash["service"] = service if service.present?
 
     hash
   end