Gossip hard-fork by YGGverse

Cargo.toml

@@ -11,7 +11,8 @@ bech32 = "0.11"
 blurhash = { version = "0.2", features = [ "image" ] }
 image = { version = "0.25", features = [ "png", "jpeg" ] }
 lazy_static = "1.5"
-nostr-types = { git = "https://github.com/mikedilger/nostr-types", rev = "e431110f5ad0a0692280ccf036e99e255837f41c", features = [ "speedy", "client", "nip46" ] }
+#nostr-types = { git = "https://github.com/mikedilger/nostr-types", rev = "e431110f5ad0a0692280ccf036e99e255837f41c", features = [ "speedy", "client", "nip46" ] }
+nostr-types = { path = "nostr-types", features = [ "speedy", "client", "nip46" ] } # I2P + IPv6 patch for linkify issues #108, #78
 paste = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

gossip-bin/Cargo.toml

@@ -51,6 +51,9 @@ tracing-subscriber = { version = "0.3", features = [ "std", "env-filter", "regis
 url = { workspace = true }
 usvg = "0.35"
 zeroize = { workspace = true }
+indexmap = { version = "2.14" }
+mime_guess = "2.0.5"
+regex = "1.12.4"
 
 [package.metadata.deb]
 section = "web"

gossip-bin/src/about.rs

@@ -9,6 +9,7 @@ pub struct About {
     pub authors: String,
     //pub repository: String,
     pub homepage: String,
+    pub contribution: String,
     pub license: String,
     pub storage_path: String,
 }
@@ -36,9 +37,13 @@ impl About {
             name: env!("CARGO_PKG_NAME").to_string(),
             version,
             description: env!("CARGO_PKG_DESCRIPTION").to_string(),
-            authors: env!("CARGO_PKG_AUTHORS").to_string(),
+            authors: format!(
+                "{}\nYGGverse developers (github.com/YGGverse)",
+                env!("CARGO_PKG_AUTHORS")
+            ), // @TODO
             //repository: env!("CARGO_PKG_REPOSITORY").to_string(),
             homepage: env!("CARGO_PKG_HOMEPAGE").to_string(),
+            contribution: "https://github.com/YGGverse/gossip".to_string(), // @TODO
             license: env!("CARGO_PKG_LICENSE").to_string(),
             storage_path: data_dir,
         }

gossip-bin/src/commands.rs

@@ -1,4 +1,5 @@
 use gossip_lib::{Error, ErrorKind, PersonList, PersonListMetadata, PersonTable, Table, GLOBALS};
+use indexmap::IndexSet;
 use nostr_types::{
     EncryptedPrivateKey, Event, EventKind, Filter, Id, NAddr, NostrBech32, NostrUrl, ParsedTag,
     PreEvent, PrivateKey, PublicKey, RelayUrl, Tag, UncheckedUrl, Unixtime,
@@ -547,10 +548,10 @@ pub fn bech32_encode_naddr(cmd: Command, mut args: env::Args) -> Result<(), Erro
         None => return cmd.usage("Missing d parameter".to_string()),
     };
 
-    let mut urls: Vec<UncheckedUrl> = vec![];
+    let mut urls = IndexSet::new();
 
     for s in args {
-        urls.push(UncheckedUrl::from_string(s));
+        urls.insert(UncheckedUrl::from_string(s));
     }
 
     let ea = NAddr {
@@ -698,18 +699,15 @@ pub async fn delete_spam_by_content(cmd: Command, mut args: env::Args) -> Result
     // Find events among those with matching spammy content
     let mut target_ids: Vec<Id> = Vec::new();
     for event in events {
-        let mut matches = false;
-        if kind == EventKind::GiftWrap {
-            if let Ok(rumor) = GLOBALS.identity.unwrap_giftwrap(&event).await {
-                if rumor.content.contains(&substring) {
-                    matches = true;
-                }
-            }
-        } else if event.content.contains(&substring) {
-            matches = true;
-        }
-
-        if matches {
+        if (kind == EventKind::GiftWrap
+            && GLOBALS
+                .identity
+                .unwrap_giftwrap(&event)
+                .await?
+                .content
+                .contains(&substring))
+            || event.content.contains(&substring)
+        {
             target_ids.push(event.id);
         }
     }
@@ -746,10 +744,8 @@ pub async fn delete_spam_by_content(cmd: Command, mut args: env::Args) -> Result
     let mut relays: HashSet<RelayUrl> = HashSet::new();
     for id in &target_ids {
         // Get seen on relays
-        if let Ok(seen_on) = GLOBALS.db().get_event_seen_on_relay(*id) {
-            for (relay, _when) in seen_on {
-                relays.insert(relay);
-            }
+        for relay in GLOBALS.db().get_event_seen_on_relay(*id)?.into_keys() {
+            relays.insert(relay);
         }
     }
 
@@ -1314,7 +1310,7 @@ pub fn reaction_stats(_cmd: Command, mut _args: env::Args) -> Result<(), Error>
             .or_insert(1);
     }
     let mut reactions: Vec<(String, usize)> = reactions.drain().collect();
-    reactions.sort_by(|a, b| b.1.cmp(&a.1));
+    reactions.sort_by_key(|b| std::cmp::Reverse(b.1));
     for (reaction, count) in reactions {
         println!("{} {}", count, reaction);
     }

gossip-bin/src/ui/feed/mod.rs

@@ -9,17 +9,17 @@ use gossip_lib::GLOBALS;
 use nostr_types::Id;
 use std::sync::atomic::Ordering;
 
-mod note;
+pub mod note;
 pub use note::NoteRenderData;
 pub(super) mod post;
 
 const LONG_WAIT_TIME: f64 = 5.0; // seconds until the user has waited a long time for the feed to load
 
-struct FeedNoteParams {
-    id: Id,
-    indent: usize,
-    as_reply_to: bool,
-    threaded: bool,
+pub struct FeedNoteParams {
+    pub id: Id,
+    pub indent: usize,
+    pub as_reply_to: bool,
+    pub threaded: bool,
 }
 
 #[derive(Default)]
@@ -271,7 +271,7 @@ pub(super) fn update(app: &mut GossipUi, ctx: &Context, ui: &mut Ui) {
             ui.add_space(10.0);
             ui.horizontal(|ui| {
                 add_left_space(ui);
-                ui.heading(format!("{}", &relay_url));
+                ui.heading(relay_url.to_string());
                 recompute_btn(app, ui);
             });
             ui.add_space(6.0);
@@ -523,7 +523,7 @@ fn render_load_more(app: &mut GossipUi, ui: &mut Ui) {
             }
 
             // draw some nice lines left and right of the button
-            let stroke = egui::Stroke::new(1.5, ui.visuals().extreme_bg_color);
+            let stroke = egui::Stroke::new(1.5_f32, ui.visuals().extreme_bg_color);
             let width = (ui.available_width() - response.rect.width()) / 2.0 - 20.0;
             let left_start = response.rect.left_center() - egui::vec2(10.0, 0.0);
             let left_end = left_start - egui::vec2(width, 0.0);

gossip-bin/src/ui/feed/note/content/media.rs

@@ -394,7 +394,7 @@ fn add_media_menu(app: &mut GossipUi, ui: &mut Ui, url: Url, response: &Response
                         BTN_SIZE,
                         egui::Button::new(RichText::new("\u{1F310}").size(TXT_SIZE)),
                     )
-                    .on_hover_text("View in Browser")
+                    .on_hover_text(format!("Open in browser:\n\n{url}"))
                     .clicked()
                 {
                     let modifiers = ui.ctx().input(|i| i.modifiers);
@@ -412,7 +412,7 @@ fn add_media_menu(app: &mut GossipUi, ui: &mut Ui, url: Url, response: &Response
                         BTN_SIZE,
                         egui::Button::new(RichText::new("\u{1F4CB}").size(TXT_SIZE)),
                     )
-                    .on_hover_text("Copy URL")
+                    .on_hover_text(format!("Copy URL:\n\n{url}"))
                     .clicked()
                 {
                     ui.output_mut(|o| {

gossip-bin/src/ui/feed/note/content/mod.rs

@@ -6,6 +6,7 @@ use egui::{Button, Color32, Margin, Pos2, RichText, Stroke, Ui};
 use gossip_lib::comms::ToOverlordMessage;
 use gossip_lib::FeedKind;
 use gossip_lib::GLOBALS;
+use indexmap::IndexSet;
 use nostr_types::{
     ContentSegment, FileMetadata, Id, NAddr, NEvent, NostrBech32, NostrUrl, ParsedTag, PublicKey,
     RelayUrl, Span,
@@ -47,7 +48,8 @@ pub(super) fn render_content(
                     } else {
                         Color32::BLACK
                     };
-                    let button = Button::new("Show more ▼").stroke(Stroke::new(1.0, text_color));
+                    let button =
+                        Button::new("Show more ▼").stroke(Stroke::new(1.0_f32, text_color));
                     if ui.add(button).clicked() {
                         app.opened.insert(note.event.id);
                     }
@@ -182,7 +184,7 @@ pub(super) fn render_content(
                                         if let Some(rurl) = recommended_relay_url {
                                             let nevent = NEvent {
                                                 id,
-                                                relays: vec![rurl],
+                                                relays: IndexSet::from([rurl]),
                                                 kind: None,
                                                 author: None,
                                             };
@@ -263,14 +265,22 @@ pub(super) fn render_hyperlink(
     let privacy_issue = note.direct_message;
 
     if let (Ok(url), Some(nurl)) = (url::Url::try_from(link), app.try_check_url(link)) {
-        if let Some(mimetype) = gossip_lib::media_url_mimetype(url.path()) {
-            if mimetype.starts_with("image/") {
-                media::show_image(app, ui, nurl, privacy_issue, note.volatile, file_metadata);
-            } else if mimetype.starts_with("video/") {
-                media::show_video(app, ui, nurl, privacy_issue, note.volatile, file_metadata);
+        match match file_metadata {
+            Some(ref fm) => fm.m.clone(),
+            None => mime_guess::from_path(url.path())
+                .first()
+                .map(|m| m.to_string()),
+        } {
+            Some(m) => {
+                if m.starts_with("image/") {
+                    media::show_image(app, ui, nurl, privacy_issue, note.volatile, file_metadata)
+                } else if m.starts_with("video/") {
+                    media::show_video(app, ui, nurl, privacy_issue, note.volatile, file_metadata)
+                } else {
+                    crate::ui::widgets::break_anywhere_hyperlink_to(ui, app, link, link)
+                }
             }
-        } else {
-            crate::ui::widgets::break_anywhere_hyperlink_to(ui, app, link, link);
+            None => crate::ui::widgets::break_anywhere_hyperlink_to(ui, app, link, link),
         }
     } else {
         crate::ui::widgets::break_anywhere_hyperlink_to(ui, app, link, link);
@@ -304,7 +314,7 @@ pub(super) fn render_plain(
                 } else {
                     Color32::BLACK
                 };
-                let button = Button::new("Show more ▼").stroke(Stroke::new(1.0, text_color));
+                let button = Button::new("Show more ▼").stroke(Stroke::new(1.0_f32, text_color));
                 if ui.add(button).clicked() {
                     app.opened.insert(note.event.id);
                 }
@@ -345,7 +355,7 @@ pub fn render_relay_link(app: &mut GossipUi, ui: &mut Ui, relay_url: RelayUrl) {
 pub fn render_note_id_link(app: &mut GossipUi, ui: &mut Ui, referenced_by_id: Id, link_to_id: Id) {
     let nevent = NEvent {
         id: link_to_id,
-        relays: vec![],
+        relays: IndexSet::new(),
         kind: None,
         author: None,
     };
@@ -413,7 +423,7 @@ pub(super) fn render_hashtag(app: &mut GossipUi, ui: &mut Ui, s: &String) {
         app.set_page(ui.ctx(), Page::SearchLocal);
         let _ = GLOBALS
             .to_overlord
-            .send(ToOverlordMessage::SearchLocally(app.search.clone()));
+            .send(ToOverlordMessage::SearchLocally(app.search.clone(), None));
     }
 }