Take control over your live stream video by running it yourself. Streaming + chat out of the box.
HTML activitypubbroadcastingchatdecentralizedfederationfediversegolanghacktoberfesthlslivelivestreamowncastrtmpself-hostedstreaming-videovideo
feat(web,server): featured-stream canonical priority ordering
Gabe Kangasce0459cb070c
diff --git a/db/models.go b/db/models.goindex ab0d53a92d..d67ee36bd4 100644--- a/db/models.go+++ b/db/models.go@@ -97,6 +97,7 @@ type FederatedServer struct {AcceptedAt sql.NullTimeRejectedAt sql.NullTimeFollowStatus sql.NullString+ Priority int64}type IpBan struct {diff --git a/db/query.sql b/db/query.sqlindex 93079acbf1..37234fabef 100644--- a/db/query.sql+++ b/db/query.sql@@ -312,10 +312,10 @@ DELETE FROM users WHERE id = ?;-- Federated servers queries-- name: GetFederatedServers :many-SELECT id, iri, name, logo_url, is_online, stream_title, stream_description, stream_tags, thumbnail_url, last_seen_online, last_status_update, added_at, followed_at, pending, username, display_name, summary, accepted_at, rejected_at, follow_status FROM federated_servers ORDER BY added_at DESC;+SELECT id, iri, name, logo_url, is_online, stream_title, stream_description, stream_tags, thumbnail_url, last_seen_online, last_status_update, added_at, followed_at, pending, username, display_name, summary, accepted_at, rejected_at, follow_status, priority FROM federated_servers ORDER BY priority ASC, added_at ASC;-- name: GetFederatedServer :one-SELECT id, iri, name, logo_url, is_online, stream_title, stream_description, stream_tags, thumbnail_url, last_seen_online, last_status_update, added_at, followed_at, pending, username, display_name, summary, accepted_at, rejected_at, follow_status FROM federated_servers WHERE iri = ?;+SELECT id, iri, name, logo_url, is_online, stream_title, stream_description, stream_tags, thumbnail_url, last_seen_online, last_status_update, added_at, followed_at, pending, username, display_name, summary, accepted_at, rejected_at, follow_status, priority FROM federated_servers WHERE iri = ?;-- name: AddFederatedServer :execINSERT INTO federated_servers(iri, name, logo_url, followed_at, pending, username, follow_status) values(?, ?, ?, ?, ?, ?, ?);@@ -335,5 +335,11 @@ UPDATE federated_servers SET follow_status = ?, pending = ?, accepted_at = ?, re-- name: UpdateFederatedServerMetadata :execUPDATE federated_servers SET name = ?, display_name = ?, summary = ?, logo_url = ? WHERE iri = ?;+-- name: SetFederatedServerPriority :exec+UPDATE federated_servers SET priority = ? WHERE id = ?;++-- name: GetMaxAcceptedFederatedServerPriority :one+SELECT COALESCE(MAX(priority), 0) FROM federated_servers WHERE follow_status = 'accepted';+-- name: GetPendingFederatedServers :many-SELECT id, iri, name, logo_url, is_online, stream_title, stream_description, stream_tags, thumbnail_url, last_seen_online, last_status_update, added_at, followed_at, pending, username, display_name, summary, accepted_at, rejected_at, follow_status FROM federated_servers WHERE pending = true ORDER BY added_at DESC;+SELECT id, iri, name, logo_url, is_online, stream_title, stream_description, stream_tags, thumbnail_url, last_seen_online, last_status_update, added_at, followed_at, pending, username, display_name, summary, accepted_at, rejected_at, follow_status, priority FROM federated_servers WHERE pending = true ORDER BY added_at DESC;diff --git a/db/query.sql.go b/db/query.sql.goindex b434087cd1..7ea1d1647e 100644--- a/db/query.sql.go+++ b/db/query.sql.go@@ -536,7 +536,7 @@ func (q *Queries) GetAuthForUsers(ctx context.Context, userIds []string) ([]GetA}const getFederatedServer = `-- name: GetFederatedServer :one-SELECT id, iri, name, logo_url, is_online, stream_title, stream_description, stream_tags, thumbnail_url, last_seen_online, last_status_update, added_at, followed_at, pending, username, display_name, summary, accepted_at, rejected_at, follow_status FROM federated_servers WHERE iri = ?+SELECT id, iri, name, logo_url, is_online, stream_title, stream_description, stream_tags, thumbnail_url, last_seen_online, last_status_update, added_at, followed_at, pending, username, display_name, summary, accepted_at, rejected_at, follow_status, priority FROM federated_servers WHERE iri = ?`func (q *Queries) GetFederatedServer(ctx context.Context, iri string) (FederatedServer, error) {@@ -563,13 +563,14 @@ func (q *Queries) GetFederatedServer(ctx context.Context, iri string) (Federated&i.AcceptedAt,&i.RejectedAt,&i.FollowStatus,+ &i.Priority,)return i, err}const getFederatedServers = `-- name: GetFederatedServers :many-SELECT id, iri, name, logo_url, is_online, stream_title, stream_description, stream_tags, thumbnail_url, last_seen_online, last_status_update, added_at, followed_at, pending, username, display_name, summary, accepted_at, rejected_at, follow_status FROM federated_servers ORDER BY added_at DESC+SELECT id, iri, name, logo_url, is_online, stream_title, stream_description, stream_tags, thumbnail_url, last_seen_online, last_status_update, added_at, followed_at, pending, username, display_name, summary, accepted_at, rejected_at, follow_status, priority FROM federated_servers ORDER BY priority ASC, added_at ASC`// Federated servers queries@@ -603,6 +604,7 @@ func (q *Queries) GetFederatedServers(ctx context.Context) ([]FederatedServer, e&i.AcceptedAt,&i.RejectedAt,&i.FollowStatus,+ &i.Priority,); err != nil {return nil, err}@@ -923,6 +925,17 @@ func (q *Queries) GetLocalPostCount(ctx context.Context) (int64, error) {return count, err}+const getMaxAcceptedFederatedServerPriority = `-- name: GetMaxAcceptedFederatedServerPriority :one+SELECT COALESCE(MAX(priority), 0) FROM federated_servers WHERE follow_status = 'accepted'+`++func (q *Queries) GetMaxAcceptedFederatedServerPriority(ctx context.Context) (interface{}, error) {+ row := q.db.QueryRowContext(ctx, getMaxAcceptedFederatedServerPriority)+ var coalesce interface{}+ err := row.Scan(&coalesce)+ return coalesce, err+}+const getMessagesFromUser = `-- name: GetMessagesFromUser :manySELECT id, body, hidden_at, timestamp FROM messages WHERE eventType = 'CHAT' AND user_id = ? ORDER BY TIMESTAMP DESC`@@ -1109,7 +1122,7 @@ func (q *Queries) GetPendingFeaturedFollowRequests(ctx context.Context) ([]GetPe}const getPendingFederatedServers = `-- name: GetPendingFederatedServers :many-SELECT id, iri, name, logo_url, is_online, stream_title, stream_description, stream_tags, thumbnail_url, last_seen_online, last_status_update, added_at, followed_at, pending, username, display_name, summary, accepted_at, rejected_at, follow_status FROM federated_servers WHERE pending = true ORDER BY added_at DESC+SELECT id, iri, name, logo_url, is_online, stream_title, stream_description, stream_tags, thumbnail_url, last_seen_online, last_status_update, added_at, followed_at, pending, username, display_name, summary, accepted_at, rejected_at, follow_status, priority FROM federated_servers WHERE pending = true ORDER BY added_at DESC`func (q *Queries) GetPendingFederatedServers(ctx context.Context) ([]FederatedServer, error) {@@ -1142,6 +1155,7 @@ func (q *Queries) GetPendingFederatedServers(ctx context.Context) ([]FederatedSe&i.AcceptedAt,&i.RejectedAt,&i.FollowStatus,+ &i.Priority,); err != nil {return nil, err}@@ -1812,6 +1826,20 @@ func (q *Queries) SetAccessTokenToOwner(ctx context.Context, arg SetAccessTokenTreturn err}+const setFederatedServerPriority = `-- name: SetFederatedServerPriority :exec+UPDATE federated_servers SET priority = ? WHERE id = ?+`++type SetFederatedServerPriorityParams struct {+ Priority int64+ ID int64+}++func (q *Queries) SetFederatedServerPriority(ctx context.Context, arg SetFederatedServerPriorityParams) error {+ _, err := q.db.ExecContext(ctx, setFederatedServerPriority, arg.Priority, arg.ID)+ return err+}+const setUserAsAuthenticated = `-- name: SetUserAsAuthenticated :execUPDATE users SET authenticated_at = CURRENT_TIMESTAMP WHERE id = ?`diff --git a/models/federatedserver.go b/models/federatedserver.goindex 3ee3c96467..a0b352031b 100644--- a/models/federatedserver.go+++ b/models/federatedserver.go@@ -30,6 +30,7 @@ type FederatedServer struct {AcceptedAt *time.Time `json:"acceptedAt,omitempty"`RejectedAt *time.Time `json:"rejectedAt,omitempty"`FollowStatus string `json:"followStatus"`+ Priority int64 `json:"priority"`}// FederatedStreamUpdate represents stream metadata for ActivityPub handlers.@@ -61,6 +62,7 @@ func (f *FederatedServer) FromDatabaseModel(dbServer db.FederatedServer) {f.Summary = nullStringToPointer(dbServer.Summary)f.AcceptedAt = nullTimeToPointer(dbServer.AcceptedAt)f.RejectedAt = nullTimeToPointer(dbServer.RejectedAt)+ f.Priority = dbServer.Priority// Default follow status to "pending" if not setif dbServer.FollowStatus.Valid {diff --git a/openapi.yaml b/openapi.yamlindex 3549a07b25..d0dab3da6f 100644--- a/openapi.yaml+++ b/openapi.yaml@@ -2903,6 +2903,60 @@ paths:responses:'204':$ref: '#/components/responses/204'+ /admin/federation/servers/{id}/reorder:+ put:+ summary: Move a federated server up or down in the priority order+ operationId: ReorderFederatedServer+ tags: ['Internal', 'Admin', 'Federation']+ security:+ - BasicAuth: []+ parameters:+ - name: id+ in: path+ required: true+ description: ID of the federated server to reorder+ schema:+ type: integer+ requestBody:+ required: true+ content:+ application/json:+ schema:+ type: object+ required:+ - direction+ properties:+ direction:+ type: string+ enum: [up, down]+ description: Move the server up (higher priority) or down (lower priority)+ responses:+ '200':+ description: Federated server reordered successfully+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/BaseAPIResponse'+ '400':+ $ref: '#/components/responses/400'+ '401':+ $ref: '#/components/responses/401BasicAuth'+ default:+ $ref: '#/components/responses/Default'+ options:+ operationId: ReorderFederatedServerOptions+ x-internal: true+ tags: ['Objects', 'Internal', 'Admin', 'Federation']+ parameters:+ - name: id+ in: path+ required: true+ description: ID of the federated server to reorder+ schema:+ type: integer+ responses:+ '204':+ $ref: '#/components/responses/204'/admin/federation/feature-requests:get:summary: Get pending requests from other servers to feature this server's streamdiff --git a/persistence/federatedserversrepository/federatedserversrepository.go b/persistence/federatedserversrepository/federatedserversrepository.goindex e17b010737..680971309d 100644--- a/persistence/federatedserversrepository/federatedserversrepository.go+++ b/persistence/federatedserversrepository/federatedserversrepository.go@@ -17,4 +17,6 @@ type FederatedServersRepository interface {UpdateFollowStatus(iri, followStatus string, pending bool, acceptedAt, rejectedAt *time.Time) errorUpdateServerMetadata(iri, name, displayName, summary, logoURL string) errorGetPendingFederatedServers() ([]models.FederatedServer, error)+ AssignNextPriority(iri string) error+ ReorderFederatedServer(id int64, direction string) error}diff --git a/persistence/federatedserversrepository/sqlfederatedserversrepository.go b/persistence/federatedserversrepository/sqlfederatedserversrepository.goindex 7ce4f8d80f..283c2a6980 100644--- a/persistence/federatedserversrepository/sqlfederatedserversrepository.go+++ b/persistence/federatedserversrepository/sqlfederatedserversrepository.go@@ -2,6 +2,7 @@ package federatedserversrepositoryimport ("context"+ "fmt""time""github.com/owncast/owncast/db"@@ -191,3 +192,114 @@ func (r *SqlFederatedServersRepository) GetPendingFederatedServers() ([]models.Freturn servers, nil}++// AssignNextPriority sets the priority of the accepted server with the given+// IRI to MAX(priority)+1 among all currently accepted servers. Called when+// a remote server accepts our Follow so newly accepted servers enter at the+// bottom of the operator's ordered list.+func (r *SqlFederatedServersRepository) AssignNextPriority(iri string) error {+ queries := db.New(r.datastore.DB)++ maxPriority, err := queries.GetMaxAcceptedFederatedServerPriority(context.Background())+ if err != nil {+ return err+ }++ // sqlc returns COALESCE result as interface{}; convert to int64.+ var max int64+ switch v := maxPriority.(type) {+ case int64:+ max = v+ case int32:+ max = int64(v)+ }++ server, err := r.GetFederatedServer(iri)+ if err != nil || server == nil {+ return err+ }++ return queries.SetFederatedServerPriority(context.Background(), db.SetFederatedServerPriorityParams{+ Priority: max + 1,+ ID: server.ID,+ })+}++// neighbourIndex returns the index of the neighbour to swap with for the given+// direction, or -1 if the move is a boundary no-op or invalid.+func neighbourIndex(targetIdx int, direction string) (int, error) {+ switch direction {+ case "up":+ return targetIdx - 1, nil+ case "down":+ return targetIdx + 1, nil+ default:+ return -1, fmt.Errorf("direction must be 'up' or 'down', got %q", direction)+ }+}++// swapPriorities atomically exchanges the priority values of two servers.+func swapPriorities(ctx context.Context, qtx *db.Queries, a, b models.FederatedServer) error {+ if err := qtx.SetFederatedServerPriority(ctx, db.SetFederatedServerPriorityParams{+ Priority: b.Priority,+ ID: a.ID,+ }); err != nil {+ return err+ }+ return qtx.SetFederatedServerPriority(ctx, db.SetFederatedServerPriorityParams{+ Priority: a.Priority,+ ID: b.ID,+ })+}++// ReorderFederatedServer moves an accepted server one position up ("up") or+// down ("down") in the canonical priority order by swapping its priority with+// its immediate neighbour. The swap is performed inside a transaction so no+// partial state is possible.+func (r *SqlFederatedServersRepository) ReorderFederatedServer(id int64, direction string) error {+ servers, err := r.GetFederatedServers()+ if err != nil {+ return err+ }++ accepted := make([]models.FederatedServer, 0, len(servers))+ for _, s := range servers {+ if s.FollowStatus == "accepted" {+ accepted = append(accepted, s)+ }+ }++ targetIdx := -1+ for i, s := range accepted {+ if s.ID == id {+ targetIdx = i+ break+ }+ }+ if targetIdx < 0 {+ return fmt.Errorf("federated server with id %d not found or not accepted", id)+ }++ neighbourIdx, err := neighbourIndex(targetIdx, direction)+ if err != nil {+ return err+ }+ if neighbourIdx < 0 || neighbourIdx >= len(accepted) {+ return nil+ }++ tx, err := r.datastore.DB.BeginTx(context.Background(), nil)+ if err != nil {+ return err+ }+ defer func() {+ if err != nil {+ _ = tx.Rollback()+ }+ }()++ if err = swapPriorities(context.Background(), db.New(tx), accepted[targetIdx], accepted[neighbourIdx]); err != nil {+ return err+ }+ return tx.Commit()+}diff --git a/persistence/migrations/00008_federated_server_priority.sql b/persistence/migrations/00008_federated_server_priority.sqlnew file mode 100644index 0000000000..3e4c2c1ba9--- /dev/null+++ b/persistence/migrations/00008_federated_server_priority.sql@@ -0,0 +1,31 @@+-- +goose Up+-- +goose StatementBegin++-- Add a canonical operator-set priority to each federated server.+-- Lower values appear first (priority 1 = highest priority recommendation).+-- Pending and rejected servers keep their default of 0; priority is only+-- assigned when a server transitions to "accepted" so pending rows do not+-- consume positions.+ALTER TABLE federated_servers ADD COLUMN priority INTEGER NOT NULL DEFAULT 0;++-- +goose StatementEnd++-- +goose StatementBegin++-- Assign an initial priority to already-accepted servers based on insertion+-- order (id) so they have a deterministic starting order. Operators can+-- reorder using the move-up/move-down admin controls once the server is running.+UPDATE federated_servers+SET priority = (+ SELECT COUNT(*) + 1+ FROM federated_servers AS fs2+ WHERE fs2.follow_status = 'accepted' AND fs2.id < federated_servers.id+)+WHERE follow_status = 'accepted';++-- +goose StatementEnd++-- +goose Down+-- +goose StatementBegin+ALTER TABLE federated_servers DROP COLUMN priority;+-- +goose StatementEnddiff --git a/persistence/migrations/migrations_test.go b/persistence/migrations/migrations_test.goindex 2811a6658d..125cf6f4fb 100644--- a/persistence/migrations/migrations_test.go+++ b/persistence/migrations/migrations_test.go@@ -80,8 +80,12 @@ func TestRun_FreshDatabase(t *testing.T) {t.Error("fresh install should not have legacy config table")}- if v := gooseVersion(t, db); v != 7 {- t.Errorf("goose version = %d, want 7", v)+ if v := gooseVersion(t, db); v != 8 {+ t.Errorf("goose version = %d, want 8", v)+ }++ if !columnExists(t, db, "federated_servers", "priority") {+ t.Error("federated_servers table is missing priority column")}// Calling Run a second time should be a no-op (idempotent).@@ -105,8 +109,8 @@ func TestRun_LegacyDatabaseAtV9(t *testing.T) {}// Goose should record the latest migration.- if v := gooseVersion(t, db); v != 7 {- t.Errorf("goose version = %d, want 7", v)+ if v := gooseVersion(t, db); v != 8 {+ t.Errorf("goose version = %d, want 8", v)}// Config version should still be 9, the legacy bridge was not invoked.@@ -156,8 +160,8 @@ func TestRun_LegacyDatabasePreV9(t *testing.T) {}// Goose should have recorded the latest migration.- if v := gooseVersion(t, db); v != 7 {- t.Errorf("goose version = %d, want 7", v)+ if v := gooseVersion(t, db); v != 8 {+ t.Errorf("goose version = %d, want 8", v)}}diff --git a/services/activitypub/inbox/accept.go b/services/activitypub/inbox/accept.goindex 6e5bd0a072..339c8d1f4f 100644--- a/services/activitypub/inbox/accept.go+++ b/services/activitypub/inbox/accept.go@@ -79,6 +79,13 @@ func (s *Service) markFederatedServerAccepted(actorIRI string, metadata *apmodelreturn}+ // Assign a priority so the newly accepted server enters at the bottom of+ // the operator's ordered list rather than floating to the top on the next+ // public fetch.+ if err := repo.AssignNextPriority(serverURL); err != nil {+ log.Warnf("Failed to assign priority for %s: %v", serverURL, err)+ }+if actorData, err := s.resolver.GetResolvedActorFromIRI(actorIRI); err == nil {var logoURL stringif actorData.Image != nil {diff --git a/web/components/admin/FederatedServers/FederatedServersTable.module.scss b/web/components/admin/FederatedServers/FederatedServersTable.module.scssindex 2a32a3b6e9..24a5afca31 100644--- a/web/components/admin/FederatedServers/FederatedServersTable.module.scss+++ b/web/components/admin/FederatedServers/FederatedServersTable.module.scss@@ -5,7 +5,7 @@:global(.ant-table-thead > tr > th) {background: var(--theme-color-background-header);- color: var(--theme-color-components-text-on-dark);+ color: var(--theme-color-components-text-on-light);}:global(.ant-table-tbody > tr > td) {diff --git a/web/components/admin/FederatedServers/FederatedServersTable.tsx b/web/components/admin/FederatedServers/FederatedServersTable.tsxindex 0ec2beeb62..14917ca4e1 100644--- a/web/components/admin/FederatedServers/FederatedServersTable.tsx+++ b/web/components/admin/FederatedServers/FederatedServersTable.tsx@@ -1,5 +1,6 @@+import { format, parseISO, isValid } from 'date-fns';import { FC, useState } from 'react';-import { Table, Button, Space, Tag, Popconfirm, message } from 'antd';+import { Table, Button, Space, Tag, Popconfirm, message, Tooltip } from 'antd';import { useTranslation } from 'next-export-i18n';import {DeleteOutlined,@@ -7,6 +8,8 @@ import {CheckCircleOutlined,CloseCircleOutlined,ClockCircleOutlined,+ ArrowUpOutlined,+ ArrowDownOutlined,} from '@ant-design/icons';import { ColumnsType } from 'antd/es/table';import { Translation } from '../../ui/Translation/Translation';@@ -23,12 +26,14 @@ export interface FederatedServerData {lastStatusUpdate?: string;addedAt: string;followStatus?: string;+ priority?: number;}export interface FederatedServersTableProps {servers: FederatedServerData[];loading?: boolean;onRemove: (id: number) => Promise<void>;+ onReorder: (id: number, direction: 'up' | 'down') => Promise<void>;}// Prefer the human-friendly display name, fall back to the federation@@ -40,9 +45,11 @@ export const FederatedServersTable: FC<FederatedServersTableProps> = ({servers,loading = false,onRemove,+ onReorder,}) => {const { t } = useTranslation();const [removingId, setRemovingId] = useState<number | null>(null);+ const [reorderingId, setReorderingId] = useState<number | null>(null);const handleRemove = async (id: number) => {setRemovingId(id);@@ -56,6 +63,14 @@ export const FederatedServersTable: FC<FederatedServersTableProps> = ({}};+ const acceptedCount = servers.filter(s => s.followStatus === 'accepted').length;++ // Sort: accepted servers first (in priority/API order), then pending, then rejected.+ // Defined before columns so the Priority column render can reference it.+ const sortedServers = [+ ...servers.filter(s => s.followStatus === 'accepted'),+ ...servers.filter(s => s.followStatus !== 'accepted'),+ ];const columns: ColumnsType<FederatedServerData> = [{title: (@@ -156,7 +171,9 @@ export const FederatedServersTable: FC<FederatedServersTableProps> = ({dataIndex: 'lastStatusUpdate',key: 'lastStatusUpdate',render: (text: string) =>- text || (+ text && isValid(parseISO(text)) ? (+ format(parseISO(text), 'MMM d, yyyy HH:mm')+ ) : (<TranslationtranslationKey={Localization.Admin.FeaturedStreams.never}defaultText="Never"@@ -172,6 +189,80 @@ export const FederatedServersTable: FC<FederatedServersTableProps> = ({),dataIndex: 'addedAt',key: 'addedAt',+ render: (text: string) =>+ text && isValid(parseISO(text)) ? format(parseISO(text), 'MMM d, yyyy') : (text ?? ''),+ },+ {+ title: (+ <Translation+ translationKey={Localization.Admin.FeaturedStreams.priority}+ defaultText="Priority"+ />+ ),+ key: 'priority',+ render: (_: unknown, record: FederatedServerData) => {+ if (record.followStatus !== 'accepted') return null;+ const acceptedServers = sortedServers.filter(s => s.followStatus === 'accepted');+ const acceptedIdx = acceptedServers.findIndex(s => s.id === record.id);+ const isFirst = acceptedIdx === 0;+ const isLast = acceptedIdx === acceptedServers.length - 1;+ return (+ <Space size="small">+ <Tooltip+ title={+ <Translation+ translationKey={Localization.Admin.FeaturedStreams.moveUp}+ defaultText="Move up"+ />+ }+ >+ <Button+ size="small"+ icon={<ArrowUpOutlined />}+ disabled={isFirst || reorderingId === record.id}+ loading={reorderingId === record.id}+ onClick={async () => {+ setReorderingId(record.id);+ try {+ await onReorder(record.id, 'up');+ } catch {+ message.error(t(Localization.Admin.FeaturedStreams.failedToReorder));+ } finally {+ setReorderingId(null);+ }+ }}+ aria-label={t(Localization.Admin.FeaturedStreams.moveUp)}+ />+ </Tooltip>+ <Tooltip+ title={+ <Translation+ translationKey={Localization.Admin.FeaturedStreams.moveDown}+ defaultText="Move down"+ />+ }+ >+ <Button+ size="small"+ icon={<ArrowDownOutlined />}+ disabled={isLast || reorderingId === record.id}+ loading={reorderingId === record.id}+ onClick={async () => {+ setReorderingId(record.id);+ try {+ await onReorder(record.id, 'down');+ } catch {+ message.error(t(Localization.Admin.FeaturedStreams.failedToReorder));+ } finally {+ setReorderingId(null);+ }+ }}+ aria-label={t(Localization.Admin.FeaturedStreams.moveDown)}+ />+ </Tooltip>+ </Space>+ );+ },},{title: (@@ -181,7 +272,7 @@ export const FederatedServersTable: FC<FederatedServersTableProps> = ({/>),key: 'actions',- render: (_: any, record: FederatedServerData) => (+ render: (_: unknown, record: FederatedServerData) => (<Popconfirmtitle={<Translation@@ -215,17 +306,21 @@ export const FederatedServersTable: FC<FederatedServersTableProps> = ({},];+ // Hide the Priority column entirely when there is only one server — move+ // buttons would both be disabled and the column is just visual noise.+ const visibleColumns = acceptedCount > 1 ? columns : columns.filter(c => c.key !== 'priority');+return (<TableclassName={styles.table}- columns={columns}- dataSource={servers}+ columns={visibleColumns}+ dataSource={sortedServers}rowKey="id"loading={loading}pagination={{pageSize: 10,showSizeChanger: true,- showTotal: (total: number) => `Total ${total} streams`, // Note: This would need custom translation handling+ showTotal: (total: number) => `Total ${total} streams`,}}/>);diff --git a/web/hooks/useFederatedServers.tsx b/web/hooks/useFederatedServers.tsxindex b3699530d4..e03964f46c 100644--- a/web/hooks/useFederatedServers.tsx+++ b/web/hooks/useFederatedServers.tsx@@ -21,6 +21,7 @@ export interface FederatedServerResponse {thumbnailUrl?: string;lastStatusUpdate?: string;addedAt: string;+ priority: number;}export interface UseFederatedServersResult {@@ -30,6 +31,7 @@ export interface UseFederatedServersResult {refetch: () => void;addServer: (url: string) => Promise<void>;removeServer: (id: number) => Promise<void>;+ reorderServer: (id: number, direction: 'up' | 'down') => Promise<void>;}interface APIErrorResponse {@@ -147,6 +149,22 @@ export function useFederatedServers(isAdmin: boolean = false): UseFederatedServeawait fetchServers();};+ const reorderServer = async (id: number, direction: 'up' | 'down'): Promise<void> => {+ const response = await fetch(`${API_ADMIN_FEDERATED_SERVERS}/${id}/reorder`, {+ method: 'PUT',+ headers: { 'Content-Type': 'application/json' },+ credentials: 'include',+ body: JSON.stringify({ direction }),+ });++ if (!response.ok) {+ const apiError: APIErrorResponse = await response.json();+ throw new Error(apiError.message || t(Localization.Admin.FeaturedStreams.failedToReorder));+ }++ await fetchServers();+ };+// Fetch on mount, then poll so the directory reflects servers going// live/offline without a reload. fetchServers is intentionally NOT a// dependency: it is recreated every render (it closes over `t`), so depending@@ -166,5 +184,6 @@ export function useFederatedServers(isAdmin: boolean = false): UseFederatedServerefetch: fetchServers,addServer: isAdmin ? addServer : async () => {},removeServer: isAdmin ? removeServer : async () => {},+ reorderServer: isAdmin ? reorderServer : async () => {},};}diff --git a/web/i18n/en/translation.json b/web/i18n/en/translation.jsonindex ed2a8edd73..988cd1b803 100644--- a/web/i18n/en/translation.json+++ b/web/i18n/en/translation.json@@ -103,6 +103,10 @@"requirementHttps": "The stream must be accessible via HTTPS","requirementOwncast": "The stream must be an Owncast instance","resendApprovalButton": "Resend approval",+ "moveUp": "Move up",+ "moveDown": "Move down",+ "priority": "Priority",+ "failedToReorder": "Failed to reorder featured stream","socialFeaturesRequired": "Social features must be enabled","socialFeaturesRequiredDesc": "before you can feature other streams.","status": "Status",diff --git a/web/pages/admin/config-featured.tsx b/web/pages/admin/config-featured.tsxindex 9065a0598a..cbaf090198 100644--- a/web/pages/admin/config-featured.tsx+++ b/web/pages/admin/config-featured.tsx@@ -28,6 +28,7 @@ const ConfigFeatured = () => {loading: serversLoading,addServer,removeServer,+ reorderServer,} = useFederatedServers(true);const {@@ -118,6 +119,7 @@ const ConfigFeatured = () => {servers={federatedServers}loading={serversLoading}onRemove={removeServer}+ onReorder={reorderServer}/></Space>),diff --git a/web/tests/FederatedServersTable.test.tsx b/web/tests/FederatedServersTable.test.tsxindex ecb77cb6b8..34b3a166eb 100644--- a/web/tests/FederatedServersTable.test.tsx+++ b/web/tests/FederatedServersTable.test.tsx@@ -1,3 +1,4 @@+import { message as antdMessage } from 'antd';import { render, screen, fireEvent, waitFor } from '@testing-library/react';import '@testing-library/jest-dom';import {@@ -31,27 +32,40 @@ describe('FederatedServersTable', () => {id: 1,iri: 'https://server1.example.com',name: 'Server 1',+ displayName: 'Server 1',isOnline: true,- lastStatusUpdate: '2024-01-01 12:00',- addedAt: '2023-12-01',+ lastStatusUpdate: '2024-01-01T12:00:00Z',+ addedAt: '2023-12-01T00:00:00Z',+ followStatus: 'accepted',+ priority: 1,},{id: 2,iri: 'https://server2.example.com',name: 'Server 2',+ displayName: 'Server 2',isOnline: false,- addedAt: '2023-12-02',+ addedAt: '2023-12-02T00:00:00Z',+ followStatus: 'accepted',+ priority: 2,},];const mockOnRemove = jest.fn();-+ const mockOnReorder = jest.fn();beforeEach(() => {mockOnRemove.mockClear();+ mockOnReorder.mockClear();});it('renders servers correctly', () => {- render(<FederatedServersTable servers={mockServers} onRemove={mockOnRemove} />);+ render(+ <FederatedServersTable+ servers={mockServers}+ onRemove={mockOnRemove}+ onReorder={mockOnReorder}+ />,+ );expect(screen.getByText('Server 1')).toBeInTheDocument();expect(screen.getByText('Server 2')).toBeInTheDocument();@@ -60,7 +74,13 @@ describe('FederatedServersTable', () => {});it('displays online/offline status correctly', () => {- render(<FederatedServersTable servers={mockServers} onRemove={mockOnRemove} />);+ render(+ <FederatedServersTable+ servers={mockServers}+ onRemove={mockOnRemove}+ onReorder={mockOnReorder}+ />,+ );const onlineTags = screen.getAllByText('Online');const offlineTags = screen.getAllByText('Offline');@@ -70,14 +90,26 @@ describe('FederatedServersTable', () => {});it('displays last checked time or "Never"', () => {- render(<FederatedServersTable servers={mockServers} onRemove={mockOnRemove} />);+ render(+ <FederatedServersTable+ servers={mockServers}+ onRemove={mockOnRemove}+ onReorder={mockOnReorder}+ />,+ );- expect(screen.getByText('2024-01-01 12:00')).toBeInTheDocument();+ expect(screen.getByText(/Jan 1, 2024/)).toBeInTheDocument();expect(screen.getByText('Never')).toBeInTheDocument();});it('shows confirmation dialog when removing server', async () => {- render(<FederatedServersTable servers={mockServers} onRemove={mockOnRemove} />);+ render(+ <FederatedServersTable+ servers={mockServers}+ onRemove={mockOnRemove}+ onReorder={mockOnReorder}+ />,+ );const removeButtons = screen.getAllByText('Unfeature');fireEvent.click(removeButtons[0]);@@ -90,7 +122,13 @@ describe('FederatedServersTable', () => {it('calls onRemove when confirmed', async () => {mockOnRemove.mockResolvedValue(undefined);- render(<FederatedServersTable servers={mockServers} onRemove={mockOnRemove} />);+ render(+ <FederatedServersTable+ servers={mockServers}+ onRemove={mockOnRemove}+ onReorder={mockOnReorder}+ />,+ );const removeButtons = screen.getAllByText('Unfeature');fireEvent.click(removeButtons[0]);@@ -104,7 +142,13 @@ describe('FederatedServersTable', () => {});it('cancels removal when declined', async () => {- render(<FederatedServersTable servers={mockServers} onRemove={mockOnRemove} />);+ render(+ <FederatedServersTable+ servers={mockServers}+ onRemove={mockOnRemove}+ onReorder={mockOnReorder}+ />,+ );const removeButtons = screen.getAllByText('Unfeature');fireEvent.click(removeButtons[0]);@@ -117,7 +161,12 @@ describe('FederatedServersTable', () => {it('shows loading state correctly', () => {const { container } = render(- <FederatedServersTable servers={[]} loading onRemove={mockOnRemove} />,+ <FederatedServersTable+ servers={[]}+ loading+ onRemove={mockOnRemove}+ onReorder={mockOnReorder}+ />,);// Ant Design Table renders a spinner when loading@@ -125,11 +174,16 @@ describe('FederatedServersTable', () => {});it('handles removal error gracefully', async () => {- // eslint-disable-next-line @typescript-eslint/no-var-requires, global-require- const { message: antdMessage } = require('antd');+ // The antd module is mocked above, so this is the mocked message object.mockOnRemove.mockRejectedValue(new Error('Removal failed'));- render(<FederatedServersTable servers={mockServers} onRemove={mockOnRemove} />);+ render(+ <FederatedServersTable+ servers={mockServers}+ onRemove={mockOnRemove}+ onReorder={mockOnReorder}+ />,+ );const removeButtons = screen.getAllByText('Unfeature');fireEvent.click(removeButtons[0]);@@ -144,7 +198,11 @@ describe('FederatedServersTable', () => {it('renders external links for servers', () => {const { container } = render(- <FederatedServersTable servers={mockServers} onRemove={mockOnRemove} />,+ <FederatedServersTable+ servers={mockServers}+ onRemove={mockOnRemove}+ onReorder={mockOnReorder}+ />,);const links = container.querySelectorAll('a[target="_blank"]');diff --git a/web/tests/useFederatedServers.test.tsx b/web/tests/useFederatedServers.test.tsxindex fdc955cf2a..eebb7fa7f3 100644--- a/web/tests/useFederatedServers.test.tsx+++ b/web/tests/useFederatedServers.test.tsx@@ -52,6 +52,7 @@ const API_SERVER = {username: 'goodnight',summary: 'Goodnight TV',followStatus: 'accepted',+ priority: 1,};function mockFetchServers(server: object = API_SERVER) {@@ -71,7 +72,14 @@ const PublicHarness = () => {const AdminHarness = () => {const { servers, loading, removeServer } = useFederatedServers(true);- return <FederatedServersTable servers={servers} loading={loading} onRemove={removeServer} />;+ return (+ <FederatedServersTable+ servers={servers}+ loading={loading}+ onRemove={removeServer}+ onReorder={jest.fn()}+ />+ );};describe('useFederatedServers contract', () => {@@ -126,7 +134,8 @@ describe('useFederatedServers contract', () => {// isOnline -> "Online"; lastStatusUpdate -> the Last Checked column.expect(screen.getByText('Online')).toBeInTheDocument();- expect(screen.getByText(API_SERVER.lastStatusUpdate)).toBeInTheDocument();+ // lastStatusUpdate is formatted as a local date; match the date part only.+ expect(screen.getByText(/Jun 16, 2026 \d{2}:\d{2}/)).toBeInTheDocument();// isOnline also surfaces the federated stream title in its column.expect(screen.getByText(API_SERVER.streamTitle)).toBeInTheDocument();diff --git a/web/types/localization.ts b/web/types/localization.tsindex 6aa5877a41..ae7b84acd4 100644--- a/web/types/localization.ts+++ b/web/types/localization.ts@@ -422,6 +422,10 @@ export const Localization = {failedToRemoveDirectory: 'Admin.FeaturedStreams.failedToRemoveDirectory',failedToResendApproval: 'Admin.FeaturedStreams.failedToResendApproval',removeFromDirectoryButton: 'Admin.FeaturedStreams.removeFromDirectoryButton',+ moveUp: 'Admin.FeaturedStreams.moveUp',+ moveDown: 'Admin.FeaturedStreams.moveDown',+ priority: 'Admin.FeaturedStreams.priority',+ failedToReorder: 'Admin.FeaturedStreams.failedToReorder',removeFromDirectoryConfirm: 'Admin.FeaturedStreams.removeFromDirectoryConfirm',resendApprovalButton: 'Admin.FeaturedStreams.resendApprovalButton',},diff --git a/webserver/handlers/admin/federatedservers.go b/webserver/handlers/admin/federatedservers.goindex ff597081aa..26b35a0148 100644--- a/webserver/handlers/admin/federatedservers.go+++ b/webserver/handlers/admin/federatedservers.go@@ -218,3 +218,38 @@ func (a *Admin) AddFederatedServerOptions(w http.ResponseWriter, r *http.Requestfunc (a *Admin) RemoveFederatedServerOptions(w http.ResponseWriter, r *http.Request, id int) {w.WriteHeader(http.StatusNoContent)}++// ReorderFederatedServer moves a federated server one step up or down in the+// operator-set canonical priority order.+func (a *Admin) ReorderFederatedServer(w http.ResponseWriter, r *http.Request, id int) {+ var request struct {+ Direction string `json:"direction"`+ }+ if err := json.NewDecoder(r.Body).Decode(&request); err != nil {+ webutils.WriteSimpleResponse(w, false, "Invalid request body: "+err.Error())+ return+ }+ if request.Direction != "up" && request.Direction != "down" {+ webutils.WriteSimpleResponse(w, false, "direction must be 'up' or 'down'")+ return+ }++ repo := federatedserversrepository.Get()+ if repo == nil {+ webutils.WriteSimpleResponse(w, false, "Federated servers repository is not initialised")+ return+ }++ if err := repo.ReorderFederatedServer(int64(id), request.Direction); err != nil {+ log.Errorf("Failed to reorder federated server %d: %v", id, err)+ webutils.WriteSimpleResponse(w, false, "Failed to reorder federated server: "+err.Error())+ return+ }++ webutils.WriteSimpleResponse(w, true, "Federated server reordered successfully")+}++// ReorderFederatedServerOptions handles CORS preflight requests.+func (a *Admin) ReorderFederatedServerOptions(w http.ResponseWriter, r *http.Request, id int) {+ w.WriteHeader(http.StatusNoContent)+}diff --git a/webserver/handlers/generated/generated-types.gen.go b/webserver/handlers/generated/generated-types.gen.goindex 9cc5a1b0e6..f308680b0a 100644--- a/webserver/handlers/generated/generated-types.gen.go+++ b/webserver/handlers/generated/generated-types.gen.go@@ -143,6 +143,24 @@ func (e WebhookEventType) Valid() bool {}}+// Defines values for ReorderFederatedServerJSONBodyDirection.+const (+ Down ReorderFederatedServerJSONBodyDirection = "down"+ Up ReorderFederatedServerJSONBodyDirection = "up"+)++// Valid indicates whether the value is a known member of the ReorderFederatedServerJSONBodyDirection enum.+func (e ReorderFederatedServerJSONBodyDirection) Valid() bool {+ switch e {+ case Down:+ return true+ case Up:+ return true+ default:+ return false+ }+}+// Defines values for GetUsersParamsStatus.const (Active GetUsersParamsStatus = "active"@@ -1100,6 +1118,15 @@ type AddFederatedServerJSONBody struct {Url string `json:"url"`}+// ReorderFederatedServerJSONBody defines parameters for ReorderFederatedServer.+type ReorderFederatedServerJSONBody struct {+ // Direction Move the server up (higher priority) or down (lower priority)+ Direction ReorderFederatedServerJSONBodyDirection `json:"direction"`+}++// ReorderFederatedServerJSONBodyDirection defines parameters for ReorderFederatedServer.+type ReorderFederatedServerJSONBodyDirection string+// GetFollowersAdminParams defines parameters for GetFollowersAdmin.type GetFollowersAdminParams struct {Offset *Offset `form:"offset,omitempty" json:"offset,omitempty"`@@ -1466,6 +1493,9 @@ type SendFederatedMessageJSONRequestBody = AdminConfigValue// AddFederatedServerJSONRequestBody defines body for AddFederatedServer for application/json ContentType.type AddFederatedServerJSONRequestBody AddFederatedServerJSONBody+// ReorderFederatedServerJSONRequestBody defines body for ReorderFederatedServer for application/json ContentType.+type ReorderFederatedServerJSONRequestBody ReorderFederatedServerJSONBody+// ApproveFollowerJSONRequestBody defines body for ApproveFollower for application/json ContentType.type ApproveFollowerJSONRequestBody ApproveFollowerJSONBodydiff --git a/webserver/handlers/generated/generated.gen.go b/webserver/handlers/generated/generated.gen.goindex a671be4088..545b506faa 100644--- a/webserver/handlers/generated/generated.gen.go+++ b/webserver/handlers/generated/generated.gen.go@@ -449,6 +449,12 @@ type ServerInterface interface {// (OPTIONS /admin/federation/servers/{id})RemoveFederatedServerOptions(w http.ResponseWriter, r *http.Request, id int)++ // (OPTIONS /admin/federation/servers/{id}/reorder)+ ReorderFederatedServerOptions(w http.ResponseWriter, r *http.Request, id int)+ // ReorderFederatedServer Move a federated server up or down in the priority order+ // (PUT /admin/federation/servers/{id}/reorder)+ ReorderFederatedServer(w http.ResponseWriter, r *http.Request, id int)// GetFollowersAdmin Get followers// (GET /admin/followers)GetFollowersAdmin(w http.ResponseWriter, r *http.Request, params GetFollowersAdminParams)@@ -1542,6 +1548,17 @@ func (_ Unimplemented) RemoveFederatedServerOptions(w http.ResponseWriter, r *htw.WriteHeader(http.StatusNotImplemented)}+// (OPTIONS /admin/federation/servers/{id}/reorder)+func (_ Unimplemented) ReorderFederatedServerOptions(w http.ResponseWriter, r *http.Request, id int) {+ w.WriteHeader(http.StatusNotImplemented)+}++// ReorderFederatedServer Move a federated server up or down in the priority order+// (PUT /admin/federation/servers/{id}/reorder)+func (_ Unimplemented) ReorderFederatedServer(w http.ResponseWriter, r *http.Request, id int) {+ w.WriteHeader(http.StatusNotImplemented)+}+// GetFollowersAdmin Get followers// (GET /admin/followers)func (_ Unimplemented) GetFollowersAdmin(w http.ResponseWriter, r *http.Request, params GetFollowersAdminParams) {@@ -4030,6 +4047,56 @@ func (siw *ServerInterfaceWrapper) RemoveFederatedServerOptions(w http.ResponseWhandler.ServeHTTP(w, r)}+// ReorderFederatedServerOptions operation middleware+func (siw *ServerInterfaceWrapper) ReorderFederatedServerOptions(w http.ResponseWriter, r *http.Request) {+ var err error+ _ = err++ // ------------- Path parameter "id" -------------+ var id int++ err = runtime.BindStyledParameterWithOptions("simple", "id", chi.URLParam(r, "id"), &id, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true, Type: "integer", Format: "", ValueIsUnescaped: r.URL.RawPath == ""})+ if err != nil {+ siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "id", Err: err})+ return+ }++ handler := http.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ siw.Handler.ReorderFederatedServerOptions(w, r, id)+ }))++ for _, middleware := range siw.HandlerMiddlewares {+ handler = middleware(handler)+ }++ handler.ServeHTTP(w, r)+}++// ReorderFederatedServer operation middleware+func (siw *ServerInterfaceWrapper) ReorderFederatedServer(w http.ResponseWriter, r *http.Request) {+ var err error+ _ = err++ // ------------- Path parameter "id" -------------+ var id int++ err = runtime.BindStyledParameterWithOptions("simple", "id", chi.URLParam(r, "id"), &id, runtime.BindStyledParameterOptions{ParamLocation: runtime.ParamLocationPath, Explode: false, Required: true, Type: "integer", Format: "", ValueIsUnescaped: r.URL.RawPath == ""})+ if err != nil {+ siw.ErrorHandlerFunc(w, r, &InvalidParamFormatError{ParamName: "id", Err: err})+ return+ }++ handler := http.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ siw.Handler.ReorderFederatedServer(w, r, id)+ }))++ for _, middleware := range siw.HandlerMiddlewares {+ handler = middleware(handler)+ }++ handler.ServeHTTP(w, r)+}+// GetFollowersAdmin operation middlewarefunc (siw *ServerInterfaceWrapper) GetFollowersAdmin(w http.ResponseWriter, r *http.Request) {var err error@@ -6366,6 +6433,12 @@ func HandlerWithOptions(si ServerInterface, options ChiServerOptions) http.Handlr.Group(func(r chi.Router) {r.Options(options.BaseURL+"/admin/federation/servers/{id}", wrapper.RemoveFederatedServerOptions)})+ r.Group(func(r chi.Router) {+ r.Options(options.BaseURL+"/admin/federation/servers/{id}/reorder", wrapper.ReorderFederatedServerOptions)+ })+ r.Group(func(r chi.Router) {+ r.Put(options.BaseURL+"/admin/federation/servers/{id}/reorder", wrapper.ReorderFederatedServer)+ })r.Group(func(r chi.Router) {r.Get(options.BaseURL+"/admin/federation/feature-requests", wrapper.GetFeatureRequests)})diff --git a/webserver/handlers/handler.go b/webserver/handlers/handler.goindex 47648c9fce..df839e295b 100644--- a/webserver/handlers/handler.go+++ b/webserver/handlers/handler.go@@ -134,6 +134,16 @@ func (s *ServerInterfaceImpl) RemoveFederatedServerOptions(w http.ResponseWriters.h.admin.RemoveFederatedServerOptions(w, r, id)}+func (s *ServerInterfaceImpl) ReorderFederatedServer(w http.ResponseWriter, r *http.Request, id int) {+ s.h.middleware.RequireAdminAuth(func(w http.ResponseWriter, r *http.Request) {+ s.h.admin.ReorderFederatedServer(w, r, id)+ })(w, r)+}++func (s *ServerInterfaceImpl) ReorderFederatedServerOptions(w http.ResponseWriter, r *http.Request, id int) {+ s.h.admin.ReorderFederatedServerOptions(w, r, id)+}+func (s *ServerInterfaceImpl) GetFeatureRequests(w http.ResponseWriter, r *http.Request) {s.h.middleware.RequireAdminAuth(s.h.admin.GetFeatureRequests)(w, r)}