From 73f91a4400fc4f17aea279c652ad6ddae2562eb2 Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <ace@haxalot.com>
Date: Fri, 12 Aug 2022 11:17:38 +0200
Subject: [PATCH] Fix two potential issues

---
 lib/matrix_sdk/bot/base.rb | 2 ++
 lib/matrix_sdk/room.rb     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/matrix_sdk/bot/base.rb b/lib/matrix_sdk/bot/base.rb
index 289caf2..f289d64 100644
--- a/lib/matrix_sdk/bot/base.rb
+++ b/lib/matrix_sdk/bot/base.rb
@@ -686,6 +686,8 @@ module MatrixSdk::Bot
 
       handler = get_command(command)
       return unless handler
+
+      event = event.data if event.is_a? MatrixSdk::MatrixEvent
       return unless command_allowed?(command, event)
 
       @event = MatrixSdk::Response.new(client.api, event)
diff --git a/lib/matrix_sdk/room.rb b/lib/matrix_sdk/room.rb
index 301dfe6..897258d 100644
--- a/lib/matrix_sdk/room.rb
+++ b/lib/matrix_sdk/room.rb
@@ -454,7 +454,7 @@ module MatrixSdk
     #   :content key of the resulting event object
     # @see Protocols::CS#send_message_event
     def send_event(type, content = {})
-      client.api.send_message_event(room.id, type, content)
+      client.api.send_message_event(id, type, content)
     end
 
     # Redacts a message from the room
-- 
GitLab