main.py

@@ -42,7 +42,7 @@ def load(variables) -> dict:
     return keys
 
 
-def cleanTweet(tweet: str) -> str | None:
+def cleanTweet(tweet: str) -> str:
     """Remove all unwanted elements from the tweet"""
     # Convert to lower case
     tweet = tweet.lower()
@@ -56,7 +56,7 @@ def cleanTweet(tweet: str) -> str | None:
         tweet = sub(r"#\S+", " ", tweet)
     else:
         # Too much hashtags in the tweet -> so ignore it
-        return None
+        return ""
     # Remove usernames
     tweet = sub(r"@\S+", " ", tweet)
     # Remove everything who isn't a letter/number/space
@@ -109,20 +109,18 @@ class Listener(StreamingClient):
             # Log
             if keys["VERBOSE"]:
                 infoLastWord = "dernier mot : "
-                newline = "\n"
+                if len(lastWord) > 0:
-                match lastWord:
+                    infoLastWord += f"dernier mot : {lastWord.split()[-1:][0]}"
-                    case None:
+                else:
-                        infoLastWord += "tweet ignoré car trop de hashtags"
+                    infoLastWord += "tweet ignoré car trop de hashtags"
-                    case w if len(w) == 0:
-                        infoLastWord += "tweet pas intéressant"
-                    case _:
-                        infoLastWord += f"dernier mot : {lastWord.split()[-1:][0]}"
-                        newline = ""
                 print(
-                    f"Tweet trouvé de {username} ({infoLastWord})...{newline}", end=" ")
+                    f"Tweet trouvé de {username} ({infoLastWord})...", end=" ")
 
-            # Ignore a tweet
+            # Hashtag tweet
-            if lastWord == None or len(lastWord) == 0:
+            if len(lastWord) == 0:
+                if keys["VERBOSE"]:
+                    # Newline
+                    print("")
                 return
 
             # Fetch the last word of the tweet
@@ -174,19 +172,6 @@ class Listener(StreamingClient):
                 if keys["VERBOSE"]:
                     print("Annulation car le dernier mot n'est pas intéressant.")
 
-    def on_request_error(self, status_code):
-        print(f"{errorMessage[:-2]} ({status_code}) !", end=" ")
-        match status_code:
-            case 420:
-                if keys["VERBOSE"]:
-                    print("Déconnecter du flux.")
-            case 429:
-                if keys["VERBOSE"]:
-                    print("En attente de reconnexion...")
-            case _:
-                print("\n")
-        return False
-
 
 def repeater(word: str) -> str:
     """Formating a word who need to be repeated"""