tyiu/notedeck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clippy postbox cleanups

Browse Source 
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2024-06-20 13:05:57 -07:00
parent 395ff57edf
commit bb6c68e05c
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ui/note/post.rs
View File

@@ -1,5 +1,4 @@
use crate::app::Damus; use crate::app::Damus;
use crate::draft::Draft;
use crate::ui::{Preview, PreviewConfig, View}; use crate::ui::{Preview, PreviewConfig, View};
use crate::{ui, Error}; use crate::{ui, Error};
use egui::widgets::text_edit::TextEdit; use egui::widgets::text_edit::TextEdit;
@@ -45,7 +44,7 @@ impl<'app, 'p> PostView<'app, 'p> {
let poster_pfp = self let poster_pfp = self
.app .app
.ndb .ndb
.get_profile_by_pubkey(&txn, poster_pubkey) .get_profile_by_pubkey(txn, poster_pubkey)
.as_ref() .as_ref()
.ok() .ok()
.and_then(|p| ui::ProfilePic::from_profile(&mut self.app.img_cache, p)); .and_then(|p| ui::ProfilePic::from_profile(&mut self.app.img_cache, p));
@@ -66,7 +65,7 @@ impl<'app, 'p> PostView<'app, 'p> {
.app .app
.drafts .drafts
.entry(enostr::NoteId::new(*self.replying_to)) .entry(enostr::NoteId::new(*self.replying_to))
.or_insert_with(|| Draft::new()); .or_default();
ui.add(TextEdit::multiline(&mut draft.buffer).frame(false)); ui.add(TextEdit::multiline(&mut draft.buffer).frame(false));

10
src/ui/profile/picture.rs
View File

@@ -24,11 +24,11 @@ impl<'cache, 'url> ProfilePic<'cache, 'url> {
cache: &'cache mut ImageCache, cache: &'cache mut ImageCache,
profile: &nostrdb::ProfileRecord<'url>, profile: &nostrdb::ProfileRecord<'url>,
) -> Option<Self> { ) -> Option<Self> {
if let Some(url) = profile.record().profile().and_then(|p| p.picture()) { profile
Some(ProfilePic::new(cache, url)) .record()
} else { .profile()
None .and_then(|p| p.picture())
} .map(|url| ProfilePic::new(cache, url))
} }
pub fn default_size() -> f32 { pub fn default_size() -> f32 {