Make it work again - TODO: Update docs

api.py

@@ -1,11 +0,0 @@
-import json
-import datetime
-import sqlite3
-
-from request import Request, urlopen
-
-try:
-    from settings import USERNAME, PASSWORD
-except:
-    USERNAME, PASSWORD = None, None
-

classes/api.py

@@ -1,26 +1,39 @@
-from .http import HTTPRequest
+from .http import HTTPRequest, urlopen
+from .message import Message
 
+from urllib.error import HTTPError
+
+from const import API_URL, X_API_KEY
+
+import json
 
 class RomeoAPI:
-    def __init__(self, login=True, username=USERNAME, password=PASSWORD):
+    def __init__(self, login=True, username=None, password=None):
+        self.session = None
+
         if login:
             self.login(username, password)
         
+
     def login(self, username, password):
-        payload = {"username": USERNAME,
+        payload = {"username": username,
-                   "password": PASSWORD, 
+                   "password": password, 
                    "keep_login": True}
 
-        response = urlopen(HTTPRequest(API_URL + "session?lang=en"),
+        try:
+            response = urlopen(HTTPRequest(API_URL + "session?lang=en", headers=self.build_headers()),
                            json.dumps(payload).encode("utf-8"))
+        except HTTPError as e:
+            print(e.read())
+            raise
 
         data = json.load(response)
         self.session = data
 
     def build_headers(self, additional={}):
         headers = {
-            "X-Api-Key": "vuEp8o93b34CxUCljSMFEdhI70qDWtuk",
+            "X-Api-Key": X_API_KEY,
-            "X-Session-Id": self.session["session_id"]
+            "X-Session-Id": self.session["session_id"] if self.session else ""
         }
 
         for key, value in additional:
@@ -35,4 +48,5 @@ class RomeoAPI:
         data = json.load(response)
 
         for message in data["items"]:
-            yield Message.from_dict(message)
+            if messageobj := Message.from_dict(message):
+                yield messageobj

classes/attachment.py

@@ -0,0 +1,39 @@
+from urllib.request import urlopen
+
+from .http import HTTPRequest
+
+
+class Attachment:
+    def __init__(self, id, owner, token, message, content=None, retrieve=True):
+        self.id = id
+        self.owner = owner
+        self.token = token
+        self.content = content if content else self.get_content() if retrieve else None
+        self.message = message
+
+    def get_content(self, exceptions=False):
+        try:
+            return urlopen(HTTPRequest(IMAGE_URL % self.token)).read()
+        except:
+            if not exceptions:
+                return False
+            raise
+
+    def to_database(self, db=None, exceptions=False):
+        try:
+            db = db or Database()
+            db.execute("INSERT INTO attachment VALUES (?, ?, ?, ?, ?);",
+                               (self.id, self.owner, self.token, self.message, self.content))
+        except:
+            if not exceptions:
+                return
+            raise
+
+    @classmethod
+    def from_dict(cls, attachment, message_id):
+        if attachment["type"] == "IMAGE":
+            try:
+                return cls(attachment["params"]["id"], attachment["params"]["owner_id"], attachment["params"]["url_token"], message_id)
+            except Exception as e:
+                print(f"Error getting attachment: {e}")
+                return False

classes/database.py

@@ -1,6 +1,6 @@
 import sqlite3
 
-from urllib3 import urlopen
+from urllib.request import urlopen
 
 from .http import HTTPRequest
 
@@ -27,34 +27,3 @@ class Database:
 
     def fetchone(self, *args, **kwargs):
         return self.cur.fetchone(*args, **kwargs)
-
-
-class Attachment:
-    def __init__(self, id, owner, token, message, content=None, retrieve=True):
-        self.id = id
-        self.owner = owner
-        self.token = token
-        self.content = content if content else self.get_content() if retrieve else None
-        self.message = message
-
-    def get_content(self, exceptions=False):
-        try:
-            return urlopen(Request(IMAGE_URL % self.token)).read()
-        except:
-            if not exceptions:
-                return False
-            raise
-
-    def to_database(self, exceptions=False):
-        try:
-            Database().execute("INSERT INTO attachment VALUES (?, ?, ?, ?, ?);",
-                               (self.id, self.owner, self.token, self.message, self.content))
-        except:
-            if not exceptions:
-                return
-            raise
-
-    @classmethod
-    def from_dict(cls, attachment, message_id):
-        if attachment["type"] == "IMAGE":
-            return cls(attachment["params"]["id"], attachment["params"]["owner_id"], attachment["params"]["url_token"], message_id)

classes/http.py

@@ -1,4 +1,4 @@
-from urllib3 import Request, urlopen
+from urllib.request import Request, urlopen
 
 from const import USER_AGENT, X_API_KEY
 

classes/location.py

@@ -10,9 +10,10 @@ class Location:
         self.country = country
         self.timestamp = timestamp
 
-    def to_database(self, exceptions=False):
+    def to_database(self, db=None, exceptions=False):
         try:
-            Database().execute("INSERT INTO location VALUES (?, ?, ?, ?);",
+            db = db or Database()
+            db.execute("INSERT INTO location VALUES (?, ?, ?, ?);",
                                (self.profile, self.timestamp, self.name, self.country))
         except:
             if not exceptions:

classes/message.py

@@ -1,4 +1,5 @@
 from .database import Database
+from .attachment import Attachment
 
 
 class Message:
@@ -10,12 +11,13 @@ class Message:
         self.text = text
         self.attachments = attachments
 
-    def to_database(self, exceptions=False):
+    def to_database(self, db=None, exceptions=False):
         try:
-            Database().execute("INSERT INTO message VALUES (?, ?, ?, ?, ?);",
+            db = db or Database()
+            db.execute("INSERT INTO message VALUES (?, ?, ?, ?, ?);",
                                (self.id, self.sender, self.recipient, self.date, self.text))
             for attachment in self.attachments:
-                attachment.to_database()
+                attachment.to_database(db)
         except:
             if not exceptions:
                 return

const.py

@@ -1,5 +1,5 @@
-API_URL = "https://www.planetromeo.com/api/v4/"
+API_URL = "https://www.romeo.com/api/v4/"
-IMAGE_URL = "https://www.planetromeo.com/img/usr/original/0x0/%s.jpg"
+IMAGE_URL = "https://www.romeo.com/img/usr/original/0x0/%s.jpg"
 
 USER_AGENT = "RomeoTools (https://kumig.it/kumitterer/romeotools.git)"
-X_API_KEY = "vuEp8o93b34CxUCljSMFEdhI70qDWtuk"
+X_API_KEY = "8JNvPbV3I9KLiNqPSqscNTYeg7uiwvMI"

requirements.txt

@@ -0,0 +1 @@
+urllib3

worker.py

@@ -0,0 +1,19 @@
+import json
+import datetime
+import sqlite3
+
+from classes.database import Database
+from classes.api import RomeoAPI
+
+try:
+    from settings import USERNAME, PASSWORD
+except:
+    USERNAME, PASSWORD = None, None
+
+api = RomeoAPI(True, USERNAME, PASSWORD)
+db = Database()
+
+db.create_tables()
+
+for message in api.messages():
+    message.to_database()