donpdonp/ircbr - Change VPIXILLMRSWG2Y7AAXGKE3YYFRPXKFVYQJTTAKJWCGTSGSLAQO6AC

catchup

Created by F6Qmb1gajt6stVP4JzjzsWN19AAZgmE3x2HEyt7PJuju on July 6, 2021

VPIXILLMRSWG2Y7AAXGKE3YYFRPXKFVYQJTTAKJWCGTSGSLAQO6AC

Dependencies

In channels

main

Change contents

Replacement in src/irc/irc.v at line 25 [10.447]

B:BD[8.20] → [9.0:55]

type Payload = Connect | Disconnect | Joined | PrivMsg

[8.20]

[10.483]

type Payload = Connect | Disconnect | Joined | NickInUse | PrivMsg

Replacement in src/irc/irc.v at line 27 [10.447]
B:BD[10.484] → [11.0:17]
```
struct Connect {
```
[10.484]
[12.54]
```
struct NickInUse {
pub mut:
	puppet &Puppet
}
pub struct Connect {
```

Replacement in src/irc/irc.v at line 231 [10.447]

B:BD[13.1344] → [13.1344:1453]

	self.sock = dial(self.network.hostname, self.nick)
	if self.sock is net.TcpConn {
		self.state = .connected

[13.1344]

[13.1453]

	println('$self.nick dial($self.network.hostname, $self.nick)')
	if self.state == .connected {
		println('$self.nick dial: already connected.')

Replacement in src/irc/irc.v at line 235 [10.447]

B:BD[13.1463] → [13.1463:1492]

		self.state = .disconnected

[13.1463]

[13.1492]

		self.sock = dial(self.network.hostname, self.nick)
		if self.sock is net.TcpConn {
			println('$self.nick dial is connected')
			self.state = .connected
		} else {
			println('$self.nick dial failed')
		}

Replacement in src/irc/irc.v at line 267 [10.447]
B:BD[13.1877] → [13.1877:1916]
∅:D[13.1916] → [14.264:291]
B:BD[14.264] → [14.264:291]
B:BD[14.291] → [13.1917:1942]
B:BD[13.1942] → [6.0:44]
∅:D[6.44] → [13.1943:1968]
B:BD[14.365] → [13.1943:1968]
```
		go self.comm(mut ircnet, mut puppet)
		nick_cmd := 'nick $nick'
		puppet.write(nick_cmd)
		user_cmd := 'user vbridge b c :full name'
		puppet.write(user_cmd)
```
[13.1877]
[14.472]
```
		go self.comm(mut puppet)
		puppet.signin()
```

Insertion in src/irc/irc.v at line 275 [10.447]

[15.787]

[13.2055]

pub fn (mut self Puppet) signin() {
	nick_cmd := 'nick $self.nick'
	self.write(nick_cmd)
	user_cmd := 'user vbridge b c :full name'
	self.write(user_cmd)
}

Replacement in src/irc/irc.v at line 291 [10.447]

B:BD[16.491] → [13.2207:2276]

∅:D[13.2276] → [15.788:883]

B:BD[17.954] → [15.788:883]

pub fn (self &IrcActor) comm(mut ircnet Network, mut ghost Puppet) {
	if mut ghost.sock is net.TcpConn {
		mut reader := io.new_buffered_reader(reader: ghost.sock)

[16.491]

[15.883]

pub fn (self &IrcActor) comm(mut puppet Puppet) {
	if mut puppet.sock is net.TcpConn {
		println('$puppet.nick comm() started')
		mut reader := io.new_buffered_reader(reader: puppet.sock)

Replacement in src/irc/irc.v at line 297 [10.447]

B:BD[15.926] → [15.926:1010]

				parsed := self.proto(line, mut ircnet, mut ghost)
				if parsed.len > 0 {
				}

[15.926]

[15.1010]

				_ := self.proto(line, mut puppet)

Replacement in src/irc/irc.v at line 299 [10.447]

B:BD[15.1022] → [18.177:229]

∅:D[18.229] → [15.1083:1102]

B:BD[15.1083] → [15.1083:1102]

				println('$ircnet $ghost.nick: TCP closed $err')
				ghost.hangup()

[15.1022]

[15.1102]

				println('$puppet.network $puppet.nick comm() TCP closed $err')
				puppet.hangup()

Replacement in src/irc/irc.v at line 302 [10.447]
B:BD[15.1138] → [13.2277:2296]
```
					puppet: ghost
```
[15.1138]
[15.1177]
```
					puppet: puppet
```
Replacement in src/irc/irc.v at line 306 [10.447]
B:BD[15.1199] → [13.2297:2316]
```
			if ghost.stop {
```
[15.1199]
[15.1219]
```
			if puppet.stop {
```

Insertion in src/irc/irc.v at line 310 [10.447]

[19.18683]

[20.848]

	} else {
		println('WARNING: $puppet.nick comm() called with missing socket')

Replacement in src/irc/irc.v at line 315 [10.447]

B:BD[21.17] → [13.2317:2407]

pub fn (self &IrcActor) proto(line string, mut ircnet Network, mut ghost Puppet) string {

[21.17]

[22.0]

pub fn (self &IrcActor) proto(line string, mut puppet Puppet) string {

Replacement in src/irc/irc.v at line 319 [10.447]

B:BD[23.124] → [24.160:219]

		word := if parts.len == 2 { parts[0] } else { parts[1] }

[23.124]

[24.219]

		word := if parts.len == 2 {
			parts[0]
		} else {
			if parts.len > 2 {
				parts[1]
			} else {
				println('irc.proto parse err $parts')
				'E_PARSEERR'
			}
		}

Replacement in src/irc/irc.v at line 331 [10.447]

B:BD[25.74] → [25.74:118]

				ghost.nick = parts[3] // nick confirmed

[26.1373]

[26.1455]

				puppet.nick = parts[3] // nick confirmed

Replacement in src/irc/irc.v at line 339 [10.447]

B:BD[27.423] → [28.123:184]

∅:D[28.184] → [27.489:516]

B:BD[27.489] → [27.489:516]

					println('$ircnet.hostname is part of network $netname')
					ircnet.name = netname

[27.423]

[29.838]

					println('$puppet.network.hostname is part of network $netname')
					puppet.network.name = netname

Replacement in src/irc/irc.v at line 370 [10.447]

B:BD[30.35] → [31.0:76]

				println('irc.proto 376 end of motd - Connect $ircnet.name $ghost.nick')

[30.35]

[32.0]

				println('irc.proto 376 end of motd - Connect $puppet.network.name $puppet.nick')
				puppet.state = .connected

Replacement in src/irc/irc.v at line 373 [10.447]
B:BD[32.33] → [13.2408:2427]
```
					puppet: ghost
```
[32.33]
[32.72]
```
					puppet: puppet
```
Deletion in src/irc/irc.v at line 375 [10.447]
B:BD[32.79] → [3.0:29]
```
				ghost.state = .connected
```

Replacement in src/irc/irc.v at line 377 [10.447]

B:BD[33.48] → [13.2428:2485]

				println('$ghost irc.proto 433 nick already in use!')

[33.48]

[33.84]

				println('$puppet irc.proto 433 nick $puppet.nick already in use! aborting connection')
				self.cin <- Payload(NickInUse{
					puppet: puppet
				})

Replacement in src/irc/irc.v at line 386 [10.447]

B:BD[34.63] → [34.63:190]

				if nick_parts[0] == ghost.nick {
					println('NICK changing ghost $ghost.nick to ${parts[3]}')
					ghost.nick = parts[3]

[34.63]

[35.29]

				if nick_parts[0] == puppet.nick {
					println('NICK changing puppet $puppet.nick to ${parts[3]}')
					puppet.nick = parts[3]

Replacement in src/irc/irc.v at line 390 [10.447]

B:BD[35.42] → [2.0:92]

					println('$ghost.nick heard NICK change for ${nick_parts[0]} -> ${parts[3]}. ignoring')

[35.42]

[34.190]

					println('$puppet.nick heard NICK change for ${nick_parts[0]} -> ${parts[3]}. ignoring')

Replacement in src/irc/irc.v at line 395 [10.447]

B:BD[30.48] → [36.82:131]

				println('sock ${ptr_str(ghost.sock)} $line')

[30.48]

[37.52]

				println('sock ${ptr_str(puppet.sock)} $line')

Replacement in src/irc/irc.v at line 399 [10.447]

B:BD[9.97] → [18.230:323]

∅:D[38.102] → [37.144:181]

∅:D[9.175] → [37.144:181]

∅:D[18.323] → [37.144:181]

B:BD[37.144] → [37.144:181]

B:BD[37.268] → [37.268:300]

				println('$ircnet $ghost.nick ghost ${ptr_str(ghost)}: ${nick_parts[0]} JOINed $channel')
				if nick_parts[0] == ghost.nick {
					ghost.add_channel(channel)

[9.97]

[9.176]

				println('$puppet.network $puppet.nick puppet ${ptr_str(puppet)}: ${nick_parts[0]} JOINed $channel')
				if nick_parts[0] == puppet.nick {
					puppet.add_channel(channel)

Replacement in src/irc/irc.v at line 403 [10.447]
B:BD[9.209] → [13.2486:2506]
```
						puppet: ghost
```
[9.209]
[37.376]
```
						puppet: puppet
```
Replacement in src/irc/irc.v at line 410 [10.447]
B:BD[39.32] → [13.2507:2530]
```
				ghost.write(reply)
```
[39.32]
[40.242]
```
				puppet.write(reply)
```
Replacement in src/irc/irc.v at line 415 [10.447]
B:BD[41.298] → [13.2531:2550]
```
					puppet: ghost
```
[41.298]
[41.316]
```
					puppet: puppet
```
Replacement in src/irc/irc.v at line 476 [10.447]
B:BD[42.3] → [43.0:38]
```
pub fn (self &PrivMsg) str() string {
```
[42.3]
[13.2551]
```
pub fn (self PrivMsg) str() string {
```
Insertion in src/irc/irc.v at line 538 [10.447]
[13.3626]
[13.3626]
```
pub fn (self Channel) str() string {
	return '$self.name'
}
```
Insertion in src/irc/irc.v at line 561 [10.447]
[5.146]
[5.146]
```
			self.hangup()
```
Insertion in src/irc/irc.v at line 569 [10.447]
[13.4234]
[15.1433]
```
	println('$self.nick hangup()')
```

Replacement in src/irc/irc.v at line 571 [10.447]

B:BD[15.1468] → [15.1468:1494]

		self.sock.close() or {}

[15.1468]

[15.1494]

		println('$self.nick sock.close()')
		self.sock.close() or { println('$self.nick sock.close $err') }

Insertion in src/appsvc/appsvc.v at line 36 [19.17602]
[44.63]
[45.413]
```
		peer_ip := conn.peer_ip() or { err }
```

Replacement in src/appsvc/appsvc.v at line 39 [19.17602]

B:BD[46.186] → [47.145:204]

∅:D[47.204] → [48.0:83]

B:BD[46.232] → [48.0:83]

B:BD[48.83] → [47.205:315]

		response := http.parse_response(header_lines.join('\n'))
		peer_ip := conn.peer_ip() or { err }
		println('<- $peer_ip ${header_lines[0]}')
		if response.header.contains_custom('Content-Length') {
			self.process_request(response.header, mut reader)

[46.186]

[49.45]

		if header_lines.len > 0 {
			response := http.parse_response(header_lines.join('\n'))
			println('<- $peer_ip ${header_lines[0]}')
			if response.header.contains_custom('Content-Length') {
				self.process_request(response.header, mut reader)
			}

Replacement in src/appsvc/appsvc.v at line 77 [19.17602]
B:BD[50.154] → [50.154:190]
```
			println('read_headerlines BAIL')
```
[50.154]
[50.190]
```
			println('read_headerlines read_line() BAIL')
```

Insertion in src/app.v at line 199 [10.914]

[13.5398]

[51.957]

		}
		irc.NickInUse {
			user_id := self.name_convert(.irc, irc_m.puppet.nick)
			msg := '$irc_m.puppet.nick is already in use on $irc_m.puppet.network.name'
			self.matrix_say(user_id, msg)
			mut puppet := self.irc.puppets.by_nick(irc_m.puppet.nick) or { return } // mut hack
			puppet.hangup()

Replacement in src/app.v at line 308 [10.914]

B:BD[7.41] → [7.41:176]

									for idx, saypart in sayparts {
										if sayparts.len > 1 {
											println('multiline $idx/$sayparts.len')
										}

[7.41]

[7.176]

									for saypart in sayparts {

Replacement in src/app.v at line 559 [10.914]

B:BD[4.837] → [4.837:905]

					msg2 := '$p_net $p_p.nick $p_p.channels.channels.len channels'

[4.837]

[52.567]

					msg2 := '$p_net $p_p.nick $p_p.state $p_p.channels.channels.len channels'

Replacement in src/app.v at line 562 [10.914]

B:BD[4.950] → [4.950:1013]

						msg3 := '$p_net $channel.name $channel.joined $p_p.nick'

[4.950]

[52.751]

						msg3 := '$p_net $channel $p_p.nick'

Replacement in src/app.v at line 624 [10.914]

B:BD[4.1135] → [4.1135:1177]

					msg = 'connecting to $p_pup.network'

[4.1135]

[13.7347]

					msg = '$p_pup.nick disconnected. reconnecting to $p_pup.network'

Insertion in src/app.v at line 627 [10.914]

[4.1196]

[53.322]

					println('command_irc connect p_pup.state $p_pup.state')
					if p_pup.state == .connected {
						self.irc.comm(mut p_pup)
						p_pup.signin()
					}

catchup

Dependencies

In channels

Change contents

Replacement in src/irc/irc.v at line 25 [10.447]

Replacement in src/irc/irc.v at line 27 [10.447]

Replacement in src/irc/irc.v at line 231 [10.447]

Replacement in src/irc/irc.v at line 235 [10.447]

Replacement in src/irc/irc.v at line 267 [10.447]

Insertion in src/irc/irc.v at line 275 [10.447]

Replacement in src/irc/irc.v at line 291 [10.447]

Replacement in src/irc/irc.v at line 297 [10.447]

Replacement in src/irc/irc.v at line 299 [10.447]

Replacement in src/irc/irc.v at line 302 [10.447]

Replacement in src/irc/irc.v at line 306 [10.447]

Insertion in src/irc/irc.v at line 310 [10.447]

Replacement in src/irc/irc.v at line 315 [10.447]

Replacement in src/irc/irc.v at line 319 [10.447]

Replacement in src/irc/irc.v at line 331 [10.447]

Replacement in src/irc/irc.v at line 339 [10.447]

Replacement in src/irc/irc.v at line 370 [10.447]

Replacement in src/irc/irc.v at line 373 [10.447]

Deletion in src/irc/irc.v at line 375 [10.447]

Replacement in src/irc/irc.v at line 377 [10.447]

Replacement in src/irc/irc.v at line 386 [10.447]

Replacement in src/irc/irc.v at line 390 [10.447]

Replacement in src/irc/irc.v at line 395 [10.447]

Replacement in src/irc/irc.v at line 399 [10.447]

Replacement in src/irc/irc.v at line 403 [10.447]

Replacement in src/irc/irc.v at line 410 [10.447]

Replacement in src/irc/irc.v at line 415 [10.447]

Replacement in src/irc/irc.v at line 476 [10.447]

Insertion in src/irc/irc.v at line 538 [10.447]

Insertion in src/irc/irc.v at line 561 [10.447]

Insertion in src/irc/irc.v at line 569 [10.447]