From f7ba71b0495bbe13e73940ab4cf234195af8257e Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Sun, 30 Jun 2024 17:01:08 -0400 Subject: [PATCH] Use friendica->network field if available and adds hometown network type --- CHANGELOG.md | 8 +++ .../timeline_network_info_control.dart | 3 +- lib/models/timeline_network_info.dart | 1 + .../timeline_entry_mastodon_extensions.dart | 4 +- ...line_network_info_mastodon_extensions.dart | 42 ++++---------- lib/utils/known_network_extensions.dart | 2 + pubspec.lock | 58 ++++++------------- pubspec.yaml | 4 +- 8 files changed, 43 insertions(+), 79 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d885535..103aed6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Relatica Change Log +## Version 0.12.0 (beta) + +* Changes + * Use the network data in the friendica extensions rather than the application data if available since the app data + is the app name. +* Fixes +* New Features + ## Version 0.11.0 (beta) * Changes diff --git a/lib/controls/timeline/timeline_network_info_control.dart b/lib/controls/timeline/timeline_network_info_control.dart index 3385e4c..d8b4dc9 100644 --- a/lib/controls/timeline/timeline_network_info_control.dart +++ b/lib/controls/timeline/timeline_network_info_control.dart @@ -11,8 +11,9 @@ class TimelineNetworkInfoControl extends StatelessWidget { @override Widget build(BuildContext context) { + const genericNetworks = [KnownNetworks.unknown, KnownNetworks.activityPub]; final networkText = - info.network == KnownNetworks.unknown ? info.name : info.labelName; + genericNetworks.contains(info.network) ? info.name : info.labelName; return GestureDetector( onTap: () async => showConfirmDialog(context, networkText), child: Tooltip( diff --git a/lib/models/timeline_network_info.dart b/lib/models/timeline_network_info.dart index bc734e6..a525fcf 100644 --- a/lib/models/timeline_network_info.dart +++ b/lib/models/timeline_network_info.dart @@ -8,6 +8,7 @@ enum KnownNetworks { friendica, funkwhale, gnu_social, + hometown, hubzilla, kbin, lemmy, diff --git a/lib/serializers/mastodon/timeline_entry_mastodon_extensions.dart b/lib/serializers/mastodon/timeline_entry_mastodon_extensions.dart index 99013da..ff90599 100644 --- a/lib/serializers/mastodon/timeline_entry_mastodon_extensions.dart +++ b/lib/serializers/mastodon/timeline_entry_mastodon_extensions.dart @@ -35,9 +35,7 @@ extension TimelineEntryMastodonExtensions on TimelineEntry { return null; }); - final networkInfo = json['application'] != null - ? TimelineNetworkInfoMastodonExtensions.fromJson(json['application']) - : TimelineNetworkInfo.empty; + final networkInfo = TimelineNetworkInfoMastodonExtensions.fromJson(json); final connectionManager = getIt>() .getForProfile(activeProfile) diff --git a/lib/serializers/mastodon/timeline_network_info_mastodon_extensions.dart b/lib/serializers/mastodon/timeline_network_info_mastodon_extensions.dart index 67765c7..1ffaf45 100644 --- a/lib/serializers/mastodon/timeline_network_info_mastodon_extensions.dart +++ b/lib/serializers/mastodon/timeline_network_info_mastodon_extensions.dart @@ -2,11 +2,15 @@ import '../../models/timeline_network_info.dart'; extension TimelineNetworkInfoMastodonExtensions on TimelineNetworkInfo { static TimelineNetworkInfo fromJson(Map json) { - final String name = json['name'] ?? 'Unknown'; + final String? applicationName = json['application']?['name']; + final String? name = json['friendica']?['network'] ?? applicationName; + if (name == null) { + return TimelineNetworkInfo.empty; + } + final vapidKey = json['vapid_key'] ?? ''; final nameMainPart = name.split('(').first.trim(); final KnownNetworks network = switch (nameMainPart.toLowerCase()) { - 'api' => KnownNetworks.friendica, 'activitypub' => KnownNetworks.activityPub, 'akkoma' => KnownNetworks.pleroma, 'bluesky' => KnownNetworks.bluesky, @@ -16,6 +20,7 @@ extension TimelineNetworkInfoMastodonExtensions on TimelineNetworkInfo { 'gnu social' => KnownNetworks.gnu_social, 'gnusocial' => KnownNetworks.gnu_social, 'hubzilla' => KnownNetworks.hubzilla, + 'hometown' => KnownNetworks.hometown, 'mastodon' => KnownNetworks.mastodon, 'peertube' => KnownNetworks.peertube, 'pixelfed' => KnownNetworks.pixelfed, @@ -33,36 +38,9 @@ extension TimelineNetworkInfoMastodonExtensions on TimelineNetworkInfo { 'calckey' => KnownNetworks.calckey, 'kbin' => KnownNetworks.kbin, 'threads' => KnownNetworks.threads, - - // Clients which are assumed to be interfacing with Friendica if got set as application - // list from blockbot's blockbot_is_fediverse_client - 'mastodonandroid' => KnownNetworks.friendica, - 'tootdeck-worker' => KnownNetworks.friendica, - 'piefed' => KnownNetworks.friendica, - 'brighteon' => KnownNetworks.friendica, - 'pachli' => KnownNetworks.friendica, - 'tusky' => KnownNetworks.friendica, - 'mona' => KnownNetworks.friendica, - 'mitra' => KnownNetworks.friendica, - 'megalodonandroid' => KnownNetworks.friendica, - 'fedilab' => KnownNetworks.friendica, - 'mastodonapp' => KnownNetworks.friendica, - 'toot!' => KnownNetworks.friendica, - 'intravnews' => KnownNetworks.friendica, - 'pixeldroid' => KnownNetworks.friendica, - 'greatnews' => KnownNetworks.friendica, - 'protopage' => KnownNetworks.friendica, - 'newsfox' => KnownNetworks.friendica, - 'vienna' => KnownNetworks.friendica, - 'wp-urldetails' => KnownNetworks.friendica, - 'husky' => KnownNetworks.friendica, - 'activitypub-go-http-client' => KnownNetworks.friendica, - 'mobilesafari' => KnownNetworks.friendica, - 'mastodon-ios' => KnownNetworks.friendica, - 'mastodonpy' => KnownNetworks.friendica, - 'techniverse' => KnownNetworks.friendica, - 'relatica' => KnownNetworks.friendica, - _ => KnownNetworks.unknown, + _ => name.contains('(AP)') + ? KnownNetworks.activityPub + : KnownNetworks.unknown, }; return TimelineNetworkInfo( diff --git a/lib/utils/known_network_extensions.dart b/lib/utils/known_network_extensions.dart index 551eb3a..046240a 100644 --- a/lib/utils/known_network_extensions.dart +++ b/lib/utils/known_network_extensions.dart @@ -11,6 +11,7 @@ extension KnownNetworkExtensions on KnownNetworks { KnownNetworks.friendica => 'Friendica', KnownNetworks.funkwhale => 'Funkwhale', KnownNetworks.gnu_social => 'GNU Social', + KnownNetworks.hometown => 'Hometown', KnownNetworks.hubzilla => 'Hubzilla', KnownNetworks.kbin => 'Kbin', KnownNetworks.lemmy => 'Lemmy', @@ -38,6 +39,7 @@ extension KnownNetworkExtensions on KnownNetworks { KnownNetworks.friendica => '\uf2e6', KnownNetworks.funkwhale => '\uf339', KnownNetworks.gnu_social => '\uf2e7', + KnownNetworks.hometown => '\uf2e1', KnownNetworks.hubzilla => '\uf2eb', KnownNetworks.kbin => '\uf058', KnownNetworks.lemmy => '\uf0c0', diff --git a/pubspec.lock b/pubspec.lock index dae4e9a..3c4da85 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -733,30 +733,6 @@ packages: url: "https://pub.dev" source: hosted version: "4.8.1" - leak_tracker: - dependency: transitive - description: - name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" - url: "https://pub.dev" - source: hosted - version: "10.0.0" - leak_tracker_flutter_testing: - dependency: transitive - description: - name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 - url: "https://pub.dev" - source: hosted - version: "2.0.1" - leak_tracker_testing: - dependency: transitive - description: - name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 - url: "https://pub.dev" - source: hosted - version: "2.0.1" lints: dependency: transitive description: @@ -785,18 +761,18 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.5.0" media_kit: dependency: "direct main" description: @@ -873,10 +849,10 @@ packages: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.10.0" mime: dependency: transitive description: @@ -969,10 +945,10 @@ packages: dependency: "direct main" description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.8.3" path_parsing: dependency: transitive description: @@ -1547,14 +1523,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.17" - vm_service: - dependency: transitive - description: - name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 - url: "https://pub.dev" - source: hosted - version: "13.0.0" volume_controller: dependency: transitive description: @@ -1587,6 +1555,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + url: "https://pub.dev" + source: hosted + version: "0.3.0" web_socket_channel: dependency: transitive description: @@ -1644,5 +1620,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.0-0 <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index b716cbc..4e14853 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: relatica description: A mobile and desktop client for interacting with the Friendica social network publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 0.11.0 +version: 0.12.0+7 environment: sdk: '>=3.0.0 <4.0.0' @@ -72,7 +72,7 @@ flutter: - family: ForkAwesome fonts: - asset: fonts/forkawesome-webfont.ttf - + parts: uet-lms: source: .