parasocial
Code Issues

feat: add irc-backed streamer split view

Browse Source
This commit is contained in:
ruinivist
2026-04-29 00:40:35 +02:00
parent 01b044e305
commit ad1f5ec3ff
8 changed files with 1500 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/app/app.go
+53 -5
View File
@@ -17,6 +17,7 @@ import (
"parasocial/internal/auth"
"parasocial/internal/config"
"parasocial/internal/gql"
"parasocial/internal/irc"
"parasocial/internal/tui"
"parasocial/internal/twitch"
)
@@ -68,13 +69,15 @@ func Run(ctx context.Context) error {
StartResolve: func(state *auth.State, ch chan<- tui.StreamerUpdate) {
go func() {
defer close(ch)
ircManager := newIRCManager(ch)
defer ircManager.Close()
service, err := newTwitchService(httpClient, state)
if err != nil {
ch <- tui.StreamerUpdate{Err: err, Done: true}
return
}
if err := resolveStreamerEntries(ctx, service, cfg.Streamers, func(update tui.StreamerUpdate) {
if err := resolveStreamerEntries(ctx, service, state, cfg.Streamers, ircManager, func(update tui.StreamerUpdate) {
ch <- update
}); err != nil {
if errors.Is(err, context.Canceled) {
@@ -103,6 +106,10 @@ type streamerService interface {
PlaybackAccessToken(context.Context, string) (*twitch.PlaybackToken, error)
}
type ircSyncer interface {
Sync(context.Context, string, string, []irc.Target)
}
// newTwitchService builds a Twitch service from the authenticated session state.
func newTwitchService(httpClient *http.Client, state *auth.State) (*twitch.Service, error) {
client := &gql.Client{
@@ -120,28 +127,48 @@ func newTwitchService(httpClient *http.Client, state *auth.State) (*twitch.Servi
return &twitch.Service{GQL: client}, nil
}
// resolveStreamerEntries streams viewer and streamer resolution results into the TUI.
func resolveStreamerEntries(ctx context.Context, service streamerService, logins []string, send func(tui.StreamerUpdate)) error {
return resolveStreamerEntriesWithSleep(ctx, service, logins, send, streamerRefreshInterval, sleepContext)
func newIRCManager(ch chan<- tui.StreamerUpdate) *irc.Manager {
return &irc.Manager{
Addr: irc.DefaultAddr,
Events: func(event irc.Event) {
ch <- tui.StreamerUpdate{
IRC: &tui.IRCUpdate{
Login: event.Streamer,
State: tui.IRCState(event.State),
Line: event.Line,
},
}
},
}
}
func resolveStreamerEntriesWithSleep(ctx context.Context, service streamerService, logins []string, send func(tui.StreamerUpdate), interval time.Duration, sleep func(context.Context, time.Duration) error) error {
// resolveStreamerEntries streams viewer and streamer resolution results into the TUI.
func resolveStreamerEntries(ctx context.Context, service streamerService, state *auth.State, logins []string, syncer ircSyncer, send func(tui.StreamerUpdate)) error {
return resolveStreamerEntriesWithSleep(ctx, service, state, logins, syncer, send, streamerRefreshInterval, sleepContext)
}
func resolveStreamerEntriesWithSleep(ctx context.Context, service streamerService, state *auth.State, logins []string, syncer ircSyncer, send func(tui.StreamerUpdate), interval time.Duration, sleep func(context.Context, time.Duration) error) error {
viewer, err := service.CurrentUser(ctx)
if err != nil {
return fmt.Errorf("resolve current user: %w", err)
}
send(tui.StreamerUpdate{Viewer: viewer})
entries := twitch.LoadingStreamerEntries(logins)
syncWatchedChannels(ctx, syncer, state, entries)
for {
for index, login := range logins {
entry, err := resolveStreamerEntry(ctx, service, login)
if errors.Is(err, context.Canceled) {
return err
}
entries[index] = *entry
send(tui.StreamerUpdate{
Index: index,
Entry: entry,
})
syncWatchedChannels(ctx, syncer, state, entries)
}
if err := sleep(ctx, interval); err != nil {
return err
@@ -201,3 +228,24 @@ func sleepContext(ctx context.Context, duration time.Duration) error {
return nil
}
}
func syncWatchedChannels(ctx context.Context, syncer ircSyncer, state *auth.State, entries []twitch.StreamerEntry) {
if syncer == nil || state == nil {
return
}
syncer.Sync(ctx, state.Login, state.AccessToken, watchedIRCTargets(entries))
}
func watchedIRCTargets(entries []twitch.StreamerEntry) []irc.Target {
targets := make([]irc.Target, 0, 2)
for _, entry := range entries {
if entry.Status != twitch.StreamerReady || !entry.Live || entry.Login == "" {
continue
}
targets = append(targets, irc.Target{Login: entry.Login})
if len(targets) == 2 {
break
}
}
return targets
}
internal/app/app_test.go
+102 -3
View File
@@ -6,9 +6,12 @@ package app
import (
"context"
"errors"
"reflect"
"testing"
"time"
"parasocial/internal/auth"
"parasocial/internal/irc"
"parasocial/internal/tui"
"parasocial/internal/twitch"
)
@@ -73,6 +76,18 @@ func (f *fakeStreamerService) PlaybackAccessToken(_ context.Context, login strin
return &twitch.PlaybackToken{Signature: "sig", Value: "token"}, nil
}
type fakeIRCSyncer struct {
calls [][]string
}
func (f *fakeIRCSyncer) Sync(_ context.Context, _, _ string, targets []irc.Target) {
logins := make([]string, 0, len(targets))
for _, target := range targets {
logins = append(logins, target.Login)
}
f.calls = append(f.calls, logins)
}
// TestResolveStreamerEntries verifies that app resolution emits viewer, success, and error updates.
func TestResolveStreamerEntries(t *testing.T) {
t.Parallel()
@@ -91,7 +106,7 @@ func TestResolveStreamerEntries(t *testing.T) {
}
var updates []tui.StreamerUpdate
err := resolveStreamerEntriesWithSleep(context.Background(), service, []string{"alpha", "beta"}, func(update tui.StreamerUpdate) {
err := resolveStreamerEntriesWithSleep(context.Background(), service, &auth.State{Login: "viewer", AccessToken: "token"}, []string{"alpha", "beta"}, nil, func(update tui.StreamerUpdate) {
updates = append(updates, update)
}, 0, func(context.Context, time.Duration) error {
return context.Canceled
@@ -130,7 +145,7 @@ func TestResolveStreamerEntriesPlaybackFailureStillMarksLive(t *testing.T) {
}
var updates []tui.StreamerUpdate
err := resolveStreamerEntriesWithSleep(context.Background(), service, []string{"alpha"}, func(update tui.StreamerUpdate) {
err := resolveStreamerEntriesWithSleep(context.Background(), service, &auth.State{Login: "viewer", AccessToken: "token"}, []string{"alpha"}, nil, func(update tui.StreamerUpdate) {
updates = append(updates, update)
}, 0, func(context.Context, time.Duration) error {
return context.Canceled
@@ -165,7 +180,7 @@ func TestResolveStreamerEntriesRefreshesLiveState(t *testing.T) {
var updates []tui.StreamerUpdate
sleepCalls := 0
err := resolveStreamerEntriesWithSleep(context.Background(), service, []string{"alpha"}, func(update tui.StreamerUpdate) {
err := resolveStreamerEntriesWithSleep(context.Background(), service, &auth.State{Login: "viewer", AccessToken: "token"}, []string{"alpha"}, nil, func(update tui.StreamerUpdate) {
updates = append(updates, update)
}, 0, func(context.Context, time.Duration) error {
sleepCalls++
@@ -187,3 +202,87 @@ func TestResolveStreamerEntriesRefreshesLiveState(t *testing.T) {
t.Fatalf("second pass = %#v", updates[2])
}
}
func TestResolveStreamerEntriesSyncsTopTwoLiveChannels(t *testing.T) {
t.Parallel()
service := &fakeStreamerService{
viewer: &twitch.Viewer{ID: "7", Login: "viewer"},
channels: map[string]*twitch.Channel{
"alpha": {ID: "1", Login: "alpha_live"},
"beta": {ID: "2", Login: "beta_live"},
"gamma": {ID: "3", Login: "gamma_live"},
},
streams: map[string][]streamResult{
"1": {{info: &twitch.StreamInfo{Online: true}}},
"2": {{info: &twitch.StreamInfo{Online: true}}},
"3": {{info: &twitch.StreamInfo{Online: true}}},
},
}
syncer := &fakeIRCSyncer{}
err := resolveStreamerEntriesWithSleep(context.Background(), service, &auth.State{Login: "viewer", AccessToken: "token"}, []string{"alpha", "beta", "gamma"}, syncer, func(tui.StreamerUpdate) {
}, 0, func(context.Context, time.Duration) error {
return context.Canceled
})
if !errors.Is(err, context.Canceled) {
t.Fatal(err)
}
want := [][]string{
{},
{"alpha_live"},
{"alpha_live", "beta_live"},
{"alpha_live", "beta_live"},
}
if !reflect.DeepEqual(syncer.calls, want) {
t.Fatalf("sync calls = %#v, want %#v", syncer.calls, want)
}
}
func TestResolveStreamerEntriesRefreshUpdatesWatchedChannels(t *testing.T) {
t.Parallel()
service := &fakeStreamerService{
viewer: &twitch.Viewer{ID: "7", Login: "viewer"},
channels: map[string]*twitch.Channel{
"alpha": {ID: "1", Login: "alpha_live"},
"beta": {ID: "2", Login: "beta_live"},
},
streams: map[string][]streamResult{
"1": {
{info: &twitch.StreamInfo{Online: true}},
{info: &twitch.StreamInfo{Online: false}},
},
"2": {
{info: &twitch.StreamInfo{Online: false}},
{info: &twitch.StreamInfo{Online: true}},
},
},
}
syncer := &fakeIRCSyncer{}
sleepCalls := 0
err := resolveStreamerEntriesWithSleep(context.Background(), service, &auth.State{Login: "viewer", AccessToken: "token"}, []string{"alpha", "beta"}, syncer, func(tui.StreamerUpdate) {
}, 0, func(context.Context, time.Duration) error {
sleepCalls++
if sleepCalls == 1 {
return nil
}
return context.Canceled
})
if !errors.Is(err, context.Canceled) {
t.Fatal(err)
}
want := [][]string{
{},
{"alpha_live"},
{"alpha_live"},
{},
{"beta_live"},
}
if !reflect.DeepEqual(syncer.calls, want) {
t.Fatalf("sync calls = %#v, want %#v", syncer.calls, want)
}
}