From ad504e9416ef61979ef1f743fc9271c05280f328 Mon Sep 17 00:00:00 2001 From: "ADAM-PC\\adam_" Date: Sun, 5 Aug 2018 04:34:23 +0530 Subject: [PATCH] 05/08/18: fixed xpaths and fixed bug where emojies crashed the bot XPaths: Changed input text xpath Updated XPaths.newChatGroup to ignore other icons (like mute) which are next to new message icon Bubble: Added exception handling when bubble doesnt contain any text (like emojies) --- build/supbot.jar | Bin 110094 -> 110263 bytes changes | 9 +++++++++ src/src/in/definex/ChatSystem/Bubble.java | 12 ++++++++++-- src/src/in/definex/String/XPaths.java | 4 ++-- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/build/supbot.jar b/build/supbot.jar index 3673d252d25d74d3a65d07cc1b3351fc365959de..58d3e9a8fbf979089da0ff0649c6c651c76165d6 100644 GIT binary patch delta 12532 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 Z9hpuZ)=n=11o-h8Ac;>C3ylEl{{R`ATtWZ< delta 12252 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 JhtQJX{Xc3Tv7P_` diff --git a/changes b/changes index 77eadb5..8ef658e 100644 --- a/changes +++ b/changes @@ -1,5 +1,14 @@ dd/mm/yy +05/08/18: + + XPaths: + Changed input text xpath + Updated XPaths.newChatGroup to ignore other icons (like mute) which are next to new message icon + + Bubble: + Added exception handling when bubble doesnt contain any text (like emojies) + 16/07/18: Fixed Bugs: bot taps the wrong chat if it shifts up or down due to new messages in other group diff --git a/src/src/in/definex/ChatSystem/Bubble.java b/src/src/in/definex/ChatSystem/Bubble.java index a7638b0..5cf0d77 100644 --- a/src/src/in/definex/ChatSystem/Bubble.java +++ b/src/src/in/definex/ChatSystem/Bubble.java @@ -1,9 +1,11 @@ package in.definex.ChatSystem; import in.definex.Bot; +import in.definex.Console.Log; import in.definex.String.Strings; import in.definex.String.XPaths; import org.openqa.selenium.By; +import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; import java.util.List; @@ -33,8 +35,14 @@ public Bubble(WebElement webElement) { */ public String getText(){ - if(text == null) - text = webElement.findElement(By.xpath(XPaths.bubbleToText)).getText(); + if(text == null){ + try{ + text = webElement.findElement(By.xpath(XPaths.bubbleToText)).getText(); + }catch (NoSuchElementException e){ + Log.d("Bubble","Bubble doesn't contain text"); + return ""; + } + } return text; } diff --git a/src/src/in/definex/String/XPaths.java b/src/src/in/definex/String/XPaths.java index bf5f69e..d61665f 100644 --- a/src/src/in/definex/String/XPaths.java +++ b/src/src/in/definex/String/XPaths.java @@ -19,12 +19,12 @@ public class XPaths { public static final String bubbleToAuthorName = ".//span[@class='_2a1Yw _1OmDL']"; //get the input body of the chat - public static final String inputBody = "//div[@class='_2bXVy']"; + public static final String inputBody = "//div[@class='_1Plpp']"; //the send button when text is typed inside the input body public static final String sendButton = "//span[contains(@data-icon,'send')]"; //get the group list item with the new chat - public static final String newChatGroup = "//div[not(contains(@class,'_1f1zm')) and contains(@class,'_2EXPL')]//div[contains(@class,'_15G96')]/../../../../../../div[not(contains(@class,'active'))]//div[@class='_25Ooe']"; + public static final String newChatGroup = "//div[not(contains(@class,'_1f1zm')) and contains(@class,'_2EXPL')]//span[contains(@class,'OUeyt')]/../../../../../../../div[not(contains(@class,'active'))]//div[@class='_25Ooe']"; //get the chat bubbles after the "x unread messages" public static final String newChatBubbles = "//div[@class='_1mq8g']//following-sibling::div//div[@class='Tkt2p']"; //get the chat bubble before ethe "x unread messages"