donpdonp/ircbr - Change OYO7SPBZRLTZHT22POUHC3KWVPU4XDWKSZAZ2I73IXOQGRW7VC3QC

wrap get() with contains()

Created by on April 23, 2021

OYO7SPBZRLTZHT22POUHC3KWVPU4XDWKSZAZ2I73IXOQGRW7VC3QC

Dependencies

In channels

main

Change contents

Replacement in src/irc/irc.v at line 414 [7.447]

B:BD[6.113] → [5.0:67]

	println('by_nick($nick) ghost.nick ${ptr_str(g.nick)} "$g.nick"')

[6.113]

[8.1696]

		println('by_nick($nick) ghost.nick ${ptr_str(g.nick)} "$g.nick"')

Insertion in src/chat/chat.v at line 102 [10.17]

[9.93]

}
pub fn (mut self Queue) contains(name string) bool {
	return self.entries.keys().contains(name)

Replacement in src/app.v at line 539 [7.914]

B:BD[11.326] → [12.911:946]

B:BD[12.946] → [13.179:240]

B:BD[13.240] → [4.0:118]

∅:D[14.64] → [15.199:394]

∅:D[16.77] → [15.199:394]

∅:D[4.118] → [15.199:394]

∅:D[17.145] → [15.199:394]

∅:D[18.166] → [15.199:394]

∅:D[19.190] → [15.199:394]

∅:D[13.240] → [15.199:394]

∅:D[20.320] → [15.199:394]

∅:D[11.357] → [15.199:394]

∅:D[12.1032] → [15.199:394]

B:BD[15.199] → [15.199:394]

B:BD[15.394] → [21.480:485]

B:BD[22.1351] → [21.605:696]

B:BD[21.696] → [3.0:46]

∅:D[23.41] → [21.696:728]

∅:D[3.46] → [21.696:728]

B:BD[21.696] → [21.696:728]

	outmsg := self.chat.queue.get(id)
	println('process_out [$id/$self.chat.queue.len()] $outmsg')
	println('process_out queue keys $self.chat.queue.entries.keys() ${self.chat.queue.entries.keys().map(ptr_str(it))}')
	match outmsg.system {
		.irc {
			ircnet_name := if outmsg.network.len == 0 {
				if self.irc.networks.len > 0 { self.irc.networks[0].hostname } else { 'noname' }
			} else {
				outmsg.network
			}
			match self.irc.say(ircnet_name, outmsg.name, outmsg.room, outmsg.message) {
				.good {
					println('process_out queue.delete($id)')
					self.chat.queue.delete(id)

[11.326]

[21.728]

	if self.chat.queue.contains(id) {
		outmsg := self.chat.queue.get(id)
		println('process_out [$id/$self.chat.queue.len()] $outmsg')
		println('process_out queue keys $self.chat.queue.entries.keys() ${self.chat.queue.entries.keys().map(ptr_str(it))}')
		match outmsg.system {
			.irc {
				ircnet_name := if outmsg.network.len == 0 {
					if self.irc.networks.len > 0 { self.irc.networks[0].hostname } else { 'noname' }
				} else {
					outmsg.network

Replacement in src/app.v at line 550 [7.914]

B:BD[21.734] → [21.734:782]

B:BD[21.782] → [2.118:239]

				.network_not_found {}
				.user_not_found {
					self.chat.cin <- chat.Payload(chat.MakeIrcUser{
						network_hostname: ircnet_name
						nick: outmsg.name
					})

[21.734]

[21.826]

				match self.irc.say(ircnet_name, outmsg.name, outmsg.room, outmsg.message) {
					.good {
						println('process_out queue.delete($id)')
						self.chat.queue.delete(id)
					}
					.network_not_found {}
					.user_not_found {
						self.chat.cin <- chat.Payload(chat.MakeIrcUser{
							network_hostname: ircnet_name
							nick: outmsg.name
						})
					}
					.error {}

Deletion in src/app.v at line 564 [7.914]
B:BD[21.832] → [21.832:846]
```
				.error {}
```

Replacement in src/app.v at line 565 [7.914]

∅:D[24.30] → [15.453:629]

∅:D[21.851] → [15.453:629]

B:BD[15.453] → [15.453:629]

∅:D[25.163] → [26.1656:1669]

∅:D[15.629] → [26.1656:1669]

B:BD[26.1656] → [26.1656:1669]

B:BD[26.1669] → [27.315:435]

B:BD[27.435] → [28.126:254]

		}
		.matrix {
			if room := self.matrix.joined_rooms.find_room_by_id(outmsg.room) {
				if self.matrix.owner == outmsg.name {
					self.matrix.room_say(room, outmsg.message)
				} else {
					match self.matrix.room_say_as(outmsg.name, room, outmsg.message) {
						.good {
							self.chat.queue.delete(id)
							if self.chat.queue.len() > 0 {
								println('process_out finished ${id}. remaining queue len $self.chat.queue.len()')

[21.851]

[28.254]

			.matrix {
				if room := self.matrix.joined_rooms.find_room_by_id(outmsg.room) {
					if self.matrix.owner == outmsg.name {
						self.matrix.room_say(room, outmsg.message)
					} else {
						match self.matrix.room_say_as(outmsg.name, room, outmsg.message) {
							.good {
								self.chat.queue.delete(id)
								if self.chat.queue.len() > 0 {
									println('process_out finished ${id}. remaining queue len $self.chat.queue.len()')
								}

Replacement in src/app.v at line 577 [7.914]

∅:D[29.91] → [27.435:467]

∅:D[28.263] → [27.435:467]

B:BD[27.435] → [27.435:467]

B:BD[27.467] → [30.644:738]

∅:D[31.34] → [27.712:720]

∅:D[32.124] → [27.712:720]

∅:D[30.738] → [27.712:720]

B:BD[27.712] → [27.712:720]

B:BD[27.720] → [9.655:676]

B:BD[9.676] → [33.0:44]

∅:D[33.44] → [34.598:660]

B:BD[34.598] → [34.598:660]

B:BD[34.660] → [33.45:88]

B:BD[33.88] → [35.400:540]

						}
						.user_not_found {
							self.matrix.cin <- matrix.Payload(matrix.MakeUser{
								name: outmsg.name
							})
						}
						.not_in_room {
							p := matrix.Payload(matrix.JoinRoom{
								name: outmsg.name
								room: outmsg.room
							})
							match self.matrix.cin.try_push(p) {
								.success {}
								.not_ready { println('WARNING matrix.cin channel not ready. $self.matrix.cin.len entries') }
								.closed {}

[28.263]

[33.200]

							.user_not_found {
								self.matrix.cin <- matrix.Payload(matrix.MakeUser{
									name: outmsg.name
								})

Replacement in src/app.v at line 582 [7.914]

∅:D[33.209] → [34.660:668]

B:BD[34.660] → [34.660:668]

∅:D[34.668] → [27.720:811]

∅:D[30.766] → [27.720:811]

B:BD[27.720] → [27.720:811]

						}
						.error {
							println('matrix room_say_as error. retainig msg for retransmission')

[33.209]

[27.811]

							.not_in_room {
								p := matrix.Payload(matrix.JoinRoom{
									name: outmsg.name
									room: outmsg.room
								})
								match self.matrix.cin.try_push(p) {
									.success {}
									.not_ready { println('WARNING matrix.cin channel not ready. $self.matrix.cin.len entries') }
									.closed {}
								}
							}
							.error {
								println('matrix room_say_as error. retainig msg for retransmission')
							}

Insertion in src/app.v at line 598 [7.914]

[36.371]

[26.1739]

				} else {
					println('listen_out matrix.joined_rooms.find_room_by_id failed: $err.msg dropped: $outmsg.message ')
					println('process_out queue.delete($id)')
					self.chat.queue.delete(id)

Deletion in src/app.v at line 603 [7.914]
B:BD[26.1745] → [15.695:707]
B:BD[15.707] → [37.315:420]
B:BD[37.420] → [3.47:92]
∅:D[3.92] → [38.224:255]
∅:D[37.420] → [38.224:255]
B:BD[38.224] → [38.224:255]
```
			} else {
				println('listen_out matrix.joined_rooms.find_room_by_id failed: $err.msg dropped: $outmsg.message ')
				println('process_out queue.delete($id)')
				self.chat.queue.delete(id)
```

Insertion in src/app.v at line 605 [7.914]

[39.379]

	} else {
	  println("procesS_out dropping $id not in queue (len $self.chat.queue.len()")