Skip to content

Events/i18n: Remove start/end display times from protos #8457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tristanlabelle merged 3 commits into from
May 10, 2026
Merged

Events/i18n: Remove start/end display times from protos #8457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff942d0
Events/i18n: Remove start/end display times from protos
tristanlabelle May 5, 2026
53b521b
reserve removed fields
tristanlabelle May 6, 2026
e001a74
Fix reserved syntax
tristanlabelle May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/backend/src/couchers/servicers/events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,6 @@ def event_to_pb(session: Session, occurrence: EventOccurrence, context: Couchers
start_time=Timestamp_from_datetime(occurrence.start_time),
end_time=Timestamp_from_datetime(occurrence.end_time),
timezone=occurrence.timezone,
start_time_display=str(occurrence.start_time),
end_time_display=str(occurrence.end_time),
attendance_state=attendancestate2api[attendance_state],
organizer=event.organizers.where(EventOrganizer.user_id == context.user_id).one_or_none() is not None,
subscriber=event.subscribers.where(EventSubscription.user_id == context.user_id).one_or_none() is not None,
Expand Down
32 changes: 0 additions & 32 deletions app/backend/src/tests/test_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@ def test_CreateEvent(db, push_collector: PushCollector, moderator: Moderator):
assert to_aware_datetime(res.start_time) == start_time
assert to_aware_datetime(res.end_time) == end_time
# assert res.timezone == "UTC"
assert res.start_time_display
assert res.end_time_display
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_GOING
assert res.organizer
assert res.subscriber
Expand Down Expand Up @@ -129,8 +127,6 @@ def test_CreateEvent(db, push_collector: PushCollector, moderator: Moderator):
assert to_aware_datetime(res.start_time) == start_time
assert to_aware_datetime(res.end_time) == end_time
# assert res.timezone == "UTC"
assert res.start_time_display
assert res.end_time_display
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_NOT_GOING
assert not res.organizer
assert not res.subscriber
Expand Down Expand Up @@ -163,8 +159,6 @@ def test_CreateEvent(db, push_collector: PushCollector, moderator: Moderator):
assert to_aware_datetime(res.start_time) == start_time
assert to_aware_datetime(res.end_time) == end_time
# assert res.timezone == "UTC"
assert res.start_time_display
assert res.end_time_display
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_NOT_GOING
assert not res.organizer
assert not res.subscriber
Expand Down Expand Up @@ -209,8 +203,6 @@ def test_CreateEvent(db, push_collector: PushCollector, moderator: Moderator):
assert to_aware_datetime(res.start_time) == start_time
assert to_aware_datetime(res.end_time) == end_time
# assert res.timezone == "UTC"
assert res.start_time_display
assert res.end_time_display
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_GOING
assert res.organizer
assert res.subscriber
Expand Down Expand Up @@ -246,8 +238,6 @@ def test_CreateEvent(db, push_collector: PushCollector, moderator: Moderator):
assert to_aware_datetime(res.start_time) == start_time
assert to_aware_datetime(res.end_time) == end_time
# assert res.timezone == "UTC"
assert res.start_time_display
assert res.end_time_display
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_NOT_GOING
assert not res.organizer
assert not res.subscriber
Expand Down Expand Up @@ -278,8 +268,6 @@ def test_CreateEvent(db, push_collector: PushCollector, moderator: Moderator):
assert to_aware_datetime(res.start_time) == start_time
assert to_aware_datetime(res.end_time) == end_time
# assert res.timezone == "UTC"
assert res.start_time_display
assert res.end_time_display
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_NOT_GOING
assert not res.organizer
assert not res.subscriber
Expand Down Expand Up @@ -582,8 +570,6 @@ def test_ScheduleEvent(db):
assert to_aware_datetime(res.start_time) == new_start_time
assert to_aware_datetime(res.end_time) == new_end_time
# assert res.timezone == "UTC"
assert res.start_time_display
assert res.end_time_display
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_GOING
assert res.organizer
assert res.subscriber
Expand Down Expand Up @@ -785,8 +771,6 @@ def test_UpdateEvent_single(db, moderator: Moderator):
assert to_aware_datetime(res.start_time) == start_time
assert to_aware_datetime(res.end_time) == end_time
# assert res.timezone == "UTC"
assert res.start_time_display
assert res.end_time_display
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_GOING
assert res.organizer
assert res.subscriber
Expand Down Expand Up @@ -819,8 +803,6 @@ def test_UpdateEvent_single(db, moderator: Moderator):
assert to_aware_datetime(res.start_time) == start_time
assert to_aware_datetime(res.end_time) == end_time
# assert res.timezone == "UTC"
assert res.start_time_display
assert res.end_time_display
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_NOT_GOING
assert not res.organizer
assert not res.subscriber
Expand Down Expand Up @@ -853,8 +835,6 @@ def test_UpdateEvent_single(db, moderator: Moderator):
assert to_aware_datetime(res.start_time) == start_time
assert to_aware_datetime(res.end_time) == end_time
# assert res.timezone == "UTC"
assert res.start_time_display
assert res.end_time_display
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_NOT_GOING
assert not res.organizer
assert not res.subscriber
Expand Down Expand Up @@ -895,8 +875,6 @@ def test_UpdateEvent_single(db, moderator: Moderator):
assert to_aware_datetime(res.start_time) == start_time
assert to_aware_datetime(res.end_time) == end_time
# assert res.timezone == "UTC"
assert res.start_time_display
assert res.end_time_display
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_GOING
assert res.organizer
assert res.subscriber
Expand Down Expand Up @@ -929,8 +907,6 @@ def test_UpdateEvent_single(db, moderator: Moderator):
assert to_aware_datetime(res.start_time) == start_time
assert to_aware_datetime(res.end_time) == end_time
# assert res.timezone == "UTC"
assert res.start_time_display
assert res.end_time_display
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_NOT_GOING
assert not res.organizer
assert not res.subscriber
Expand Down Expand Up @@ -961,8 +937,6 @@ def test_UpdateEvent_single(db, moderator: Moderator):
assert to_aware_datetime(res.start_time) == start_time
assert to_aware_datetime(res.end_time) == end_time
# assert res.timezone == "UTC"
assert res.start_time_display
assert res.end_time_display
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_NOT_GOING
assert not res.organizer
assert not res.subscriber
Expand Down Expand Up @@ -1174,8 +1148,6 @@ def test_GetEvent(db, moderator: Moderator):
assert to_aware_datetime(res.start_time) == start_time
assert to_aware_datetime(res.end_time) == end_time
# assert res.timezone == "UTC"
assert res.start_time_display
assert res.end_time_display
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_GOING
assert res.organizer
assert res.subscriber
Expand Down Expand Up @@ -1208,8 +1180,6 @@ def test_GetEvent(db, moderator: Moderator):
assert to_aware_datetime(res.start_time) == start_time
assert to_aware_datetime(res.end_time) == end_time
# assert res.timezone == "UTC"
assert res.start_time_display
assert res.end_time_display
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_NOT_GOING
assert not res.organizer
assert not res.subscriber
Expand Down Expand Up @@ -1242,8 +1212,6 @@ def test_GetEvent(db, moderator: Moderator):
assert to_aware_datetime(res.start_time) == start_time
assert to_aware_datetime(res.end_time) == end_time
# assert res.timezone == "UTC"
assert res.start_time_display
assert res.end_time_display
assert res.attendance_state == events_pb2.ATTENDANCE_STATE_NOT_GOING
assert not res.organizer
assert not res.subscriber
Expand Down
6 changes: 3 additions & 3 deletions app/proto/events.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ message Event {
// the tzdata timezone identifier
string timezone = 18;

// the start/end times as localized strings (according to the above timezone)
string start_time_display = 19;
string end_time_display = 20;
// start/end_time_display were unused and not localized
reserved 19, 20;
reserved "start_time_display", "end_time_display";

// the user's attendance state
AttendanceState attendance_state = 21;
Expand Down
8 changes: 0 additions & 8 deletions app/web/test/fixtures/events.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
"slug": "weekly-meetup",
"startTime": { "nanos": 0, "seconds": 1624934247.732 },
"endTime": { "nanos": 0, "seconds": 1624937847 },
"startTimeDisplay": "",
"endTimeDisplay": "",
"title": "Weekly Meetup",
"timezone": "Europe/Amsterdam"
},
Expand Down Expand Up @@ -68,8 +66,6 @@
"slug": "planting-season-meetup",
"startTime": { "nanos": 0, "seconds": 1625000420 },
"endTime": { "nanos": 0, "seconds": 1625004020 },
"startTimeDisplay": "",
"endTimeDisplay": "",
"title": "Planting Season Meetup",
"timezone": "Europe/Amsterdam"
},
Expand Down Expand Up @@ -106,8 +102,6 @@
"slug": "cherry-blossom-bike-ride",
"startTime": { "nanos": 0, "seconds": 1625000420 },
"endTime": { "nanos": 0, "seconds": 1625018400 },
"startTimeDisplay": "",
"endTimeDisplay": "",
"title": "Cherry Blossom Bike Ride around the entire Amsterdam because I like to write long event titles",
"timezone": "Europe/Amsterdam"
},
Expand Down Expand Up @@ -144,8 +138,6 @@
"slug": "cherry-blossom-bike-ride",
"startTime": { "nanos": 0, "seconds": 1625000420 },
"endTime": { "nanos": 0, "seconds": 1625018400 },
"startTimeDisplay": "",
"endTimeDisplay": "",
"title": "A cancelled event",
"timezone": "Europe/Amsterdam"
}
Expand Down
Loading