diff --git a/yaboli/__init__.py b/yaboli/__init__.py index 06a26de..7d439d5 100644 --- a/yaboli/__init__.py +++ b/yaboli/__init__.py @@ -1,3 +1,6 @@ from .connection import Connection from .session import Session from .message import Message +from .sessions import Sessions +from .messages import Messages +from .room import Room diff --git a/yaboli/room.py b/yaboli/room.py index 17b69b4..35e8ac1 100644 --- a/yaboli/room.py +++ b/yaboli/room.py @@ -1,9 +1,37 @@ -import connection +from . import connection +from . import messages +from . import sessions class Room(): """ - TODO + Connects to and provides more abstract access to a room on euphoria. """ - def __init__(self): - self.messages = [] \ No newline at end of file + def __init__(self, room, nick=None, password=None, account_email=None, account_password=None): + """ + room - name of the room to connect to + nick - nick to assume, None -> no nick + password - room password (in case the room is private) + account_email - email of your account + account_password - password of your account + """ + + self.room = room + self.nick = nick + self.password = password + self.account_email = account_email + self.account_password = account_password + + self.messages = messages.Messages() + self.sessions = sessions.Sessions() + + self.con = connection.Connection(self.room) + + def launch(self): + """ + launch() -> Thread + + Open connection in a new thread (see connection.Connection.launch). + """ + + return self.con.launch() diff --git a/yaboli/session.py b/yaboli/session.py index dccf754..25a788c 100644 --- a/yaboli/session.py +++ b/yaboli/session.py @@ -99,4 +99,3 @@ class Session(): """ return self.staff and True or False - \ No newline at end of file