Skip to content

Commit db34c54

Browse files
xaionaroxaionaro
committed
No comment
1 parent 6dadf97 commit db34c54

7 files changed

Lines changed: 21 additions & 15 deletions

File tree

‎cmd/streamcli/commands/screenshot_sender.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (s *screenshotSender) setImage(
6262
var err error
6363
s.ImageResized, err = imgLike(
6464
img.Image,
65-
image.Point{X: consts.ScreenshotMaxWidth, Y: consts.ScreenshotMaxHeight},
65+
image.Point{X: consts.ScreenshotMaxWidth / 2, Y: consts.ScreenshotMaxHeight / 2},
6666
)
6767
if err != nil {
6868
return fmt.Errorf("unable to create resized image: %w", err)

‎go.mod‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ replace github.com/scorfly/gokick => github.com/xaionaro-go/gokick v0.0.0-202507
3535

3636
replace github.com/abhinavxd/youtube-live-chat-downloader/v2 => github.com/xaionaro-go/youtube-live-chat-downloader/v2 v2.0.0-20250726224735-811554015ae8
3737

38+
replace github.com/Danny-Dasilva/CycleTLS => github.com/xaionaro-go/CycleTLS v0.0.0-20250923213111-aed0022ae7b5
39+
3840
require (
3941
github.com/facebookincubator/go-belt v0.0.0-20250308011339-62fb7027b11f
4042
github.com/go-git/go-billy/v5 v5.6.2
@@ -71,7 +73,7 @@ require (
7173
github.com/abema/go-mp4 v1.4.1 // indirect
7274
github.com/adrg/libvlc-go/v3 v3.1.6 // indirect
7375
github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b // indirect
74-
github.com/andybalholm/brotli v1.1.0 // indirect
76+
github.com/andybalholm/brotli v1.2.0 // indirect
7577
github.com/asticode/go-astikit v0.55.0 // indirect
7678
github.com/asticode/go-astits v1.13.0 // indirect
7779
github.com/av-elier/go-decimal-to-rational v0.0.0-20250603203441-f39a07f43ff3 // indirect
@@ -294,7 +296,7 @@ require (
294296
github.com/iancoleman/strcase v0.3.0
295297
github.com/immune-gmbh/attestation-sdk v0.0.0-20230711173209-f44e4502aeca
296298
github.com/kbinani/screenshot v0.0.0-20250624051815-089614a94018
297-
github.com/klauspost/compress v1.17.9
299+
github.com/klauspost/compress v1.18.0
298300
github.com/lusingander/colorpicker v0.7.3
299301
github.com/pojntfx/weron v0.2.7
300302
github.com/prometheus/client_golang v1.20.5
@@ -312,7 +314,7 @@ require (
312314
github.com/xaionaro-go/go-rtmp v0.0.0-20241009130244-1e3160f27f42
313315
github.com/xaionaro-go/grpcproxy v0.0.0-20241103205849-a8fef42e72f9
314316
github.com/xaionaro-go/iterate v0.0.0-20250406123757-7802d56b52ce
315-
github.com/xaionaro-go/kickcom v0.0.0-20250923213542-2e7de9d14c9a
317+
github.com/xaionaro-go/kickcom v0.0.0-20251019213336-23769c47b395
316318
github.com/xaionaro-go/lockmap v0.0.0-20240901172806-e17aea364748
317319
github.com/xaionaro-go/logwriter v0.0.0-20250111154941-c3f7a1a2d567
318320
github.com/xaionaro-go/mediamtx v0.0.0-20250406132618-79ecbc3e138f

‎go.sum‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
141141
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
142142
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
143143
github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
144-
github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
145-
github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
144+
github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ=
145+
github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
146146
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
147147
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
148148
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
@@ -664,8 +664,8 @@ github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF
664664
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
665665
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
666666
github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
667-
github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
668-
github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
667+
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
668+
github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
669669
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
670670
github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
671671
github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
@@ -1129,8 +1129,8 @@ github.com/xaionaro-go/helix/v2 v2.0.0-20250309182928-f54c9d4c8a29 h1:k7WLDHIK0A
11291129
github.com/xaionaro-go/helix/v2 v2.0.0-20250309182928-f54c9d4c8a29/go.mod h1:e1GsZq4NDk9sQlPJ0Nr3+14R9cizqg09VAk7/IonpOU=
11301130
github.com/xaionaro-go/iterate v0.0.0-20250406123757-7802d56b52ce h1:4a0vM4EOq7cU15TTmJHX66vX2cXA7RgVX3bWyj4ZVw4=
11311131
github.com/xaionaro-go/iterate v0.0.0-20250406123757-7802d56b52ce/go.mod h1:Dx52o1WH1xUoV8jjpiIVTRZ/rNoPNPcnLdMrQ5D2FH0=
1132-
github.com/xaionaro-go/kickcom v0.0.0-20250923213542-2e7de9d14c9a h1:NgG7G0HBfvtrkgp0eWkKwAg6iwtJMUbLo4RtoxC4bTg=
1133-
github.com/xaionaro-go/kickcom v0.0.0-20250923213542-2e7de9d14c9a/go.mod h1:F02WBGD4oO/NTVzE/355Osx9nhZSE1pS7vsasXkdfSs=
1132+
github.com/xaionaro-go/kickcom v0.0.0-20251019213336-23769c47b395 h1:lkr6P2AsXh6hVQcdJeWsttQcWskhg4GW4uKeaoc3USo=
1133+
github.com/xaionaro-go/kickcom v0.0.0-20251019213336-23769c47b395/go.mod h1:dxsKxBKOTkPeeXejFkmmIuSpHVSJo8X1rv2O7iPZKj0=
11341134
github.com/xaionaro-go/libsrt v0.0.0-20250505013920-61d894a3b7e9 h1:z5K1pa9cJZ2oqFNWyyxrxO/50Hv4Gn+1kkfXTHkoKNM=
11351135
github.com/xaionaro-go/libsrt v0.0.0-20250505013920-61d894a3b7e9/go.mod h1:yH5w7hdIyhbR4p0WfABH9fLIIK2ZwPd5CKk2K2ND/vo=
11361136
github.com/xaionaro-go/lockmap v0.0.0-20240901172806-e17aea364748 h1:SlB3zLAuLgRxdOo250gMUG/7hSiEU2NzEUNYbJDuI2A=
@@ -1192,6 +1192,8 @@ github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM
11921192
github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
11931193
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8=
11941194
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
1195+
github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
1196+
github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
11951197
github.com/yargevad/filepathx v1.0.0 h1:SYcT+N3tYGi+NvazubCNlvgIPbzAk7i7y2dwg3I5FYc=
11961198
github.com/yargevad/filepathx v1.0.0/go.mod h1:BprfX/gpYNJHJfc35GjRRpVcwWXS89gGulUIU5tK3tA=
11971199
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

‎pkg/chatmessagesstorage/store.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ func (s *ChatMessagesStorage) storeLocked(ctx context.Context) (_err error) {
4040
err = os.Rename(s.FilePath, oldFilePath)
4141
if err != nil {
4242
if !os.IsNotExist(err) {
43-
return fmt.Errorf("unable to move '%s' to '%s': %w", s.FilePath, oldFilePath)
43+
return fmt.Errorf("unable to move '%s' to '%s': %w", s.FilePath, oldFilePath, err)
4444
}
4545
}
4646

4747
err = os.Rename(newFilePath, s.FilePath)
4848
if err != nil {
49-
return fmt.Errorf("unable to move '%s' to '%s': %w", newFilePath, s.FilePath)
49+
return fmt.Errorf("unable to move '%s' to '%s': %w", newFilePath, s.FilePath, err)
5050
}
5151

5252
err = os.Remove(oldFilePath)

‎pkg/streamcontrol/twitch/chat_handler_irc_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,12 @@ func TestChatHandlerIRC(t *testing.T) {
5454
require.NoError(t, err)
5555

5656
expectedEvent := streamcontrol.ChatMessage{
57+
EventType: 1,
5758
UserID: "user-id",
5859
Username: "user-id",
5960
MessageID: "message-id",
6061
Message: "some\nmulti line\n message",
62+
MessageFormatType: 1,
6163
}
6264

6365
messagesCount := 0

‎pkg/streamd/grpc/goconv/encoder_config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func AudioCodecToThrift(
5555
case recoder.AudioCodecOpus:
5656
return streamd_grpc.AudioCodec_AudioCodecOpus
5757
default:
58-
panic(fmt.Errorf("unexpected audio codec: '%s'", codec))
58+
panic(fmt.Errorf("unexpected audio codec: '%#+v'", codec))
5959
}
6060
}
6161

@@ -114,7 +114,7 @@ func VideoCodecToThrift(
114114
case recoder.VideoCodecAV1:
115115
return streamd_grpc.VideoCodec_VideoCodecAV1
116116
default:
117-
panic(fmt.Errorf("unexpected video codec: '%s'", codec))
117+
panic(fmt.Errorf("unexpected video codec: '%#+v'", codec))
118118
}
119119
}
120120

‎pkg/streamserver/implementations/mediamtx/streamserver/stream_server.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func (s *StreamServer) PathReady(path defs.Path) {
152152
publisher := s.publishers[appKey]
153153
if publisher != nil {
154154
err := fmt.Errorf(
155-
"double-registration of a publisher for '%s' (this is an internal error in the code): %w",
155+
"double-registration of a publisher for '%s' (this is an internal error in the code)",
156156
appKey,
157157
)
158158
logger.Errorf(ctx, "%v", err)

0 commit comments

Comments
 (0)