Skip to content

Commit

Permalink
Fix multiple issues after ban tracking
Browse files Browse the repository at this point in the history
- fix new control room not opening
- fix new network room not opening
- fix invalid room cleanup failing
  • Loading branch information
hifi committed Nov 15, 2021
1 parent 7ffcad5 commit ed154e6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
8 changes: 6 additions & 2 deletions heisenbridge/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@ async def _on_mx_event(self, event):

# accept invite sequence
try:
room = ControlRoom(id=event["room_id"], user_id=event["sender"], serv=self, members=[event["sender"]])
room = ControlRoom(
id=event["room_id"], user_id=event["sender"], serv=self, members=[event["sender"]], bans=[]
)
await room.save()
self.register_room(room)

Expand Down Expand Up @@ -472,6 +474,8 @@ async def run(self, listen_address, listen_port, homeserver_url, owner):

# import all rooms
for room_id in resp["joined_rooms"]:
joined = {}

try:
config = await self.api.get_room_account_data(self.user_id, room_id, "irc")

Expand Down Expand Up @@ -506,7 +510,7 @@ async def run(self, listen_address, listen_port, homeserver_url, owner):
logging.exception(f"Failed to reconfigure room {room_id} during init, leaving.")

self.unregister_room(room_id)
await self.leave_room(room_id, members)
await self.leave_room(room_id, joined.keys())

runner = aiohttp.web.AppRunner(app)
await runner.setup()
Expand Down
2 changes: 1 addition & 1 deletion heisenbridge/network_room.py
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ def init(self):
@staticmethod
async def create(serv, network, user_id, name):
room_id = await serv.create_room(name, "Network room for {}".format(network), [user_id])
room = NetworkRoom(room_id, user_id, serv, [serv.user_id, user_id])
room = NetworkRoom(room_id, user_id, serv, [serv.user_id, user_id], bans=[])
room.from_config({"name": network})
await room.save()
serv.register_room(room)
Expand Down

0 comments on commit ed154e6

Please sign in to comment.