Resolve rebase conflicts: dedupe discussion methods, formatting

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: aapeliv

app/backend/src/couchers/servicers/discussions.py

@@ -313,70 +313,3 @@ def ListMyCommunitiesDiscussions(
             discussions=[discussion_to_pb(session, d, context) for d in discussions[:page_size]],
             next_page_token=str(discussions[-1].id) if len(discussions) > page_size else None,
         )
-
-    def UpdateDiscussion(
-        self, request: discussions_pb2.UpdateDiscussionReq, context: CouchersContext, session: Session
-    ) -> discussions_pb2.Discussion:
-        discussion = session.execute(
-            select(Discussion).where(Discussion.id == request.discussion_id)
-        ).scalar_one_or_none()
-        if not discussion:
-            context.abort_with_error_code(grpc.StatusCode.NOT_FOUND, "discussion_not_found")
-        if discussion.deleted is not None:
-            context.abort_with_error_code(grpc.StatusCode.FAILED_PRECONDITION, "discussion_deleted")
-        if context.user_id != discussion.creator_user_id:
-            context.abort_with_error_code(grpc.StatusCode.PERMISSION_DENIED, "discussion_edit_permission_denied")
-
-        if request.HasField("title"):
-            new_title = request.title.value.strip()
-            if not new_title:
-                context.abort_with_error_code(grpc.StatusCode.INVALID_ARGUMENT, "missing_discussion_title")
-            discussion.title = new_title
-
-        if request.HasField("content"):
-            new_content = request.content.value.strip()
-            if not new_content:
-                context.abort_with_error_code(grpc.StatusCode.INVALID_ARGUMENT, "missing_discussion_content")
-            discussion.content = new_content
-
-        discussion.last_edited = now()
-
-        log_event(
-            context,
-            session,
-            "discussion.updated",
-            {
-                "discussion_id": discussion.id,
-            },
-        )
-
-        return discussion_to_pb(session, discussion, context)
-
-    def DeleteDiscussion(
-        self, request: discussions_pb2.DeleteDiscussionReq, context: CouchersContext, session: Session
-    ) -> empty_pb2.Empty:
-        discussion = session.execute(
-            select(Discussion).where(Discussion.id == request.discussion_id)
-        ).scalar_one_or_none()
-        if not discussion:
-            context.abort_with_error_code(grpc.StatusCode.NOT_FOUND, "discussion_not_found")
-        if discussion.deleted is not None:
-            context.abort_with_error_code(grpc.StatusCode.FAILED_PRECONDITION, "discussion_deleted")
-
-        is_creator = context.user_id == discussion.creator_user_id
-        is_moderator = can_moderate_node(session, context.user_id, discussion.owner_cluster.parent_node_id)
-        if not is_creator and not is_moderator:
-            context.abort_with_error_code(grpc.StatusCode.PERMISSION_DENIED, "discussion_delete_permission_denied")
-
-        discussion.deleted = now()
-
-        log_event(
-            context,
-            session,
-            "discussion.deleted",
-            {
-                "discussion_id": discussion.id,
-            },
-        )
-
-        return empty_pb2.Empty()

app/backend/src/couchers/servicers/threads.py

@@ -260,9 +260,7 @@ def GetThread(
             visible_reply_count = (
                 where_moderated_content_visible(
                     where_users_column_visible(
-                        select(func.count(Reply.id))
-                        .where(Reply.comment_id == Comment.id)
-                        .where(Reply.deleted == None),
+                        select(func.count(Reply.id)).where(Reply.comment_id == Comment.id).where(Reply.deleted == None),
                         context,
                         Reply.author_user_id,
                     ),