Upload WarOnline_Chat.py

Updated with option to answer direct messages, starting with @WarBot

WarOnline_Chat.py

@@ -189,12 +189,19 @@ def getMessages(thread_url=config.thread_url, quotedUser="", startingPage=1):
                     if blockquote:
                         # Extract the text
                         text = data.find('div', {'class': 'bbWrapper'})
+
                         for bq in text.find_all('blockquote'):
                             bq.extract()
                         reply = text.get_text().replace('\n', ' ').strip()
 
                         allquotes.append({'reply': reply, 'messengerName': messengerName, 'messageID': messageID, 'quotedID': quotedID})
 
+                    else: # Looking for a direct message "@WarBot"
+                        text = data.find('div', {'class': 'bbWrapper'})
+                        if text.get_text().startswith('@WarBot'):
+                            reply = text.get_text().replace('@WarBot','').replace('\n', ' ').strip()
+                            allquotes.append({'reply': reply, 'messengerName': messengerName, 'messageID': messageID, 'quotedID': 'post: 0'})
+
                 except:
                     continue # There was no text in this quote, move to the next
 
@@ -225,7 +232,13 @@ def WarOnlineBot():
     # IDs of the quoted messages, replied by the bot:
     messages_by_bot_IDs = []
 
+    # Initiate the direct messages
+    direct_messages = []
+
     for msg in allMessages:
+        # Direct message to the bot
+        if msg['quotedID'].split(': ')[-1] == '0': #debug
+            direct_messages.append(msg)
         # Set a list of replied messages IDs
         if msg['messengerName'] == config.username: #message posted by the WarBot
             messages_by_bot_IDs.append(msg['quotedID'].split(': ')[-1])
@@ -235,6 +248,10 @@ def WarOnlineBot():
     # All messages (with quotes) sent _FOR_ the Bot:
     messagesForBot = getMessages(thread_url=config.thread_url, quotedUser=config.username, startingPage=startingPage)
 
+    # Append the direct messages to the messagesForBot:
+    for msg in direct_messages:
+        messagesForBot.append(msg)
+
     # IDs of the messages, quoting the bot:
     messages_for_bot_IDs = []
 
@@ -247,6 +264,7 @@ def WarOnlineBot():
     # Filter to leave just the unanswered messages IDs:
     messages_for_bot_IDs = [ID for ID in messages_for_bot_IDs if ID not in messages_by_bot_IDs]
 
+
     # Reply the unanswered messages:
     for msg in messagesForBot:
         if msg['messageID'].split('-')[-1] in messages_for_bot_IDs:
@@ -265,16 +283,19 @@ def WarOnlineBot():
 
             # Init Connection
             db = conversationDB.DataBase()
-            # Get the previous dialogue from the database
-            dbmessages = db.getmessages(msg['messengerName'])
-            for dbmessage in dbmessages:
-                previous_dialogue += dbmessage[0]+' '+dbmessage[1]+' '
-            # Update the string and preprocess it
-            quote = previous_dialogue + quote
-            quote = remove_non_english_russian_chars(quote)
-            quote = remove_extra_spaces(quote)
-            # Truncate the quote to return only the last MaxWords of words:
-            quote = " ".join(quote.split()[-config.MaxWords:])
+
+            if msg['quotedID'].split(': ')[-1] != '0':  # It is dialogue. Look-up for the previous quotes
+
+                # Get the previous dialogue from the database
+                dbmessages = db.getmessages(msg['messengerName'])
+                for dbmessage in dbmessages:
+                    previous_dialogue += dbmessage[0]+' '+dbmessage[1]+' '
+                # Update the string and preprocess it
+                quote = previous_dialogue + quote
+                quote = remove_non_english_russian_chars(quote)
+                quote = remove_extra_spaces(quote)
+                # Truncate the quote to return only the last MaxWords of words:
+                quote = " ".join(quote.split()[-config.MaxWords:])
 
             # Fix the quote string, to eliminate errors:
             quote = fixString(quote)
@@ -314,6 +335,7 @@ if __name__ == '__main__':
     while True:
         print('Starting Session')
         WarOnlineBot()
+        print('Session finished. Timeout...')
 
         timer = range(60 * config.timeout)
         for t in timer: