rzerres/conduit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'correct-sendtxn' into pushers

Browse Source
This commit is contained in:
Timo Kösters
2021-03-15 09:48:19 +01:00
parent 835cf80acd 6da40225bb
commit 21f785d530
61 changed files with 3003 additions and 1919 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/database/pusher.rs
View File

@@ -11,7 +11,7 @@ use ruma::{
},
events::room::{
member::{MemberEventContent, MembershipState},
message::{MessageEventContent, TextMessageEventContent},
message::{MessageEventContent, MessageType, TextMessageEventContent},
power_levels::PowerLevelsEventContent,
},
events::EventType,
@@ -265,8 +265,8 @@ pub async fn send_push_notice(
.map_err(|_| {
Error::bad_database("PDU contained bad message content")
})?;
if let MessageEventContent::Text(TextMessageEventContent { body, .. }) =
&msg_content
if let MessageType::Text(TextMessageEventContent { body, .. }) =
&msg_content.msgtype
{
if body.contains(user.localpart()) {
let tweaks = rule
@@ -305,8 +305,8 @@ pub async fn send_push_notice(
.map_err(|_| {
Error::bad_database("PDU contained bad message content")
})?;
if let MessageEventContent::Text(TextMessageEventContent { body, .. }) =
&msg_content
if let MessageType::Text(TextMessageEventContent { body, .. }) =
&msg_content.msgtype
{
let power_level_cmp = |pl: PowerLevelsEventContent| {
&pl.notifications.room
@@ -346,8 +346,8 @@ pub async fn send_push_notice(
.map_err(|_| {
Error::bad_database("PDU contained bad message content")
})?;
if let MessageEventContent::Text(TextMessageEventContent { body, .. }) =
&msg_content
if let MessageType::Text(TextMessageEventContent { body, .. }) =
&msg_content.msgtype
{
if body.contains(user.localpart()) {
let tweaks = rule