Compare commits
	
		
			50 Commits
		
	
	
		
			2f19e5a733
			...
			v2.1.0
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						a8575ab875
	
				 | 
					
					
						|||
| 
						
						
							
						
						081525f5be
	
				 | 
					
					
						|||
| 
						
						
							
						
						6ac2ac5511
	
				 | 
					
					
						|||
| 
						
						
							
						
						f6483489c2
	
				 | 
					
					
						|||
| 
						
						
							
						
						ed5ac1815b
	
				 | 
					
					
						|||
| 
						
						
							
						
						509cb9f4dd
	
				 | 
					
					
						|||
| 
						
						
							
						
						b3684c4d9f
	
				 | 
					
					
						|||
| 
						
						
							
						
						918c589c65
	
				 | 
					
					
						|||
| 
						
						
							
						
						21095a11d6
	
				 | 
					
					
						|||
| 
						
						
							
						
						a22baa4b55
	
				 | 
					
					
						|||
| 
						
						
							
						
						b3e545e0bb
	
				 | 
					
					
						|||
| 
						
						
							
						
						cd76702ab2
	
				 | 
					
					
						|||
| 
						
						
							
						
						977b073b58
	
				 | 
					
					
						|||
| 
						
						
							
						
						46be4836df
	
				 | 
					
					
						|||
| 
						
						
							
						
						05a41b2629
	
				 | 
					
					
						|||
| 
						
						
							
						
						a62ed5bbac
	
				 | 
					
					
						|||
| 
						
						
							
						
						9c9776bacd
	
				 | 
					
					
						|||
| 
						
						
							
						
						086b879ab8
	
				 | 
					
					
						|||
| 
						
						
							
						
						214c349869
	
				 | 
					
					
						|||
| 
						
						
							
						
						3d975c9437
	
				 | 
					
					
						|||
| 
						
						
							
						
						fce8fd40cc
	
				 | 
					
					
						|||
| 
						
						
							
						
						3597ab9420
	
				 | 
					
					
						|||
| 
						
						
							
						
						1635a730e8
	
				 | 
					
					
						|||
| 
						
						
							
						
						a64b1152a1
	
				 | 
					
					
						|||
| 
						
						
							
						
						a011b57ce2
	
				 | 
					
					
						|||
| 
						
						
							
						
						b1ee295345
	
				 | 
					
					
						|||
| 
						
						
							
						
						872f2d7c59
	
				 | 
					
					
						|||
| 
						
						
							
						
						f15d887dcd
	
				 | 
					
					
						|||
| 
						
						
							
						
						841bc00c51
	
				 | 
					
					
						|||
| 
						
						
							
						
						8afe4f8aad
	
				 | 
					
					
						|||
| 
						
						
							
						
						73cc8f448a
	
				 | 
					
					
						|||
| 
						
						
							
						
						4565afe294
	
				 | 
					
					
						|||
| 
						
						
							
						
						3ad8c79de8
	
				 | 
					
					
						|||
| 
						
						
							
						
						12fc3c228a
	
				 | 
					
					
						|||
| 
						
						
							
						
						175533a5e9
	
				 | 
					
					
						|||
| 
						
						
							
						
						a9b46141a9
	
				 | 
					
					
						|||
| 
						
						
							
						
						c38cca3b92
	
				 | 
					
					
						|||
| 
						
						
							
						
						aee7540faa
	
				 | 
					
					
						|||
| 
						
						
							
						
						53ba996ec9
	
				 | 
					
					
						|||
| 
						
						
							
						
						d450c6cc5f
	
				 | 
					
					
						|||
| 
						
						
							
						
						f8ea1634c4
	
				 | 
					
					
						|||
| 
						
						
							
						
						ef257cd575
	
				 | 
					
					
						|||
| 
						
						
							
						
						69eccc7065
	
				 | 
					
					
						|||
| 
						
						
							
						
						13d2ff115b
	
				 | 
					
					
						|||
| 
						
						
							
						
						9e4692bb09
	
				 | 
					
					
						|||
| 
						
						
							
						
						1c4343058d
	
				 | 
					
					
						|||
| 
						
						
							
						
						e5156cddbf
	
				 | 
					
					
						|||
| 
						
						
							
						
						34521e61c1
	
				 | 
					
					
						|||
| 
						
						
							
						
						c22dd67fc1
	
				 | 
					
					
						|||
| 
						
						
							
						
						274d5f03e7
	
				 | 
					
					
						
							
								
								
									
										2
									
								
								LICENSE
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								LICENSE
									
									
									
									
									
								
							@@ -1,4 +1,4 @@
 | 
			
		||||
Copyright (c) 2014 - 2023, Přemysl Eric Janouch <p@janouch.name>
 | 
			
		||||
Copyright (c) 2014 - 2024, Přemysl Eric Janouch <p@janouch.name>
 | 
			
		||||
 | 
			
		||||
Permission to use, copy, modify, and/or distribute this software for any
 | 
			
		||||
purpose with or without fee is hereby granted.
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										23
									
								
								NEWS
									
									
									
									
									
								
							
							
						
						
									
										23
									
								
								NEWS
									
									
									
									
									
								
							@@ -1,4 +1,19 @@
 | 
			
		||||
2.0.0 (Unreleased)
 | 
			
		||||
2.1.0 (2024-12-19) "Bunnyrific"
 | 
			
		||||
 | 
			
		||||
 * xC: fixed a crash when the channel topic had too many formatting items
 | 
			
		||||
 | 
			
		||||
 * xC: fixed keyboard EOF behaviour with Readline >= 8.0
 | 
			
		||||
 | 
			
		||||
 * xC: made it possible to stream commands into the binary
 | 
			
		||||
 | 
			
		||||
 * xM/xW: various bugfixes
 | 
			
		||||
 | 
			
		||||
 * Added a Fyne frontend for xC called xA
 | 
			
		||||
 | 
			
		||||
 * Added a Qt Widgets frontend for xC called xT
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
2.0.0 (2024-07-28) "Perfect Is the Enemy of Good"
 | 
			
		||||
 | 
			
		||||
 * xD: now using SHA-256 for client certificate fingerprints
 | 
			
		||||
 | 
			
		||||
@@ -16,6 +31,8 @@
 | 
			
		||||
 | 
			
		||||
 * xC: replaced behaviour.save_on_quit with general.autosave
 | 
			
		||||
 | 
			
		||||
 * xC: the servers.*.command configuration option now supports multiple lines
 | 
			
		||||
 | 
			
		||||
 * xC: improved pager integration capabilities
 | 
			
		||||
 | 
			
		||||
 * xC: unsolicited JOINs will no longer automatically activate the buffer
 | 
			
		||||
@@ -33,8 +50,12 @@
 | 
			
		||||
 | 
			
		||||
 * Added a Win32 frontend for xC called xW
 | 
			
		||||
 | 
			
		||||
 * Added a Cocoa frontend for xC called xM
 | 
			
		||||
 | 
			
		||||
 * Added a Go port of xD called xS
 | 
			
		||||
 | 
			
		||||
 * Added a simple notifier called xN
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
1.5.0 (2021-12-21) "The Show Must Go On"
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										42
									
								
								README.adoc
									
									
									
									
									
								
							
							
						
						
									
										42
									
								
								README.adoc
									
									
									
									
									
								
							@@ -1,9 +1,10 @@
 | 
			
		||||
xK
 | 
			
		||||
==
 | 
			
		||||
 | 
			
		||||
'xK' (chat kit) is an IRC software suite consisting of a daemon, bot, terminal
 | 
			
		||||
client, and web + Win32 frontends for the client.  It's all you're ever going to
 | 
			
		||||
need for chatting, so long as you can make do with slightly minimalist software.
 | 
			
		||||
'xK' (chat kit) is an IRC software suite consisting of a daemon, bot, notifier,
 | 
			
		||||
terminal client, and web/Windows/macOS/Linux/FreeBSD/Android/iOS frontends
 | 
			
		||||
for the client.  It's all you're ever going to need for chatting, so long as
 | 
			
		||||
you can make do with slightly minimalist software.
 | 
			
		||||
 | 
			
		||||
They're all lean on dependencies, and offer a maximally permissive licence.
 | 
			
		||||
 | 
			
		||||
@@ -32,6 +33,11 @@ including link:xC.adoc#_key_bindings[keyboard shortcuts].
 | 
			
		||||
 | 
			
		||||
image::xP.webp[align="center"]
 | 
			
		||||
 | 
			
		||||
xA, xT, xW, xM
 | 
			
		||||
--------------
 | 
			
		||||
Fyne, Qt Widgets, Win32, Cocoa frontends for 'xC'.
 | 
			
		||||
Using them is not recommended.
 | 
			
		||||
 | 
			
		||||
xD
 | 
			
		||||
--
 | 
			
		||||
The IRC daemon.  It is designed for use as a regular user application rather
 | 
			
		||||
@@ -55,6 +61,10 @@ https://github.com/kiwiirc/webircgateway[].
 | 
			
		||||
Any further development, such as P10 or TS6 linking for IRC services,
 | 
			
		||||
or plugin support for arbitrary bridges, will happen here.
 | 
			
		||||
 | 
			
		||||
xN
 | 
			
		||||
--
 | 
			
		||||
The IRC notifier, should you ever need to send automated messages from a script.
 | 
			
		||||
 | 
			
		||||
xB
 | 
			
		||||
--
 | 
			
		||||
The IRC bot.  While originally intended to be a simple rewrite of my old GNU AWK
 | 
			
		||||
@@ -137,16 +147,38 @@ For remote use, it's recommended to put 'xP' behind a reverse proxy, with TLS,
 | 
			
		||||
and some form of HTTP authentication.  Pass the external URL of the WebSocket
 | 
			
		||||
endpoint as the third command line argument in this case.
 | 
			
		||||
 | 
			
		||||
xA
 | 
			
		||||
~~
 | 
			
		||||
The Fyne frontend supports all of Linux, FreeBSD, Windows, macOS, Android, and
 | 
			
		||||
iOS natively, albeit somewhat poorly.  Only use `fyne` or `fyne-cross` after
 | 
			
		||||
running `make generate` first.
 | 
			
		||||
 | 
			
		||||
xT
 | 
			
		||||
~~
 | 
			
		||||
The Qt Widgets frontend is a separate CMake subproject.  It generally supports
 | 
			
		||||
all desktop operating systems.  To avoid having to specify the relay address
 | 
			
		||||
each time you run it, pass it on the command line.
 | 
			
		||||
 | 
			
		||||
xW
 | 
			
		||||
~~
 | 
			
		||||
The Win32 frontend is a separate CMake subproject that should be compiled
 | 
			
		||||
using MinGW-w64.  In order to run it, make a shortcut for the executable and
 | 
			
		||||
include the relay address in its _Target_ field:
 | 
			
		||||
using MinGW-w64.  To avoid having to specify the relay address each time you
 | 
			
		||||
run it, create a shortcut for the executable and include the address in its
 | 
			
		||||
_Target_ field:
 | 
			
		||||
 | 
			
		||||
 C:\...\xW.exe 127.0.0.1 9000
 | 
			
		||||
 | 
			
		||||
It works reasonably well starting with Windows 7.
 | 
			
		||||
 | 
			
		||||
xM
 | 
			
		||||
~~
 | 
			
		||||
The Cocoa frontend is a separate CMake subproject that requires Xcode to build.
 | 
			
		||||
It is currently not that usable.  The relay address can either be passed on
 | 
			
		||||
the command line, or preset in the _defaults_ database:
 | 
			
		||||
 | 
			
		||||
 $ defaults write name.janouch.xM relayHost 127.0.0.1
 | 
			
		||||
 $ defaults write name.janouch.xM relayPort 9000
 | 
			
		||||
 | 
			
		||||
Client Certificates
 | 
			
		||||
-------------------
 | 
			
		||||
'xC' will use the SASL EXTERNAL method to authenticate using the TLS client
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								liberty
									
									
									
									
									
								
							
							
								
								
								
								
								
							
						
						
									
										2
									
								
								liberty
									
									
									
									
									
								
							 Submodule liberty updated: 62166f9679...1930f138d4
									
								
							
							
								
								
									
										5
									
								
								xA/.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								xA/.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1,5 @@
 | 
			
		||||
/xA
 | 
			
		||||
/proto.go
 | 
			
		||||
/FyneApp.toml
 | 
			
		||||
/*.png
 | 
			
		||||
/beep.raw
 | 
			
		||||
							
								
								
									
										36
									
								
								xA/Makefile
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										36
									
								
								xA/Makefile
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,36 @@
 | 
			
		||||
.POSIX:
 | 
			
		||||
.SUFFIXES:
 | 
			
		||||
.SUFFIXES: .png .svg
 | 
			
		||||
AWK = env LC_ALL=C awk
 | 
			
		||||
 | 
			
		||||
tools = ../liberty/tools
 | 
			
		||||
generated = FyneApp.toml xA.png xA-highlighted.png beep.raw proto.go
 | 
			
		||||
outputs = xA $(generated)
 | 
			
		||||
all: $(outputs)
 | 
			
		||||
generate: $(generated)
 | 
			
		||||
 | 
			
		||||
FyneApp.toml: ../xK-version
 | 
			
		||||
	printf "\
 | 
			
		||||
	[Details]\n\
 | 
			
		||||
	Icon = 'xA.png'\n\
 | 
			
		||||
	Name = 'xA'\n\
 | 
			
		||||
	ID = 'name.janouch.xA'\n\
 | 
			
		||||
	Version = '$$(cat ../xK-version)'\n\
 | 
			
		||||
	Build = 1\n\
 | 
			
		||||
	\n\
 | 
			
		||||
	[LinuxAndBSD]\n\
 | 
			
		||||
	GenericName = 'IRC Client'\n\
 | 
			
		||||
	Categories = ['Network', 'Chat', 'IRCClient']\n" > $@
 | 
			
		||||
.svg.png:
 | 
			
		||||
	rsvg-convert --output=$@ -- $<
 | 
			
		||||
beep.raw:
 | 
			
		||||
	sox -Dr 44100 -c 1 -e signed-integer -b 16 -L -n $@ \
 | 
			
		||||
		synth 0.1 0 25 triangle 800 vol 0.5 fade t 0 -0 0.005 pad 0 0.05
 | 
			
		||||
proto.go: $(tools)/lxdrgen.awk $(tools)/lxdrgen-go.awk ../xC.lxdr
 | 
			
		||||
	$(AWK) -f $(tools)/lxdrgen.awk -f $(tools)/lxdrgen-go.awk \
 | 
			
		||||
		-v PrefixCamel=Relay ../xC.lxdr > $@
 | 
			
		||||
xA: xA.go ../xK-version $(generated)
 | 
			
		||||
	go build -ldflags "-X 'main.projectVersion=$$(cat ../xK-version)'" -o $@ \
 | 
			
		||||
		-gcflags=all="-N -l"
 | 
			
		||||
clean:
 | 
			
		||||
	rm -f $(outputs)
 | 
			
		||||
							
								
								
									
										41
									
								
								xA/go.mod
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										41
									
								
								xA/go.mod
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,41 @@
 | 
			
		||||
module janouch.name/xK/xA
 | 
			
		||||
 | 
			
		||||
go 1.22
 | 
			
		||||
 | 
			
		||||
require (
 | 
			
		||||
	fyne.io/fyne/v2 v2.5.2
 | 
			
		||||
	github.com/ebitengine/oto/v3 v3.3.1
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
require (
 | 
			
		||||
	fyne.io/systray v1.11.0 // indirect
 | 
			
		||||
	github.com/BurntSushi/toml v1.4.0 // indirect
 | 
			
		||||
	github.com/davecgh/go-spew v1.1.1 // indirect
 | 
			
		||||
	github.com/ebitengine/purego v0.8.1 // indirect
 | 
			
		||||
	github.com/fredbi/uri v1.1.0 // indirect
 | 
			
		||||
	github.com/fsnotify/fsnotify v1.8.0 // indirect
 | 
			
		||||
	github.com/fyne-io/gl-js v0.0.0-20230506162202-1fdaa286a934 // indirect
 | 
			
		||||
	github.com/fyne-io/glfw-js v0.0.0-20240101223322-6e1efdc71b7a // indirect
 | 
			
		||||
	github.com/fyne-io/image v0.0.0-20240417123036-dc0ee9e7c964 // indirect
 | 
			
		||||
	github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 // indirect
 | 
			
		||||
	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a // indirect
 | 
			
		||||
	github.com/go-text/render v0.2.0 // indirect
 | 
			
		||||
	github.com/go-text/typesetting v0.2.0 // indirect
 | 
			
		||||
	github.com/godbus/dbus/v5 v5.1.0 // indirect
 | 
			
		||||
	github.com/gopherjs/gopherjs v1.17.2 // indirect
 | 
			
		||||
	github.com/jeandeaual/go-locale v0.0.0-20240223122105-ce5225dcaa49 // indirect
 | 
			
		||||
	github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 // indirect
 | 
			
		||||
	github.com/nicksnyder/go-i18n/v2 v2.4.1 // indirect
 | 
			
		||||
	github.com/pmezard/go-difflib v1.0.0 // indirect
 | 
			
		||||
	github.com/rymdport/portal v0.3.0 // indirect
 | 
			
		||||
	github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect
 | 
			
		||||
	github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect
 | 
			
		||||
	github.com/stretchr/testify v1.9.0 // indirect
 | 
			
		||||
	github.com/yuin/goldmark v1.7.8 // indirect
 | 
			
		||||
	golang.org/x/image v0.22.0 // indirect
 | 
			
		||||
	golang.org/x/mobile v0.0.0-20241108191957-fa514ef75a0f // indirect
 | 
			
		||||
	golang.org/x/net v0.31.0 // indirect
 | 
			
		||||
	golang.org/x/sys v0.27.0 // indirect
 | 
			
		||||
	golang.org/x/text v0.20.0 // indirect
 | 
			
		||||
	gopkg.in/yaml.v3 v3.0.1 // indirect
 | 
			
		||||
)
 | 
			
		||||
							
								
								
									
										659
									
								
								xA/go.sum
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										659
									
								
								xA/go.sum
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,659 @@
 | 
			
		||||
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 | 
			
		||||
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 | 
			
		||||
cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
 | 
			
		||||
cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
 | 
			
		||||
cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
 | 
			
		||||
cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
 | 
			
		||||
cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
 | 
			
		||||
cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
 | 
			
		||||
cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
 | 
			
		||||
cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
 | 
			
		||||
cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
 | 
			
		||||
cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
 | 
			
		||||
cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
 | 
			
		||||
cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
 | 
			
		||||
cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
 | 
			
		||||
cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
 | 
			
		||||
cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
 | 
			
		||||
cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
 | 
			
		||||
cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
 | 
			
		||||
cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
 | 
			
		||||
cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 | 
			
		||||
cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 | 
			
		||||
cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
 | 
			
		||||
cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
 | 
			
		||||
cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 | 
			
		||||
cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
 | 
			
		||||
cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 | 
			
		||||
cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
 | 
			
		||||
cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
 | 
			
		||||
cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 | 
			
		||||
cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 | 
			
		||||
cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
 | 
			
		||||
cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
 | 
			
		||||
cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 | 
			
		||||
cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
 | 
			
		||||
cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
 | 
			
		||||
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 | 
			
		||||
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 | 
			
		||||
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 | 
			
		||||
fyne.io/fyne/v2 v2.5.2 h1:eSyGTmSkv10yAdAeHpDet6u2KkKxOGFc14kQu81We7Q=
 | 
			
		||||
fyne.io/fyne/v2 v2.5.2/go.mod h1:26gqPDvtaxHeyct+C0BBjuGd2zwAJlPkUGSBrb+d7Ug=
 | 
			
		||||
fyne.io/systray v1.11.0 h1:D9HISlxSkx+jHSniMBR6fCFOUjk1x/OOOJLa9lJYAKg=
 | 
			
		||||
fyne.io/systray v1.11.0/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs=
 | 
			
		||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 | 
			
		||||
github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
 | 
			
		||||
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 | 
			
		||||
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 | 
			
		||||
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 | 
			
		||||
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 | 
			
		||||
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 | 
			
		||||
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 | 
			
		||||
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 | 
			
		||||
github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
 | 
			
		||||
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 | 
			
		||||
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 | 
			
		||||
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 | 
			
		||||
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 | 
			
		||||
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 | 
			
		||||
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 | 
			
		||||
github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 | 
			
		||||
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 | 
			
		||||
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 | 
			
		||||
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 | 
			
		||||
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 | 
			
		||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 | 
			
		||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 | 
			
		||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 | 
			
		||||
github.com/ebitengine/oto/v3 v3.3.1 h1:d4McwGQuXOT0GL7bA5g9ZnaUEIEjQvG3hafzMy+T3qE=
 | 
			
		||||
github.com/ebitengine/oto/v3 v3.3.1/go.mod h1:MZeb/lwoC4DCOdiTIxYezrURTw7EvK/yF863+tmBI+U=
 | 
			
		||||
github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/BE=
 | 
			
		||||
github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 | 
			
		||||
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 | 
			
		||||
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 | 
			
		||||
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 | 
			
		||||
github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 | 
			
		||||
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 | 
			
		||||
github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 | 
			
		||||
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 | 
			
		||||
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 | 
			
		||||
github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g=
 | 
			
		||||
github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw=
 | 
			
		||||
github.com/fredbi/uri v1.1.0 h1:OqLpTXtyRg9ABReqvDGdJPqZUxs8cyBDOMXBbskCaB8=
 | 
			
		||||
github.com/fredbi/uri v1.1.0/go.mod h1:aYTUoAXBOq7BLfVJ8GnKmfcuURosB1xyHDIfWeC/iW4=
 | 
			
		||||
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 | 
			
		||||
github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
 | 
			
		||||
github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 | 
			
		||||
github.com/fyne-io/gl-js v0.0.0-20230506162202-1fdaa286a934 h1:dZC5aKobSN07hf71oMivxUmAofFja5GrfPK2rBlttX4=
 | 
			
		||||
github.com/fyne-io/gl-js v0.0.0-20230506162202-1fdaa286a934/go.mod h1:d4clgH0/GrRwWjRzJJQXxT/h1TyuNSfF/X64zb/3Ggg=
 | 
			
		||||
github.com/fyne-io/glfw-js v0.0.0-20240101223322-6e1efdc71b7a h1:ybgRdYvAHTn93HW79bLiBiJwVL4jVeyGQRZMgImoeWs=
 | 
			
		||||
github.com/fyne-io/glfw-js v0.0.0-20240101223322-6e1efdc71b7a/go.mod h1:gsGA2dotD4v0SR6PmPCYvS9JuOeMwAtmfvDE7mbYXMY=
 | 
			
		||||
github.com/fyne-io/image v0.0.0-20240417123036-dc0ee9e7c964 h1:0pTELtjlVAVGSazfwRNcqTVzqmkWb1GsNozCmmZfdZA=
 | 
			
		||||
github.com/fyne-io/image v0.0.0-20240417123036-dc0ee9e7c964/go.mod h1:J9Uunu842kOcTjzQj4Eq8XIDmF55szvT1PTS1cUb1UE=
 | 
			
		||||
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 | 
			
		||||
github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw=
 | 
			
		||||
github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 h1:5BVwOaUSBTlVZowGO6VZGw2H/zl9nrd3eCZfYV+NfQA=
 | 
			
		||||
github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw=
 | 
			
		||||
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 | 
			
		||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 | 
			
		||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 | 
			
		||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a h1:vxnBhFDDT+xzxf1jTJKMKZw3H0swfWk9RpWbBbDK5+0=
 | 
			
		||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 | 
			
		||||
github.com/go-text/render v0.2.0 h1:LBYoTmp5jYiJ4NPqDc2pz17MLmA3wHw1dZSVGcOdeAc=
 | 
			
		||||
github.com/go-text/render v0.2.0/go.mod h1:CkiqfukRGKJA5vZZISkjSYrcdtgKQWRa2HIzvwNN5SU=
 | 
			
		||||
github.com/go-text/typesetting v0.2.0 h1:fbzsgbmk04KiWtE+c3ZD4W2nmCRzBqrqQOvYlwAOdho=
 | 
			
		||||
github.com/go-text/typesetting v0.2.0/go.mod h1:2+owI/sxa73XA581LAzVuEBZ3WEEV2pXeDswCH/3i1I=
 | 
			
		||||
github.com/go-text/typesetting-utils v0.0.0-20240317173224-1986cbe96c66 h1:GUrm65PQPlhFSKjLPGOZNPNxLCybjzjYBzjfoBGaDUY=
 | 
			
		||||
github.com/go-text/typesetting-utils v0.0.0-20240317173224-1986cbe96c66/go.mod h1:DDxDdQEnB70R8owOx3LVpEFvpMK9eeH1o2r0yZhFI9o=
 | 
			
		||||
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 | 
			
		||||
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
 | 
			
		||||
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 | 
			
		||||
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 | 
			
		||||
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 | 
			
		||||
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 | 
			
		||||
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 | 
			
		||||
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 | 
			
		||||
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 | 
			
		||||
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 | 
			
		||||
github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
 | 
			
		||||
github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 | 
			
		||||
github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 | 
			
		||||
github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 | 
			
		||||
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
 | 
			
		||||
github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
 | 
			
		||||
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 | 
			
		||||
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 | 
			
		||||
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 | 
			
		||||
github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 | 
			
		||||
github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 | 
			
		||||
github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 | 
			
		||||
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 | 
			
		||||
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 | 
			
		||||
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 | 
			
		||||
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 | 
			
		||||
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 | 
			
		||||
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 | 
			
		||||
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 | 
			
		||||
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 | 
			
		||||
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 | 
			
		||||
github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
 | 
			
		||||
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 | 
			
		||||
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 | 
			
		||||
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 | 
			
		||||
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 | 
			
		||||
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 | 
			
		||||
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 | 
			
		||||
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 | 
			
		||||
github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 | 
			
		||||
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 | 
			
		||||
github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 | 
			
		||||
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 | 
			
		||||
github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 | 
			
		||||
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 | 
			
		||||
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 | 
			
		||||
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 | 
			
		||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 | 
			
		||||
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 | 
			
		||||
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 | 
			
		||||
github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 | 
			
		||||
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 | 
			
		||||
github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 | 
			
		||||
github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 | 
			
		||||
github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 | 
			
		||||
github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 | 
			
		||||
github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 | 
			
		||||
github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 | 
			
		||||
github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 | 
			
		||||
github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 | 
			
		||||
github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 | 
			
		||||
github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 | 
			
		||||
github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8fqdZK1R22vvA0J7JZKcuOIQ7Y=
 | 
			
		||||
github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg=
 | 
			
		||||
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 | 
			
		||||
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 | 
			
		||||
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 | 
			
		||||
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 | 
			
		||||
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 | 
			
		||||
github.com/gopherjs/gopherjs v0.0.0-20211219123610-ec9572f70e60/go.mod h1:cz9oNYuRUWGdHmLF2IodMLkAhcPtXeULvcBNagUrxTI=
 | 
			
		||||
github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
 | 
			
		||||
github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
 | 
			
		||||
github.com/goxjs/gl v0.0.0-20210104184919-e3fafc6f8f2a/go.mod h1:dy/f2gjY09hwVfIyATps4G2ai7/hLwLkc5TrPqONuXY=
 | 
			
		||||
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 | 
			
		||||
github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
 | 
			
		||||
github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 | 
			
		||||
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 | 
			
		||||
github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 | 
			
		||||
github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 | 
			
		||||
github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 | 
			
		||||
github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 | 
			
		||||
github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
 | 
			
		||||
github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
 | 
			
		||||
github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
 | 
			
		||||
github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 | 
			
		||||
github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 | 
			
		||||
github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
 | 
			
		||||
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 | 
			
		||||
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 | 
			
		||||
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 | 
			
		||||
github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
 | 
			
		||||
github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
 | 
			
		||||
github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
 | 
			
		||||
github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 | 
			
		||||
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 | 
			
		||||
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 | 
			
		||||
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 | 
			
		||||
github.com/jeandeaual/go-locale v0.0.0-20240223122105-ce5225dcaa49 h1:Po+wkNdMmN+Zj1tDsJQy7mJlPlwGNQd9JZoPjObagf8=
 | 
			
		||||
github.com/jeandeaual/go-locale v0.0.0-20240223122105-ce5225dcaa49/go.mod h1:YiutDnxPRLk5DLUFj6Rw4pRBBURZY07GFr54NdV9mQg=
 | 
			
		||||
github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 | 
			
		||||
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 | 
			
		||||
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 | 
			
		||||
github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 h1:YLvr1eE6cdCqjOe972w/cYF+FjW34v27+9Vo5106B4M=
 | 
			
		||||
github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw=
 | 
			
		||||
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 | 
			
		||||
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 | 
			
		||||
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 | 
			
		||||
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 | 
			
		||||
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 | 
			
		||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 | 
			
		||||
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 | 
			
		||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 | 
			
		||||
github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
 | 
			
		||||
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 | 
			
		||||
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 | 
			
		||||
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 | 
			
		||||
github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 | 
			
		||||
github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 | 
			
		||||
github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 | 
			
		||||
github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
 | 
			
		||||
github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 | 
			
		||||
github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 | 
			
		||||
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 | 
			
		||||
github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 | 
			
		||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 | 
			
		||||
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 | 
			
		||||
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 | 
			
		||||
github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
 | 
			
		||||
github.com/neelance/sourcemap v0.0.0-20200213170602-2833bce08e4c/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
 | 
			
		||||
github.com/nicksnyder/go-i18n/v2 v2.4.1 h1:zwzjtX4uYyiaU02K5Ia3zSkpJZrByARkRB4V3YPrr0g=
 | 
			
		||||
github.com/nicksnyder/go-i18n/v2 v2.4.1/go.mod h1:++Pl70FR6Cki7hdzZRnEEqdc2dJt+SAGotyFg/SvZMk=
 | 
			
		||||
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 | 
			
		||||
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 | 
			
		||||
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 | 
			
		||||
github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 | 
			
		||||
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 | 
			
		||||
github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA=
 | 
			
		||||
github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo=
 | 
			
		||||
github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
 | 
			
		||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 | 
			
		||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 | 
			
		||||
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 | 
			
		||||
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 | 
			
		||||
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 | 
			
		||||
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 | 
			
		||||
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 | 
			
		||||
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 | 
			
		||||
github.com/rymdport/portal v0.3.0 h1:QRHcwKwx3kY5JTQcsVhmhC3TGqGQb9LFghVNUy8AdB8=
 | 
			
		||||
github.com/rymdport/portal v0.3.0/go.mod h1:kFF4jslnJ8pD5uCi17brj/ODlfIidOxlgUDTO5ncnC4=
 | 
			
		||||
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 | 
			
		||||
github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
 | 
			
		||||
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
 | 
			
		||||
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 | 
			
		||||
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
 | 
			
		||||
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 | 
			
		||||
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 | 
			
		||||
github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
 | 
			
		||||
github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 | 
			
		||||
github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk=
 | 
			
		||||
github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 | 
			
		||||
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 | 
			
		||||
github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
 | 
			
		||||
github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c h1:km8GpoQut05eY3GiYWEedbTT0qnSxrCjsVbb7yKY1KE=
 | 
			
		||||
github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c/go.mod h1:cNQ3dwVJtS5Hmnjxy6AgTPd0Inb3pW05ftPSX7NZO7Q=
 | 
			
		||||
github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef h1:Ch6Q+AZUxDBCVqdkI8FSpFyZDtCVBc2VmejdNrm5rRQ=
 | 
			
		||||
github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef/go.mod h1:nXTWP6+gD5+LUJ8krVhhoeHjvHTutPxMYl5SvkcnJNE=
 | 
			
		||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 | 
			
		||||
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 | 
			
		||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 | 
			
		||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 | 
			
		||||
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 | 
			
		||||
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 | 
			
		||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 | 
			
		||||
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 | 
			
		||||
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 | 
			
		||||
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 | 
			
		||||
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 | 
			
		||||
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 | 
			
		||||
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 | 
			
		||||
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 | 
			
		||||
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 | 
			
		||||
github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 | 
			
		||||
github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic=
 | 
			
		||||
github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
 | 
			
		||||
go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
 | 
			
		||||
go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
 | 
			
		||||
go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
 | 
			
		||||
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 | 
			
		||||
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 | 
			
		||||
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 | 
			
		||||
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 | 
			
		||||
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 | 
			
		||||
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 | 
			
		||||
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 | 
			
		||||
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 | 
			
		||||
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 | 
			
		||||
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
 | 
			
		||||
golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 | 
			
		||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 | 
			
		||||
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 | 
			
		||||
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 | 
			
		||||
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 | 
			
		||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 | 
			
		||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 | 
			
		||||
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 | 
			
		||||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 | 
			
		||||
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 | 
			
		||||
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
 | 
			
		||||
golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
 | 
			
		||||
golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
 | 
			
		||||
golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
 | 
			
		||||
golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 | 
			
		||||
golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 | 
			
		||||
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 | 
			
		||||
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 | 
			
		||||
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
 | 
			
		||||
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 | 
			
		||||
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 | 
			
		||||
golang.org/x/image v0.22.0 h1:UtK5yLUzilVrkjMAZAZ34DXGpASN8i8pj8g+O+yd10g=
 | 
			
		||||
golang.org/x/image v0.22.0/go.mod h1:9hPFhljd4zZ1GNSIZJ49sqbp45GKK9t6w+iXvGqZUz4=
 | 
			
		||||
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 | 
			
		||||
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 | 
			
		||||
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 | 
			
		||||
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 | 
			
		||||
golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 | 
			
		||||
golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 | 
			
		||||
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 | 
			
		||||
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
 | 
			
		||||
golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 | 
			
		||||
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 | 
			
		||||
golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 | 
			
		||||
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 | 
			
		||||
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 | 
			
		||||
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 | 
			
		||||
golang.org/x/mobile v0.0.0-20211207041440-4e6c2922fdee/go.mod h1:pe2sM7Uk+2Su1y7u/6Z8KJ24D7lepUjFZbhFOrmDfuQ=
 | 
			
		||||
golang.org/x/mobile v0.0.0-20241108191957-fa514ef75a0f h1:23H/YlmTHfmmvpZ+ajKZL0qLz0+IwFOIqQA0mQbmLeM=
 | 
			
		||||
golang.org/x/mobile v0.0.0-20241108191957-fa514ef75a0f/go.mod h1:UbSUP4uu/C9hw9R2CkojhXlAxvayHjBdU9aRvE+c1To=
 | 
			
		||||
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 | 
			
		||||
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 | 
			
		||||
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 | 
			
		||||
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 | 
			
		||||
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 | 
			
		||||
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 | 
			
		||||
golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 | 
			
		||||
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 | 
			
		||||
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 | 
			
		||||
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 | 
			
		||||
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 | 
			
		||||
golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 | 
			
		||||
golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 | 
			
		||||
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 | 
			
		||||
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 | 
			
		||||
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 | 
			
		||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 | 
			
		||||
golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 | 
			
		||||
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 | 
			
		||||
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 | 
			
		||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 | 
			
		||||
golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 | 
			
		||||
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 | 
			
		||||
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 | 
			
		||||
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 | 
			
		||||
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 | 
			
		||||
golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 | 
			
		||||
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 | 
			
		||||
golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 | 
			
		||||
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 | 
			
		||||
golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 | 
			
		||||
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 | 
			
		||||
golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 | 
			
		||||
golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 | 
			
		||||
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 | 
			
		||||
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 | 
			
		||||
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 | 
			
		||||
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 | 
			
		||||
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 | 
			
		||||
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 | 
			
		||||
golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 | 
			
		||||
golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 | 
			
		||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 | 
			
		||||
golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 | 
			
		||||
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 | 
			
		||||
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 | 
			
		||||
golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
 | 
			
		||||
golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
 | 
			
		||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 | 
			
		||||
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 | 
			
		||||
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 | 
			
		||||
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 | 
			
		||||
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 | 
			
		||||
golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 | 
			
		||||
golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 | 
			
		||||
golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 | 
			
		||||
golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 | 
			
		||||
golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 | 
			
		||||
golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 | 
			
		||||
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 | 
			
		||||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 | 
			
		||||
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 | 
			
		||||
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 | 
			
		||||
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 | 
			
		||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 | 
			
		||||
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 | 
			
		||||
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 | 
			
		||||
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 | 
			
		||||
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 | 
			
		||||
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 | 
			
		||||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 | 
			
		||||
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 | 
			
		||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 | 
			
		||||
golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 | 
			
		||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 | 
			
		||||
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 | 
			
		||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 | 
			
		||||
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 | 
			
		||||
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 | 
			
		||||
golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
 | 
			
		||||
golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 | 
			
		||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 | 
			
		||||
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 | 
			
		||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 | 
			
		||||
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 | 
			
		||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 | 
			
		||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 | 
			
		||||
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 | 
			
		||||
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 | 
			
		||||
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 | 
			
		||||
golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
 | 
			
		||||
golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
 | 
			
		||||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 | 
			
		||||
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 | 
			
		||||
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 | 
			
		||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 | 
			
		||||
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 | 
			
		||||
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 | 
			
		||||
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 | 
			
		||||
golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 | 
			
		||||
golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 | 
			
		||||
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 | 
			
		||||
golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 | 
			
		||||
golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 | 
			
		||||
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 | 
			
		||||
golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 | 
			
		||||
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 | 
			
		||||
golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 | 
			
		||||
golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 | 
			
		||||
golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 | 
			
		||||
golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 | 
			
		||||
golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 | 
			
		||||
golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 | 
			
		||||
golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 | 
			
		||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 | 
			
		||||
golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 | 
			
		||||
golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 | 
			
		||||
golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 | 
			
		||||
golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 | 
			
		||||
golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 | 
			
		||||
golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 | 
			
		||||
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 | 
			
		||||
golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 | 
			
		||||
golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 | 
			
		||||
golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 | 
			
		||||
golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 | 
			
		||||
golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 | 
			
		||||
golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 | 
			
		||||
golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 | 
			
		||||
golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 | 
			
		||||
golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 | 
			
		||||
golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 | 
			
		||||
golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 | 
			
		||||
golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 | 
			
		||||
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 | 
			
		||||
golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 | 
			
		||||
golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 | 
			
		||||
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 | 
			
		||||
golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
 | 
			
		||||
golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 | 
			
		||||
golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 | 
			
		||||
golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 | 
			
		||||
golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 | 
			
		||||
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 | 
			
		||||
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 | 
			
		||||
golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 | 
			
		||||
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 | 
			
		||||
golang.org/x/tools v0.1.8-0.20211022200916-316ba0b74098/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
 | 
			
		||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 | 
			
		||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 | 
			
		||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 | 
			
		||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 | 
			
		||||
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 | 
			
		||||
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
 | 
			
		||||
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
 | 
			
		||||
google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
 | 
			
		||||
google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 | 
			
		||||
google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 | 
			
		||||
google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 | 
			
		||||
google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 | 
			
		||||
google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 | 
			
		||||
google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 | 
			
		||||
google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 | 
			
		||||
google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 | 
			
		||||
google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
 | 
			
		||||
google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
 | 
			
		||||
google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
 | 
			
		||||
google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
 | 
			
		||||
google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
 | 
			
		||||
google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
 | 
			
		||||
google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
 | 
			
		||||
google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
 | 
			
		||||
google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
 | 
			
		||||
google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8=
 | 
			
		||||
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 | 
			
		||||
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 | 
			
		||||
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 | 
			
		||||
google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 | 
			
		||||
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 | 
			
		||||
google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 | 
			
		||||
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
 | 
			
		||||
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
 | 
			
		||||
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 | 
			
		||||
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 | 
			
		||||
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 | 
			
		||||
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 | 
			
		||||
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 | 
			
		||||
google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 | 
			
		||||
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 | 
			
		||||
google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 | 
			
		||||
google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
 | 
			
		||||
google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
 | 
			
		||||
google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 | 
			
		||||
google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 | 
			
		||||
google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 | 
			
		||||
google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 | 
			
		||||
google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 | 
			
		||||
google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
 | 
			
		||||
google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 | 
			
		||||
google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 | 
			
		||||
google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 | 
			
		||||
google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
 | 
			
		||||
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 | 
			
		||||
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 | 
			
		||||
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 | 
			
		||||
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 | 
			
		||||
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 | 
			
		||||
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 | 
			
		||||
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 | 
			
		||||
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 | 
			
		||||
google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 | 
			
		||||
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 | 
			
		||||
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 | 
			
		||||
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 | 
			
		||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 | 
			
		||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 | 
			
		||||
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 | 
			
		||||
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 | 
			
		||||
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 | 
			
		||||
gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 | 
			
		||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 | 
			
		||||
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 | 
			
		||||
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 | 
			
		||||
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 | 
			
		||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 | 
			
		||||
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 | 
			
		||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 | 
			
		||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 | 
			
		||||
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 | 
			
		||||
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 | 
			
		||||
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 | 
			
		||||
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 | 
			
		||||
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 | 
			
		||||
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 | 
			
		||||
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 | 
			
		||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 | 
			
		||||
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 | 
			
		||||
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 | 
			
		||||
							
								
								
									
										23
									
								
								xA/xA-highlighted.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								xA/xA-highlighted.svg
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,23 @@
 | 
			
		||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 | 
			
		||||
<svg version="1.1" width="512" height="512" viewBox="0 0 512 512"
 | 
			
		||||
   xmlns="http://www.w3.org/2000/svg">
 | 
			
		||||
 | 
			
		||||
  <defs>
 | 
			
		||||
    <linearGradient id="background" x1="0" y1="0" x2="0" y2="1">
 | 
			
		||||
      <stop stop-color="#ffaa00" offset="0" />
 | 
			
		||||
      <stop stop-color="#ffffff" offset="1" />
 | 
			
		||||
    </linearGradient>
 | 
			
		||||
    <clipPath id="clip">
 | 
			
		||||
      <rect x="0" y="0" width="1" height="1" />
 | 
			
		||||
    </clipPath>
 | 
			
		||||
  </defs>
 | 
			
		||||
 | 
			
		||||
  <rect x="0" y="0" width="512" height="512" fill="url(#background)" />
 | 
			
		||||
 | 
			
		||||
  <g transform="translate(64, 64) scale(384)" stroke-linecap="square">
 | 
			
		||||
    <g clip-path="url(#clip)">
 | 
			
		||||
      <path stroke="#ff0000" stroke-width="0.125"
 | 
			
		||||
         d="M 0.25,1.1 0.65,-0.1 M 0.75,1.1 0.35,-0.1 M 0.225,0.75 0.775,0.75" />
 | 
			
		||||
    </g>
 | 
			
		||||
  </g>
 | 
			
		||||
</svg>
 | 
			
		||||
| 
		 After Width: | Height: | Size: 781 B  | 
							
								
								
									
										23
									
								
								xA/xA.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								xA/xA.svg
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,23 @@
 | 
			
		||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 | 
			
		||||
<svg version="1.1" width="512" height="512" viewBox="0 0 512 512"
 | 
			
		||||
   xmlns="http://www.w3.org/2000/svg">
 | 
			
		||||
 | 
			
		||||
  <defs>
 | 
			
		||||
    <linearGradient id="background" x1="0" y1="0" x2="0" y2="1">
 | 
			
		||||
      <stop stop-color="#ffaa00" offset="0" />
 | 
			
		||||
      <stop stop-color="#ff0000" offset="1" />
 | 
			
		||||
    </linearGradient>
 | 
			
		||||
    <clipPath id="clip">
 | 
			
		||||
      <rect x="0" y="0" width="1" height="1" />
 | 
			
		||||
    </clipPath>
 | 
			
		||||
  </defs>
 | 
			
		||||
 | 
			
		||||
  <rect x="0" y="0" width="512" height="512" fill="url(#background)" />
 | 
			
		||||
 | 
			
		||||
  <g transform="translate(64, 64) scale(384)" stroke-linecap="square">
 | 
			
		||||
    <g clip-path="url(#clip)">
 | 
			
		||||
      <path stroke="#ffffff" stroke-width="0.125"
 | 
			
		||||
         d="M 0.25,1.1 0.65,-0.1 M 0.75,1.1 0.35,-0.1 M 0.225,0.75 0.775,0.75" />
 | 
			
		||||
    </g>
 | 
			
		||||
  </g>
 | 
			
		||||
</svg>
 | 
			
		||||
| 
		 After Width: | Height: | Size: 781 B  | 
							
								
								
									
										816
									
								
								xC.c
									
									
									
									
									
								
							
							
						
						
									
										816
									
								
								xC.c
									
									
									
									
									
								
							@@ -1,7 +1,7 @@
 | 
			
		||||
/*
 | 
			
		||||
 * xC.c: a terminal-based IRC client
 | 
			
		||||
 *
 | 
			
		||||
 * Copyright (c) 2015 - 2022, Přemysl Eric Janouch <p@janouch.name>
 | 
			
		||||
 * Copyright (c) 2015 - 2024, Přemysl Eric Janouch <p@janouch.name>
 | 
			
		||||
 *
 | 
			
		||||
 * Permission to use, copy, modify, and/or distribute this software for any
 | 
			
		||||
 * purpose with or without fee is hereby granted.
 | 
			
		||||
@@ -474,6 +474,10 @@ input_rl_start (void *input, const char *program_name)
 | 
			
		||||
	// autofilter, and we don't generally want alphabetic ordering at all
 | 
			
		||||
	rl_sort_completion_matches = false;
 | 
			
		||||
 | 
			
		||||
	// Readline >= 8.0 otherwise prints spurious newlines on EOF.
 | 
			
		||||
	if (RL_VERSION_MAJOR >= 8)
 | 
			
		||||
		rl_variable_bind ("enable-bracketed-paste", "off");
 | 
			
		||||
 | 
			
		||||
	hard_assert (self->prompt != NULL);
 | 
			
		||||
	// The inputrc is read before any callbacks are called, so we need to
 | 
			
		||||
	// register all functions that our user may want to map up front
 | 
			
		||||
@@ -1030,7 +1034,7 @@ input_el__save_buffer (struct input_el *self, struct input_el_buffer *buffer)
 | 
			
		||||
	int len = info->lastchar - info->buffer;
 | 
			
		||||
	int point = info->cursor - info->buffer;
 | 
			
		||||
 | 
			
		||||
	wchar_t *line = calloc (sizeof *info->buffer, len + 1);
 | 
			
		||||
	wchar_t *line = xcalloc (len + 1, sizeof *info->buffer);
 | 
			
		||||
	memcpy (line, info->buffer, sizeof *info->buffer * len);
 | 
			
		||||
	el_cursor (self->editline, len - point);
 | 
			
		||||
	el_wdeletestr (self->editline, len);
 | 
			
		||||
@@ -1635,7 +1639,7 @@ static struct formatter
 | 
			
		||||
formatter_make (struct app_context *ctx, struct server *s)
 | 
			
		||||
{
 | 
			
		||||
	struct formatter self = { .ctx = ctx, .s = s, .clean = true };
 | 
			
		||||
	self.items = xcalloc (sizeof *self.items, (self.items_alloc = 16));
 | 
			
		||||
	self.items = xcalloc ((self.items_alloc = 16), sizeof *self.items);
 | 
			
		||||
	return self;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -2567,7 +2571,7 @@ config_validate_nonnegative
 | 
			
		||||
	return false;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static struct config_schema g_config_server[] =
 | 
			
		||||
static const struct config_schema g_config_server[] =
 | 
			
		||||
{
 | 
			
		||||
	{ .name      = "nicks",
 | 
			
		||||
	  .comment   = "IRC nickname",
 | 
			
		||||
@@ -2664,7 +2668,7 @@ static struct config_schema g_config_server[] =
 | 
			
		||||
	{}
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
static struct config_schema g_config_general[] =
 | 
			
		||||
static const struct config_schema g_config_general[] =
 | 
			
		||||
{
 | 
			
		||||
	{ .name      = "autosave",
 | 
			
		||||
	  .comment   = "Save configuration automatically after each change",
 | 
			
		||||
@@ -2772,7 +2776,7 @@ static struct config_schema g_config_general[] =
 | 
			
		||||
	{}
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
static struct config_schema g_config_theme[] =
 | 
			
		||||
static const struct config_schema g_config_theme[] =
 | 
			
		||||
{
 | 
			
		||||
#define XX(x, y, z) { .name = #y, .comment = #z, .type = CONFIG_ITEM_STRING, \
 | 
			
		||||
	.on_change = on_config_theme_change },
 | 
			
		||||
@@ -2891,390 +2895,6 @@ serialize_configuration (struct config_item *root, struct str *output)
 | 
			
		||||
	config_item_write (root, true, output);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// --- Relay output ------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
client_kill (struct client *c)
 | 
			
		||||
{
 | 
			
		||||
	struct app_context *ctx = c->ctx;
 | 
			
		||||
	poller_fd_reset (&c->socket_event);
 | 
			
		||||
	xclose (c->socket_fd);
 | 
			
		||||
	c->socket_fd = -1;
 | 
			
		||||
 | 
			
		||||
	LIST_UNLINK (ctx->clients, c);
 | 
			
		||||
	client_destroy (c);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
client_update_poller (struct client *c, const struct pollfd *pfd)
 | 
			
		||||
{
 | 
			
		||||
	int new_events = POLLIN;
 | 
			
		||||
	if (c->write_buffer.len)
 | 
			
		||||
		new_events |= POLLOUT;
 | 
			
		||||
 | 
			
		||||
	hard_assert (new_events != 0);
 | 
			
		||||
	if (!pfd || pfd->events != new_events)
 | 
			
		||||
		poller_fd_set (&c->socket_event, new_events);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_send (struct client *c)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = &c->ctx->relay_message;
 | 
			
		||||
	m->event_seq = c->event_seq++;
 | 
			
		||||
 | 
			
		||||
	// TODO: Also don't try sending anything if half-closed.
 | 
			
		||||
	if (!c->initialized || c->socket_fd == -1)
 | 
			
		||||
		return;
 | 
			
		||||
 | 
			
		||||
	// liberty has msg_{reader,writer} already, but they use 8-byte lengths.
 | 
			
		||||
	size_t frame_len_pos = c->write_buffer.len, frame_len = 0;
 | 
			
		||||
	str_pack_u32 (&c->write_buffer, 0);
 | 
			
		||||
	if (!relay_event_message_serialize (m, &c->write_buffer)
 | 
			
		||||
	 || (frame_len = c->write_buffer.len - frame_len_pos - 4) > UINT32_MAX)
 | 
			
		||||
	{
 | 
			
		||||
		print_error ("serialization failed, killing client");
 | 
			
		||||
		client_kill (c);
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	uint32_t len = htonl (frame_len);
 | 
			
		||||
	memcpy (c->write_buffer.str + frame_len_pos, &len, sizeof len);
 | 
			
		||||
	client_update_poller (c, NULL);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_broadcast_except (struct app_context *ctx, struct client *exception)
 | 
			
		||||
{
 | 
			
		||||
	LIST_FOR_EACH (struct client, c, ctx->clients)
 | 
			
		||||
		if (c != exception)
 | 
			
		||||
			relay_send (c);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define relay_broadcast(ctx) relay_broadcast_except ((ctx), NULL)
 | 
			
		||||
 | 
			
		||||
static struct relay_event_message *
 | 
			
		||||
relay_prepare (struct app_context *ctx)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = &ctx->relay_message;
 | 
			
		||||
	relay_event_message_free (m);
 | 
			
		||||
	memset (m, 0, sizeof *m);
 | 
			
		||||
	return m;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_ping (struct app_context *ctx)
 | 
			
		||||
{
 | 
			
		||||
	relay_prepare (ctx)->data.event = RELAY_EVENT_PING;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static union relay_item_data *
 | 
			
		||||
relay_translate_formatter (struct app_context *ctx, union relay_item_data *p,
 | 
			
		||||
	const struct formatter_item *i)
 | 
			
		||||
{
 | 
			
		||||
	// XXX: See attr_printer_decode_color(), this is a footgun.
 | 
			
		||||
	int16_t c16  = i->color;
 | 
			
		||||
	int16_t c256 = i->color >> 16;
 | 
			
		||||
 | 
			
		||||
	unsigned attrs = i->attribute;
 | 
			
		||||
	switch (i->type)
 | 
			
		||||
	{
 | 
			
		||||
	case FORMATTER_ITEM_TEXT:
 | 
			
		||||
		p->text.text = str_from_cstr (i->text);
 | 
			
		||||
		(p++)->kind = RELAY_ITEM_TEXT;
 | 
			
		||||
		break;
 | 
			
		||||
	case FORMATTER_ITEM_FG_COLOR:
 | 
			
		||||
		p->fg_color.color = c256 <= 0 ? c16 : c256;
 | 
			
		||||
		(p++)->kind = RELAY_ITEM_FG_COLOR;
 | 
			
		||||
		break;
 | 
			
		||||
	case FORMATTER_ITEM_BG_COLOR:
 | 
			
		||||
		p->bg_color.color = c256 <= 0 ? c16 : c256;
 | 
			
		||||
		(p++)->kind = RELAY_ITEM_BG_COLOR;
 | 
			
		||||
		break;
 | 
			
		||||
	case FORMATTER_ITEM_ATTR:
 | 
			
		||||
		(p++)->kind = RELAY_ITEM_RESET;
 | 
			
		||||
		if ((c256 = ctx->theme[i->attribute].fg) >= 0)
 | 
			
		||||
		{
 | 
			
		||||
			p->fg_color.color = c256;
 | 
			
		||||
			(p++)->kind = RELAY_ITEM_FG_COLOR;
 | 
			
		||||
		}
 | 
			
		||||
		if ((c256 = ctx->theme[i->attribute].bg) >= 0)
 | 
			
		||||
		{
 | 
			
		||||
			p->bg_color.color = c256;
 | 
			
		||||
			(p++)->kind = RELAY_ITEM_BG_COLOR;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		attrs = ctx->theme[i->attribute].attrs;
 | 
			
		||||
		// Fall-through
 | 
			
		||||
	case FORMATTER_ITEM_SIMPLE:
 | 
			
		||||
		if (attrs & TEXT_BOLD)
 | 
			
		||||
			(p++)->kind = RELAY_ITEM_FLIP_BOLD;
 | 
			
		||||
		if (attrs & TEXT_ITALIC)
 | 
			
		||||
			(p++)->kind = RELAY_ITEM_FLIP_ITALIC;
 | 
			
		||||
		if (attrs & TEXT_UNDERLINE)
 | 
			
		||||
			(p++)->kind = RELAY_ITEM_FLIP_UNDERLINE;
 | 
			
		||||
		if (attrs & TEXT_INVERSE)
 | 
			
		||||
			(p++)->kind = RELAY_ITEM_FLIP_INVERSE;
 | 
			
		||||
		if (attrs & TEXT_CROSSED_OUT)
 | 
			
		||||
			(p++)->kind = RELAY_ITEM_FLIP_CROSSED_OUT;
 | 
			
		||||
		if (attrs & TEXT_MONOSPACE)
 | 
			
		||||
			(p++)->kind = RELAY_ITEM_FLIP_MONOSPACE;
 | 
			
		||||
		break;
 | 
			
		||||
	default:
 | 
			
		||||
		break;
 | 
			
		||||
	}
 | 
			
		||||
	return p;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static union relay_item_data *
 | 
			
		||||
relay_items (struct app_context *ctx, const struct formatter_item *items,
 | 
			
		||||
	uint32_t *len)
 | 
			
		||||
{
 | 
			
		||||
	size_t items_len = 0;
 | 
			
		||||
	for (size_t i = 0; items[i].type; i++)
 | 
			
		||||
		items_len++;
 | 
			
		||||
 | 
			
		||||
	// Beware of the upper bound, currently dominated by FORMATTER_ITEM_ATTR.
 | 
			
		||||
	union relay_item_data *a = xcalloc (items_len * 9, sizeof *a), *p = a;
 | 
			
		||||
	for (const struct formatter_item *i = items; items_len--; i++)
 | 
			
		||||
		p = relay_translate_formatter (ctx, p, i);
 | 
			
		||||
 | 
			
		||||
	*len = p - a;
 | 
			
		||||
	return a;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_buffer_line (struct app_context *ctx, struct buffer *buffer,
 | 
			
		||||
	struct buffer_line *line, bool leak_to_active)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_buffer_line *e = &m->data.buffer_line;
 | 
			
		||||
	e->event = RELAY_EVENT_BUFFER_LINE;
 | 
			
		||||
	e->buffer_name = str_from_cstr (buffer->name);
 | 
			
		||||
	e->is_unimportant = !!(line->flags & BUFFER_LINE_UNIMPORTANT);
 | 
			
		||||
	e->is_highlight = !!(line->flags & BUFFER_LINE_HIGHLIGHT);
 | 
			
		||||
	e->rendition = 1 + line->r;
 | 
			
		||||
	e->when = line->when * 1000;
 | 
			
		||||
	e->leak_to_active = leak_to_active;
 | 
			
		||||
	e->items = relay_items (ctx, line->items, &e->items_len);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// TODO: Consider pushing this whole block of code much further down.
 | 
			
		||||
static void formatter_add (struct formatter *self, const char *format, ...);
 | 
			
		||||
static char *irc_to_utf8 (const char *text);
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_channel_buffer_update (struct app_context *ctx,
 | 
			
		||||
	struct buffer *buffer, struct relay_buffer_context_channel *e)
 | 
			
		||||
{
 | 
			
		||||
	struct channel *channel = buffer->channel;
 | 
			
		||||
	struct formatter f = formatter_make (ctx, buffer->server);
 | 
			
		||||
	if (channel->topic)
 | 
			
		||||
		formatter_add (&f, "#m", channel->topic);
 | 
			
		||||
	e->topic = relay_items (ctx, f.items, &e->topic_len);
 | 
			
		||||
	formatter_free (&f);
 | 
			
		||||
 | 
			
		||||
	// As in make_prompt(), conceal the last known channel modes.
 | 
			
		||||
	// XXX: This should use irc_channel_is_joined().
 | 
			
		||||
	if (!channel->users_len)
 | 
			
		||||
		return;
 | 
			
		||||
 | 
			
		||||
	struct str modes = str_make ();
 | 
			
		||||
	str_append_str (&modes, &channel->no_param_modes);
 | 
			
		||||
 | 
			
		||||
	struct str params = str_make ();
 | 
			
		||||
	struct str_map_iter iter = str_map_iter_make (&channel->param_modes);
 | 
			
		||||
	const char *param;
 | 
			
		||||
	while ((param = str_map_iter_next (&iter)))
 | 
			
		||||
	{
 | 
			
		||||
		str_append_c (&modes, iter.link->key[0]);
 | 
			
		||||
		str_append_c (¶ms, ' ');
 | 
			
		||||
		str_append (¶ms, param);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	str_append_str (&modes, ¶ms);
 | 
			
		||||
	str_free (¶ms);
 | 
			
		||||
 | 
			
		||||
	char *modes_utf8 = irc_to_utf8 (modes.str);
 | 
			
		||||
	str_free (&modes);
 | 
			
		||||
	e->modes = str_from_cstr (modes_utf8);
 | 
			
		||||
	free (modes_utf8);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_buffer_update (struct app_context *ctx, struct buffer *buffer)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_buffer_update *e = &m->data.buffer_update;
 | 
			
		||||
	e->event = RELAY_EVENT_BUFFER_UPDATE;
 | 
			
		||||
	e->buffer_name = str_from_cstr (buffer->name);
 | 
			
		||||
	e->hide_unimportant = buffer->hide_unimportant;
 | 
			
		||||
 | 
			
		||||
	struct str *server_name = NULL;
 | 
			
		||||
	switch (buffer->type)
 | 
			
		||||
	{
 | 
			
		||||
	case BUFFER_GLOBAL:
 | 
			
		||||
		e->context.kind = RELAY_BUFFER_KIND_GLOBAL;
 | 
			
		||||
		break;
 | 
			
		||||
	case BUFFER_SERVER:
 | 
			
		||||
		e->context.kind = RELAY_BUFFER_KIND_SERVER;
 | 
			
		||||
		server_name = &e->context.server.server_name;
 | 
			
		||||
		break;
 | 
			
		||||
	case BUFFER_CHANNEL:
 | 
			
		||||
		e->context.kind = RELAY_BUFFER_KIND_CHANNEL;
 | 
			
		||||
		server_name = &e->context.channel.server_name;
 | 
			
		||||
		relay_prepare_channel_buffer_update (ctx, buffer, &e->context.channel);
 | 
			
		||||
		break;
 | 
			
		||||
	case BUFFER_PM:
 | 
			
		||||
		e->context.kind = RELAY_BUFFER_KIND_PRIVATE_MESSAGE;
 | 
			
		||||
		server_name = &e->context.private_message.server_name;
 | 
			
		||||
		break;
 | 
			
		||||
	}
 | 
			
		||||
	if (server_name)
 | 
			
		||||
		*server_name = str_from_cstr (buffer->server->name);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_buffer_stats (struct app_context *ctx, struct buffer *buffer)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_buffer_stats *e = &m->data.buffer_stats;
 | 
			
		||||
	e->event = RELAY_EVENT_BUFFER_STATS;
 | 
			
		||||
	e->buffer_name = str_from_cstr (buffer->name);
 | 
			
		||||
	e->new_messages = MIN (UINT32_MAX,
 | 
			
		||||
		buffer->new_messages_count - buffer->new_unimportant_count);
 | 
			
		||||
	e->new_unimportant_messages = MIN (UINT32_MAX,
 | 
			
		||||
		buffer->new_unimportant_count);
 | 
			
		||||
	e->highlighted = buffer->highlighted;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_buffer_rename (struct app_context *ctx, struct buffer *buffer,
 | 
			
		||||
	const char *new_name)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_buffer_rename *e = &m->data.buffer_rename;
 | 
			
		||||
	e->event = RELAY_EVENT_BUFFER_RENAME;
 | 
			
		||||
	e->buffer_name = str_from_cstr (buffer->name);
 | 
			
		||||
	e->new = str_from_cstr (new_name);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_buffer_remove (struct app_context *ctx, struct buffer *buffer)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_buffer_remove *e = &m->data.buffer_remove;
 | 
			
		||||
	e->event = RELAY_EVENT_BUFFER_REMOVE;
 | 
			
		||||
	e->buffer_name = str_from_cstr (buffer->name);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_buffer_activate (struct app_context *ctx, struct buffer *buffer)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_buffer_activate *e = &m->data.buffer_activate;
 | 
			
		||||
	e->event = RELAY_EVENT_BUFFER_ACTIVATE;
 | 
			
		||||
	e->buffer_name = str_from_cstr (buffer->name);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_buffer_input (struct app_context *ctx, struct buffer *buffer,
 | 
			
		||||
	const char *input)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_buffer_input *e = &m->data.buffer_input;
 | 
			
		||||
	e->event = RELAY_EVENT_BUFFER_INPUT;
 | 
			
		||||
	e->buffer_name = str_from_cstr (buffer->name);
 | 
			
		||||
	e->text = str_from_cstr (input);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_buffer_clear (struct app_context *ctx,
 | 
			
		||||
	struct buffer *buffer)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_buffer_clear *e = &m->data.buffer_clear;
 | 
			
		||||
	e->event = RELAY_EVENT_BUFFER_CLEAR;
 | 
			
		||||
	e->buffer_name = str_from_cstr (buffer->name);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
enum relay_server_state
 | 
			
		||||
relay_server_state_for_server (struct server *s)
 | 
			
		||||
{
 | 
			
		||||
	switch (s->state)
 | 
			
		||||
	{
 | 
			
		||||
	case IRC_DISCONNECTED: return RELAY_SERVER_STATE_DISCONNECTED;
 | 
			
		||||
	case IRC_CONNECTING:   return RELAY_SERVER_STATE_CONNECTING;
 | 
			
		||||
	case IRC_CONNECTED:    return RELAY_SERVER_STATE_CONNECTED;
 | 
			
		||||
	case IRC_REGISTERED:   return RELAY_SERVER_STATE_REGISTERED;
 | 
			
		||||
	case IRC_CLOSING:
 | 
			
		||||
	case IRC_HALF_CLOSED:  return RELAY_SERVER_STATE_DISCONNECTING;
 | 
			
		||||
	}
 | 
			
		||||
	return 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_server_update (struct app_context *ctx, struct server *s)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_server_update *e = &m->data.server_update;
 | 
			
		||||
	e->event = RELAY_EVENT_SERVER_UPDATE;
 | 
			
		||||
	e->server_name = str_from_cstr (s->name);
 | 
			
		||||
	e->data.state = relay_server_state_for_server (s);
 | 
			
		||||
	if (s->state == IRC_REGISTERED)
 | 
			
		||||
	{
 | 
			
		||||
		char *user_utf8 = irc_to_utf8 (s->irc_user->nickname);
 | 
			
		||||
		e->data.registered.user = str_from_cstr (user_utf8);
 | 
			
		||||
		free (user_utf8);
 | 
			
		||||
 | 
			
		||||
		char *user_modes_utf8 = irc_to_utf8 (s->irc_user_modes.str);
 | 
			
		||||
		e->data.registered.user_modes = str_from_cstr (user_modes_utf8);
 | 
			
		||||
		free (user_modes_utf8);
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_server_rename (struct app_context *ctx, struct server *s,
 | 
			
		||||
	const char *new_name)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_server_rename *e = &m->data.server_rename;
 | 
			
		||||
	e->event = RELAY_EVENT_SERVER_RENAME;
 | 
			
		||||
	e->server_name = str_from_cstr (s->name);
 | 
			
		||||
	e->new = str_from_cstr (new_name);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_server_remove (struct app_context *ctx, struct server *s)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_server_remove *e = &m->data.server_remove;
 | 
			
		||||
	e->event = RELAY_EVENT_SERVER_REMOVE;
 | 
			
		||||
	e->server_name = str_from_cstr (s->name);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_error (struct app_context *ctx, uint32_t seq, const char *message)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_error *e = &m->data.error;
 | 
			
		||||
	e->event = RELAY_EVENT_ERROR;
 | 
			
		||||
	e->command_seq = seq;
 | 
			
		||||
	e->error = str_from_cstr (message);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static struct relay_event_data_response *
 | 
			
		||||
relay_prepare_response (struct app_context *ctx, uint32_t seq)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_response *e = &m->data.response;
 | 
			
		||||
	e->event = RELAY_EVENT_RESPONSE;
 | 
			
		||||
	e->command_seq = seq;
 | 
			
		||||
	return e;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// --- Terminal output ---------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
/// Default colour pair
 | 
			
		||||
@@ -4515,6 +4135,387 @@ formatter_flush (struct formatter *self, FILE *stream, int flush_opts)
 | 
			
		||||
	attr_printer_reset (&state);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// --- Relay output ------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
client_kill (struct client *c)
 | 
			
		||||
{
 | 
			
		||||
	struct app_context *ctx = c->ctx;
 | 
			
		||||
	poller_fd_reset (&c->socket_event);
 | 
			
		||||
	xclose (c->socket_fd);
 | 
			
		||||
	c->socket_fd = -1;
 | 
			
		||||
 | 
			
		||||
	LIST_UNLINK (ctx->clients, c);
 | 
			
		||||
	client_destroy (c);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
client_update_poller (struct client *c, const struct pollfd *pfd)
 | 
			
		||||
{
 | 
			
		||||
	int new_events = POLLIN;
 | 
			
		||||
	if (c->write_buffer.len)
 | 
			
		||||
		new_events |= POLLOUT;
 | 
			
		||||
 | 
			
		||||
	hard_assert (new_events != 0);
 | 
			
		||||
	if (!pfd || pfd->events != new_events)
 | 
			
		||||
		poller_fd_set (&c->socket_event, new_events);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_send (struct client *c)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = &c->ctx->relay_message;
 | 
			
		||||
	m->event_seq = c->event_seq++;
 | 
			
		||||
 | 
			
		||||
	// TODO: Also don't try sending anything if half-closed.
 | 
			
		||||
	if (!c->initialized || c->socket_fd == -1)
 | 
			
		||||
		return;
 | 
			
		||||
 | 
			
		||||
	// liberty has msg_{reader,writer} already, but they use 8-byte lengths.
 | 
			
		||||
	size_t frame_len_pos = c->write_buffer.len, frame_len = 0;
 | 
			
		||||
	str_pack_u32 (&c->write_buffer, 0);
 | 
			
		||||
	if (!relay_event_message_serialize (m, &c->write_buffer)
 | 
			
		||||
	 || (frame_len = c->write_buffer.len - frame_len_pos - 4) > UINT32_MAX)
 | 
			
		||||
	{
 | 
			
		||||
		print_error ("serialization failed, killing client");
 | 
			
		||||
		client_kill (c);
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	uint32_t len = htonl (frame_len);
 | 
			
		||||
	memcpy (c->write_buffer.str + frame_len_pos, &len, sizeof len);
 | 
			
		||||
	client_update_poller (c, NULL);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_broadcast_except (struct app_context *ctx, struct client *exception)
 | 
			
		||||
{
 | 
			
		||||
	LIST_FOR_EACH (struct client, c, ctx->clients)
 | 
			
		||||
		if (c != exception)
 | 
			
		||||
			relay_send (c);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define relay_broadcast(ctx) relay_broadcast_except ((ctx), NULL)
 | 
			
		||||
 | 
			
		||||
static struct relay_event_message *
 | 
			
		||||
relay_prepare (struct app_context *ctx)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = &ctx->relay_message;
 | 
			
		||||
	relay_event_message_free (m);
 | 
			
		||||
	memset (m, 0, sizeof *m);
 | 
			
		||||
	return m;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_ping (struct app_context *ctx)
 | 
			
		||||
{
 | 
			
		||||
	relay_prepare (ctx)->data.event = RELAY_EVENT_PING;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static union relay_item_data *
 | 
			
		||||
relay_translate_formatter (struct app_context *ctx, union relay_item_data *p,
 | 
			
		||||
	const struct formatter_item *i)
 | 
			
		||||
{
 | 
			
		||||
	// XXX: See attr_printer_decode_color(), this is a footgun.
 | 
			
		||||
	int16_t c16  = i->color;
 | 
			
		||||
	int16_t c256 = i->color >> 16;
 | 
			
		||||
 | 
			
		||||
	unsigned attrs = i->attribute;
 | 
			
		||||
	switch (i->type)
 | 
			
		||||
	{
 | 
			
		||||
	case FORMATTER_ITEM_TEXT:
 | 
			
		||||
		p->text.text = str_from_cstr (i->text);
 | 
			
		||||
		(p++)->kind = RELAY_ITEM_TEXT;
 | 
			
		||||
		break;
 | 
			
		||||
	case FORMATTER_ITEM_FG_COLOR:
 | 
			
		||||
		p->fg_color.color = c256 <= 0 ? c16 : c256;
 | 
			
		||||
		(p++)->kind = RELAY_ITEM_FG_COLOR;
 | 
			
		||||
		break;
 | 
			
		||||
	case FORMATTER_ITEM_BG_COLOR:
 | 
			
		||||
		p->bg_color.color = c256 <= 0 ? c16 : c256;
 | 
			
		||||
		(p++)->kind = RELAY_ITEM_BG_COLOR;
 | 
			
		||||
		break;
 | 
			
		||||
	case FORMATTER_ITEM_ATTR:
 | 
			
		||||
		(p++)->kind = RELAY_ITEM_RESET;
 | 
			
		||||
		if ((c256 = ctx->theme[i->attribute].fg) >= 0)
 | 
			
		||||
		{
 | 
			
		||||
			p->fg_color.color = c256;
 | 
			
		||||
			(p++)->kind = RELAY_ITEM_FG_COLOR;
 | 
			
		||||
		}
 | 
			
		||||
		if ((c256 = ctx->theme[i->attribute].bg) >= 0)
 | 
			
		||||
		{
 | 
			
		||||
			p->bg_color.color = c256;
 | 
			
		||||
			(p++)->kind = RELAY_ITEM_BG_COLOR;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		attrs = ctx->theme[i->attribute].attrs;
 | 
			
		||||
		// Fall-through
 | 
			
		||||
	case FORMATTER_ITEM_SIMPLE:
 | 
			
		||||
		if (attrs & TEXT_BOLD)
 | 
			
		||||
			(p++)->kind = RELAY_ITEM_FLIP_BOLD;
 | 
			
		||||
		if (attrs & TEXT_ITALIC)
 | 
			
		||||
			(p++)->kind = RELAY_ITEM_FLIP_ITALIC;
 | 
			
		||||
		if (attrs & TEXT_UNDERLINE)
 | 
			
		||||
			(p++)->kind = RELAY_ITEM_FLIP_UNDERLINE;
 | 
			
		||||
		if (attrs & TEXT_INVERSE)
 | 
			
		||||
			(p++)->kind = RELAY_ITEM_FLIP_INVERSE;
 | 
			
		||||
		if (attrs & TEXT_CROSSED_OUT)
 | 
			
		||||
			(p++)->kind = RELAY_ITEM_FLIP_CROSSED_OUT;
 | 
			
		||||
		if (attrs & TEXT_MONOSPACE)
 | 
			
		||||
			(p++)->kind = RELAY_ITEM_FLIP_MONOSPACE;
 | 
			
		||||
		break;
 | 
			
		||||
	default:
 | 
			
		||||
		break;
 | 
			
		||||
	}
 | 
			
		||||
	return p;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static union relay_item_data *
 | 
			
		||||
relay_items (struct app_context *ctx, const struct formatter_item *items,
 | 
			
		||||
	uint32_t *len)
 | 
			
		||||
{
 | 
			
		||||
	size_t items_len = 0;
 | 
			
		||||
	for (size_t i = 0; items[i].type; i++)
 | 
			
		||||
		items_len++;
 | 
			
		||||
 | 
			
		||||
	// Beware of the upper bound, currently dominated by FORMATTER_ITEM_ATTR.
 | 
			
		||||
	union relay_item_data *a = xcalloc (items_len * 9, sizeof *a), *p = a;
 | 
			
		||||
	for (const struct formatter_item *i = items; items_len--; i++)
 | 
			
		||||
		p = relay_translate_formatter (ctx, p, i);
 | 
			
		||||
 | 
			
		||||
	*len = p - a;
 | 
			
		||||
	return a;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_buffer_line (struct app_context *ctx, struct buffer *buffer,
 | 
			
		||||
	struct buffer_line *line, bool leak_to_active)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_buffer_line *e = &m->data.buffer_line;
 | 
			
		||||
	e->event = RELAY_EVENT_BUFFER_LINE;
 | 
			
		||||
	e->buffer_name = str_from_cstr (buffer->name);
 | 
			
		||||
	e->is_unimportant = !!(line->flags & BUFFER_LINE_UNIMPORTANT);
 | 
			
		||||
	e->is_highlight = !!(line->flags & BUFFER_LINE_HIGHLIGHT);
 | 
			
		||||
	e->rendition = 1 + line->r;
 | 
			
		||||
	e->when = line->when * 1000;
 | 
			
		||||
	e->leak_to_active = leak_to_active;
 | 
			
		||||
	e->items = relay_items (ctx, line->items, &e->items_len);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_channel_buffer_update (struct app_context *ctx,
 | 
			
		||||
	struct buffer *buffer, struct relay_buffer_context_channel *e)
 | 
			
		||||
{
 | 
			
		||||
	struct channel *channel = buffer->channel;
 | 
			
		||||
	struct formatter f = formatter_make (ctx, buffer->server);
 | 
			
		||||
	if (channel->topic)
 | 
			
		||||
		formatter_add (&f, "#m", channel->topic);
 | 
			
		||||
	FORMATTER_ADD_ITEM (&f, END);
 | 
			
		||||
	e->topic = relay_items (ctx, f.items, &e->topic_len);
 | 
			
		||||
	formatter_free (&f);
 | 
			
		||||
 | 
			
		||||
	// As in make_prompt(), conceal the last known channel modes.
 | 
			
		||||
	// XXX: This should use irc_channel_is_joined().
 | 
			
		||||
	if (!channel->users_len)
 | 
			
		||||
		return;
 | 
			
		||||
 | 
			
		||||
	struct str modes = str_make ();
 | 
			
		||||
	str_append_str (&modes, &channel->no_param_modes);
 | 
			
		||||
 | 
			
		||||
	struct str params = str_make ();
 | 
			
		||||
	struct str_map_iter iter = str_map_iter_make (&channel->param_modes);
 | 
			
		||||
	const char *param;
 | 
			
		||||
	while ((param = str_map_iter_next (&iter)))
 | 
			
		||||
	{
 | 
			
		||||
		str_append_c (&modes, iter.link->key[0]);
 | 
			
		||||
		str_append_c (¶ms, ' ');
 | 
			
		||||
		str_append (¶ms, param);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	str_append_str (&modes, ¶ms);
 | 
			
		||||
	str_free (¶ms);
 | 
			
		||||
 | 
			
		||||
	char *modes_utf8 = irc_to_utf8 (modes.str);
 | 
			
		||||
	str_free (&modes);
 | 
			
		||||
	e->modes = str_from_cstr (modes_utf8);
 | 
			
		||||
	free (modes_utf8);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_buffer_update (struct app_context *ctx, struct buffer *buffer)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_buffer_update *e = &m->data.buffer_update;
 | 
			
		||||
	e->event = RELAY_EVENT_BUFFER_UPDATE;
 | 
			
		||||
	e->buffer_name = str_from_cstr (buffer->name);
 | 
			
		||||
	e->hide_unimportant = buffer->hide_unimportant;
 | 
			
		||||
 | 
			
		||||
	struct str *server_name = NULL;
 | 
			
		||||
	switch (buffer->type)
 | 
			
		||||
	{
 | 
			
		||||
	case BUFFER_GLOBAL:
 | 
			
		||||
		e->context.kind = RELAY_BUFFER_KIND_GLOBAL;
 | 
			
		||||
		break;
 | 
			
		||||
	case BUFFER_SERVER:
 | 
			
		||||
		e->context.kind = RELAY_BUFFER_KIND_SERVER;
 | 
			
		||||
		server_name = &e->context.server.server_name;
 | 
			
		||||
		break;
 | 
			
		||||
	case BUFFER_CHANNEL:
 | 
			
		||||
		e->context.kind = RELAY_BUFFER_KIND_CHANNEL;
 | 
			
		||||
		server_name = &e->context.channel.server_name;
 | 
			
		||||
		relay_prepare_channel_buffer_update (ctx, buffer, &e->context.channel);
 | 
			
		||||
		break;
 | 
			
		||||
	case BUFFER_PM:
 | 
			
		||||
		e->context.kind = RELAY_BUFFER_KIND_PRIVATE_MESSAGE;
 | 
			
		||||
		server_name = &e->context.private_message.server_name;
 | 
			
		||||
		break;
 | 
			
		||||
	}
 | 
			
		||||
	if (server_name)
 | 
			
		||||
		*server_name = str_from_cstr (buffer->server->name);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_buffer_stats (struct app_context *ctx, struct buffer *buffer)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_buffer_stats *e = &m->data.buffer_stats;
 | 
			
		||||
	e->event = RELAY_EVENT_BUFFER_STATS;
 | 
			
		||||
	e->buffer_name = str_from_cstr (buffer->name);
 | 
			
		||||
	e->new_messages = MIN (UINT32_MAX,
 | 
			
		||||
		buffer->new_messages_count - buffer->new_unimportant_count);
 | 
			
		||||
	e->new_unimportant_messages = MIN (UINT32_MAX,
 | 
			
		||||
		buffer->new_unimportant_count);
 | 
			
		||||
	e->highlighted = buffer->highlighted;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_buffer_rename (struct app_context *ctx, struct buffer *buffer,
 | 
			
		||||
	const char *new_name)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_buffer_rename *e = &m->data.buffer_rename;
 | 
			
		||||
	e->event = RELAY_EVENT_BUFFER_RENAME;
 | 
			
		||||
	e->buffer_name = str_from_cstr (buffer->name);
 | 
			
		||||
	e->new = str_from_cstr (new_name);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_buffer_remove (struct app_context *ctx, struct buffer *buffer)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_buffer_remove *e = &m->data.buffer_remove;
 | 
			
		||||
	e->event = RELAY_EVENT_BUFFER_REMOVE;
 | 
			
		||||
	e->buffer_name = str_from_cstr (buffer->name);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_buffer_activate (struct app_context *ctx, struct buffer *buffer)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_buffer_activate *e = &m->data.buffer_activate;
 | 
			
		||||
	e->event = RELAY_EVENT_BUFFER_ACTIVATE;
 | 
			
		||||
	e->buffer_name = str_from_cstr (buffer->name);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_buffer_input (struct app_context *ctx, struct buffer *buffer,
 | 
			
		||||
	const char *input)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_buffer_input *e = &m->data.buffer_input;
 | 
			
		||||
	e->event = RELAY_EVENT_BUFFER_INPUT;
 | 
			
		||||
	e->buffer_name = str_from_cstr (buffer->name);
 | 
			
		||||
	e->text = str_from_cstr (input);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_buffer_clear (struct app_context *ctx,
 | 
			
		||||
	struct buffer *buffer)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_buffer_clear *e = &m->data.buffer_clear;
 | 
			
		||||
	e->event = RELAY_EVENT_BUFFER_CLEAR;
 | 
			
		||||
	e->buffer_name = str_from_cstr (buffer->name);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
enum relay_server_state
 | 
			
		||||
relay_server_state_for_server (struct server *s)
 | 
			
		||||
{
 | 
			
		||||
	switch (s->state)
 | 
			
		||||
	{
 | 
			
		||||
	case IRC_DISCONNECTED: return RELAY_SERVER_STATE_DISCONNECTED;
 | 
			
		||||
	case IRC_CONNECTING:   return RELAY_SERVER_STATE_CONNECTING;
 | 
			
		||||
	case IRC_CONNECTED:    return RELAY_SERVER_STATE_CONNECTED;
 | 
			
		||||
	case IRC_REGISTERED:   return RELAY_SERVER_STATE_REGISTERED;
 | 
			
		||||
	case IRC_CLOSING:
 | 
			
		||||
	case IRC_HALF_CLOSED:  return RELAY_SERVER_STATE_DISCONNECTING;
 | 
			
		||||
	}
 | 
			
		||||
	return 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_server_update (struct app_context *ctx, struct server *s)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_server_update *e = &m->data.server_update;
 | 
			
		||||
	e->event = RELAY_EVENT_SERVER_UPDATE;
 | 
			
		||||
	e->server_name = str_from_cstr (s->name);
 | 
			
		||||
	e->data.state = relay_server_state_for_server (s);
 | 
			
		||||
	if (s->state == IRC_REGISTERED)
 | 
			
		||||
	{
 | 
			
		||||
		char *user_utf8 = irc_to_utf8 (s->irc_user->nickname);
 | 
			
		||||
		e->data.registered.user = str_from_cstr (user_utf8);
 | 
			
		||||
		free (user_utf8);
 | 
			
		||||
 | 
			
		||||
		char *user_modes_utf8 = irc_to_utf8 (s->irc_user_modes.str);
 | 
			
		||||
		e->data.registered.user_modes = str_from_cstr (user_modes_utf8);
 | 
			
		||||
		free (user_modes_utf8);
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_server_rename (struct app_context *ctx, struct server *s,
 | 
			
		||||
	const char *new_name)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_server_rename *e = &m->data.server_rename;
 | 
			
		||||
	e->event = RELAY_EVENT_SERVER_RENAME;
 | 
			
		||||
	e->server_name = str_from_cstr (s->name);
 | 
			
		||||
	e->new = str_from_cstr (new_name);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_server_remove (struct app_context *ctx, struct server *s)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_server_remove *e = &m->data.server_remove;
 | 
			
		||||
	e->event = RELAY_EVENT_SERVER_REMOVE;
 | 
			
		||||
	e->server_name = str_from_cstr (s->name);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
relay_prepare_error (struct app_context *ctx, uint32_t seq, const char *message)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_error *e = &m->data.error;
 | 
			
		||||
	e->event = RELAY_EVENT_ERROR;
 | 
			
		||||
	e->command_seq = seq;
 | 
			
		||||
	e->error = str_from_cstr (message);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static struct relay_event_data_response *
 | 
			
		||||
relay_prepare_response (struct app_context *ctx, uint32_t seq)
 | 
			
		||||
{
 | 
			
		||||
	struct relay_event_message *m = relay_prepare (ctx);
 | 
			
		||||
	struct relay_event_data_response *e = &m->data.response;
 | 
			
		||||
	e->event = RELAY_EVENT_RESPONSE;
 | 
			
		||||
	e->command_seq = seq;
 | 
			
		||||
	return e;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// --- Buffers -----------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
@@ -8317,6 +8318,8 @@ irc_try_parse_welcome_for_userhost (struct server *s, const char *m)
 | 
			
		||||
	strv_free (&v);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void process_input
 | 
			
		||||
	(struct app_context *, struct buffer *, const char *);
 | 
			
		||||
static bool process_input_line
 | 
			
		||||
	(struct app_context *, struct buffer *, const char *, int);
 | 
			
		||||
static void on_autoaway_timer (struct app_context *ctx);
 | 
			
		||||
@@ -8345,7 +8348,7 @@ irc_on_registered (struct server *s, const char *nickname)
 | 
			
		||||
	if (command)
 | 
			
		||||
	{
 | 
			
		||||
		log_server_debug (s, "Executing \"#s\"", command);
 | 
			
		||||
		(void) process_input_line (s->ctx, s->buffer, command, 0);
 | 
			
		||||
		(void) process_input (s->ctx, s->buffer, command);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	int64_t command_delay = get_config_integer (s->config, "command_delay");
 | 
			
		||||
@@ -9304,7 +9307,7 @@ config_dump_item (struct config_item *item, struct config_dump_data *data)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Currently there's no reason for us to dump unknown items
 | 
			
		||||
	struct config_schema *schema = item->schema;
 | 
			
		||||
	const struct config_schema *schema = item->schema;
 | 
			
		||||
	if (!schema)
 | 
			
		||||
		return;
 | 
			
		||||
 | 
			
		||||
@@ -9439,6 +9442,9 @@ server_add (struct app_context *ctx,
 | 
			
		||||
	str_map_set (&ctx->servers, s->name, s);
 | 
			
		||||
	s->config = subtree;
 | 
			
		||||
 | 
			
		||||
	relay_prepare_server_update (ctx, s);
 | 
			
		||||
	relay_broadcast (ctx);
 | 
			
		||||
 | 
			
		||||
	// Add a buffer and activate it
 | 
			
		||||
	struct buffer *buffer = s->buffer = buffer_new (ctx->input,
 | 
			
		||||
		BUFFER_SERVER, irc_make_buffer_name (s, NULL));
 | 
			
		||||
@@ -12937,6 +12943,16 @@ handle_command_kill (struct handler_args *a)
 | 
			
		||||
	return true;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static bool
 | 
			
		||||
handle_command_away (struct handler_args *a)
 | 
			
		||||
{
 | 
			
		||||
	if (*a->arguments)
 | 
			
		||||
		irc_send (a->s, "AWAY :%s", a->arguments);
 | 
			
		||||
	else
 | 
			
		||||
		irc_send (a->s, "AWAY");
 | 
			
		||||
	return true;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static bool
 | 
			
		||||
handle_command_nick (struct handler_args *a)
 | 
			
		||||
{
 | 
			
		||||
@@ -13002,7 +13018,6 @@ TRIVIAL_HANDLER (who,   "WHO")
 | 
			
		||||
TRIVIAL_HANDLER (motd,  "MOTD")
 | 
			
		||||
TRIVIAL_HANDLER (oper,  "OPER")
 | 
			
		||||
TRIVIAL_HANDLER (stats, "STATS")
 | 
			
		||||
TRIVIAL_HANDLER (away,  "AWAY")
 | 
			
		||||
 | 
			
		||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 | 
			
		||||
 | 
			
		||||
@@ -13168,7 +13183,7 @@ try_handle_command_help_option (struct app_context *ctx, const char *name)
 | 
			
		||||
	if (!item)
 | 
			
		||||
		return false;
 | 
			
		||||
 | 
			
		||||
	struct config_schema *schema = item->schema;
 | 
			
		||||
	const struct config_schema *schema = item->schema;
 | 
			
		||||
	if (!schema)
 | 
			
		||||
	{
 | 
			
		||||
		log_global_error (ctx, "#s: #s", "Option not recognized", name);
 | 
			
		||||
@@ -14589,21 +14604,23 @@ on_readline_input (char *line)
 | 
			
		||||
		if (*line)
 | 
			
		||||
			add_history (line);
 | 
			
		||||
 | 
			
		||||
		// readline always erases the input line after returning from here,
 | 
			
		||||
		// Readline always erases the input line after returning from here,
 | 
			
		||||
		// but we don't want that to happen if the command to be executed
 | 
			
		||||
		// would switch the buffer (we'd keep the already executed command in
 | 
			
		||||
		// the old buffer and delete any input restored from the new buffer)
 | 
			
		||||
		strv_append_owned (&ctx->pending_input, line);
 | 
			
		||||
		poller_idle_set (&ctx->input_event);
 | 
			
		||||
	}
 | 
			
		||||
	else
 | 
			
		||||
	else if (isatty (STDIN_FILENO))
 | 
			
		||||
	{
 | 
			
		||||
		// Prevent readline from showing the prompt twice for w/e reason
 | 
			
		||||
		// Prevent Readline from showing the prompt twice for w/e reason
 | 
			
		||||
		CALL (ctx->input, hide);
 | 
			
		||||
		input_rl__restore (self);
 | 
			
		||||
 | 
			
		||||
		CALL (ctx->input, ding);
 | 
			
		||||
	}
 | 
			
		||||
	else
 | 
			
		||||
		request_quit (ctx, NULL);
 | 
			
		||||
 | 
			
		||||
	if (self->active)
 | 
			
		||||
		// Readline automatically redisplays it
 | 
			
		||||
@@ -14743,7 +14760,7 @@ on_editline_return (EditLine *editline, int key)
 | 
			
		||||
 | 
			
		||||
	const LineInfoW *info = el_wline (editline);
 | 
			
		||||
	int len = info->lastchar - info->buffer;
 | 
			
		||||
	wchar_t *line = calloc (sizeof *info->buffer, len + 1);
 | 
			
		||||
	wchar_t *line = xcalloc (len + 1, sizeof *info->buffer);
 | 
			
		||||
	memcpy (line, info->buffer, sizeof *info->buffer * len);
 | 
			
		||||
 | 
			
		||||
	if (*line)
 | 
			
		||||
@@ -15853,6 +15870,7 @@ relay_start (struct app_context *ctx, char *address, struct error **e)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Just try the first one, disregarding IPv4/IPv6 ordering.
 | 
			
		||||
	// Use 0.0.0.0 or [::] to request either one specifically.
 | 
			
		||||
	int fd = relay_listen_with_context (ctx, result, e);
 | 
			
		||||
	freeaddrinfo (result);
 | 
			
		||||
	if (fd == -1)
 | 
			
		||||
@@ -15898,7 +15916,7 @@ on_config_relay_bind_change (struct config_item *item)
 | 
			
		||||
 | 
			
		||||
#ifdef TESTING
 | 
			
		||||
 | 
			
		||||
static struct config_schema g_config_test[] =
 | 
			
		||||
static const struct config_schema g_config_test[] =
 | 
			
		||||
{
 | 
			
		||||
	{ .name = "foo",    .type = CONFIG_ITEM_BOOLEAN, .default_ = "off" },
 | 
			
		||||
	{ .name = "bar",    .type = CONFIG_ITEM_INTEGER, .default_ = "1" },
 | 
			
		||||
 
 | 
			
		||||
@@ -1 +1 @@
 | 
			
		||||
1.5.0
 | 
			
		||||
2.1.0
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										45
									
								
								xM/CMakeLists.txt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										45
									
								
								xM/CMakeLists.txt
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,45 @@
 | 
			
		||||
# Swift language support
 | 
			
		||||
cmake_minimum_required (VERSION 3.15)
 | 
			
		||||
 | 
			
		||||
file (READ ../xK-version project_version)
 | 
			
		||||
configure_file (../xK-version xK-version.tag COPYONLY)
 | 
			
		||||
string (STRIP "${project_version}" project_version)
 | 
			
		||||
 | 
			
		||||
# There were two issues when building this from the main CMakeLists.txt:
 | 
			
		||||
# a) renaming main.swift to xM.swift requires removing top-level statements,
 | 
			
		||||
# b) there is a "redefinition of module 'FFI'" error.
 | 
			
		||||
project (xM VERSION "${project_version}"
 | 
			
		||||
	DESCRIPTION "Cocoa frontend for xC" LANGUAGES Swift)
 | 
			
		||||
 | 
			
		||||
set (root "${PROJECT_SOURCE_DIR}/..")
 | 
			
		||||
add_custom_command (OUTPUT xC-proto.swift
 | 
			
		||||
	COMMAND env LC_ALL=C awk
 | 
			
		||||
		-f ${root}/liberty/tools/lxdrgen.awk
 | 
			
		||||
		-f ${root}/liberty/tools/lxdrgen-swift.awk
 | 
			
		||||
		-v PrefixCamel=Relay
 | 
			
		||||
		${root}/xC.lxdr > xC-proto.swift
 | 
			
		||||
	DEPENDS
 | 
			
		||||
		${root}/liberty/tools/lxdrgen.awk
 | 
			
		||||
		${root}/liberty/tools/lxdrgen-swift.awk
 | 
			
		||||
		${root}/xC.lxdr
 | 
			
		||||
	COMMENT "Generating xC relay protocol code" VERBATIM)
 | 
			
		||||
 | 
			
		||||
set (MACOSX_BUNDLE_GUI_IDENTIFIER name.janouch.${PROJECT_NAME})
 | 
			
		||||
set (MACOSX_BUNDLE_ICON_FILE xM.icns)
 | 
			
		||||
 | 
			
		||||
# Avoid including binary files in the repository by generating icons in code.
 | 
			
		||||
# sips(1) + Javascript + iconutil(1) could probably also be used.
 | 
			
		||||
find_program (SWIFT_EXECUTABLE swift REQUIRED)
 | 
			
		||||
 | 
			
		||||
set (icon "${PROJECT_BINARY_DIR}/${MACOSX_BUNDLE_ICON_FILE}")
 | 
			
		||||
add_custom_command (OUTPUT "${icon}"
 | 
			
		||||
	COMMAND ${SWIFT_EXECUTABLE} "${PROJECT_SOURCE_DIR}/gen-icon.swift" "${icon}"
 | 
			
		||||
	DEPENDS gen-icon.swift
 | 
			
		||||
	COMMENT "Generating xM application icon" VERBATIM)
 | 
			
		||||
set_source_files_properties ("${icon}" PROPERTIES
 | 
			
		||||
	MACOSX_PACKAGE_LOCATION Resources)
 | 
			
		||||
 | 
			
		||||
# Other requirements: macOS 10.14 for Network, and macOS 11 for Logger.
 | 
			
		||||
set (CMAKE_Swift_LANGUAGE_VERSION 5)
 | 
			
		||||
add_executable (xM MACOSX_BUNDLE
 | 
			
		||||
	main.swift "${icon}" "${PROJECT_BINARY_DIR}/xC-proto.swift")
 | 
			
		||||
							
								
								
									
										99
									
								
								xM/gen-icon.swift
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										99
									
								
								xM/gen-icon.swift
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,99 @@
 | 
			
		||||
// gen-icon.swift: generate a program icon for xM in the Apple icon format
 | 
			
		||||
//
 | 
			
		||||
// Copyright (c) 2023, Přemysl Eric Janouch <p@janouch.name>
 | 
			
		||||
// SPDX-License-Identifier: 0BSD
 | 
			
		||||
//
 | 
			
		||||
// As an odd regression, AppKit may be necessary for JIT linking.
 | 
			
		||||
import AppKit
 | 
			
		||||
 | 
			
		||||
// NSGraphicsContext mostly just weirdly wraps over Quartz,
 | 
			
		||||
// so we do it all in Quartz directly.
 | 
			
		||||
import CoreGraphics
 | 
			
		||||
import Foundation
 | 
			
		||||
import ImageIO
 | 
			
		||||
import UniformTypeIdentifiers
 | 
			
		||||
 | 
			
		||||
// Apple uses something that's close to a "quintic superellipse" in their icons,
 | 
			
		||||
// but doesn't quite match. Either way, it looks better than rounded rectangles.
 | 
			
		||||
func addSquircle(context: CGContext, bounds: CGRect) {
 | 
			
		||||
	context.move(to: CGPoint(x: bounds.maxX, y: bounds.midY))
 | 
			
		||||
	for theta in stride(from: 0.0, to: .pi * 2, by: .pi / 1e4) {
 | 
			
		||||
		let x = pow(abs(cos(theta)), 2 / 5.0) * bounds.width / 2
 | 
			
		||||
			* CGFloat(signOf: cos(theta), magnitudeOf: 1) + bounds.midX
 | 
			
		||||
		let y = pow(abs(sin(theta)), 2 / 5.0) * bounds.height / 2
 | 
			
		||||
			* CGFloat(signOf: sin(theta), magnitudeOf: 1) + bounds.midY
 | 
			
		||||
		context.addLine(to: CGPoint(x: x, y: y))
 | 
			
		||||
	}
 | 
			
		||||
	context.closePath()
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func drawIcon(scale: CGFloat) -> CGImage? {
 | 
			
		||||
	let size = CGSizeMake(1024, 1024)
 | 
			
		||||
 | 
			
		||||
	let colorspace = CGColorSpaceCreateDeviceRGB()
 | 
			
		||||
	let context = CGContext(data: nil,
 | 
			
		||||
		width: Int(size.width * scale), height: Int(size.height * scale),
 | 
			
		||||
		bitsPerComponent: 8, bytesPerRow: 0, space: colorspace,
 | 
			
		||||
		bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue)!
 | 
			
		||||
	context.scaleBy(x: scale, y: scale)
 | 
			
		||||
 | 
			
		||||
	let bounds = CGRectMake(100, 100, size.width - 200, size.height - 200)
 | 
			
		||||
	addSquircle(context: context, bounds: bounds)
 | 
			
		||||
	let squircle = context.path!
 | 
			
		||||
 | 
			
		||||
	// Gradients don't draw shadows, so draw it separately.
 | 
			
		||||
	context.saveGState()
 | 
			
		||||
	context.setShadow(offset: CGSizeMake(0, -12).applying(context.ctm),
 | 
			
		||||
		blur: 28 * scale, color: CGColor(gray: 0, alpha: 0.5))
 | 
			
		||||
	context.setFillColor(CGColor(red: 1, green: 0x55p-8, blue: 0, alpha: 1))
 | 
			
		||||
	context.fillPath()
 | 
			
		||||
	context.restoreGState()
 | 
			
		||||
 | 
			
		||||
	context.saveGState()
 | 
			
		||||
	context.addPath(squircle)
 | 
			
		||||
	context.clip()
 | 
			
		||||
	context.drawLinearGradient(
 | 
			
		||||
		CGGradient(colorsSpace: colorspace, colors: [
 | 
			
		||||
			CGColor(red: 1, green: 0x00p-8, blue: 0, alpha: 1),
 | 
			
		||||
			CGColor(red: 1, green: 0xaap-8, blue: 0, alpha: 1)
 | 
			
		||||
		] as CFArray, locations: [0, 1])!,
 | 
			
		||||
		start: CGPointMake(0, 100), end: CGPointMake(0, size.height - 100),
 | 
			
		||||
		options: CGGradientDrawingOptions(rawValue: 0))
 | 
			
		||||
	context.restoreGState()
 | 
			
		||||
 | 
			
		||||
	context.move(to: CGPoint(x: size.width * 0.30, y: size.height * 0.30))
 | 
			
		||||
	context.addLine(to: CGPoint(x: size.width * 0.30, y: size.height * 0.70))
 | 
			
		||||
	context.addLine(to: CGPoint(x: size.width * 0.575, y: size.height * 0.425))
 | 
			
		||||
	context.move(to: CGPoint(x: size.width * 0.70, y: size.height * 0.30))
 | 
			
		||||
	context.addLine(to: CGPoint(x: size.width * 0.70, y: size.height * 0.70))
 | 
			
		||||
	context.addLine(to: CGPoint(x: size.width * 0.425, y: size.height * 0.425))
 | 
			
		||||
	context.setLineWidth(80)
 | 
			
		||||
	context.setLineCap(.round)
 | 
			
		||||
	context.setLineJoin(.round)
 | 
			
		||||
	context.setStrokeColor(CGColor.white)
 | 
			
		||||
	context.strokePath()
 | 
			
		||||
	return context.makeImage()
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
if CommandLine.arguments.count != 2 {
 | 
			
		||||
	print("Usage: \(CommandLine.arguments.first!) OUTPUT.icns")
 | 
			
		||||
	exit(EXIT_FAILURE)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
let filename = CommandLine.arguments[1]
 | 
			
		||||
 | 
			
		||||
let macOSSizes: Array<CGFloat> = [16, 32, 128, 256, 512]
 | 
			
		||||
let icns = CGImageDestinationCreateWithURL(
 | 
			
		||||
	URL(fileURLWithPath: filename) as CFURL,
 | 
			
		||||
	UTType.icns.identifier as CFString, macOSSizes.count * 2, nil)!
 | 
			
		||||
for size in macOSSizes {
 | 
			
		||||
	CGImageDestinationAddImage(icns, drawIcon(scale: size / 1024.0)!, nil)
 | 
			
		||||
	CGImageDestinationAddImage(icns, drawIcon(scale: size / 1024.0 * 2)!, [
 | 
			
		||||
			kCGImagePropertyDPIWidth: 144,
 | 
			
		||||
			kCGImagePropertyDPIHeight: 144,
 | 
			
		||||
		] as CFDictionary)
 | 
			
		||||
}
 | 
			
		||||
if !CGImageDestinationFinalize(icns) {
 | 
			
		||||
	print("ICNS finalization failed.")
 | 
			
		||||
	exit(EXIT_FAILURE)
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										1373
									
								
								xM/main.swift
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1373
									
								
								xM/main.swift
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										3
									
								
								xN/.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								xN/.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1,3 @@
 | 
			
		||||
/xN
 | 
			
		||||
/xN.1
 | 
			
		||||
/irc.go
 | 
			
		||||
							
								
								
									
										21
									
								
								xN/Makefile
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								xN/Makefile
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,21 @@
 | 
			
		||||
.POSIX:
 | 
			
		||||
.SUFFIXES:
 | 
			
		||||
AWK = env LC_ALL=C awk
 | 
			
		||||
 | 
			
		||||
outputs = irc.go xN xN.1
 | 
			
		||||
all: $(outputs)
 | 
			
		||||
 | 
			
		||||
# If we want to keep module dependencies separate, we don't have many options.
 | 
			
		||||
# Symlinking seems to work good enough.
 | 
			
		||||
irc.go: ../xS/irc.go
 | 
			
		||||
	ln -sf ../xS/irc.go $@
 | 
			
		||||
 | 
			
		||||
xN: xN.go ../xK-version irc.go
 | 
			
		||||
	go build -ldflags "-X 'main.projectVersion=$$(cat ../xK-version)'" -o $@
 | 
			
		||||
xN.1: ../xK-version ../liberty/tools/asciiman.awk xN.adoc
 | 
			
		||||
	env "asciidoc-release-version=$$(cat ../xK-version)" \
 | 
			
		||||
		$(AWK) -f ../liberty/tools/asciiman.awk xN.adoc > $@
 | 
			
		||||
test: all
 | 
			
		||||
	go test
 | 
			
		||||
clean:
 | 
			
		||||
	rm -f $(outputs)
 | 
			
		||||
							
								
								
									
										86
									
								
								xN/xN.adoc
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										86
									
								
								xN/xN.adoc
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,86 @@
 | 
			
		||||
xN(1)
 | 
			
		||||
=====
 | 
			
		||||
:doctype: manpage
 | 
			
		||||
:manmanual: xK Manual
 | 
			
		||||
:mansource: xK {release-version}
 | 
			
		||||
 | 
			
		||||
Name
 | 
			
		||||
----
 | 
			
		||||
xN - IRC notifier
 | 
			
		||||
 | 
			
		||||
Synopsis
 | 
			
		||||
--------
 | 
			
		||||
*xN* [_OPTION_]... IRC-URL...
 | 
			
		||||
 | 
			
		||||
Description
 | 
			
		||||
-----------
 | 
			
		||||
*xN* is a simple IRC notifier, sending the text it receives on its standard
 | 
			
		||||
input to all IRC targets specified by its command line arguments.
 | 
			
		||||
 | 
			
		||||
The input text is forced to validate as UTF-8, and it is _not_ split
 | 
			
		||||
automatically to comply with the maximum IRC message length.
 | 
			
		||||
Thus, make sure to make the lines short, or they will be trimmed by the servers.
 | 
			
		||||
 | 
			
		||||
*xN* does not attempt to appease flood detectors.
 | 
			
		||||
 | 
			
		||||
Options
 | 
			
		||||
-------
 | 
			
		||||
*-debug*::
 | 
			
		||||
	Print incoming IRC traffic, which may help in debugging any issues.
 | 
			
		||||
 | 
			
		||||
*-version*::
 | 
			
		||||
	Output version information and exit.
 | 
			
		||||
 | 
			
		||||
URL format
 | 
			
		||||
----------
 | 
			
		||||
*xN* accepts URLs describing IRC users and channels, roughly as specified by
 | 
			
		||||
the Internet Draft _draft-butcher-irc-url-04.txt_.  Note, however, that close
 | 
			
		||||
to no validation is done on these, and you should not pass URLs from untrusted
 | 
			
		||||
sources, so as to avoid command or parameter injection.
 | 
			
		||||
 | 
			
		||||
Any provided username will be propagated to the nickname, username,
 | 
			
		||||
and realname.  The default value for these is the name of your system user.
 | 
			
		||||
 | 
			
		||||
As an extension, you may use the following options:
 | 
			
		||||
 | 
			
		||||
*skipjoin*::
 | 
			
		||||
	Do not JOIN channels before sending messages to them.
 | 
			
		||||
	This requires channels to allow external messages
 | 
			
		||||
	(which are disabled by channel mode *+n*).
 | 
			
		||||
*usenotice*::
 | 
			
		||||
	Send a NOTICE rather than a PRIVMSG, which distinguishes automated messages,
 | 
			
		||||
	and is more appropriate for bots.
 | 
			
		||||
 | 
			
		||||
Examples
 | 
			
		||||
--------
 | 
			
		||||
 $ uptime | xN 'irc://uptime@localhost/%23watch?skipjoin&usenotice'
 | 
			
		||||
 | 
			
		||||
Send *uptime*(1) information as an external notice to channel *#watch*
 | 
			
		||||
on the local server, using the standard port *6667*.
 | 
			
		||||
 | 
			
		||||
 $ fortune -s | xN ircs://ohayou@irc.libera.chat/john,isuser
 | 
			
		||||
 | 
			
		||||
Greet user *john* with a fortune for this day.  In compliance with _RFC 7194_,
 | 
			
		||||
the default TLS port is assumed to be *6697*.
 | 
			
		||||
 | 
			
		||||
 $ xN 'ircs://agent:Password123@irc.cia.gov:1337/#hq?key=123456' <<EOF
 | 
			
		||||
 The red fox trots quietly at midnight.
 | 
			
		||||
 EOF
 | 
			
		||||
 | 
			
		||||
Connect over TLS to *irc.cia.gov* on port *1337*, use *Password123*
 | 
			
		||||
as the server password, register as user *agent*,
 | 
			
		||||
join channel *#hq* using the channel key *123456*,
 | 
			
		||||
and send a very secret message.
 | 
			
		||||
 | 
			
		||||
Reporting bugs
 | 
			
		||||
--------------
 | 
			
		||||
Use https://git.janouch.name/p/xK to report bugs, request features,
 | 
			
		||||
or submit pull requests.
 | 
			
		||||
 | 
			
		||||
See also
 | 
			
		||||
--------
 | 
			
		||||
_Uniform Resource Locator Schemes for Internet Relay Chat Entities_,
 | 
			
		||||
https://datatracker.ietf.org/doc/html/draft-butcher-irc-url-04[].
 | 
			
		||||
 | 
			
		||||
_Default Port for Internet Relay Chat (IRC) via TLS/SSL_,
 | 
			
		||||
https://datatracker.ietf.org/doc/html/rfc7194[].
 | 
			
		||||
							
								
								
									
										279
									
								
								xN/xN.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										279
									
								
								xN/xN.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,279 @@
 | 
			
		||||
//
 | 
			
		||||
// Copyright (c) 2024, Přemysl Eric Janouch <p@janouch.name>
 | 
			
		||||
//
 | 
			
		||||
// Permission to use, copy, modify, and/or distribute this software for any
 | 
			
		||||
// purpose with or without fee is hereby granted.
 | 
			
		||||
//
 | 
			
		||||
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 | 
			
		||||
// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 | 
			
		||||
// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
 | 
			
		||||
// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 | 
			
		||||
// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
 | 
			
		||||
// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 | 
			
		||||
// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 | 
			
		||||
//
 | 
			
		||||
 | 
			
		||||
// xN is a simple IRC notifier.
 | 
			
		||||
package main
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"bufio"
 | 
			
		||||
	"bytes"
 | 
			
		||||
	"crypto/tls"
 | 
			
		||||
	"errors"
 | 
			
		||||
	"flag"
 | 
			
		||||
	"fmt"
 | 
			
		||||
	"io"
 | 
			
		||||
	"log"
 | 
			
		||||
	"net"
 | 
			
		||||
	"net/url"
 | 
			
		||||
	"os"
 | 
			
		||||
	"os/user"
 | 
			
		||||
	"strconv"
 | 
			
		||||
	"strings"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
const projectName = "xN"
 | 
			
		||||
 | 
			
		||||
var projectVersion = "?"
 | 
			
		||||
 | 
			
		||||
var debugMode = false
 | 
			
		||||
 | 
			
		||||
type parameters struct {
 | 
			
		||||
	conn      net.Conn // underlying network connection
 | 
			
		||||
	username  string   // nickname + username + realname
 | 
			
		||||
	password  string   // server password
 | 
			
		||||
	target    string   // where to send text
 | 
			
		||||
	isuser    bool     // the target is a user rather than a channel
 | 
			
		||||
	chankey   string   // channel key
 | 
			
		||||
	skipjoin  bool     // whether to send external messages to channels
 | 
			
		||||
	usenotice bool     // whether to use NOTICE rather than PRIVMSG
 | 
			
		||||
	message   []string // lines of the message to send
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (p *parameters) send(command string, args ...string) error {
 | 
			
		||||
	var buf bytes.Buffer
 | 
			
		||||
	buf.WriteString(command)
 | 
			
		||||
	for i, arg := range args {
 | 
			
		||||
		buf.WriteRune(' ')
 | 
			
		||||
		if i+1 == len(args) {
 | 
			
		||||
			buf.WriteRune(':')
 | 
			
		||||
		}
 | 
			
		||||
		buf.WriteString(arg)
 | 
			
		||||
	}
 | 
			
		||||
	buf.WriteString("\r\n")
 | 
			
		||||
	_, err := p.conn.Write(buf.Bytes())
 | 
			
		||||
	return err
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
const (
 | 
			
		||||
	rplWELCOME       = "001"
 | 
			
		||||
	errNICKNAMEINUSE = "433"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
func notify(p *parameters) error {
 | 
			
		||||
	// The intro should comfortably fit in the TCP send buffer whole.
 | 
			
		||||
	if p.password != "" {
 | 
			
		||||
		p.send("PASS", p.password)
 | 
			
		||||
	}
 | 
			
		||||
	p.send("USER", p.username, "0", "*", p.username)
 | 
			
		||||
	p.send("NICK", p.username)
 | 
			
		||||
 | 
			
		||||
	scanner, nickCounter, issue := bufio.NewScanner(p.conn), 1, ""
 | 
			
		||||
	for scanner.Scan() {
 | 
			
		||||
		if debugMode {
 | 
			
		||||
			log.Println(scanner.Text())
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		m := ircParseMessage(scanner.Text())
 | 
			
		||||
		switch m.command {
 | 
			
		||||
		case "PING":
 | 
			
		||||
			p.send("PONG", m.params...)
 | 
			
		||||
		case rplWELCOME:
 | 
			
		||||
			if !p.isuser && !p.skipjoin {
 | 
			
		||||
				if p.chankey != "" {
 | 
			
		||||
					p.send("JOIN", p.target, p.chankey)
 | 
			
		||||
				} else {
 | 
			
		||||
					p.send("JOIN", p.target)
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
			for _, line := range p.message {
 | 
			
		||||
				if p.usenotice {
 | 
			
		||||
					p.send("NOTICE", p.target, line)
 | 
			
		||||
				} else {
 | 
			
		||||
					p.send("PRIVMSG", p.target, line)
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
			p.send("QUIT")
 | 
			
		||||
		case errNICKNAMEINUSE:
 | 
			
		||||
			p.send("NICK", fmt.Sprintf("%s%d", p.username, nickCounter))
 | 
			
		||||
			nickCounter++
 | 
			
		||||
		default:
 | 
			
		||||
			// Prevent hanging on unsuccessful registrations.
 | 
			
		||||
			numeric, _ := strconv.Atoi(m.command)
 | 
			
		||||
			if numeric >= 400 && numeric <= 599 {
 | 
			
		||||
				if len(m.params) > 1 {
 | 
			
		||||
					issue = strings.Join(m.params[1:], " ")
 | 
			
		||||
				} else {
 | 
			
		||||
					issue = strings.Join(m.params, " ")
 | 
			
		||||
				}
 | 
			
		||||
				p.send("QUIT")
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	if err := scanner.Err(); err != nil {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
	if issue != "" {
 | 
			
		||||
		return errors.New(issue)
 | 
			
		||||
	}
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func parse(rawURL string, text []byte) (
 | 
			
		||||
	p parameters, connect func() (net.Conn, error), err error) {
 | 
			
		||||
	u, err := url.Parse(rawURL)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return p, nil, err
 | 
			
		||||
	} else if !u.IsAbs() || u.Opaque != "" {
 | 
			
		||||
		return p, nil, errors.New("need an absolute URL")
 | 
			
		||||
	} else if u.Path == "/" && u.Fragment != "" {
 | 
			
		||||
		// Try to handle the common but degenerate case.
 | 
			
		||||
		fragment := "%23" + u.Fragment
 | 
			
		||||
		u.Fragment, u.RawFragment = "", ""
 | 
			
		||||
		if u, err = url.Parse(u.String() + fragment); err != nil {
 | 
			
		||||
			return p, nil, err
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Figure out registration details.
 | 
			
		||||
	p.username = projectName
 | 
			
		||||
	if u, _ := user.Current(); u != nil {
 | 
			
		||||
		p.username = u.Username
 | 
			
		||||
	}
 | 
			
		||||
	if u.User.Username() != "" {
 | 
			
		||||
		p.username = u.User.Username()
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	p.password, _ = u.User.Password()
 | 
			
		||||
 | 
			
		||||
	// Figure out the target, which for our intents must accept messages.
 | 
			
		||||
	path, _ := strings.CutPrefix(u.Path, "/")
 | 
			
		||||
	elements := strings.Split(path, ",")
 | 
			
		||||
	if path == "" || elements[0] == "" {
 | 
			
		||||
		return p, nil, errors.New("unspecified entity")
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// The last entity type wins.
 | 
			
		||||
	p.target, p.isuser = elements[0], false
 | 
			
		||||
	for _, typ := range elements[1:] {
 | 
			
		||||
		switch typ {
 | 
			
		||||
		case "isuser":
 | 
			
		||||
			p.isuser = true
 | 
			
		||||
		case "ischannel":
 | 
			
		||||
			p.isuser = false
 | 
			
		||||
		case "isserver":
 | 
			
		||||
			// We do not support network names, and this is the default.
 | 
			
		||||
		default:
 | 
			
		||||
			return p, nil, errors.New("unsupported type: " + typ)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	if p.isuser {
 | 
			
		||||
		if i := strings.IndexAny(p.target, "!@"); i != -1 {
 | 
			
		||||
			p.target = p.target[:i]
 | 
			
		||||
		}
 | 
			
		||||
	} else if !strings.HasPrefix(p.target, "#") {
 | 
			
		||||
		// TODO(p): We should consult RPL_ISUPPORT rather than guess,
 | 
			
		||||
		// though other prefixes are rare.
 | 
			
		||||
		p.target = "#" + p.target
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Note that the draft RFC wants these to be case-insensitive.
 | 
			
		||||
	p.chankey = u.Query().Get("key")
 | 
			
		||||
	// Being able to skip channel join is our own requirement and invention,
 | 
			
		||||
	// as are notices (names taken from Travis CI configuration).
 | 
			
		||||
	p.skipjoin = u.Query().Has("skipjoin")
 | 
			
		||||
	p.usenotice = u.Query().Has("usenotice")
 | 
			
		||||
 | 
			
		||||
	// Ensure valid LF-separated UTF-8, and split it at lines.
 | 
			
		||||
	sanitized := strings.ReplaceAll(string([]rune(string(text))), "\r", "\n")
 | 
			
		||||
	for _, line := range strings.Split(sanitized, "\n") {
 | 
			
		||||
		if line != "" {
 | 
			
		||||
			p.message = append(p.message, line)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	hostname, port := u.Hostname(), u.Port()
 | 
			
		||||
	switch u.Scheme {
 | 
			
		||||
	case "irc":
 | 
			
		||||
		if port == "" {
 | 
			
		||||
			port = "6667"
 | 
			
		||||
		}
 | 
			
		||||
		connect = func() (net.Conn, error) {
 | 
			
		||||
			return net.Dial("tcp", net.JoinHostPort(hostname, port))
 | 
			
		||||
		}
 | 
			
		||||
	case "ircs":
 | 
			
		||||
		if port == "" {
 | 
			
		||||
			port = "6697"
 | 
			
		||||
		}
 | 
			
		||||
		connect = func() (net.Conn, error) {
 | 
			
		||||
			return tls.Dial("tcp", net.JoinHostPort(hostname, port), nil)
 | 
			
		||||
		}
 | 
			
		||||
	default:
 | 
			
		||||
		err = errors.New("unsupported scheme: " + u.Scheme)
 | 
			
		||||
	}
 | 
			
		||||
	return
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// notifyByURL sends the given text to the IRC server specified by a URL.
 | 
			
		||||
// See draft-butcher-irc-url-04.txt for the URL scheme specification
 | 
			
		||||
// this function loosely follows.
 | 
			
		||||
func notifyByURL(rawURL string, text []byte) error {
 | 
			
		||||
	p, connect, err := parse(rawURL, text)
 | 
			
		||||
	if p.conn, err = connect(); err != nil {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
	defer p.conn.Close()
 | 
			
		||||
	return notify(&p)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func main() {
 | 
			
		||||
	flag.BoolVar(&debugMode, "debug", false, "run in verbose debug mode")
 | 
			
		||||
	version := flag.Bool("version", false, "show version and exit")
 | 
			
		||||
 | 
			
		||||
	flag.Usage = func() {
 | 
			
		||||
		f := flag.CommandLine.Output()
 | 
			
		||||
		fmt.Fprintf(f, "Usage: %s [OPTION]... URL...\n", os.Args[0])
 | 
			
		||||
		flag.PrintDefaults()
 | 
			
		||||
	}
 | 
			
		||||
	flag.Parse()
 | 
			
		||||
	if flag.NArg() < 1 {
 | 
			
		||||
		flag.Usage()
 | 
			
		||||
		os.Exit(2)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if *version {
 | 
			
		||||
		fmt.Printf("%s %s\n", projectName, projectVersion)
 | 
			
		||||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	text, err := io.ReadAll(os.Stdin)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		log.Fatalln(err)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	status := 0
 | 
			
		||||
	for _, rawURL := range flag.Args() {
 | 
			
		||||
		if err := notifyByURL(rawURL, text); err != nil {
 | 
			
		||||
			status = 1
 | 
			
		||||
 | 
			
		||||
			var ue *url.Error
 | 
			
		||||
			if errors.As(err, &ue) {
 | 
			
		||||
				log.Println(err)
 | 
			
		||||
			} else {
 | 
			
		||||
				log.Printf("notify %q: %s\n", rawURL, err)
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	os.Exit(status)
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										98
									
								
								xN/xN_test.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										98
									
								
								xN/xN_test.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,98 @@
 | 
			
		||||
//
 | 
			
		||||
// Copyright (c) 2024, Přemysl Eric Janouch <p@janouch.name>
 | 
			
		||||
//
 | 
			
		||||
// Permission to use, copy, modify, and/or distribute this software for any
 | 
			
		||||
// purpose with or without fee is hereby granted.
 | 
			
		||||
//
 | 
			
		||||
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 | 
			
		||||
// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 | 
			
		||||
// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
 | 
			
		||||
// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 | 
			
		||||
// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
 | 
			
		||||
// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 | 
			
		||||
// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 | 
			
		||||
//
 | 
			
		||||
 | 
			
		||||
package main
 | 
			
		||||
 | 
			
		||||
import "testing"
 | 
			
		||||
 | 
			
		||||
func TestParseURL(t *testing.T) {
 | 
			
		||||
	for _, rawURL := range []string{
 | 
			
		||||
		`irc:server/channel`,
 | 
			
		||||
		`irc://server/channel,isnetwork`,
 | 
			
		||||
		`ircs://ssl.ircnet.io`,
 | 
			
		||||
		`ircs://ssl.ircnet.io/`,
 | 
			
		||||
		`http://server/path`,
 | 
			
		||||
	} {
 | 
			
		||||
		if _, _, err := parse(rawURL, nil); err == nil {
 | 
			
		||||
			t.Errorf("%q should not parse\n", rawURL)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	for _, test := range []struct {
 | 
			
		||||
		rawURL string
 | 
			
		||||
		p      parameters
 | 
			
		||||
	}{
 | 
			
		||||
		{
 | 
			
		||||
			rawURL: `irc://uptime@localhost/%23watch?skipjoin&usenotice`,
 | 
			
		||||
			p: parameters{
 | 
			
		||||
				username:  "uptime",
 | 
			
		||||
				target:    "#watch",
 | 
			
		||||
				skipjoin:  true,
 | 
			
		||||
				usenotice: true,
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
		{
 | 
			
		||||
			rawURL: `ircs://ohayou@irc.libera.chat/john,isuser,isserver`,
 | 
			
		||||
			p: parameters{
 | 
			
		||||
				username: "ohayou",
 | 
			
		||||
				target:   "john",
 | 
			
		||||
				isuser:   true,
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
		{
 | 
			
		||||
			rawURL: `ircs://agent:Password123@irc.cia.gov:1337/#hq?key=123456`,
 | 
			
		||||
			p: parameters{
 | 
			
		||||
				username: "agent",
 | 
			
		||||
				password: "Password123",
 | 
			
		||||
				target:   "#hq",
 | 
			
		||||
				chankey:  "123456",
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
	} {
 | 
			
		||||
		p, _, err := parse(test.rawURL, nil)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			t.Errorf("%q should parse, got: %s\n", test.rawURL, err)
 | 
			
		||||
			continue
 | 
			
		||||
		}
 | 
			
		||||
		if p.username != test.p.username {
 | 
			
		||||
			t.Errorf("%q: username: %v ≠ %v\n",
 | 
			
		||||
				test.rawURL, p.username, test.p.username)
 | 
			
		||||
		}
 | 
			
		||||
		if p.password != test.p.password {
 | 
			
		||||
			t.Errorf("%q: password: %v ≠ %v\n",
 | 
			
		||||
				test.rawURL, p.password, test.p.password)
 | 
			
		||||
		}
 | 
			
		||||
		if p.target != test.p.target {
 | 
			
		||||
			t.Errorf("%q: target: %v ≠ %v\n",
 | 
			
		||||
				test.rawURL, p.target, test.p.target)
 | 
			
		||||
		}
 | 
			
		||||
		if p.isuser != test.p.isuser {
 | 
			
		||||
			t.Errorf("%q: isuser: %v ≠ %v\n",
 | 
			
		||||
				test.rawURL, p.isuser, test.p.isuser)
 | 
			
		||||
		}
 | 
			
		||||
		if p.chankey != test.p.chankey {
 | 
			
		||||
			t.Errorf("%q: chankey: %v ≠ %v\n",
 | 
			
		||||
				test.rawURL, p.chankey, test.p.chankey)
 | 
			
		||||
		}
 | 
			
		||||
		if p.skipjoin != test.p.skipjoin {
 | 
			
		||||
			t.Errorf("%q: skipjoin: %v ≠ %v\n",
 | 
			
		||||
				test.rawURL, p.skipjoin, test.p.skipjoin)
 | 
			
		||||
		}
 | 
			
		||||
		if p.usenotice != test.p.usenotice {
 | 
			
		||||
			t.Errorf("%q: usenotice: %v ≠ %v\n",
 | 
			
		||||
				test.rawURL, p.usenotice, test.p.usenotice)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -1,10 +1,7 @@
 | 
			
		||||
module janouch.name/xK/xP
 | 
			
		||||
 | 
			
		||||
go 1.18
 | 
			
		||||
go 1.21
 | 
			
		||||
 | 
			
		||||
require nhooyr.io/websocket v1.8.7
 | 
			
		||||
toolchain go1.23.2
 | 
			
		||||
 | 
			
		||||
require (
 | 
			
		||||
	github.com/klauspost/compress v1.15.9 // indirect
 | 
			
		||||
	golang.org/x/sys v0.0.0-20210423082822-04245dca01da // indirect
 | 
			
		||||
)
 | 
			
		||||
require nhooyr.io/websocket v1.8.17
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										64
									
								
								xP/go.sum
									
									
									
									
									
								
							
							
						
						
									
										64
									
								
								xP/go.sum
									
									
									
									
									
								
							@@ -1,62 +1,2 @@
 | 
			
		||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 | 
			
		||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 | 
			
		||||
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 | 
			
		||||
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 | 
			
		||||
github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
 | 
			
		||||
github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 | 
			
		||||
github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 | 
			
		||||
github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
 | 
			
		||||
github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 | 
			
		||||
github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
 | 
			
		||||
github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 | 
			
		||||
github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
 | 
			
		||||
github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
 | 
			
		||||
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
 | 
			
		||||
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
 | 
			
		||||
github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
 | 
			
		||||
github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 | 
			
		||||
github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=
 | 
			
		||||
github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
 | 
			
		||||
github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 | 
			
		||||
github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
 | 
			
		||||
github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 | 
			
		||||
github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 | 
			
		||||
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 | 
			
		||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 | 
			
		||||
github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
 | 
			
		||||
github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 | 
			
		||||
github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
 | 
			
		||||
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 | 
			
		||||
github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 | 
			
		||||
github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY=
 | 
			
		||||
github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
 | 
			
		||||
github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 | 
			
		||||
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 | 
			
		||||
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 | 
			
		||||
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 | 
			
		||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 | 
			
		||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 | 
			
		||||
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
 | 
			
		||||
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 | 
			
		||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 | 
			
		||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 | 
			
		||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 | 
			
		||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 | 
			
		||||
github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 | 
			
		||||
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 | 
			
		||||
github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 | 
			
		||||
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 | 
			
		||||
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c=
 | 
			
		||||
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 | 
			
		||||
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 | 
			
		||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 | 
			
		||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 | 
			
		||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 | 
			
		||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 | 
			
		||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 | 
			
		||||
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 | 
			
		||||
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 | 
			
		||||
nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
 | 
			
		||||
nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
 | 
			
		||||
nhooyr.io/websocket v1.8.17 h1:KEVeLJkUywCKVsnLIDlD/5gtayKp8VoCkksHCGGfT9Y=
 | 
			
		||||
nhooyr.io/websocket v1.8.17/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c=
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
// Copyright (c) 2022 - 2023, Přemysl Eric Janouch <p@janouch.name>
 | 
			
		||||
// Copyright (c) 2022 - 2024, Přemysl Eric Janouch <p@janouch.name>
 | 
			
		||||
// SPDX-License-Identifier: 0BSD
 | 
			
		||||
import * as Relay from './proto.js'
 | 
			
		||||
 | 
			
		||||
@@ -197,6 +197,14 @@ function bufferResetStats(b) {
 | 
			
		||||
	b.highlighted = false
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function bufferPopExcessLines(b) {
 | 
			
		||||
	// Let "new" messages be, if only because pulling the log file
 | 
			
		||||
	// is much more problematic in the web browser than in xC.
 | 
			
		||||
	// TODO: Make the limit configurable, or extract general.backlog_limit.
 | 
			
		||||
	const old = b.lines.length - b.newMessages - b.newUnimportantMessages
 | 
			
		||||
	b.lines.splice(0, old - 1000)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function bufferActivate(name) {
 | 
			
		||||
	rpc.send({command: 'BufferActivate', bufferName: name})
 | 
			
		||||
}
 | 
			
		||||
@@ -294,6 +302,13 @@ rpcEventHandlers.set(Relay.Event.BufferLine, e => {
 | 
			
		||||
			b.newMessages++
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// XXX: In its unkeyed diff algorithm, Mithril.js can only efficiently
 | 
			
		||||
	// deal with common prefixes, i.e., indefinitely growing buffers.
 | 
			
		||||
	// But we don't want to key all children of Buffer,
 | 
			
		||||
	// so only trim buffers while they are, or once they become invisible.
 | 
			
		||||
	if (e.bufferName != bufferCurrent)
 | 
			
		||||
		bufferPopExcessLines(b)
 | 
			
		||||
 | 
			
		||||
	if (e.leakToActive) {
 | 
			
		||||
		let bc = buffers.get(bufferCurrent)
 | 
			
		||||
		bc.lines.push({...line, leaked: true})
 | 
			
		||||
@@ -336,7 +351,7 @@ rpcEventHandlers.set(Relay.Event.BufferStats, e => {
 | 
			
		||||
	if (b === undefined)
 | 
			
		||||
		return
 | 
			
		||||
 | 
			
		||||
	b.newMessages = e.newMessages,
 | 
			
		||||
	b.newMessages = e.newMessages
 | 
			
		||||
	b.newUnimportantMessages = e.newUnimportantMessages
 | 
			
		||||
	b.highlighted = e.highlighted
 | 
			
		||||
})
 | 
			
		||||
@@ -344,6 +359,11 @@ rpcEventHandlers.set(Relay.Event.BufferStats, e => {
 | 
			
		||||
rpcEventHandlers.set(Relay.Event.BufferRename, e => {
 | 
			
		||||
	buffers.set(e.new, buffers.get(e.bufferName))
 | 
			
		||||
	buffers.delete(e.bufferName)
 | 
			
		||||
 | 
			
		||||
	if (e.bufferName === bufferCurrent)
 | 
			
		||||
		bufferCurrent = e.new
 | 
			
		||||
	if (e.bufferName === bufferLast)
 | 
			
		||||
		bufferLast = e.new
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
rpcEventHandlers.set(Relay.Event.BufferRemove, e => {
 | 
			
		||||
@@ -354,8 +374,16 @@ rpcEventHandlers.set(Relay.Event.BufferRemove, e => {
 | 
			
		||||
 | 
			
		||||
rpcEventHandlers.set(Relay.Event.BufferActivate, e => {
 | 
			
		||||
	let old = buffers.get(bufferCurrent)
 | 
			
		||||
	if (old !== undefined)
 | 
			
		||||
	if (old !== undefined) {
 | 
			
		||||
		bufferResetStats(old)
 | 
			
		||||
		bufferPopExcessLines(old)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Initial sync: trim all buffers to our limit, just for consistency.
 | 
			
		||||
	if (bufferCurrent === undefined) {
 | 
			
		||||
		for (let b of buffers.values())
 | 
			
		||||
			bufferPopExcessLines(b)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	bufferLast = bufferCurrent
 | 
			
		||||
	let b = buffers.get(e.bufferName)
 | 
			
		||||
@@ -501,7 +529,8 @@ let Content = {
 | 
			
		||||
		while ((match = re.exec(text)) !== null) {
 | 
			
		||||
			if (end < match.index)
 | 
			
		||||
				a.push(m('span', attrs, text.substring(end, match.index)))
 | 
			
		||||
			a.push(m('a[target=_blank]', {href: match[0], ...attrs}, match[0]))
 | 
			
		||||
			a.push(m('a[target=_blank][rel=noreferrer]',
 | 
			
		||||
				{href: match[0], ...attrs}, match[0]))
 | 
			
		||||
			end = re.lastIndex
 | 
			
		||||
		}
 | 
			
		||||
		if (end < text.length)
 | 
			
		||||
@@ -664,6 +693,10 @@ let Buffer = {
 | 
			
		||||
			const dom = event.target
 | 
			
		||||
			bufferAutoscroll =
 | 
			
		||||
				dom.scrollTop + dom.clientHeight + 1 >= dom.scrollHeight
 | 
			
		||||
 | 
			
		||||
			let b = buffers.get(bufferCurrent)
 | 
			
		||||
			if (b !== undefined && b.highlighted && !bufferAutoscroll)
 | 
			
		||||
				b.highlighted = false
 | 
			
		||||
		}}, lines)
 | 
			
		||||
	},
 | 
			
		||||
}
 | 
			
		||||
@@ -679,7 +712,8 @@ let Log = {
 | 
			
		||||
		while ((match = re.exec(text)) !== null) {
 | 
			
		||||
			if (end < match.index)
 | 
			
		||||
				a.push(text.substring(end, match.index))
 | 
			
		||||
			a.push(m('a[target=_blank]', {href: match[0]}, match[0]))
 | 
			
		||||
			a.push(m('a[target=_blank][rel=noreferrer]',
 | 
			
		||||
				{href: match[0]}, match[0]))
 | 
			
		||||
			end = re.lastIndex
 | 
			
		||||
		}
 | 
			
		||||
		if (end < text.length)
 | 
			
		||||
@@ -967,7 +1001,7 @@ let Input = {
 | 
			
		||||
		rpc.send({command: 'Active'})
 | 
			
		||||
 | 
			
		||||
		let b = buffers.get(bufferCurrent)
 | 
			
		||||
		if (b === undefined)
 | 
			
		||||
		if (b === undefined || event.isComposing)
 | 
			
		||||
			return
 | 
			
		||||
 | 
			
		||||
		let textarea = event.currentTarget
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										9
									
								
								xP/xP.go
									
									
									
									
									
								
							
							
						
						
									
										9
									
								
								xP/xP.go
									
									
									
									
									
								
							@@ -75,12 +75,12 @@ func relayMakeReceiver(ctx context.Context, conn net.Conn) <-chan []byte {
 | 
			
		||||
	go func() {
 | 
			
		||||
		defer close(p)
 | 
			
		||||
		for {
 | 
			
		||||
			j := relayReadFrame(r)
 | 
			
		||||
			if j == nil {
 | 
			
		||||
			b := relayReadFrame(r)
 | 
			
		||||
			if b == nil {
 | 
			
		||||
				return
 | 
			
		||||
			}
 | 
			
		||||
			select {
 | 
			
		||||
			case p <- j:
 | 
			
		||||
			case p <- b:
 | 
			
		||||
			case <-ctx.Done():
 | 
			
		||||
				return
 | 
			
		||||
			}
 | 
			
		||||
@@ -145,8 +145,7 @@ func clientWriteError(ctx context.Context, ws *websocket.Conn, err error) bool {
 | 
			
		||||
	b, ok := (&RelayEventMessage{
 | 
			
		||||
		EventSeq: 0,
 | 
			
		||||
		Data: RelayEventData{
 | 
			
		||||
			Interface: RelayEventDataError{
 | 
			
		||||
				Event:      RelayEventError,
 | 
			
		||||
			Variant: &RelayEventDataError{
 | 
			
		||||
				CommandSeq: 0,
 | 
			
		||||
				Error:      err.Error(),
 | 
			
		||||
			},
 | 
			
		||||
 
 | 
			
		||||
@@ -5,12 +5,14 @@ AWK = env LC_ALL=C awk
 | 
			
		||||
outputs = xS xS-replies.go xS.1
 | 
			
		||||
all: $(outputs)
 | 
			
		||||
 | 
			
		||||
xS: xS.go ../xK-version xS-replies.go
 | 
			
		||||
xS: xS.go xS-replies.go ../xK-version
 | 
			
		||||
	go build -ldflags "-X 'main.projectVersion=$$(cat ../xK-version)'" -o $@
 | 
			
		||||
xS-replies.go: xS-gen-replies.awk xS-replies
 | 
			
		||||
	$(AWK) -f xS-gen-replies.awk xS-replies > $@
 | 
			
		||||
xS.1: ../xK-version ../liberty/tools/asciiman.awk xS.adoc
 | 
			
		||||
	env "asciidoc-release-version=$$(cat ../xK-version)" \
 | 
			
		||||
		$(AWK) -f ../liberty/tools/asciiman.awk xS.adoc > $@
 | 
			
		||||
test: all
 | 
			
		||||
	go test
 | 
			
		||||
clean:
 | 
			
		||||
	rm -f $(outputs)
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										132
									
								
								xS/irc.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										132
									
								
								xS/irc.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,132 @@
 | 
			
		||||
package main
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"path/filepath"
 | 
			
		||||
	"regexp"
 | 
			
		||||
	"strings"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
func ircToLower(c byte) byte {
 | 
			
		||||
	switch c {
 | 
			
		||||
	case '[':
 | 
			
		||||
		return '{'
 | 
			
		||||
	case ']':
 | 
			
		||||
		return '}'
 | 
			
		||||
	case '\\':
 | 
			
		||||
		return '|'
 | 
			
		||||
	case '~':
 | 
			
		||||
		return '^'
 | 
			
		||||
	}
 | 
			
		||||
	if c >= 'A' && c <= 'Z' {
 | 
			
		||||
		return c + ('a' - 'A')
 | 
			
		||||
	}
 | 
			
		||||
	return c
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func ircToUpper(c byte) byte {
 | 
			
		||||
	switch c {
 | 
			
		||||
	case '{':
 | 
			
		||||
		return '['
 | 
			
		||||
	case '}':
 | 
			
		||||
		return ']'
 | 
			
		||||
	case '|':
 | 
			
		||||
		return '\\'
 | 
			
		||||
	case '^':
 | 
			
		||||
		return '~'
 | 
			
		||||
	}
 | 
			
		||||
	if c >= 'a' && c <= 'z' {
 | 
			
		||||
		return c - ('a' - 'A')
 | 
			
		||||
	}
 | 
			
		||||
	return c
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Convert identifier to a canonical form for case-insensitive comparisons.
 | 
			
		||||
// ircToUpper is used so that statically initialized maps can be in uppercase.
 | 
			
		||||
func ircToCanon(ident string) string {
 | 
			
		||||
	var canon []byte
 | 
			
		||||
	for _, c := range []byte(ident) {
 | 
			
		||||
		canon = append(canon, ircToUpper(c))
 | 
			
		||||
	}
 | 
			
		||||
	return string(canon)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func ircEqual(s1, s2 string) bool {
 | 
			
		||||
	return ircToCanon(s1) == ircToCanon(s2)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func ircFnmatch(pattern string, s string) bool {
 | 
			
		||||
	pattern, s = ircToCanon(pattern), ircToCanon(s)
 | 
			
		||||
	// FIXME: This should not support [] ranges and handle '/' specially.
 | 
			
		||||
	// We could translate the pattern to a regular expression.
 | 
			
		||||
	matched, _ := filepath.Match(pattern, s)
 | 
			
		||||
	return matched
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
var reMsg = regexp.MustCompile(
 | 
			
		||||
	`^(?:@([^ ]*) +)?(?::([^! ]*)(?:!([^@]*)@([^ ]*))? +)?([^ ]+)(.*)?$`)
 | 
			
		||||
var reArgs = regexp.MustCompile(`:.*| [^: ][^ ]*`)
 | 
			
		||||
 | 
			
		||||
type message struct {
 | 
			
		||||
	tags    map[string]string // IRC 3.2 message tags
 | 
			
		||||
	nick    string            // optional nickname
 | 
			
		||||
	user    string            // optional username
 | 
			
		||||
	host    string            // optional hostname or IP address
 | 
			
		||||
	command string            // command name
 | 
			
		||||
	params  []string          // arguments
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func ircUnescapeMessageTag(value string) string {
 | 
			
		||||
	var buf []byte
 | 
			
		||||
	escape := false
 | 
			
		||||
	for i := 0; i < len(value); i++ {
 | 
			
		||||
		if escape {
 | 
			
		||||
			switch value[i] {
 | 
			
		||||
			case ':':
 | 
			
		||||
				buf = append(buf, ';')
 | 
			
		||||
			case 's':
 | 
			
		||||
				buf = append(buf, ' ')
 | 
			
		||||
			case 'r':
 | 
			
		||||
				buf = append(buf, '\r')
 | 
			
		||||
			case 'n':
 | 
			
		||||
				buf = append(buf, '\n')
 | 
			
		||||
			default:
 | 
			
		||||
				buf = append(buf, value[i])
 | 
			
		||||
			}
 | 
			
		||||
			escape = false
 | 
			
		||||
		} else if value[i] == '\\' {
 | 
			
		||||
			escape = true
 | 
			
		||||
		} else {
 | 
			
		||||
			buf = append(buf, value[i])
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	return string(buf)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func ircParseMessageTags(tags string, out map[string]string) {
 | 
			
		||||
	for _, tag := range strings.Split(tags, ";") {
 | 
			
		||||
		if tag == "" {
 | 
			
		||||
			// Ignore empty.
 | 
			
		||||
		} else if equal := strings.IndexByte(tag, '='); equal < 0 {
 | 
			
		||||
			out[tag] = ""
 | 
			
		||||
		} else {
 | 
			
		||||
			out[tag[:equal]] = ircUnescapeMessageTag(tag[equal+1:])
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func ircParseMessage(line string) *message {
 | 
			
		||||
	m := reMsg.FindStringSubmatch(line)
 | 
			
		||||
	if m == nil {
 | 
			
		||||
		return nil
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	msg := message{nil, m[2], m[3], m[4], m[5], nil}
 | 
			
		||||
	if m[1] != "" {
 | 
			
		||||
		msg.tags = make(map[string]string)
 | 
			
		||||
		ircParseMessageTags(m[1], msg.tags)
 | 
			
		||||
	}
 | 
			
		||||
	for _, x := range reArgs.FindAllString(m[6], -1) {
 | 
			
		||||
		msg.params = append(msg.params, x[1:])
 | 
			
		||||
	}
 | 
			
		||||
	return &msg
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										126
									
								
								xS/xS.go
									
									
									
									
									
								
							
							
						
						
									
										126
									
								
								xS/xS.go
									
									
									
									
									
								
							@@ -456,132 +456,6 @@ func (fd *floodDetector) check() bool {
 | 
			
		||||
	return count <= fd.limit
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// --- IRC protocol ------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
func ircToLower(c byte) byte {
 | 
			
		||||
	switch c {
 | 
			
		||||
	case '[':
 | 
			
		||||
		return '{'
 | 
			
		||||
	case ']':
 | 
			
		||||
		return '}'
 | 
			
		||||
	case '\\':
 | 
			
		||||
		return '|'
 | 
			
		||||
	case '~':
 | 
			
		||||
		return '^'
 | 
			
		||||
	}
 | 
			
		||||
	if c >= 'A' && c <= 'Z' {
 | 
			
		||||
		return c + ('a' - 'A')
 | 
			
		||||
	}
 | 
			
		||||
	return c
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func ircToUpper(c byte) byte {
 | 
			
		||||
	switch c {
 | 
			
		||||
	case '{':
 | 
			
		||||
		return '['
 | 
			
		||||
	case '}':
 | 
			
		||||
		return ']'
 | 
			
		||||
	case '|':
 | 
			
		||||
		return '\\'
 | 
			
		||||
	case '^':
 | 
			
		||||
		return '~'
 | 
			
		||||
	}
 | 
			
		||||
	if c >= 'a' && c <= 'z' {
 | 
			
		||||
		return c - ('a' - 'A')
 | 
			
		||||
	}
 | 
			
		||||
	return c
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Convert identifier to a canonical form for case-insensitive comparisons.
 | 
			
		||||
// ircToUpper is used so that statically initialized maps can be in uppercase.
 | 
			
		||||
func ircToCanon(ident string) string {
 | 
			
		||||
	var canon []byte
 | 
			
		||||
	for _, c := range []byte(ident) {
 | 
			
		||||
		canon = append(canon, ircToUpper(c))
 | 
			
		||||
	}
 | 
			
		||||
	return string(canon)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func ircEqual(s1, s2 string) bool {
 | 
			
		||||
	return ircToCanon(s1) == ircToCanon(s2)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func ircFnmatch(pattern string, s string) bool {
 | 
			
		||||
	pattern, s = ircToCanon(pattern), ircToCanon(s)
 | 
			
		||||
	// FIXME: This should not support [] ranges and handle '/' specially.
 | 
			
		||||
	// We could translate the pattern to a regular expression.
 | 
			
		||||
	matched, _ := filepath.Match(pattern, s)
 | 
			
		||||
	return matched
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
var reMsg = regexp.MustCompile(
 | 
			
		||||
	`^(?:@([^ ]*) +)?(?::([^! ]*)(?:!([^@]*)@([^ ]*))? +)?([^ ]+)(.*)?$`)
 | 
			
		||||
var reArgs = regexp.MustCompile(`:.*| [^: ][^ ]*`)
 | 
			
		||||
 | 
			
		||||
type message struct {
 | 
			
		||||
	tags    map[string]string // IRC 3.2 message tags
 | 
			
		||||
	nick    string            // optional nickname
 | 
			
		||||
	user    string            // optional username
 | 
			
		||||
	host    string            // optional hostname or IP address
 | 
			
		||||
	command string            // command name
 | 
			
		||||
	params  []string          // arguments
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func ircUnescapeMessageTag(value string) string {
 | 
			
		||||
	var buf []byte
 | 
			
		||||
	escape := false
 | 
			
		||||
	for i := 0; i < len(value); i++ {
 | 
			
		||||
		if escape {
 | 
			
		||||
			switch value[i] {
 | 
			
		||||
			case ':':
 | 
			
		||||
				buf = append(buf, ';')
 | 
			
		||||
			case 's':
 | 
			
		||||
				buf = append(buf, ' ')
 | 
			
		||||
			case 'r':
 | 
			
		||||
				buf = append(buf, '\r')
 | 
			
		||||
			case 'n':
 | 
			
		||||
				buf = append(buf, '\n')
 | 
			
		||||
			default:
 | 
			
		||||
				buf = append(buf, value[i])
 | 
			
		||||
			}
 | 
			
		||||
			escape = false
 | 
			
		||||
		} else if value[i] == '\\' {
 | 
			
		||||
			escape = true
 | 
			
		||||
		} else {
 | 
			
		||||
			buf = append(buf, value[i])
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	return string(buf)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func ircParseMessageTags(tags string, out map[string]string) {
 | 
			
		||||
	for _, tag := range splitString(tags, ";", true /* ignoreEmpty */) {
 | 
			
		||||
		if equal := strings.IndexByte(tag, '='); equal < 0 {
 | 
			
		||||
			out[tag] = ""
 | 
			
		||||
		} else {
 | 
			
		||||
			out[tag[:equal]] = ircUnescapeMessageTag(tag[equal+1:])
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func ircParseMessage(line string) *message {
 | 
			
		||||
	m := reMsg.FindStringSubmatch(line)
 | 
			
		||||
	if m == nil {
 | 
			
		||||
		return nil
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	msg := message{nil, m[2], m[3], m[4], m[5], nil}
 | 
			
		||||
	if m[1] != "" {
 | 
			
		||||
		msg.tags = make(map[string]string)
 | 
			
		||||
		ircParseMessageTags(m[1], msg.tags)
 | 
			
		||||
	}
 | 
			
		||||
	for _, x := range reArgs.FindAllString(m[6], -1) {
 | 
			
		||||
		msg.params = append(msg.params, x[1:])
 | 
			
		||||
	}
 | 
			
		||||
	return &msg
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// --- IRC token validation ----------------------------------------------------
 | 
			
		||||
 | 
			
		||||
// Everything as per RFC 2812
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										164
									
								
								xT/CMakeLists.txt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										164
									
								
								xT/CMakeLists.txt
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,164 @@
 | 
			
		||||
# As per Qt 6.8 documentation, at least 3.16 is necessary
 | 
			
		||||
cmake_minimum_required (VERSION 3.21.1)
 | 
			
		||||
 | 
			
		||||
file (READ ../xK-version project_version)
 | 
			
		||||
configure_file (../xK-version xK-version.tag COPYONLY)
 | 
			
		||||
string (STRIP "${project_version}" project_version)
 | 
			
		||||
 | 
			
		||||
# This is an entirely separate CMake project.
 | 
			
		||||
project (xT VERSION "${project_version}"
 | 
			
		||||
	DESCRIPTION "Qt frontend for xC" LANGUAGES CXX)
 | 
			
		||||
 | 
			
		||||
set (CMAKE_CXX_STANDARD 17)
 | 
			
		||||
set (CMAKE_CXX_STANDARD_REQUIRED ON)
 | 
			
		||||
 | 
			
		||||
find_package (Qt6 REQUIRED COMPONENTS Widgets Network Multimedia)
 | 
			
		||||
qt_standard_project_setup ()
 | 
			
		||||
 | 
			
		||||
add_compile_options ("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
 | 
			
		||||
add_compile_options ("$<$<CXX_COMPILER_ID:GNU>:-Wall;-Wextra>")
 | 
			
		||||
add_compile_options ("$<$<CXX_COMPILER_ID:Clang>:-Wall;-Wextra>")
 | 
			
		||||
 | 
			
		||||
set (project_config "${PROJECT_BINARY_DIR}/config.h")
 | 
			
		||||
configure_file ("${PROJECT_SOURCE_DIR}/config.h.in" "${project_config}")
 | 
			
		||||
include_directories ("${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}")
 | 
			
		||||
 | 
			
		||||
# Produce a beep sample
 | 
			
		||||
find_program (sox_EXECUTABLE sox REQUIRED)
 | 
			
		||||
set (beep "${PROJECT_BINARY_DIR}/beep.wav")
 | 
			
		||||
add_custom_command (OUTPUT "${beep}"
 | 
			
		||||
	COMMAND ${sox_EXECUTABLE} -b 16 -Dr 44100 -n "${beep}"
 | 
			
		||||
		synth 0.1 0 25 triangle 800 vol 0.5 fade t 0 -0 0.005 pad 0 0.05
 | 
			
		||||
	COMMENT "Generating a beep sample" VERBATIM)
 | 
			
		||||
set_property (SOURCE "${beep}" APPEND PROPERTY QT_RESOURCE_ALIAS beep.wav)
 | 
			
		||||
 | 
			
		||||
# Rasterize SVG icons
 | 
			
		||||
set (root "${PROJECT_SOURCE_DIR}/..")
 | 
			
		||||
set (CMAKE_MODULE_PATH "${root}/liberty/cmake")
 | 
			
		||||
include (IconUtils)
 | 
			
		||||
 | 
			
		||||
# It might generally be better to use QtSvg, though it is an extra dependency.
 | 
			
		||||
# The icon_to_png macro is not intended to be used like this.
 | 
			
		||||
foreach (icon xT xT-highlighted)
 | 
			
		||||
	icon_to_png (${icon} "${PROJECT_SOURCE_DIR}/${icon}.svg"
 | 
			
		||||
		48 "${PROJECT_BINARY_DIR}/resources" icon_png)
 | 
			
		||||
	set_property (SOURCE "${icon_png}"
 | 
			
		||||
		APPEND PROPERTY QT_RESOURCE_ALIAS "${icon}.png")
 | 
			
		||||
	list (APPEND icon_rsrc_list "${icon_png}")
 | 
			
		||||
endforeach ()
 | 
			
		||||
 | 
			
		||||
if (APPLE)
 | 
			
		||||
	set (MACOSX_BUNDLE_ICON_FILE xT.icns)
 | 
			
		||||
	icon_to_icns ("${PROJECT_SOURCE_DIR}/xT.svg"
 | 
			
		||||
		"${MACOSX_BUNDLE_ICON_FILE}" icon_icns)
 | 
			
		||||
else ()
 | 
			
		||||
	# The largest size is mainly for an appropriately sized Windows icon
 | 
			
		||||
	set (icon_base "${PROJECT_BINARY_DIR}/icons")
 | 
			
		||||
	set (icon_png_list)
 | 
			
		||||
	foreach (icon_size 16 32 48 256)
 | 
			
		||||
		icon_to_png (xT "${PROJECT_SOURCE_DIR}/xT.svg"
 | 
			
		||||
			${icon_size} "${icon_base}" icon_png)
 | 
			
		||||
		list (APPEND icon_png_list "${icon_png}")
 | 
			
		||||
	endforeach ()
 | 
			
		||||
	add_custom_target (icons ALL DEPENDS ${icon_png_list})
 | 
			
		||||
	if (WIN32)
 | 
			
		||||
		list (REMOVE_ITEM icon_png_list "${icon_png}")
 | 
			
		||||
		set (icon_ico "${PROJECT_BINARY_DIR}/xT.ico")
 | 
			
		||||
		icon_for_win32 ("${icon_ico}" "${icon_png_list}" "${icon_png}")
 | 
			
		||||
 | 
			
		||||
		set (resource_file "${PROJECT_BINARY_DIR}/xT.rc")
 | 
			
		||||
		list (APPEND project_sources "${resource_file}")
 | 
			
		||||
		add_custom_command (OUTPUT "${resource_file}"
 | 
			
		||||
			COMMAND ${CMAKE_COMMAND} -E echo "1 ICON \"xT.ico\""
 | 
			
		||||
				> ${resource_file} VERBATIM)
 | 
			
		||||
		set_property (SOURCE "${resource_file}"
 | 
			
		||||
			APPEND PROPERTY OBJECT_DEPENDS ${icon_ico})
 | 
			
		||||
	endif ()
 | 
			
		||||
endif ()
 | 
			
		||||
 | 
			
		||||
# Build the main executable and link it
 | 
			
		||||
find_program (awk_EXECUTABLE awk ${find_program_REQUIRE})
 | 
			
		||||
add_custom_command (OUTPUT xC-proto.cpp
 | 
			
		||||
	COMMAND ${CMAKE_COMMAND} -E env LC_ALL=C ${awk_EXECUTABLE}
 | 
			
		||||
		-f ${root}/liberty/tools/lxdrgen.awk
 | 
			
		||||
		-f ${root}/liberty/tools/lxdrgen-cpp.awk
 | 
			
		||||
		-v PrefixCamel=Relay
 | 
			
		||||
		${root}/xC.lxdr > xC-proto.cpp
 | 
			
		||||
	DEPENDS
 | 
			
		||||
		${root}/liberty/tools/lxdrgen.awk
 | 
			
		||||
		${root}/liberty/tools/lxdrgen-cpp.awk
 | 
			
		||||
		${root}/xC.lxdr
 | 
			
		||||
	COMMENT "Generating xC relay protocol code" VERBATIM)
 | 
			
		||||
add_custom_target (xC-proto DEPENDS ${PROJECT_BINARY_DIR}/xC-proto.cpp)
 | 
			
		||||
 | 
			
		||||
list (APPEND project_sources "${root}/liberty/tools/lxdrgen-cpp-qt.cpp")
 | 
			
		||||
qt_add_executable (xT
 | 
			
		||||
	xT.cpp ${project_config} ${project_sources} "${icon_icns}")
 | 
			
		||||
add_dependencies (xT xC-proto)
 | 
			
		||||
qt_add_resources (xT "rsrc" PREFIX / FILES "${beep}" ${icon_rsrc_list})
 | 
			
		||||
target_link_libraries (xT PRIVATE Qt6::Widgets Qt6::Network Qt6::Multimedia)
 | 
			
		||||
set_target_properties (xT PROPERTIES WIN32_EXECUTABLE ON MACOSX_BUNDLE ON
 | 
			
		||||
	MACOSX_BUNDLE_GUI_IDENTIFIER name.janouch.xT)
 | 
			
		||||
 | 
			
		||||
# https://stackoverflow.com/questions/79079161 and resolved in Qt Creator 16.
 | 
			
		||||
set (QT_QML_GENERATE_QMLLS_INI ON)
 | 
			
		||||
 | 
			
		||||
# The files to be installed
 | 
			
		||||
include (GNUInstallDirs)
 | 
			
		||||
 | 
			
		||||
if (ANDROID)
 | 
			
		||||
	install (TARGETS xT DESTINATION .)
 | 
			
		||||
elseif (APPLE OR WIN32)
 | 
			
		||||
	install (TARGETS xT
 | 
			
		||||
		BUNDLE DESTINATION .
 | 
			
		||||
		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 | 
			
		||||
 | 
			
		||||
	# XXX: QTBUG-127075, which can be circumvented by manually running
 | 
			
		||||
	# macdeployqt on xT.app before the install.
 | 
			
		||||
	qt_generate_deploy_app_script (TARGET xT OUTPUT_SCRIPT deploy_xT)
 | 
			
		||||
	install (SCRIPT "${deploy_xT}")
 | 
			
		||||
else ()
 | 
			
		||||
	install (TARGETS xT DESTINATION ${CMAKE_INSTALL_BINDIR})
 | 
			
		||||
	install (FILES ../LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
 | 
			
		||||
 | 
			
		||||
	install (FILES xT.svg
 | 
			
		||||
		DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps)
 | 
			
		||||
	install (DIRECTORY ${icon_base}
 | 
			
		||||
		DESTINATION ${CMAKE_INSTALL_DATADIR})
 | 
			
		||||
	install (FILES xT.desktop
 | 
			
		||||
		DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
 | 
			
		||||
endif ()
 | 
			
		||||
 | 
			
		||||
# Within MSYS2, windeployqt doesn't copy the compiler runtime,
 | 
			
		||||
# which is always linked dynamically by the Qt binaries.
 | 
			
		||||
# TODO(p): Consider whether or not to use MSYS2 to cross-compile, and how.
 | 
			
		||||
if (WIN32)
 | 
			
		||||
	install (CODE [=[
 | 
			
		||||
	set (bindir "${CMAKE_INSTALL_PREFIX}/bin")
 | 
			
		||||
	execute_process (COMMAND cygpath -m /
 | 
			
		||||
		OUTPUT_VARIABLE cygroot OUTPUT_STRIP_TRAILING_WHITESPACE)
 | 
			
		||||
	if (cygroot)
 | 
			
		||||
		execute_process (COMMAND ldd "${bindir}/xT.exe"
 | 
			
		||||
			OUTPUT_VARIABLE ldd_output OUTPUT_STRIP_TRAILING_WHITESPACE)
 | 
			
		||||
		string (REGEX MATCHALL " /mingw64/bin/[^ ]+ " libs "${ldd_output}")
 | 
			
		||||
		foreach (lib ${libs})
 | 
			
		||||
			string (STRIP "${lib}" lib)
 | 
			
		||||
			file (COPY "${cygroot}${lib}" DESTINATION "${bindir}")
 | 
			
		||||
		endforeach()
 | 
			
		||||
	endif ()
 | 
			
		||||
	]=])
 | 
			
		||||
endif ()
 | 
			
		||||
 | 
			
		||||
# CPack
 | 
			
		||||
set (CPACK_PACKAGE_VENDOR "Premysl Eric Janouch")
 | 
			
		||||
set (CPACK_PACKAGE_CONTACT "Přemysl Eric Janouch <p@janouch.name>")
 | 
			
		||||
set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/../LICENSE")
 | 
			
		||||
set (CPACK_GENERATOR "TGZ;ZIP")
 | 
			
		||||
set (CPACK_PACKAGE_FILE_NAME
 | 
			
		||||
	"${PROJECT_NAME}-${PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
 | 
			
		||||
set (CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME} ${PROJECT_VERSION}")
 | 
			
		||||
set (CPACK_SOURCE_GENERATOR "TGZ;ZIP")
 | 
			
		||||
set (CPACK_SOURCE_IGNORE_FILES "/build;/CMakeLists.txt.user")
 | 
			
		||||
set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}")
 | 
			
		||||
 | 
			
		||||
include (CPack)
 | 
			
		||||
							
								
								
									
										7
									
								
								xT/config.h.in
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								xT/config.h.in
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,7 @@
 | 
			
		||||
#ifndef CONFIG_H
 | 
			
		||||
#define CONFIG_H
 | 
			
		||||
 | 
			
		||||
#define PROJECT_NAME        "${PROJECT_NAME}"
 | 
			
		||||
#define PROJECT_VERSION     "${project_version}"
 | 
			
		||||
 | 
			
		||||
#endif  // ! CONFIG_H
 | 
			
		||||
							
								
								
									
										29
									
								
								xT/xT-highlighted.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										29
									
								
								xT/xT-highlighted.svg
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,29 @@
 | 
			
		||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 | 
			
		||||
<svg version="1.1" width="48" height="48" viewBox="0 0 48 48"
 | 
			
		||||
   xmlns="http://www.w3.org/2000/svg">
 | 
			
		||||
 | 
			
		||||
  <defs>
 | 
			
		||||
    <radialGradient id="green-x">
 | 
			
		||||
      <stop stop-color="hsl(66, 100%, 80%)" offset="0" />
 | 
			
		||||
      <stop stop-color="hsl(66, 100%, 50%)" offset="1" />
 | 
			
		||||
    </radialGradient>
 | 
			
		||||
    <radialGradient id="orange">
 | 
			
		||||
      <stop stop-color="hsl(36, 100%, 60%)" offset="0" />
 | 
			
		||||
      <stop stop-color="hsl(23, 100%, 60%)" offset="1" />
 | 
			
		||||
    </radialGradient>
 | 
			
		||||
    <filter id="shadow" x="-50%" y="-50%" width="200%" height="200%">
 | 
			
		||||
      <feDropShadow dx="0" dy="0" stdDeviation="0.05"
 | 
			
		||||
         flood-color="rgba(0, 0, 0, .5)" />
 | 
			
		||||
    </filter>
 | 
			
		||||
  </defs>
 | 
			
		||||
 | 
			
		||||
  <!-- XXX: librsvg screws up shadows on rotated objects. -->
 | 
			
		||||
  <g filter="url(#shadow)" transform="translate(24 3) scale(16)">
 | 
			
		||||
    <path fill="url(#orange)" stroke="hsl(36, 100%, 20%)" stroke-width="0.1"
 | 
			
		||||
       d="M-.8 0 H.8 V.5 H.25 V2.625 H-.25 V.5 H-.8 Z" />
 | 
			
		||||
  </g>
 | 
			
		||||
  <g filter="url(#shadow)" transform="translate(24 28) rotate(-45) scale(16)">
 | 
			
		||||
    <path fill="url(#green-x)" stroke="hsl(66, 100%, 20%)" stroke-width="0.1"
 | 
			
		||||
       d="M-.25 -1 H.25 V-.25 H1 V.25 H.25 V1 H-.25 V.25 H-1 V-.25 H-.25 Z" />
 | 
			
		||||
  </g>
 | 
			
		||||
</svg>
 | 
			
		||||
| 
		 After Width: | Height: | Size: 1.2 KiB  | 
							
								
								
									
										8
									
								
								xT/xT.desktop
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								xT/xT.desktop
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,8 @@
 | 
			
		||||
[Desktop Entry]
 | 
			
		||||
Type=Application
 | 
			
		||||
Name=xT
 | 
			
		||||
GenericName=IRC Client
 | 
			
		||||
Icon=xT
 | 
			
		||||
Exec=xT
 | 
			
		||||
StartupNotify=false
 | 
			
		||||
Categories=Network;Chat;IRCClient;
 | 
			
		||||
							
								
								
									
										29
									
								
								xT/xT.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										29
									
								
								xT/xT.svg
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,29 @@
 | 
			
		||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 | 
			
		||||
<svg version="1.1" width="48" height="48" viewBox="0 0 48 48"
 | 
			
		||||
   xmlns="http://www.w3.org/2000/svg">
 | 
			
		||||
 | 
			
		||||
  <defs>
 | 
			
		||||
    <radialGradient id="grey-x">
 | 
			
		||||
      <stop stop-color="hsl(66, 0%, 90%)" offset="0" />
 | 
			
		||||
      <stop stop-color="hsl(66, 0%, 80%)" offset="1" />
 | 
			
		||||
    </radialGradient>
 | 
			
		||||
    <radialGradient id="orange">
 | 
			
		||||
      <stop stop-color="hsl(36, 100%, 60%)" offset="0" />
 | 
			
		||||
      <stop stop-color="hsl(23, 100%, 60%)" offset="1" />
 | 
			
		||||
    </radialGradient>
 | 
			
		||||
    <filter id="shadow" x="-50%" y="-50%" width="200%" height="200%">
 | 
			
		||||
      <feDropShadow dx="0" dy="0" stdDeviation="0.05"
 | 
			
		||||
         flood-color="rgba(0, 0, 0, .5)" />
 | 
			
		||||
    </filter>
 | 
			
		||||
  </defs>
 | 
			
		||||
 | 
			
		||||
  <!-- XXX: librsvg screws up shadows on rotated objects. -->
 | 
			
		||||
  <g filter="url(#shadow)" transform="translate(24 28) rotate(-45) scale(16)">
 | 
			
		||||
    <path fill="url(#grey-x)" stroke="hsl(66, 0%, 30%)" stroke-width="0.1"
 | 
			
		||||
       d="M-.25 -1 H.25 V-.25 H1 V.25 H.25 V1 H-.25 V.25 H-1 V-.25 H-.25 Z" />
 | 
			
		||||
  </g>
 | 
			
		||||
  <g filter="url(#shadow)" transform="translate(24 3) scale(16)">
 | 
			
		||||
    <path fill="url(#orange)" stroke="hsl(36, 100%, 20%)" stroke-width="0.1"
 | 
			
		||||
       d="M-.8 0 H.8 V.5 H.25 V2.625 H-.25 V.5 H-.8 Z" />
 | 
			
		||||
  </g>
 | 
			
		||||
</svg>
 | 
			
		||||
| 
		 After Width: | Height: | Size: 1.2 KiB  | 
@@ -24,42 +24,11 @@ set (project_config ${PROJECT_BINARY_DIR}/config.h)
 | 
			
		||||
configure_file (${PROJECT_SOURCE_DIR}/config.h.in ${project_config})
 | 
			
		||||
include_directories (${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
 | 
			
		||||
 | 
			
		||||
# Icon generation utilities
 | 
			
		||||
# TODO: Shove this into liberty as a CMake module, similar to AddThreads,
 | 
			
		||||
# and remove the copies in the parent CMakeLists.txt as well as in tdv.
 | 
			
		||||
# Produce a beep sample
 | 
			
		||||
if (NOT ${CMAKE_VERSION} VERSION_LESS 3.18.0)
 | 
			
		||||
	set (find_program_REQUIRE REQUIRED)
 | 
			
		||||
endif ()
 | 
			
		||||
 | 
			
		||||
function (icon_to_png name svg size output_dir output)
 | 
			
		||||
	set (_dimensions ${size}x${size})
 | 
			
		||||
	set (_png_path ${output_dir}/hicolor/${_dimensions}/apps)
 | 
			
		||||
	set (_png ${_png_path}/${name}.png)
 | 
			
		||||
	set (${output} ${_png} PARENT_SCOPE)
 | 
			
		||||
 | 
			
		||||
	find_program (rsvg_convert_EXECUTABLE rsvg-convert ${find_program_REQUIRE})
 | 
			
		||||
	add_custom_command (OUTPUT ${_png}
 | 
			
		||||
		COMMAND ${CMAKE_COMMAND} -E make_directory ${_png_path}
 | 
			
		||||
		COMMAND ${rsvg_convert_EXECUTABLE} --output=${_png}
 | 
			
		||||
			--width=${size} --height=${size} ${svg}
 | 
			
		||||
		DEPENDS ${svg}
 | 
			
		||||
		COMMENT "Generating ${name} ${_dimensions} application icon" VERBATIM)
 | 
			
		||||
endfunction ()
 | 
			
		||||
 | 
			
		||||
function (icon_for_win32 ico pngs pngs_raw)
 | 
			
		||||
	set (_raws)
 | 
			
		||||
	foreach (png ${pngs_raw})
 | 
			
		||||
		list (APPEND _raws "--raw=${png}")
 | 
			
		||||
	endforeach ()
 | 
			
		||||
 | 
			
		||||
	find_program (icotool_EXECUTABLE icotool ${find_program_REQUIRE})
 | 
			
		||||
	add_custom_command (OUTPUT ${ico}
 | 
			
		||||
		COMMAND ${icotool_EXECUTABLE} -c -o ${ico} ${_raws} -- ${pngs}
 | 
			
		||||
		DEPENDS ${pngs} ${pngs_raw}
 | 
			
		||||
		COMMENT "Generating Windows program icon" VERBATIM)
 | 
			
		||||
endfunction ()
 | 
			
		||||
 | 
			
		||||
# Produce a beep sample
 | 
			
		||||
find_program (sox_EXECUTABLE sox ${find_program_REQUIRE})
 | 
			
		||||
add_custom_command (OUTPUT beep.wav
 | 
			
		||||
	COMMAND ${sox_EXECUTABLE} -b 16 -Dr 44100 -n beep.wav
 | 
			
		||||
@@ -67,6 +36,10 @@ add_custom_command (OUTPUT beep.wav
 | 
			
		||||
	COMMENT "Generating a beep sample" VERBATIM)
 | 
			
		||||
 | 
			
		||||
# Rasterize SVG icons
 | 
			
		||||
set (root "${PROJECT_SOURCE_DIR}/..")
 | 
			
		||||
set (CMAKE_MODULE_PATH ${root}/liberty/cmake)
 | 
			
		||||
include (IconUtils)
 | 
			
		||||
 | 
			
		||||
set (icon_ico_list)
 | 
			
		||||
foreach (icon xW xW-highlighted)
 | 
			
		||||
	set (icon_png_list)
 | 
			
		||||
@@ -87,8 +60,6 @@ set_property (SOURCE xW.rc
 | 
			
		||||
	APPEND PROPERTY OBJECT_DEPENDS ${icon_ico_list} beep.wav)
 | 
			
		||||
 | 
			
		||||
# Build the main executable and link it
 | 
			
		||||
set (root "${PROJECT_SOURCE_DIR}/..")
 | 
			
		||||
 | 
			
		||||
find_program (awk_EXECUTABLE awk ${find_program_REQUIRE})
 | 
			
		||||
add_custom_command (OUTPUT xC-proto.cpp
 | 
			
		||||
	COMMAND ${CMAKE_COMMAND} -E env LC_ALL=C ${awk_EXECUTABLE}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										203
									
								
								xW/xW.cpp
									
									
									
									
									
								
							
							
						
						
									
										203
									
								
								xW/xW.cpp
									
									
									
									
									
								
							@@ -1,7 +1,7 @@
 | 
			
		||||
/*
 | 
			
		||||
 * xW.cpp: Win32 frontend for xC
 | 
			
		||||
 *
 | 
			
		||||
 * Copyright (c) 2023, Přemysl Eric Janouch <p@janouch.name>
 | 
			
		||||
 * Copyright (c) 2023 - 2024, Přemysl Eric Janouch <p@janouch.name>
 | 
			
		||||
 *
 | 
			
		||||
 * Permission to use, copy, modify, and/or distribute this software for any
 | 
			
		||||
 * purpose with or without fee is hereby granted.
 | 
			
		||||
@@ -255,73 +255,6 @@ buffer_by_name(const std::wstring &name)
 | 
			
		||||
	return nullptr;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
buffer_activate(const std::wstring &name)
 | 
			
		||||
{
 | 
			
		||||
	auto activate = new Relay::CommandData_BufferActivate();
 | 
			
		||||
	activate->buffer_name = name;
 | 
			
		||||
	relay_send(activate);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
buffer_toggle_unimportant(const std::wstring &name)
 | 
			
		||||
{
 | 
			
		||||
	auto toggle = new Relay::CommandData_BufferToggleUnimportant();
 | 
			
		||||
	toggle->buffer_name = name;
 | 
			
		||||
	relay_send(toggle);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// --- Current buffer ----------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
buffer_toggle_log(
 | 
			
		||||
	const std::wstring &error, const Relay::ResponseData_BufferLog *response)
 | 
			
		||||
{
 | 
			
		||||
	if (!response) {
 | 
			
		||||
		show_error_message(error.c_str());
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	std::wstring log;
 | 
			
		||||
	if (!LibertyXDR::utf8_to_wstring(
 | 
			
		||||
			response->log.data(), response->log.size(), log)) {
 | 
			
		||||
		show_error_message(L"Invalid encoding.");
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	std::wstring filtered;
 | 
			
		||||
	for (auto wch : log) {
 | 
			
		||||
		if (wch == L'\n')
 | 
			
		||||
			filtered += L"\r\n";
 | 
			
		||||
		else
 | 
			
		||||
			filtered += wch;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	SetWindowText(g.hwndBufferLog, filtered.c_str());
 | 
			
		||||
	ShowWindow(g.hwndBuffer, SW_HIDE);
 | 
			
		||||
	ShowWindow(g.hwndBufferLog, SW_SHOW);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
buffer_toggle_log()
 | 
			
		||||
{
 | 
			
		||||
	if (IsWindowVisible(g.hwndBufferLog)) {
 | 
			
		||||
		ShowWindow(g.hwndBufferLog, SW_HIDE);
 | 
			
		||||
		ShowWindow(g.hwndBuffer, SW_SHOW);
 | 
			
		||||
		SetWindowText(g.hwndBufferLog, L"");
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	auto log = new Relay::CommandData_BufferLog();
 | 
			
		||||
	log->buffer_name = g.buffer_current;
 | 
			
		||||
	relay_send(log, [name = g.buffer_current](auto error, auto response) {
 | 
			
		||||
		if (g.buffer_current != name)
 | 
			
		||||
			return;
 | 
			
		||||
		buffer_toggle_log(error,
 | 
			
		||||
			dynamic_cast<const Relay::ResponseData_BufferLog *>(response));
 | 
			
		||||
	});
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static bool
 | 
			
		||||
buffer_at_bottom()
 | 
			
		||||
{
 | 
			
		||||
@@ -354,6 +287,7 @@ refresh_icon()
 | 
			
		||||
		if (b.highlighted)
 | 
			
		||||
			icon = g.hiconHighlighted;
 | 
			
		||||
 | 
			
		||||
	// XXX: This may not change the taskbar icon.
 | 
			
		||||
	SendMessage(g.hwndMain, WM_SETICON, ICON_SMALL, (LPARAM) icon);
 | 
			
		||||
	SendMessage(g.hwndMain, WM_SETICON, ICON_BIG, (LPARAM) icon);
 | 
			
		||||
}
 | 
			
		||||
@@ -430,6 +364,88 @@ refresh_status()
 | 
			
		||||
		SetWindowText(g.hwndStatus, status.c_str());
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
recheck_highlighted()
 | 
			
		||||
{
 | 
			
		||||
	// Corresponds to the logic toggling the bool on.
 | 
			
		||||
	auto b = buffer_by_name(g.buffer_current);
 | 
			
		||||
	if (b && b->highlighted && buffer_at_bottom() &&
 | 
			
		||||
		!IsIconic(g.hwndMain) && !IsWindowVisible(g.hwndBufferLog)) {
 | 
			
		||||
		b->highlighted = false;
 | 
			
		||||
		refresh_icon();
 | 
			
		||||
		refresh_buffer_list();
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// --- Buffer actions ----------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
buffer_activate(const std::wstring &name)
 | 
			
		||||
{
 | 
			
		||||
	auto activate = new Relay::CommandData_BufferActivate();
 | 
			
		||||
	activate->buffer_name = name;
 | 
			
		||||
	relay_send(activate);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
buffer_toggle_unimportant(const std::wstring &name)
 | 
			
		||||
{
 | 
			
		||||
	auto toggle = new Relay::CommandData_BufferToggleUnimportant();
 | 
			
		||||
	toggle->buffer_name = name;
 | 
			
		||||
	relay_send(toggle);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
buffer_toggle_log(
 | 
			
		||||
	const std::wstring &error, const Relay::ResponseData_BufferLog *response)
 | 
			
		||||
{
 | 
			
		||||
	if (!response) {
 | 
			
		||||
		show_error_message(error.c_str());
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	std::wstring log;
 | 
			
		||||
	if (!LibertyXDR::utf8_to_wstring(
 | 
			
		||||
			response->log.data(), response->log.size(), log)) {
 | 
			
		||||
		show_error_message(L"Invalid encoding.");
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	std::wstring filtered;
 | 
			
		||||
	for (auto wch : log) {
 | 
			
		||||
		if (wch == L'\n')
 | 
			
		||||
			filtered += L"\r\n";
 | 
			
		||||
		else
 | 
			
		||||
			filtered += wch;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	SetWindowText(g.hwndBufferLog, filtered.c_str());
 | 
			
		||||
	ShowWindow(g.hwndBuffer, SW_HIDE);
 | 
			
		||||
	ShowWindow(g.hwndBufferLog, SW_SHOW);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void
 | 
			
		||||
buffer_toggle_log()
 | 
			
		||||
{
 | 
			
		||||
	if (IsWindowVisible(g.hwndBufferLog)) {
 | 
			
		||||
		ShowWindow(g.hwndBufferLog, SW_HIDE);
 | 
			
		||||
		ShowWindow(g.hwndBuffer, SW_SHOW);
 | 
			
		||||
		SetWindowText(g.hwndBufferLog, L"");
 | 
			
		||||
 | 
			
		||||
		recheck_highlighted();
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	auto log = new Relay::CommandData_BufferLog();
 | 
			
		||||
	log->buffer_name = g.buffer_current;
 | 
			
		||||
	relay_send(log, [name = g.buffer_current](auto error, auto response) {
 | 
			
		||||
		if (g.buffer_current != name)
 | 
			
		||||
			return;
 | 
			
		||||
		buffer_toggle_log(error,
 | 
			
		||||
			dynamic_cast<const Relay::ResponseData_BufferLog *>(response));
 | 
			
		||||
	});
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// --- Rich Edit formatting ----------------------------------------------------
 | 
			
		||||
 | 
			
		||||
static COLORREF
 | 
			
		||||
@@ -678,14 +694,12 @@ buffer_print_line(std::vector<BufferLine>::const_iterator begin,
 | 
			
		||||
		if (!prefix.empty())
 | 
			
		||||
			richedit_replacesel(g.hwndBuffer, &pcf, prefix.c_str());
 | 
			
		||||
 | 
			
		||||
		std::wstring text;
 | 
			
		||||
		for (const auto &it : line->items)
 | 
			
		||||
			text += it.text;
 | 
			
		||||
 | 
			
		||||
		CHARFORMAT2 format = default_charformat();
 | 
			
		||||
		format.dwEffects &= ~CFE_AUTOCOLOR;
 | 
			
		||||
		format.crTextColor = GetSysColor(COLOR_GRAYTEXT);
 | 
			
		||||
		richedit_replacesel(g.hwndBuffer, &format, text.c_str());
 | 
			
		||||
		for (auto it : line->items) {
 | 
			
		||||
			it.format.dwEffects &= ~CFE_AUTOCOLOR;
 | 
			
		||||
			it.format.crTextColor = GetSysColor(COLOR_GRAYTEXT);
 | 
			
		||||
			it.format.dwEffects |= CFE_AUTOBACKCOLOR;
 | 
			
		||||
			richedit_replacesel(g.hwndBuffer, &it.format, it.text.c_str());
 | 
			
		||||
		}
 | 
			
		||||
	} else {
 | 
			
		||||
		if (!prefix.empty())
 | 
			
		||||
			richedit_replacesel(g.hwndBuffer, &pcf, prefix.c_str());
 | 
			
		||||
@@ -697,7 +711,7 @@ buffer_print_line(std::vector<BufferLine>::const_iterator begin,
 | 
			
		||||
static void
 | 
			
		||||
buffer_print_separator()
 | 
			
		||||
{
 | 
			
		||||
	bool sameline = !GetWindowTextLength(g.hwndBuffer);
 | 
			
		||||
	bool sameline = !buffer_reset_selection();
 | 
			
		||||
 | 
			
		||||
	CHARFORMAT2 format = default_charformat();
 | 
			
		||||
	format.dwEffects &= ~CFE_AUTOCOLOR;
 | 
			
		||||
@@ -730,6 +744,7 @@ refresh_buffer(const Buffer &b)
 | 
			
		||||
 | 
			
		||||
	buffer_print_and_watch_trailing_date_changes();
 | 
			
		||||
	buffer_scroll_to_bottom();
 | 
			
		||||
	// We will get a scroll event, so no need to recheck_highlighted() here.
 | 
			
		||||
 | 
			
		||||
	SendMessage(g.hwndBuffer, WM_SETREDRAW, (WPARAM) TRUE, 0);
 | 
			
		||||
	InvalidateRect(g.hwndBuffer, NULL, TRUE);
 | 
			
		||||
@@ -751,8 +766,9 @@ relay_process_buffer_line(Buffer &b, Relay::EventData_BufferLine &m)
 | 
			
		||||
	// Retained mode is complicated.
 | 
			
		||||
	bool display = (!m.is_unimportant || !bc->hide_unimportant) &&
 | 
			
		||||
		(b.buffer_name == g.buffer_current || m.leak_to_active);
 | 
			
		||||
	// XXX: It would be great if it didn't autoscroll when focused.
 | 
			
		||||
	bool to_bottom = display &&
 | 
			
		||||
		buffer_at_bottom();
 | 
			
		||||
		(buffer_at_bottom() || GetFocus() == g.hwndBuffer);
 | 
			
		||||
	bool visible = display &&
 | 
			
		||||
		to_bottom &&
 | 
			
		||||
		!IsIconic(g.hwndMain) &&
 | 
			
		||||
@@ -914,11 +930,15 @@ relay_process_message(const Relay::EventMessage &m)
 | 
			
		||||
		if (!b)
 | 
			
		||||
			break;
 | 
			
		||||
 | 
			
		||||
		b->buffer_name = data.buffer_name;
 | 
			
		||||
		b->buffer_name = data.new_;
 | 
			
		||||
 | 
			
		||||
		refresh_buffer_list();
 | 
			
		||||
		if (b->buffer_name == g.buffer_current)
 | 
			
		||||
		if (data.buffer_name == g.buffer_current) {
 | 
			
		||||
			g.buffer_current = data.new_;
 | 
			
		||||
			refresh_status();
 | 
			
		||||
		}
 | 
			
		||||
		refresh_buffer_list();
 | 
			
		||||
		if (data.buffer_name == g.buffer_last)
 | 
			
		||||
			g.buffer_last = data.new_;
 | 
			
		||||
		break;
 | 
			
		||||
	}
 | 
			
		||||
	case Relay::Event::BUFFER_REMOVE:
 | 
			
		||||
@@ -1463,6 +1483,7 @@ richedit_proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
 | 
			
		||||
	{
 | 
			
		||||
		// Dragging the scrollbar doesn't result in EN_VSCROLL.
 | 
			
		||||
		LRESULT lResult = DefSubclassProc(hWnd, uMsg, wParam, lParam);
 | 
			
		||||
		recheck_highlighted();
 | 
			
		||||
		refresh_status();
 | 
			
		||||
		return lResult;
 | 
			
		||||
	}
 | 
			
		||||
@@ -1520,8 +1541,12 @@ process_resize(UINT w, UINT h)
 | 
			
		||||
	MoveWindow(g.hwndBufferList, 3, top, 150, h - top - bottom, FALSE);
 | 
			
		||||
	MoveWindow(g.hwndBuffer, 156, top, w - 159, h - top - bottom, FALSE);
 | 
			
		||||
	MoveWindow(g.hwndBufferLog, 156, top, w - 159, h - top - bottom, FALSE);
 | 
			
		||||
	if (to_bottom)
 | 
			
		||||
	if (to_bottom) {
 | 
			
		||||
		buffer_scroll_to_bottom();
 | 
			
		||||
	} else {
 | 
			
		||||
		recheck_highlighted();
 | 
			
		||||
		refresh_status();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	InvalidateRect(g.hwndMain, NULL, TRUE);
 | 
			
		||||
}
 | 
			
		||||
@@ -1683,8 +1708,10 @@ window_proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 | 
			
		||||
	}
 | 
			
		||||
	case WM_SYSCOMMAND:
 | 
			
		||||
	{
 | 
			
		||||
		// We're not deiconified yet, so duplicate recheck_highlighted().
 | 
			
		||||
		auto b = buffer_by_name(g.buffer_current);
 | 
			
		||||
		if (b && wParam == SC_RESTORE) {
 | 
			
		||||
		if (wParam == SC_RESTORE && b && b->highlighted && buffer_at_bottom() &&
 | 
			
		||||
			!IsWindowVisible(g.hwndBufferLog)) {
 | 
			
		||||
			b->highlighted = false;
 | 
			
		||||
			refresh_icon();
 | 
			
		||||
		}
 | 
			
		||||
@@ -1692,13 +1719,15 @@ window_proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 | 
			
		||||
		break;
 | 
			
		||||
	}
 | 
			
		||||
	case WM_COMMAND:
 | 
			
		||||
		if (!lParam)
 | 
			
		||||
		if (!lParam) {
 | 
			
		||||
			process_accelerator(LOWORD(wParam));
 | 
			
		||||
		else if (lParam == (LPARAM) g.hwndBufferList)
 | 
			
		||||
		} else if (lParam == (LPARAM) g.hwndBufferList) {
 | 
			
		||||
			process_bufferlist_notification(HIWORD(wParam));
 | 
			
		||||
		else if (lParam == (LPARAM) g.hwndBuffer &&
 | 
			
		||||
				HIWORD(wParam) == EN_VSCROLL)
 | 
			
		||||
		} else if (lParam == (LPARAM) g.hwndBuffer &&
 | 
			
		||||
				HIWORD(wParam) == EN_VSCROLL) {
 | 
			
		||||
			recheck_highlighted();
 | 
			
		||||
			refresh_status();
 | 
			
		||||
		}
 | 
			
		||||
		return 0;
 | 
			
		||||
	case WM_NOTIFY:
 | 
			
		||||
		switch (((LPNMHDR) lParam)->code) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user