donpdonp/ircbr - Change P55KFFWQA4XHWREYQ7OTR2EP2SFWHORAT4YKH22OZMYVNZUZQC6AC

better matrix name handling

Created by on March 11, 2021

P55KFFWQA4XHWREYQ7OTR2EP2SFWHORAT4YKH22OZMYVNZUZQC6AC

Dependencies

In channels

main

Change contents

Replacement in src/db/db.v at line 25 [4.13]

B:BD[4.245] → [5.92:203]

∅:D[5.203] → [6.100:202]

B:BD[6.100] → [6.100:202]

B:BD[6.202] → [7.562:648]

	dbo.exec_oneshot('create table irc_servers (id integer primary key, hostname text, netname text, nick text)')
	dbo.exec_oneshot('create table irc_channels (id integer primary key, server_id integer, name text)')
	dbo.exec_oneshot('create table matrix_rooms (id integer primary key, room_id text)')

[4.245]

[8.39]

	dbo.exec_oneshot('create table irc_servers if not exists (netname text primary key, hostname text, nick text)')
	dbo.exec_oneshot('create table irc_channels if not exists (name text primary key, netname text)')
	dbo.exec_oneshot('create table matrix_rooms if not exists (room_id text primary key)')

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

B:BD[9.42] → [10.0:60]

				match self.join_request(chat.System.matrix, '', room) {

[9.42]

[10.60]

				match self.join_request_matrix(room, room) {

Replacement in src/app.v at line 202 [11.914]

B:BD[12.223] → [10.389:457]

					match self.join_request(chat.System.irc, real_network, room) {

[12.223]

[10.457]

					match self.join_request_irc(real_network, room) {

Replacement in src/app.v at line 212 [11.914]

B:BD[2.63] → [2.63:133]

					match self.join_request(chat.System.matrix, '', added_room_id) {

[2.63]

[10.661]

					match self.join_request_matrix(room, added_room_id) {

Replacement in src/app.v at line 214 [11.914]

B:BD[10.676] → [10.676:715]

							msg = 'matrix room $room added'

[10.676]

[10.715]

							msg = 'matrix room $room ($added_room_id) added'

Replacement in src/app.v at line 348 [11.914]

∅:D[10.862] → [13.131:237]

B:BD[13.131] → [13.131:237]

B:BD[13.237] → [3.724:752]

∅:D[3.752] → [14.1271:1280]

B:BD[14.1271] → [14.1271:1280]

B:BD[14.1280] → [3.753:810]

∅:D[3.810] → [14.1333:1349]

B:BD[14.1333] → [14.1333:1349]

B:BD[14.1349] → [3.811:871]

∅:D[15.292] → [14.1408:1415]

∅:D[3.871] → [14.1408:1415]

B:BD[14.1408] → [14.1408:1415]

B:BD[14.1415] → [3.872:895]

∅:D[3.895] → [15.293:341]

B:BD[16.125] → [15.293:341]

B:BD[15.341] → [10.863:906]

∅:D[15.341] → [16.125:135]

∅:D[10.906] → [16.125:135]

B:BD[16.125] → [16.125:135]

B:BD[16.135] → [3.896:913]

∅:D[3.913] → [16.160:170]

B:BD[16.160] → [16.160:170]

B:BD[16.170] → [3.914:1070]

∅:D[3.1070] → [16.248:266]

B:BD[16.248] → [16.248:266]

B:BD[16.266] → [3.1071:1221]

∅:D[7.707] → [16.317:326]

∅:D[3.1221] → [16.317:326]

B:BD[16.317] → [16.317:326]

B:BD[16.347] → [10.907:941]

∅:D[10.941] → [16.347:350]

B:BD[16.347] → [16.347:350]

pub fn (mut self Main) join_request(system chat.System, network string, room string) JoinRequestResults {
	existing := match system {
		.irc {
			self.db.select_by_field('irc_channels', 'name', room)
		}
		.matrix {
			self.db.select_by_field('matrix_rooms', 'room_id', room)
		}
	}
	if existing.len > 0 {
		println('join_request: $room already joined')
		return JoinRequestResults.already_joined
	} else {
		match system {
			.irc {
				self.db.insert('irc_channels', [db.SqlValue{ name: 'server_id', value: network },
					db.SqlValue{
						name: 'name'
						value: room
					},
				])
			}
			.matrix {
				self.db.insert('matrix_rooms', [db.SqlValue{ name: 'room_id', value: room},
					db.SqlValue{
						name: 'name'
						value: room
					},
				])
			}
		}
		return JoinRequestResults.saved
	}

[10.862]

[17.23]

pub fn (mut self Main) join_request_irc(network string, room string) JoinRequestResults {
	self.db.insert('irc_channels', [db.SqlValue{ name: 'server_id', value: network },
		db.SqlValue{
			name: 'name'
			value: room
		},
	])
	return JoinRequestResults.saved
}
pub fn (mut self Main) join_request_matrix(name string, room string) JoinRequestResults {
	self.db.insert('matrix_rooms', [db.SqlValue{ name: 'room_id', value: room },
		db.SqlValue{
			name: 'name'
			value: room
		},
	])
	return JoinRequestResults.saved