From 915b18789f002fa8f4c50fe1e626d34cc47c5c9b Mon Sep 17 00:00:00 2001 From: fiaxh Date: Fri, 13 Jun 2025 19:38:49 +0200 Subject: Disregard SFS fallback messages even without source attachment given a full-body fallback indication --- xmpp-vala/src/module/xep/0428_fallback_indication.vala | 7 +++---- xmpp-vala/src/module/xep/0447_stateless_file_sharing.vala | 10 ++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) (limited to 'xmpp-vala/src') diff --git a/xmpp-vala/src/module/xep/0428_fallback_indication.vala b/xmpp-vala/src/module/xep/0428_fallback_indication.vala index 3cad689b..d07ec9be 100644 --- a/xmpp-vala/src/module/xep/0428_fallback_indication.vala +++ b/xmpp-vala/src/module/xep/0428_fallback_indication.vala @@ -6,10 +6,9 @@ namespace Xmpp.Xep.FallbackIndication { public class Fallback { public string ns_uri { get; set; } - public FallbackLocation[] locations; + public Gee.List locations; - - public Fallback(string ns_uri, FallbackLocation[] locations) { + public Fallback(string ns_uri, Gee.List locations) { this.ns_uri = ns_uri; this.locations = locations; } @@ -73,7 +72,7 @@ namespace Xmpp.Xep.FallbackIndication { } } if (locations.is_empty) continue; - ret.add(new Fallback(ns_uri, locations.to_array())); + ret.add(new Fallback(ns_uri, locations)); } return ret; diff --git a/xmpp-vala/src/module/xep/0447_stateless_file_sharing.vala b/xmpp-vala/src/module/xep/0447_stateless_file_sharing.vala index 63cab59f..86da6a3a 100644 --- a/xmpp-vala/src/module/xep/0447_stateless_file_sharing.vala +++ b/xmpp-vala/src/module/xep/0447_stateless_file_sharing.vala @@ -44,6 +44,16 @@ namespace Xmpp.Xep.StatelessFileSharing { return ret; } + public static bool is_sfs_fallback_message(MessageStanza message) { + Gee.List fallbacks = Xep.FallbackIndication.get_fallbacks(message); + foreach (var fallback in fallbacks) { + if (fallback.ns_uri == StatelessFileSharing.NS_URI && fallback.locations.any_match((it) => it.is_whole)) { + return true; + } + } + return false; + } + // Currently only returns a single http source private static Gee.List? get_sources(StanzaNode sources_node) { string? url = HttpSchemeForUrlData.get_url(sources_node); -- cgit v1.3