Fix branches sharing code.
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
parent
eca01cfb3f
commit
b0315da3d7
1 changed files with 4 additions and 13 deletions
|
|
@ -454,13 +454,7 @@ impl Service {
|
|||
notifi.counts = NotificationCounts::default();
|
||||
}
|
||||
|
||||
if event_id_only {
|
||||
self.send_request(
|
||||
&http.url,
|
||||
send_event_notification::v1::Request::new(notifi),
|
||||
)
|
||||
.await?;
|
||||
} else {
|
||||
if !event_id_only {
|
||||
if *event.kind() == TimelineEventType::RoomEncrypted
|
||||
|| tweaks
|
||||
.iter()
|
||||
|
|
@ -499,14 +493,11 @@ impl Service {
|
|||
.get_canonical_alias(event.room_id())
|
||||
.await
|
||||
.ok();
|
||||
|
||||
self.send_request(
|
||||
&http.url,
|
||||
send_event_notification::v1::Request::new(notifi),
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
|
||||
self.send_request(&http.url, send_event_notification::v1::Request::new(notifi))
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
},
|
||||
// TODO: Handle email
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue