jmug/stoatchat
1
0
Fork 1
mirror of https://github.com/stoatchat/stoatchat.git synced 2026-07-14 21:47:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fallback to unknown user.

Browse Source 
Add GitHub CI.
This commit is contained in:
Paul
2021-09-03 16:26:34 +01:00
parent 835a32932f
commit 862f57235c
5 changed files with 116 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/database/entities/message.rs
View File

@@ -32,16 +32,20 @@ pub struct PushNotification {
impl PushNotification {
pub async fn new(msg: Message, channel: &Channel) -> Self {
let author = Ref::from(msg.author)
.expect("id valid")
let author = Ref::from_unchecked(msg.author.clone())
.fetch_user()
.await
.expect("user valid");
.await;
let icon = if let Some(avatar) = author.avatar {
let (author, avatar) = if let Ok(author) = author {
(Some(author.username), author.avatar)
} else {
(None, None)
};
let icon = if let Some(avatar) = avatar {
avatar.get_autumn_url()
} else {
format!("{}/users/{}/default_avatar", PUBLIC_URL.as_str(), &author.id)
format!("{}/users/{}/default_avatar", PUBLIC_URL.as_str(), msg.author)
};
let image = msg.attachments.map_or(None, |attachments| {
@@ -61,7 +65,7 @@ impl PushNotification {
.as_secs();
Self {
author: author.username,
author: author.unwrap_or_else(|| "Unknown".into()),
icon,
image,
body,