krabopolis/frogbot
2
1
Fork 0
Code Issues 4 Pull requests Projects Releases Wiki Activity Actions

bugfix: fix the recursive embed issue #8

Manually merged
AxelSilverdew merged 1 commit from bugfix/recursive_embeds into master 2023-06-26 05:43:22 +00:00
Conversation 0 Commits 1 Files changed 1 +10 -1
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 16f05e00f3 - Show all commits

11
src/embeds.rs
View file

@ -7,7 +7,7 @@ use log::warn;
use matrix_sdk::{ use matrix_sdk::{
room::Room, room::Room,
ruma::events::room::message::{ ruma::events::room::message::{
MessageType, OriginalSyncRoomMessageEvent, RoomMessageEventContent, MessageType, OriginalSyncRoomMessageEvent, Relation, RoomMessageEventContent,
}, },
Client, Client,
}; };
@ -95,6 +95,15 @@ fn get_urls_from_message(message: &str) -> Vec<&str> {
pub async fn embed_handler(event: OriginalSyncRoomMessageEvent, room: Room, client: Client) { pub async fn embed_handler(event: OriginalSyncRoomMessageEvent, room: Room, client: Client) {
if let Room::Joined(room) = room { if let Room::Joined(room) = room {
let full_reply_event = event.clone().into_full_event(room.room_id().to_owned()); let full_reply_event = event.clone().into_full_event(room.room_id().to_owned());
// Do not make an embed if someone replies to a URL
// Unfortunately, this makes it so that if your reply has a URL, it will not embed.
if let Some(Relation::Reply { in_reply_to: _ }) = &event.content.relates_to {
warn!("Ignoring message, it's a reply to someone else");
return;
}
// Ignore anything that isn't text
let MessageType::Text(text_content) = event.content.msgtype else { let MessageType::Text(text_content) = event.content.msgtype else {
warn!("Ignoring message, content is not plaintext!"); warn!("Ignoring message, content is not plaintext!");
return; return;