Merge pull request #26 from thoughtsunificator/develop

Develop

Author: thoughtsunificator

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "idmu",
-  "version": "0.5.14",
+  "version": "0.5.15",
   "description": "idmu (instagram-dm-unsender) is a simple script to unsend all DMs in a thread on instagram.com",
   "short_name": " idmu",
   "type": "module",

package.json

@@ -9,7 +9,8 @@ export default class UIMessage extends UIComponent {
 	 */
 	static async isMyOwnMessage(element) {
 		console.debug("isMyOwnMessage", element)
-		element.querySelector("[aria-label=More][aria-expanded=true]")?.click()
+		// close menu in case it was left open
+		element.querySelector("[aria-label=More]")?.parentNode?.click()
 		element.querySelector(`[aria-label="Close details and actions"]`)?.click()
 		element.dispatchEvent(new MouseEvent("mouseout", { bubbles: true }))
 		const uiMessage = new UIMessage(element)
@@ -47,7 +48,8 @@ export default class UIMessage extends UIComponent {
 		this.root.dispatchEvent(new MouseEvent("mousemove", { bubbles: true }))
 		this.root.dispatchEvent(new MouseEvent("mouseover", { bubbles: true }))
 		this.root.dispatchEvent(new MouseEvent("mousenter", { bubbles: true }))
-		return this.waitForElement(this.root, () => this.root.querySelector("[aria-label=More]")) // TODO i18n
+		// Some rows are empty and we do want the entire run to fail
+		return this.waitForElement(this.root, () => this.root.querySelector("[aria-label=More]")?.parentNode) // TODO i18n
 	}
 
 	/**

src/ui/default/ui-message.js

@@ -93,7 +93,8 @@ export function createMessageElement(document, text="", includesUnsend=true, ign
 		setTimeout(() => {
 			const moreElement = event.target.ownerDocument.createElement("div")
 			moreElement.setAttribute("aria-label", "More")
-			moreElement.addEventListener("click", () => {
+			event.target.appendChild(moreElement)
+			event.target.addEventListener("click", () => { // Listen for event of parent instead of moreElement because instagram use a svg Element
 				setTimeout(() => {
 					if(event.target.messageActionsMenuElement) {
 						event.target.messageActionsMenuElement.remove()
@@ -106,7 +107,6 @@ export function createMessageElement(document, text="", includesUnsend=true, ign
 					}
 				}, eventsTimeout)
 			})
-			event.target.appendChild(moreElement)
 		})
 	})
 	element.addEventListener("mouseout", () => {