Correct attendee ical formatting

opencal-me · Sep 24, 2023 · 64853f4 · 64853f4
1 parent dc367fa
commit 64853f4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -22,7 +22,7 @@ def calendar
         cal = Icalendar::Calendar.new
         cal.append_custom_property("x_wr_calname", "opencal")
         cal.add_timezone(
-          TZInfo::Timezone.get(user.time_zone).ical_timezone(Time.current),
+          TZInfo::Timezone.get(user.time_zone.name).ical_timezone(Time.current),
         )
         cal.source = calendar_user_url(
           user,

diff --git a/app/models/activity.rb b/app/models/activity.rb
@@ -367,7 +367,11 @@ def save_to_icalendar_event(event)
     event.description = description
     event.location = location
     reservations.find_each do |reservation|
-      event.append_attendee("mailto:" + reservation.email_with_name)
+      attendee = Icalendar::Values::CalAddress.new(
+        "mailto:#{reservation.email}",
+        cn: reservation.name,
+      )
+      event.append_attendee(attendee)
     end
     attachment = Icalendar::Values::Uri.new(
       join_activity_url(self),