Upload 4 files

Fixed several major bugs

WarClient.py

@@ -11,6 +11,7 @@ def getReply(message):
         message = message.rstrip(".")
     if message.endswith(" ?"):
         message = message.replace(" ?","?")
+    mesage = message.replace(" .",".")
 
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as client_socket:
         try:

WarOnline_Chat.py

@@ -36,9 +36,13 @@ def fixString(S):
     S = S.replace("&", "")
     S = S.replace("&", "")
     S = S.replace("ен,ицхак", "ен-ицхак")
+    S = S.replace("СШа", "США")
     S = S.replace("(,", "(")
     S = S.replace("?.", "?")
-    S = S.replace("#","")
+    S = S.replace("#", "")
+    S = S.replace("()", "")
+    S = S.strip(',')
+    S = S.strip()
     return S
 
 def compare_pages(url1, url2):
@@ -47,9 +51,28 @@ def compare_pages(url1, url2):
 
 def remove_non_english_russian_chars(s):
     # Regular expression to match all characters that are not in English or Russian
-    pattern = '[^0-9A-Za-zА-Яа-яЁё(),.!?"\s-]'
+    pattern = '[^A-Za-zА-Яа-яЁё(),.!?"\s-]'
     # Replace all matched characters with an empty string
     return re.sub(pattern, '', s)
+
+def remove_extra_spaces(s):
+    s = re.sub(r"\s+", " ", s)  # replace all sequences of whitespace with a single space
+    s = re.sub(r"\s+([.,])", r"\1", s)  # remove spaces before period or comma
+    return(s)
+
+def getLastPage(thread_url=thread_url):
+    # Returns the number of the last page
+    page = 1  # Starting page
+    lastPage = False
+
+    while not lastPage:
+        if not compare_pages(thread_url + 'page-' + str(page), thread_url + 'page-' + str(page + 1)):
+            page += 1
+        else:
+            lastPage = True
+    return page
+
+
 def login(username=username, password=password, thread_url=thread_url):
     # Log-In to the forum and redirect to thread
 
@@ -191,11 +214,16 @@ def getMessages(thread_url=thread_url, quotedUser="", startingPage=1):
 # Core Engine of the Client
 def WarOnlineBot():
 
+    lookUpPages = 5 # How many pages back to look in the thread
+    startingPage = getLastPage(thread_url=thread_url) - lookUpPages
+    if startingPage < 1:
+        startingPage = 1 # Starting page cannot be less than 1
+
     login(username=username, password=password, thread_url=thread_url)
     #print("logged in")
 
     # All messages (with quotes) by ALL users:
-    allMessages = getMessages(thread_url=thread_url, quotedUser='', startingPage=1)
+    allMessages = getMessages(thread_url=thread_url, quotedUser='', startingPage=startingPage)
 
     # IDs of the quoted messages, replied by the bot:
     messages_by_bot_IDs = []
@@ -208,7 +236,7 @@ def WarOnlineBot():
     messages_by_bot_IDs = list(set([elem for elem in messages_by_bot_IDs if elem]))
 
     # All messages (with quotes) sent _FOR_ the Bot:
-    messagesForBot = getMessages(thread_url=thread_url, quotedUser=username, startingPage=1)
+    messagesForBot = getMessages(thread_url=thread_url, quotedUser=username, startingPage=startingPage)
 
     # IDs of the messages, quoting the bot:
     messages_for_bot_IDs = []
@@ -230,7 +258,8 @@ def WarOnlineBot():
             if originalQuote == "": # Just images, no text
                 continue
             else:
-                quote = remove_non_english_russian_chars(msg['reply']).strip()
+                quote = remove_non_english_russian_chars(msg['reply'])
+                quote = remove_extra_spaces(quote)
 
             message = ""
 

WarServer.py

@@ -24,7 +24,8 @@ with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as server_socket:
 
             response = ""
             while not response:
-                response = WarBot.get_response(received_string, model, tokenizer, model_punct, temperature=0.2)
+                response = WarBot.get_response(received_string, model, tokenizer, model_punct, temperature=0.6)
+
             response_string = response
 
             conn.sendall(response_string.encode())