donpdonp/ircbr - Change SX4IAP27IQ7B5QFX74GKQYRX4IJSJTZ4CLH7EPFSJWATV7LVXR4AC

out msg queue in main

Created by on February 22, 2021

SX4IAP27IQ7B5QFX74GKQYRX4IJSJTZ4CLH7EPFSJWATV7LVXR4AC

Dependencies

In channels

main

Change contents

Replacement in src/matrix/matrix.v at line 16 [6.21]
∅:D[4.5] → [5.282:301]
∅:D[7.15] → [5.282:301]
B:BD[8.22] → [5.282:301]
```
	chan  chan string
```
[4.5]
[5.301]
```
	out   chan Say
	cin   chan string
```
Replacement in src/matrix/matrix.v at line 40 [6.21]
∅:D[9.58] → [7.16:72]
B:BD[8.59] → [7.16:72]
```
pub fn init(c chan string, config setup.Config) Actor {
```
[9.58]
[7.72]
```
pub fn init(config setup.Config) Actor {
```
Replacement in src/matrix/matrix.v at line 42 [6.21]
∅:D[7.92] → [8.135:145]
∅:D[10.42] → [8.135:145]
B:BD[8.135] → [8.135:145]
```
		chan: c
```
[7.92]
[5.380]
```
		out: chan Say{}
		cin: chan string{}
```
Deletion in src/irc/irc.v at line 3 [6.447]
B:BD[6.460] → [11.67:81]
```
import matrix
```
Insertion in src/irc/irc.v at line 8 [6.447]
[12.10]
[13.12]
```
import chat
```
Replacement in src/irc/irc.v at line 16 [6.447]
B:BD[14.183] → [15.0:18]
```
	out chan PrivMsg
```
[14.183]
[16.0]
```
	out chan chat.Say
	cin chan PrivMsg
```
Replacement in src/irc/irc.v at line 49 [6.447]
∅:D[17.45] → [18.55:64]
B:BD[18.55] → [18.55:64]
```
		out: c
```
[17.45]
[17.46]
```
		out: chan chat.Say{}
		cin: c
```

Replacement in src/irc/irc.v at line 119 [6.447]

B:BD[19.390] → [11.82:143]

B:BD[20.102] → [21.0:44]

pub fn (self &IrcActor) connect_all(say matrix.SayContext) {
	say.say <- matrix.Say{
		room: say.room_id

[19.390]

[22.0]

pub fn (self &IrcActor) connect_all(outchan chan chat.Say, room string, system chat.System) {
	outchan <- chat.Say{
		system: system
		room: room

Replacement in src/irc/irc.v at line 129 [6.447]
B:BD[22.123] → [23.362:392]
```
			self.dial(mut ircnet, say)
```
[22.123]
[23.392]
```
			self.dial(mut ircnet, outchan, room, system)
```

Replacement in src/irc/irc.v at line 134 [6.447]

B:BD[24.71] → [11.174:248]

pub fn (self &IrcActor) dial(mut ircnet Network, say matrix.SayContext) {

[24.71]

[12.401]

pub fn (self &IrcActor) dial(mut ircnet Network, outchan chan chat.Say, room_id string, system chat.System) {

Replacement in src/irc/irc.v at line 206 [6.447]
B:BD[25.262] → [15.143:168]
```
				self.out <- PrivMsg{
```
[25.262]
[15.168]
```
				self.cin <- PrivMsg{
```
Replacement in src/app.v at line 10 [6.914]
B:BD[26.62] → [27.195:208]
```
import debug
```
[26.62]
[6.996]
```
//import debug
import chat
```
Replacement in src/app.v at line 21 [6.914]
B:BD[28.188] → [9.59:85]
```
	say_chan chan matrix.Say
```
[28.188]
[14.418]
```
	out_chan chan chat.Say
```
Deletion in src/app.v at line 24 [6.914]
B:BD[29.311] → [29.311:357]
∅:D[29.357] → [18.139:140]
B:BD[14.420] → [18.139:140]
```
type ChatSystem = irc.IrcActor | matrix.Actor
```
Insertion in src/app.v at line 26 [6.914]
[5.898]
[15.262]
```
	out_chan := chan chat.Say{}
```
Deletion in src/app.v at line 29 [6.914]
B:BD[8.661] → [8.661:691]
```
	matrix_chan := chan string{}
```
Replacement in src/app.v at line 34 [6.914]
B:BD[30.578] → [31.623:667]
```
		matrix: &matrix.init(matrix_chan, config)
```
[30.578]
[32.1245]
```
		matrix: &matrix.init(config)
```
Replacement in src/app.v at line 38 [6.914]
B:BD[26.102] → [28.233:254]
```
		say_chan: say_chan
```
[26.102]
[18.184]
```
		out_chan: out_chan
```

Insertion in src/app.v at line 40 [6.914]

[18.187]

[33.385]

	go listen_out(out_chan, mut main.irc, mut main.matrix)

Replacement in src/app.v at line 53 [6.914]

B:BD[34.135] → [23.869:959]

∅:D[35.90] → [27.209:240]

∅:D[23.959] → [27.209:240]

B:BD[34.135] → [27.209:240]

∅:D[27.240] → [21.410:473]

B:BD[34.135] → [21.410:473]

	println('!!startup irc ${ptr_str(main.irc)} irc.networks ${ptr_str(main.irc.networks)}')
	debug.dump(main.irc.networks)
	go main.irc.connect_all(room_id: 'admin_room', say: say_chan)

[34.135]

[6.1255]

	go main.irc.connect_all(out_chan, 'admin_room', chat.System.matrix)

Replacement in src/app.v at line 59 [6.914]

B:BD[3.219] → [3.219:290]

					main.command(ChatSystem(main.irc), irc.channel, irc.message[1..])

[3.219]

[29.488]

					main.command(chat.System.irc, irc.channel, irc.message[1..])

Replacement in src/app.v at line 62 [6.914]
B:BD[6.1326] → [36.615:644]
```
			matrix := <-matrix_chan {
```
[6.1326]
[37.774]
```
			matrix := <-main.matrix.cin {
```

Replacement in src/app.v at line 86 [6.914]

B:BD[19.799] → [21.474:543]

			go self.irc.dial(mut ircnet, room_id: 'none', say: self.say_chan)

[19.799]

[6.1447]

			go self.irc.dial(mut ircnet, self.out_chan, 'none', chat.System.matrix)

Replacement in src/app.v at line 112 [6.914]

B:BD[38.190] → [29.495:557]

				self.command(ChatSystem(self.matrix), room_id, body[1..])

[38.190]

[39.182]

				self.command(chat.System.matrix, room_id, body[1..])

Replacement in src/app.v at line 121 [6.914]

B:BD[39.189] → [29.558:636]

fn (mut self Main) command(chat ChatSystem, room_id string, message string) {

[39.189]

[29.636]

fn (mut self Main) command(system chat.System, room_id string, message string) {

Replacement in src/app.v at line 129 [6.914]

B:BD[40.128] → [40.128:259]

					self.say_chan <- matrix.Say{
						room: room_id
						message: "cant find ${host}. add with '!server add <hostname>'"
					}

[40.128]

[40.259]

					chat.say(self.out_chan, system, room_id, "cant find ${host}. add with '!server add <hostname>'")

Replacement in src/app.v at line 132 [6.914]

B:BD[40.277] → [21.544:615]

				go self.irc.dial(mut ircnet, room_id: room_id, say: self.say_chan)

[40.277]

[40.310]

				go self.irc.dial(mut ircnet, self.out_chan, room_id, chat.System.matrix)

Replacement in src/app.v at line 134 [6.914]

∅:D[40.322] → [19.881:933]

B:BD[19.881] → [19.881:933]

B:BD[19.933] → [40.323:382]

∅:D[40.382] → [19.1002:1008]

B:BD[19.1002] → [19.1002:1008]

				self.say_chan <- matrix.Say{
					room: room_id
					message: '!connect <hostname> (see !server for list)'
				}

[40.322]

[19.1019]

				chat.say(self.out_chan, chat.System.matrix, room_id, '!connect <hostname> (see !server for list)')

Replacement in src/app.v at line 138 [6.914]

B:BD[4.114] → [4.114:164]

B:BD[4.164] → [2.0:99]

∅:D[2.99] → [41.60:65]

B:BD[4.224] → [41.60:65]

			self.say_chan <- matrix.Say{
				room: room_id
				message: '$self.matrix.host is ${self.matrix.conn_state}. $self.irc.networks.len irc networks'
			}

[4.114]

[42.42]

			chat.say(self.out_chan, system, room_id, '$self.matrix.host is ${self.matrix.conn_state}. $self.irc.networks.len irc networks')

Replacement in src/app.v at line 143 [6.914]

B:BD[43.53] → [29.666:729]

				default_action = self.command_server(chat, room_id, parts)

[43.53]

[4.224]

				default_action = self.command_server(system, room_id, parts)

Deletion in src/app.v at line 146 [6.914]
B:BD[43.319] → [23.960:994]
```
				debug.dump(self.irc.networks)
```

Replacement in src/app.v at line 147 [6.914]

B:BD[29.864] → [29.864:913]

				self.say(ChatSystem(self.irc), room_id, msg)

[29.864]

[44.558]

				chat.say(self.out_chan, chat.System.irc, room_id, msg)

Replacement in src/app.v at line 150 [6.914]

B:BD[23.1084] → [29.914:978]

					self.say(ChatSystem(self.irc), room_id, ircnet.one_line())

[23.1084]

[43.462]

					chat.say(self.out_chan, chat.System.irc, room_id, ircnet.one_line())

Replacement in src/app.v at line 155 [6.914]

B:BD[45.180] → [45.180:278]

			self.say_chan <- matrix.Say{
				room: room_id
				message: 'unknown command ${parts[0]}'
			}

[45.180]

[45.278]

			chat.say(self.out_chan, system, room_id, 'unknown command ${parts[0]}')

Replacement in src/app.v at line 160 [6.914]

B:BD[46.157] → [29.979:1069]

fn (mut self Main) command_server(chat ChatSystem, room_id string, parts []string) bool {

[46.157]

[46.230]

fn (mut self Main) command_server(system chat.System, room_id string, parts []string) bool {

Replacement in src/app.v at line 172 [6.914]

B:BD[46.524] → [29.1070:1112]

			self.say(chat, room_id, '$host added')

[46.524]

[46.606]

			chat.say(self.out_chan, system, room_id, '$host added')

Replacement in src/app.v at line 190 [6.914]

B:BD[29.1114] → [29.1114:1185]

B:BD[29.1185] → [3.291:374]

∅:D[3.374] → [29.1278:1346]

B:BD[29.1278] → [29.1278:1346]

fn (mut self Main) say(chat ChatSystem, room string, message string) {
	match chat {
		irc.IrcActor {
			self.irc.say(room, message)
		}
		matrix.Actor {
			self.say_chan <- matrix.Say{
				room: room
				message: message

[29.1114]

[29.1346]

fn listen_out(out_chan chan chat.Say, mut irc irc.IrcActor, mut matrix matrix.Actor) {
	for {
		println("!!*! OUTMSG WAIT")
		outmsg := <-out_chan or { println("listen_out err!") }
		println("!!!** GOT OUTMSG $outmsg")
		match outmsg.system {
			.irc {
				irc.say(outmsg.room, outmsg.message)

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

[29.1351]

[3.375]

			.matrix {
				matrix.room_say(outmsg.room, outmsg.message)
			}

out msg queue in main

Dependencies

In channels

Change contents

Replacement in src/matrix/matrix.v at line 16 [6.21]

Replacement in src/matrix/matrix.v at line 40 [6.21]

Replacement in src/matrix/matrix.v at line 42 [6.21]

Deletion in src/irc/irc.v at line 3 [6.447]

Insertion in src/irc/irc.v at line 8 [6.447]

Replacement in src/irc/irc.v at line 16 [6.447]

Replacement in src/irc/irc.v at line 49 [6.447]

Replacement in src/irc/irc.v at line 119 [6.447]

Replacement in src/irc/irc.v at line 129 [6.447]

Replacement in src/irc/irc.v at line 134 [6.447]

Replacement in src/irc/irc.v at line 206 [6.447]

Replacement in src/app.v at line 10 [6.914]

Replacement in src/app.v at line 21 [6.914]

Deletion in src/app.v at line 24 [6.914]

Insertion in src/app.v at line 26 [6.914]

Deletion in src/app.v at line 29 [6.914]

Replacement in src/app.v at line 34 [6.914]

Replacement in src/app.v at line 38 [6.914]