FlowyLabs/llink
1
0
Fork 0
Code Issues 71 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

cleanup message retention from orion api

Browse Source
This commit is contained in:
talksik
2026-04-07 16:10:53 -07:00
parent a9a51f499e
commit 0ad74d2f8f
9 changed files with 12 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/cmd/orion/main.go
-1
View File
@@ -127,7 +127,6 @@ func main() {
mux.Handle("GET /networks", withAuth(h.ListNetworks))
mux.Handle("GET /networks/{id}", withAuth(h.GetNetwork))
mux.Handle("POST /networks/{id}/members", withAuth(h.AddMembersToNetwork))
mux.Handle("PUT /networks/{id}/message-retention", withAuth(h.SetMessageRetentionHours))
// mux.Handle("DELETE /networks/{id}/members/{humanId}", withAuth(h.RemoveMemberFromNetwork))
// Network Invitations
go/internal/handler/handler.go
-76
View File
@@ -61,7 +61,6 @@ type Network struct {
Name string `json:"name"`
AdminHuman Human `json:"admin_human"`
Humans []Human `json:"humans"`
MessageRetentionHours int `json:"message_retention_hours"`
CreatedAt time.Time `json:"created_at"`
}
@@ -91,14 +90,6 @@ type AddMembersToNetworkRequest struct {
EmailAddresses []string `json:"email_addresses"`
}
type SetOpenStreamCapacityRequest struct {
Capacity int `json:"capacity"`
}
type SetMessageRetentionHoursRequest struct {
Hours int `json:"hours"`
}
type MembersRequest struct {
Emails []string `json:"emails"`
}
@@ -675,72 +666,6 @@ func (h *Handler) RevokeInvitation(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusNoContent)
}
// SetMessageRetentionHours updates the message retention window for a network (admin-only)
func (h *Handler) SetMessageRetentionHours(w http.ResponseWriter, r *http.Request) {
humanId, ok := middleware.HumanIdFromContext(r.Context())
if !ok {
http.Error(w, "unauthorized", http.StatusUnauthorized)
return
}
networkID := r.PathValue("id")
if networkID == "" {
http.Error(w, "network id is required", http.StatusBadRequest)
return
}
// Fetch network to verify admin
net, err := h.networkSvc.GetByID(r.Context(), networkID)
if err != nil {
if errors.Is(err, network.ErrNotFound) {
http.Error(w, "network not found", http.StatusNotFound)
return
}
slog.Error("failed to get network", "error", err, "network_id", networkID)
http.Error(w, "internal server error", http.StatusInternalServerError)
return
}
if net.AdminHumanId != humanId {
http.Error(w, "only the network admin can change this setting", http.StatusForbidden)
return
}
var req SetMessageRetentionHoursRequest
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
http.Error(w, "invalid request body", http.StatusBadRequest)
return
}
if err := h.networkSvc.SetMessageRetentionHours(r.Context(), networkID, req.Hours); err != nil {
if errors.Is(err, network.ErrInvalidRetentionHours) {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
slog.Error("failed to set message retention hours", "error", err, "network_id", networkID)
http.Error(w, "internal server error", http.StatusInternalServerError)
return
}
// Return updated network
updatedNet, err := h.networkSvc.GetByID(r.Context(), networkID)
if err != nil {
slog.Error("failed to get network after update", "error", err, "network_id", networkID)
http.Error(w, "internal server error", http.StatusInternalServerError)
return
}
resp, err := h.networkToDTO(r.Context(), updatedNet)
if err != nil {
slog.Error("failed to convert network to DTO", "error", err, "network_id", networkID)
http.Error(w, "internal server error", http.StatusInternalServerError)
return
}
w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(resp)
}
// DownloadParticleMedia returns a fresh signed download URL for media/file particles
func (h *Handler) DownloadParticleMedia(w http.ResponseWriter, r *http.Request) {
_, ok := middleware.EmailFromContext(r.Context())
@@ -1056,7 +981,6 @@ func (h *Handler) networkToDTO(ctx context.Context, n *network.Network) (Network
Name: n.Name,
AdminHuman: humanToDTO(adminHuman),
Humans: humans,
MessageRetentionHours: n.MessageRetentionHours,
CreatedAt: n.CreatedAt,
}, nil
}
go/internal/network/models.go
-3
View File
@@ -7,9 +7,6 @@ type Network struct {
Name string
AdminHumanId string
MemberHumanIds []string
OpenStreamCapacity int
OpenStreamCount int
MessageRetentionHours int
CreatedAt time.Time
}
go/internal/network/repository.go
+6 -21
View File
@@ -35,7 +35,6 @@ type repository interface {
getMemberHumanIds(ctx context.Context, networkID string) ([]string, error)
getNetworksForHuman(ctx context.Context, humanId string) ([]*Network, error)
isMember(ctx context.Context, networkID, humanId string) (bool, error)
updateMessageRetentionHours(ctx context.Context, id string, hours int) error
// Invitations
createInvitation(ctx context.Context, networkID, email string) error
@@ -61,9 +60,9 @@ func (r *repositoryImpl) create(ctx context.Context, name, adminHumanId string)
var n Network
err = r.pool.QueryRow(ctx,
`INSERT INTO networks (id, name, admin_human_id) VALUES ($1, $2, $3)
RETURNING id, name, admin_human_id, open_stream_capacity, open_stream_count, message_retention_hours, created_at`,
RETURNING id, name, admin_human_id, created_at`,
id.String(), name, adminHumanId,
).Scan(&n.ID, &n.Name, &n.AdminHumanId, &n.OpenStreamCapacity, &n.OpenStreamCount, &n.MessageRetentionHours, &n.CreatedAt)
).Scan(&n.ID, &n.Name, &n.AdminHumanId, &n.CreatedAt)
if err != nil {
return nil, err
}
@@ -75,9 +74,9 @@ func (r *repositoryImpl) create(ctx context.Context, name, adminHumanId string)
func (r *repositoryImpl) getByID(ctx context.Context, id string) (*Network, error) {
var n Network
err := r.pool.QueryRow(ctx,
`SELECT id, name, admin_human_id, open_stream_capacity, open_stream_count, message_retention_hours, created_at FROM networks WHERE id = $1`,
`SELECT id, name, admin_human_id, created_at FROM networks WHERE id = $1`,
id,
).Scan(&n.ID, &n.Name, &n.AdminHumanId, &n.OpenStreamCapacity, &n.OpenStreamCount, &n.MessageRetentionHours, &n.CreatedAt)
).Scan(&n.ID, &n.Name, &n.AdminHumanId, &n.CreatedAt)
if err != nil {
if errors.Is(err, pgx.ErrNoRows) {
return nil, errNotFound
@@ -158,7 +157,7 @@ func (r *repositoryImpl) getMemberHumanIds(ctx context.Context, networkID string
func (r *repositoryImpl) getNetworksForHuman(ctx context.Context, humanId string) ([]*Network, error) {
rows, err := r.pool.Query(ctx,
`SELECT n.id, n.name, n.admin_human_id, n.open_stream_capacity, n.open_stream_count, n.message_retention_hours, n.created_at
`SELECT n.id, n.name, n.admin_human_id, n.created_at
FROM networks n
WHERE n.admin_human_id = $1
OR EXISTS (SELECT 1 FROM network_members nm WHERE nm.network_id = n.id AND nm.human_id = $1)`,
@@ -172,7 +171,7 @@ func (r *repositoryImpl) getNetworksForHuman(ctx context.Context, humanId string
var networks []*Network
for rows.Next() {
var n Network
if err := rows.Scan(&n.ID, &n.Name, &n.AdminHumanId, &n.OpenStreamCapacity, &n.OpenStreamCount, &n.MessageRetentionHours, &n.CreatedAt); err != nil {
if err := rows.Scan(&n.ID, &n.Name, &n.AdminHumanId, &n.CreatedAt); err != nil {
return nil, err
}
networks = append(networks, &n)
@@ -269,17 +268,3 @@ func (r *repositoryImpl) deleteInvitation(ctx context.Context, networkID, email
)
return err
}
func (r *repositoryImpl) updateMessageRetentionHours(ctx context.Context, id string, hours int) error {
result, err := r.pool.Exec(ctx,
`UPDATE networks SET message_retention_hours = $1 WHERE id = $2`,
hours, id,
)
if err != nil {
return err
}
if result.RowsAffected() == 0 {
return errNotFound
}
return nil
}
go/internal/network/service.go
-13
View File
@@ -26,8 +26,6 @@ type Service interface {
RemoveMember(ctx context.Context, networkID, humanId string) error
ListForHuman(ctx context.Context, humanId string) ([]*Network, error)
IsMember(ctx context.Context, networkID, humanId string) (bool, error)
// SetMessageRetentionHours sets how long messages remain visible (24–336 hours).
SetMessageRetentionHours(ctx context.Context, id string, hours int) error
// Invitations (email-based, for users who haven't registered yet)
InviteByEmail(ctx context.Context, networkID string, emails []string) error
@@ -118,17 +116,6 @@ func (s *serviceImpl) IsMember(ctx context.Context, networkID, humanId string) (
return s.repo.isMember(ctx, networkID, humanId)
}
func (s *serviceImpl) SetMessageRetentionHours(ctx context.Context, id string, hours int) error {
if hours < 24 || hours > 336 {
return ErrInvalidRetentionHours
}
err := s.repo.updateMessageRetentionHours(ctx, id, hours)
if errors.Is(err, errNotFound) {
return ErrNotFound
}
return err
}
// Invitation methods
func (s *serviceImpl) InviteByEmail(ctx context.Context, networkID string, emails []string) error {
go/migrations/000011_message_retention.down.sql
-2
View File
@@ -1,2 +0,0 @@
ALTER TABLE networks
DROP COLUMN IF EXISTS message_retention_hours;
go/migrations/000011_message_retention.up.sql
-2
View File
@@ -1,2 +0,0 @@
ALTER TABLE networks
ADD COLUMN message_retention_hours INTEGER NOT NULL DEFAULT 24;
go/migrations/000011_remove_network_capacity.down.sql
+3
View File
@@ -0,0 +1,3 @@
ALTER TABLE networks
ADD COLUMN open_stream_capacity INTEGER NOT NULL DEFAULT 5,
ADD COLUMN open_stream_count INTEGER NOT NULL DEFAULT 0;
go/migrations/000011_remove_network_capacity.up.sql
+3
View File
@@ -0,0 +1,3 @@
ALTER TABLE networks
DROP COLUMN IF EXISTS open_stream_capacity,
DROP COLUMN IF EXISTS open_stream_count;