donpdonp/ircbr - Change JFD7BGS3ANIPYT4DPN3TKDKGGKGTUHUU5LU35JRMV3KDTNHAEW5AC

check out this optional+sumtype return style

Created by on April 15, 2021

JFD7BGS3ANIPYT4DPN3TKDKGGKGTUHUU5LU35JRMV3KDTNHAEW5AC

Dependencies

In channels

main

Change contents

Insertion in src/matrix/matrix.v at line 267 [7.21]

[6.2]


type RoomAliasResult = RoomAliasResultNotFound | RoomAliasResultRoom

Replacement in src/matrix/matrix.v at line 270 [7.21]

B:BD[6.3] → [8.0:63]

B:BD[8.63] → [9.0:33]

B:BD[9.33] → [3.0:82]

pub fn (mut self Actor) room_alias(room_name string) ?string {
	if room_name.starts_with('#') {
		ret, code := self.call_get('directory/room/' + urllib.path_escape(room_name)) ?

[6.3]

[3.82]

struct RoomAliasResultRoom {
pub:
	room_id string
}
struct RoomAliasResultNotFound {}
pub fn (mut self Actor) room_alias(room_alias string) ?&RoomAliasResult {
	if room_alias.starts_with('#') {
		ret, code := self.call_get('directory/room/' + urllib.path_escape(room_alias)) ?

Replacement in src/matrix/matrix.v at line 281 [7.21]
B:BD[3.101] → [3.101:146]
```
			return error('room $room_name not found')
```
[3.101]
[3.146]
```
			return &RoomAliasResultNotFound{}
```

Replacement in src/matrix/matrix.v at line 283 [7.21]

B:BD[3.157] → [3.157:188]

			return ret['room_id'].str()

[3.157]

[3.188]

			return &RoomAliasResultRoom{
				room_id: ret['room_id'].str()
			}

Replacement in src/matrix/matrix.v at line 288 [7.21]
B:BD[9.149] → [9.149:168]
```
		return room_name
```
[9.149]
[9.168]
```
		return error('$room_alias is not a room_alias')
```

Replacement in src/matrix/matrix.v at line 391 [7.21]

B:BD[10.725] → [5.0:54]

pub fn (mut self Rooms) by_id(room_id string) ?&Room{

[10.725]

[11.1374]

pub fn (mut self Rooms) by_id(room_id string) ?&Room {

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

B:BD[5.368] → [5.368:423]

					    msg = msg + '(no matching irc channel found)'

[5.368]

[5.423]

						msg = msg + '(no matching irc channel found)'

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

B:BD[6.276] → [12.104:293]

B:BD[12.293] → [3.363:392]

					if added_room_id := self.matrix.room_alias(room) {
						match self.join_request_matrix(room, added_room_id) {
							.saved {
								msg = 'matrix room $room ($added_room_id) added'
								go self.sync_rooms()

[6.276]

[12.293]

					if alias_result := self.matrix.room_alias(room) {
						match alias_result {
							matrix.RoomAliasResultRoom {
								match self.join_request_matrix(room, alias_result.room_id) {
									.saved {
										msg = 'matrix room $room ($alias_result.room_id) added'
										go self.sync_rooms()
									}
									.already_joined {
										msg = 'matrix room $room already added'
									}
								}

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

B:BD[12.302] → [12.302:375]

							.already_joined {
								msg = 'matrix room $room already added'

[12.302]

[12.375]

							matrix.RoomAliasResultNotFound {
								msg = 'join failed: no room_alias exists for ${room}.'

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

B:BD[12.399] → [4.0:68]

						msg = 'join failed: no room_alias exists for ${room}. ($err)'

[12.399]

[13.802]

						msg = 'join failed: room_alias failure: ($err)'

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

B:BD[14.470] → [15.61:124]

∅:D[15.124] → [16.81:149]

B:BD[16.81] → [16.81:149]

∅:D[16.149] → [17.37:76]

B:BD[14.529] → [17.37:76]

					added_room_id := self.matrix.room_alias(room) or { room }
					self.leave_request(chat.System.matrix, network, added_room_id)
					msg = 'matrix room $room removed'

[14.470]

[14.566]

					if alias_result := self.matrix.room_alias(room) {
						match alias_result {
							matrix.RoomAliasResultRoom {
								self.leave_request(chat.System.matrix, network, alias_result.room_id)
								msg = 'matrix room $room removed'
							}
							else {}
						}
					} else {
					}

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

B:BD[18.1171] → [2.0:50]

∅:D[2.50] → [18.1239:1282]

B:BD[18.1239] → [18.1239:1282]

B:BD[18.1282] → [19.282:382]

∅:D[20.89] → [11.1992:2051]

∅:D[19.382] → [11.1992:2051]

B:BD[11.1992] → [11.1992:2051]

B:BD[11.2051] → [21.0:48]

B:BD[21.48] → [22.63:143]

		if room_id := self.matrix.room_alias(room.id) {
			println('sync_rooms: joining $room_id')
			_, code := self.matrix.join(room_id) or {
				println('matrix.join fail $err')
				continue
			}
			if code == 200 {
				self.matrix.joined_rooms.add(room)
				self.admin_say('matrix: room $room joined')
			} else if code == 403 {
				println('sync_rooms: not invited to $room.name')

[18.1171]

[11.2051]

		if alias_result := self.matrix.room_alias(room.id) {
			match alias_result {
				matrix.RoomAliasResultRoom {
					println('sync_rooms: joining $alias_result.room_id')
					_, code := self.matrix.join(alias_result.room_id) or {
						println('matrix.join fail $err')
						continue
					}
					if code == 200 {
						self.matrix.joined_rooms.add(room)
						self.admin_say('matrix: room $room joined')
					} else if code == 403 {
						println('sync_rooms: not invited to $room.name')
					}
				}
				matrix.RoomAliasResultNotFound {
					println('sync_rooms: matrix room $room unknown/no alias')
				}

Deletion in src/app.v at line 560 [7.914]
∅:D[23.66] → [24.234:245]
∅:D[17.534] → [24.234:245]
∅:D[25.626] → [24.234:245]
∅:D[26.801] → [24.234:245]
∅:D[18.1311] → [24.234:245]
∅:D[11.2056] → [24.234:245]
B:BD[24.234] → [24.234:245]
B:BD[24.245] → [18.1312:1373]
```
		} else {
			println('sync_rooms: matrix room $room unknown/no alias')
```