Merge branch 'The-Commit-Company:main' into main

Author: bvisible

raven/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.7.0"
+__version__ = "2.7.1"
 
 from raven.raven_integrations.doctype.raven_incoming_webhook.raven_incoming_webhook import (  # noqa
 	handle_incoming_webhook as webhook,

raven/api/chat_stream.py

@@ -19,7 +19,7 @@ def get_messages(channel_id: str, limit: int = 20, base_message: str | None = No
 		frappe.throw(_("You do not have permission to access this channel"), frappe.PermissionError)
 
 	# Fetch messages for the channel
-	if base_message:
+	if base_message and frappe.db.exists("Raven Message", base_message):
 		return get_messages_around_base(channel_id, base_message)
 
 	# Cannot use `get_all` as it does not apply the `order_by` clause to multiple fields

raven/api/mentions.py

@@ -18,6 +18,7 @@ def get_mentions(limit: int = 10, start: int = 0):
 	message = frappe.qb.DocType("Raven Message")
 	channel = frappe.qb.DocType("Raven Channel")
 	channel_member = frappe.qb.DocType("Raven Channel Member")
+	workspace_member = frappe.qb.DocType("Raven Workspace Member")
 
 	query = (
 		frappe.qb.from_(mention)
@@ -42,9 +43,11 @@ def get_mentions(limit: int = 10, start: int = 0):
 		.on(
 			(channel.name == channel_member.channel_id) & (channel_member.user_id == frappe.session.user)
 		)
+		.left_join(workspace_member)
+		.on((channel.workspace == workspace_member.workspace) & (workspace_member.user == frappe.session.user))
 		.where(mention.user == frappe.session.user)
 		.where(message.owner != frappe.session.user)
-		.where(channel_member.user_id == frappe.session.user)
+		.where((channel_member.user_id == frappe.session.user) | ((workspace_member.user == frappe.session.user) & (channel.type != "Private")))
 		.orderby(message.creation, order=Order.desc)
 		.limit(limit)
 		.offset(start)
@@ -81,6 +84,7 @@ def get_unread_mention_count():
 	message = frappe.qb.DocType("Raven Message")
 	channel = frappe.qb.DocType("Raven Channel")
 	channel_member = frappe.qb.DocType("Raven Channel Member")
+	workspace_member = frappe.qb.DocType("Raven Workspace Member")
 
 	# Join mention with message and message with channel.
 	# Only fetch count for where the user is a member of the channel
@@ -96,8 +100,10 @@ def get_unread_mention_count():
 		.on(
 			(channel.name == channel_member.channel_id) & (channel_member.user_id == frappe.session.user)
 		)
+		.left_join(workspace_member)
+		.on((channel.workspace == workspace_member.workspace) & (workspace_member.user == frappe.session.user))
 		.where(mention.user == frappe.session.user)
-		.where(channel_member.user_id == frappe.session.user)
+		.where((channel_member.user_id == frappe.session.user) | ((workspace_member.user == frappe.session.user) & (channel.type != "Private")))
 		.where(message.creation > last_mention_viewed_date)
 		.where(message.owner != frappe.session.user)
 	)

raven/api/threads.py

@@ -72,7 +72,7 @@ def get_all_threads(
 			(channel.name == channel_member.channel_id) & (channel_member.user_id == frappe.session.user)
 		)
 		.left_join(thread_messages)
-		.on(channel.name == thread_messages.channel_id)
+		.on((channel.name == thread_messages.channel_id) & (thread_messages.message_type != "System"))
 		.where(channel_member.user_id == frappe.session.user)
 		.where(channel.is_thread == 1)
 		.where(channel.is_ai_thread == is_ai_thread)
@@ -154,7 +154,7 @@ def get_other_threads(
 		.left_join(main_thread_message)
 		.on((main_thread_message.is_thread == 1) & (main_thread_message.name == thread_channel.name))
 		.left_join(thread_message)
-		.on(thread_channel.name == thread_message.channel_id)
+		.on((thread_channel.name == thread_message.channel_id) & (thread_message.message_type != "System"))
 		.left_join(channel_member)
 		.on(
 			(main_thread_message.channel_id == channel_member.channel_id)