Fix up merge issues

Couchers-org · May 19, 2024 · a20f1ce · a20f1ce
1 parent 282f1c8
commit a20f1ce
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 21 deletions.
diff --git a/app/backend/proto/internal/jobs.proto b/app/backend/proto/internal/jobs.proto
@@ -34,13 +34,3 @@ message FanNotificationsPayload {
   string fan_func = 9;
   string fan_func_data = 10;
 }
-
-message GenerateCreateEventNotificationsPayload {
-  int64 occurrence_id = 1;
-}
-
-message GenerateUpdateEventNotificationsPayload {
-  int64 occurrence_id = 1;
-  int64 updater_user_id = 2;
-  repeated string updated_fields = 3;
-}
diff --git a/app/backend/src/couchers/constants.py b/app/backend/src/couchers/constants.py
@@ -28,6 +28,3 @@
 DATETIME_INFINITY = pytz.UTC.localize(datetime(9876, 12, 31, hour=23, minute=59, second=59))
 
 SERVER_THREADS = 128
-
-# default digest settings
-DIGEST_FREQUENCY = timedelta(hours=48)
diff --git a/app/backend/src/couchers/models.py b/app/backend/src/couchers/models.py
@@ -2157,12 +2157,6 @@ def unpack(self):
     event__update = ("event", "update", [dt.push, dt.digest], True)
     event__invite_organizer = ("event", "invite_organizer", [dt.email, dt.push, dt.digest], True)
 
-    # events
-    event__create = ("event", "create", [dt.push, dt.digest])
-    event__update = ("event", "update", [dt.push, dt.digest])
-    event__commented = ("event", "commented", [dt.push, dt.digest])
-    event__invite_organizer = ("event", "invite_organizer", [dt.email, dt.push, dt.digest])
-
 
 class NotificationPreference(Base):
     __tablename__ = "notification_preferences"

diff --git a/app/backend/src/couchers/servicers/events.py b/app/backend/src/couchers/servicers/events.py
@@ -37,8 +37,6 @@
 
 logger = logging.getLogger(__name__)
 
-logger = logging.getLogger(__name__)
-
 attendancestate2sql = {
     events_pb2.AttendanceState.ATTENDANCE_STATE_NOT_GOING: None,
     events_pb2.AttendanceState.ATTENDANCE_STATE_GOING: AttendeeStatus.going,