donpdonp/ircbr - Change XKBAYE546KBYGPXQFVIVWLVAOR6GSJALEGRLWFSHA5LRUFKJCDTQC

great Chat refoactor

Created by on April 1, 2021

XKBAYE546KBYGPXQFVIVWLVAOR6GSJALEGRLWFSHA5LRUFKJCDTQC

Dependencies

In channels

main

Change contents

Insertion in src/chat/chat.v at line 2 [5.17]
[5.30]
[5.30]
```
import setup
```

Insertion in src/chat/chat.v at line 5 [5.17]

[5.31]

pub struct Actor {
  pub:
  out chan Say
  queue []Say
}

Replacement in src/chat/chat.v at line 25 [5.17]

B:BD[5.138] → [6.333:431]

∅:D[7.383] → [5.207:294]

∅:D[6.431] → [5.207:294]

B:BD[5.207] → [5.207:294]

pub fn say(out chan Say, chat System, name string, network string, room string, message string) {
	system := match chat {
		.irc {
			System.irc
		}
		.matrix {
			System.matrix
		}
	}

[5.138]

[5.294]

pub fn setup(config setup.Config) &Actor {
return &Actor{}
}
pub fn (mut self Actor) say(chat System, name string, network string, room string, message string) {

Replacement in src/chat/chat.v at line 31 [5.17]
B:BD[5.307] → [5.307:324]
```
		system: system
```
[5.307]
[7.384]
```
		system: chat
```
Replacement in src/chat/chat.v at line 37 [5.17]
B:BD[5.359] → [5.359:371]
```
	out <- msg
```
[5.359]
[5.371]
```
	self.out <- msg
```

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

B:BD[8.410] → [9.49:171]

B:BD[9.171] → [11.52:68]

∅:D[11.68] → [12.563:587]

B:BD[9.188] → [12.563:587]

	irc      &irc.IrcActor
	appsvc   &appsvc.AppsvcActor
	matrix   &matrix.Actor
	rpc      &rpc.Actor
	config   setup.Config
	db       db.Db
	out_chan chan chat.Say

[8.410]

[13.418]

	irc    &irc.IrcActor
	appsvc &appsvc.AppsvcActor
	matrix &matrix.Actor
	rpc    &rpc.Actor
	config setup.Config
	db     db.Db
	chat   &chat.Actor

Replacement in src/app.v at line 32 [10.914]
B:BD[14.764] → [15.204:232]
```
		out_chan: chan chat.Say{}
```
[14.764]
[16.184]
```
		chat: chat.setup(config)
```

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

B:BD[17.988] → [15.233:294]

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

[17.988]

[18.385]

	go listen_out(main.chat.out, mut main.irc, mut main.matrix)

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

B:BD[2.135] → [2.135:210]

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

[2.135]

[19.40]

	go main.irc.connect_all(main.chat.out, admin_room.id, chat.System.matrix)

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

B:BD[20.112] → [4.52:119]

				chat.say(self.out_chan, system, name, '', room, irc_m.message)

[20.112]

[15.911]

				self.chat.say(system, name, '', room, irc_m.message)

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

B:BD[21.477] → [22.77:150]

					chat.say(self.out_chan, chat.System.matrix, self.matrix.whoami, '',

[21.477]

[22.150]

					self.chat.say(chat.System.matrix, self.matrix.whoami, '',

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

∅:D[21.636] → [6.647:706]

B:BD[6.647] → [6.647:706]

					chat.say(self.out_chan, system, name, '', room, body)

[21.636]

[23.551]

					self.chat.say(system, name, '', room, body)

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

B:BD[24.128] → [6.707:1080]

			chat.say(self.out_chan, system, '', network, room_id, 'commands: (each command gives its own help)')
			chat.say(self.out_chan, system, '', network, room_id, '!status')
			chat.say(self.out_chan, system, '', network, room_id, '!server')
			chat.say(self.out_chan, system, '', network, room_id, '!join')
			chat.say(self.out_chan, system, '', network, room_id, '!leave')

[24.128]

[24.256]

			self.chat.say(system, '', network, room_id, 'commands: (each command gives its own help)')
			self.chat.say(system, '', network, room_id, '!status')
			self.chat.say(system, '', network, room_id, '!server')
			self.chat.say(system, '', network, room_id, '!join')
			self.chat.say(system, '', network, room_id, '!leave')

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

B:BD[25.128] → [6.1081:1196]

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

[25.128]

[25.259]

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

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

B:BD[25.322] → [6.1197:1317]

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

[25.322]

[26.1019]

				self.chat.say(chat.System.matrix, '', network, room_id, '!connect <irc hostname> (see !status for list)')

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

B:BD[27.140] → [6.1318:1381]

				chat.say(self.out_chan, system, '', network, room_id, msg)

[27.140]

[27.199]

				self.chat.say(system, '', network, room_id, msg)

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

B:BD[28.356] → [6.1382:1479]

				chat.say(self.out_chan, system, '', network, room_id, '!join <#ircchannel or #matrix:room>')

[28.356]

[27.224]

				self.chat.say(system, '', network, room_id, '!join <#ircchannel or #matrix:room>')

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

B:BD[29.282] → [6.1480:1543]

				chat.say(self.out_chan, system, '', network, room_id, msg)

[29.282]

[30.656]

				self.chat.say(system, '', network, room_id, msg)

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

B:BD[28.462] → [6.1544:1642]

				chat.say(self.out_chan, system, '', network, room_id, '!leave <#ircchannel or #matrix:room>')

[28.462]

[29.282]

				self.chat.say(system, '', network, room_id, '!leave <#ircchannel or #matrix:room>')

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

B:BD[15.980] → [6.1643:1822]

				chat.say(self.out_chan, system, '', network, room_id, '!server add <hostname> <nickname>')
				chat.say(self.out_chan, system, '', network, room_id, '!server del <hostname>')

[15.980]

[31.468]

				self.chat.say(system, '', network, room_id, '!server add <hostname> <nickname>')
				self.chat.say(system, '', network, room_id, '!server del <hostname>')

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

B:BD[32.180] → [6.1823:1911]

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

[32.180]

[33.118]

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

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

B:BD[34.1768] → [6.1912:1969]

	chat.say(self.out_chan, system, '', network, room, msg)

[34.1768]

[34.1769]

	self.chat.say(system, '', network, room, msg)

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

B:BD[34.1812] → [6.1970:2053]

		chat.say(self.out_chan, system, '', network, room, 'matrix: room $r.name $r.id')

[34.1812]

[17.1393]

		self.chat.say(system, '', network, room, 'matrix: room $r.name $r.id')

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

B:BD[33.493] → [6.2054:2136]

		chat.say(self.out_chan, system, '', network, room, 'irc: ' + ircnet.one_line())

[33.493]

[35.454]

		self.chat.say(system, '', network, room, 'irc: ' + ircnet.one_line())

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

B:BD[35.498] → [6.2137:2246]

			chat.say(self.out_chan, system, '', network, room, 'irc: $ircnet.hostname $channel.name $channel.joined')

[35.498]

[32.278]

			self.chat.say(system, '', network, room, 'irc: $ircnet.hostname $channel.name $channel.joined')

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

∅:D[3.96] → [6.2247:2336]

∅:D[22.281] → [6.2247:2336]

B:BD[36.231] → [6.2247:2336]

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

[3.96]

[3.97]

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

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

B:BD[36.328] → [6.2337:2446]

				chat.say(self.out_chan, system, '', network, room_id, 'usage: server add <host:port> <bridge nickname>')

[36.328]

[37.86]

				self.chat.say(system, '', network, room_id, 'usage: server add <host:port> <bridge nickname>')

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

B:BD[38.1114] → [12.1964:2051]

fn listen_out(out_chan chan chat.Say, mut irc irc.IrcActor, mut matrix matrix.Actor) {

[38.1114]

[12.2051]

fn listen_out(out chan chat.Say, mut irc irc.IrcActor, mut matrix matrix.Actor) {

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

B:BD[12.2058] → [39.814:876]

		outmsg := <-out_chan or { println('listen_out err: $err') }

[12.2058]

[12.2183]

		outmsg := <-out or { println('listen_out err: $err') }

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

B:BD[40.516] → [21.863:946]

	chat.say(self.out_chan, chat.System.matrix, '', self.config.matrix_host, room.id,

[40.516]

[21.946]

	self.chat.say(chat.System.matrix, '', self.config.matrix_host, room.id,