laantungir/zapstore
1
0
Fork 0
mirror of https://github.com/zapstore/zapstore.git synced 2026-10-05 12:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use verify reputation as DVM, closes #210

Browse Source
This commit is contained in:
franzap
2025-03-18 18:05:04 -03:00
parent 11af4e870e
commit 6dc5b6f685
9 changed files with 121 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2
View File
@@ -48,3 +48,5 @@ app.*.map.json
/tmp
/flutter_data
.fvm/
android/app/.cxx/
lib/models/nostr_adapter.dart
+2 -2
View File
@@ -57,8 +57,8 @@ mixin NostrAdapter<T extends DataModelMixin<T>> on Adapter<T> {
int get kind {
var pbType = internalType.singularize().capitalize();
pbType =
pbType.replaceFirst('datum', 'data'); // handle FileMetadata edge case
// handle FileMetadata edge case
pbType = pbType.replaceFirst('datum', 'data');
return Event.types[pbType]!.kind;
}
lib/models/user.dart
+37 -10
View File
@@ -1,3 +1,4 @@
import 'dart:async';
import 'dart:convert';
import 'package:collection/collection.dart';
@@ -7,6 +8,7 @@ import 'package:http/http.dart' as http;
import 'package:zapstore/main.data.dart';
import 'package:zapstore/models/nostr_adapter.dart';
import 'package:zapstore/models/settings.dart';
import 'package:zapstore/models/verify_reputation_dvm.dart';
import 'package:zapstore/navigation/app_initializer.dart';
import 'package:zapstore/utils/extensions.dart';
import 'package:zapstore/utils/nwc.dart';
@@ -146,7 +148,7 @@ mixin UserAdapter on NostrAdapter<User> {
}
final request = base.RelayRequest(
kinds: {0}, // 3
kinds: {0},
authors: {...authors},
);
@@ -198,9 +200,11 @@ mixin UserAdapter on NostrAdapter<User> {
);
}
params ??= {};
final result = await socialRelays.queryRaw(base.RelayRequest(
kinds: {0}, // 3
tags: params ?? {},
kinds: {0},
tags: params,
authors: {publicKey},
));
@@ -215,22 +219,45 @@ mixin UserAdapter on NostrAdapter<User> {
final list = data is Iterable ? data : [data as Map];
for (final Map<String, dynamic> map in list) {
// if (map['kind'] == 3) {
// map['following'] = {
// for (final [name, value] in map['tags'] as Iterable)
// if (name == 'p') value
// };
// }
map['id'] = map['pubkey'];
}
return super.deserialize(data);
}
Future<List<User>> getRelevantWhoFollow(String npub1, String npub2) async {
final search = jsonEncode({
'source': npub1.hexKey,
'targets': [npub2.hexKey]
Future<List<User>> getRelevantWhoFollow(
String fromNpub, String toNpub) async {
final dvmReq = await PartialVerifyReputationRequest(
source: fromNpub.hexKey, target: toNpub.hexKey)
.signWith(amberSigner, withPubkey: fromNpub.hexKey);
await ref.users.nostrAdapter.vertexRelay.publish(dvmReq);
final req = base.RelayRequest(kinds: {
6312,
7000
}, tags: {
'e': [dvmReq.event.id]
});
final response = await ref.users.nostrAdapter.vertexRelay
.queryRaw(base.RelayRequest(kinds: {6312, 7000}, search: search));
if (response.isEmpty || response.first['kind'] == 7000) {
final response = await ref.users.nostrAdapter.vertexRelay.queryRaw(req);
if (response.isEmpty) {
return [];
}
if (response.first['kind'] == 7000) {
final error = (response.first['tags'] as Iterable?)
?.firstWhereOrNull((t) => t[0] == 'status')?[2];
if (error.toString().contains('credits')) {
throw 'Unable to check followers';
} else {
throw error;
}
}
final result = response.first['content'];
final pubkeyList = (jsonDecode(result) as List).map((e) => e['pubkey']);
final users = await findAll(params: {'authors': pubkeyList});
lib/models/verify_reputation_dvm.dart
+16
View File
@@ -0,0 +1,16 @@
import 'package:purplebase/purplebase.dart';
class VerifyReputationRequest extends RegularEvent<VerifyReputationRequest> {
VerifyReputationRequest.fromJson(super.map) : super.fromJson();
}
class PartialVerifyReputationRequest
extends RegularPartialEvent<VerifyReputationRequest> {
PartialVerifyReputationRequest({
required String source,
required String target,
}) {
event.setTag('param', ['source', source]);
event.setTag('param', ['target', target]);
}
}
lib/navigation/app_initializer.dart
+6
View File
@@ -7,9 +7,11 @@ import 'package:zapstore/main.data.dart';
import 'package:zapstore/models/app.dart';
import 'package:zapstore/models/local_app.dart';
import 'package:zapstore/models/user.dart';
import 'package:zapstore/models/verify_reputation_dvm.dart';
import 'package:zapstore/navigation/router.dart';
import 'package:zapstore/utils/signers.dart';
import 'package:zapstore/widgets/app_curation_container.dart';
import 'package:purplebase/purplebase.dart' as base;
AppLifecycleListener? _lifecycleListener;
SharedPreferences? sharedPreferences;
@@ -55,6 +57,10 @@ final appInitializer = FutureProvider<void>((ref) async {
.init()
.saveLocal();
// Register event types
base.Event.types['VerifyReputationRequest'] =
(kind: 5312, constructor: VerifyReputationRequest.fromJson);
// App-wide listeners
// Register app lifecycle listener
lib/widgets/install_alert_dialog.dart
+12 -12
View File
@@ -2,12 +2,11 @@ import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:gap/gap.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:purplebase/purplebase.dart' as base;
import 'package:zapstore/models/app.dart';
import 'package:zapstore/models/user.dart';
import 'package:zapstore/widgets/sign_in_container.dart';
import 'package:zapstore/widgets/author_container.dart';
import 'package:zapstore/widgets/relevant_who_follow_container.dart';
import 'package:zapstore/widgets/sign_in_container.dart';
class InstallAlertDialog extends HookConsumerWidget {
const InstallAlertDialog({
@@ -43,15 +42,16 @@ class InstallAlertDialog extends HookConsumerWidget {
oneLine: true),
Gap(20),
if (app.signer.value != null)
RelevantWhoFollowContainer(
fromNpub: signedInUser?.npub ?? kFranzapPubkey.npub,
toNpub: app.signer.value!.npub,
),
if (signedInUser == null)
SignInButton(
label: 'Sign in to view profiles in your web of trust',
minimal: true,
),
signedInUser != null
? RelevantWhoFollowContainer(
toNpub: app.signer.value!.npub,
)
: SignInButton(
label:
'Sign in to view the signer\'s reputable followers',
minimal: true,
requireNip55: true,
),
Gap(16),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -65,7 +65,7 @@ class InstallAlertDialog extends HookConsumerWidget {
Gap(4),
Expanded(
child: Text(
'Do not ask again for ${app.signer.value!.name} apps',
'Do not ask again for apps from ${app.signer.value!.name}',
),
)
],
lib/widgets/relevant_who_follow_container.dart
+9 -12
View File
@@ -9,24 +9,22 @@ import 'package:zapstore/widgets/users_rich_text.dart';
class RelevantWhoFollowContainer extends HookConsumerWidget {
const RelevantWhoFollowContainer({
super.key,
required this.fromNpub,
required this.toNpub,
});
final String fromNpub;
final String toNpub;
@override
Widget build(BuildContext context, WidgetRef ref) {
final data =
ref.watch(relevantWhoFollowProvider((from: fromNpub, to: toNpub)));
final signedInUser = ref.watch(signedInUserProvider);
final data = ref.watch(relevantWhoFollowProvider((to: toNpub)));
return switch (data) {
AsyncData<List<User>>(value: final trustedUsers) => Builder(
builder: (context) {
if (trustedUsers.isEmpty) {
return Text('You don\'t follow any users who follow the signer.');
return Text(
'No reputable profiles follow the signer. Make sure you know the signer.');
}
return UsersRichText(
@@ -37,15 +35,14 @@ class RelevantWhoFollowContainer extends HookConsumerWidget {
);
},
),
AsyncError(:final error) =>
Center(child: Text('Error connecting with web of trust DVM: $error')),
AsyncError(:final error) => Center(child: Text(error.toString())),
// Loading state
_ => Center(
child: Padding(
padding: const EdgeInsets.all(24),
child: Column(
children: [
Text('Loading profiles in your web of trust...'),
Text('Checking reputation...'),
Gap(10),
SmallCircularProgressIndicator(),
],
@@ -57,9 +54,9 @@ class RelevantWhoFollowContainer extends HookConsumerWidget {
}
final relevantWhoFollowProvider = FutureProvider.autoDispose
.family<List<User>, ({String from, String to})>((ref, arg) async {
final _ = ref.watch(signedInUserProvider);
final users =
await ref.users.userAdapter.getRelevantWhoFollow(arg.from, arg.to);
.family<List<User>, ({String to})>((ref, arg) async {
final signedInUser = ref.watch(signedInUserProvider);
final users = await ref.users.userAdapter
.getRelevantWhoFollow(signedInUser!.npub, arg.to);
return users.toSet().toList();
});
lib/widgets/sign_in_container.dart
-2
View File
@@ -59,8 +59,6 @@ class SignInButton extends ConsumerWidget {
Icon(Icons.diamond, color: Colors.lightBlue, size: 18),
],
),
// if (user.following.isNotEmpty)
// Text('${user.following.length} contacts'),
],
),
],
pubspec.lock
+37 -37
View File
@@ -82,10 +82,10 @@ packages:
dependency: "direct main"
description:
name: async
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
url: "https://pub.dev"
source: hosted
version: "2.11.0"
version: "2.12.0"
async_button_builder:
dependency: "direct main"
description:
@@ -138,10 +138,10 @@ packages:
dependency: transitive
description:
name: boolean_selector
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
url: "https://pub.dev"
source: hosted
version: "2.1.1"
version: "2.1.2"
build:
dependency: transitive
description:
@@ -234,10 +234,10 @@ packages:
dependency: transitive
description:
name: characters
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
url: "https://pub.dev"
source: hosted
version: "1.3.0"
version: "1.4.0"
checked_yaml:
dependency: transitive
description:
@@ -250,10 +250,10 @@ packages:
dependency: transitive
description:
name: clock
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
url: "https://pub.dev"
source: hosted
version: "1.1.1"
version: "1.1.2"
code_builder:
dependency: transitive
description:
@@ -266,10 +266,10 @@ packages:
dependency: "direct main"
description:
name: collection
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
url: "https://pub.dev"
source: hosted
version: "1.19.0"
version: "1.19.1"
convert:
dependency: "direct main"
description:
@@ -362,10 +362,10 @@ packages:
dependency: transitive
description:
name: fake_async
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
url: "https://pub.dev"
source: hosted
version: "1.3.1"
version: "1.3.2"
ffi:
dependency: transitive
description:
@@ -706,18 +706,18 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
url: "https://pub.dev"
source: hosted
version: "10.0.7"
version: "10.0.8"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
url: "https://pub.dev"
source: hosted
version: "3.0.8"
version: "3.0.9"
leak_tracker_testing:
dependency: transitive
description:
@@ -770,10 +770,10 @@ packages:
dependency: transitive
description:
name: matcher
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
url: "https://pub.dev"
source: hosted
version: "0.12.16+1"
version: "0.12.17"
material_color_utilities:
dependency: transitive
description:
@@ -786,10 +786,10 @@ packages:
dependency: transitive
description:
name: meta
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
url: "https://pub.dev"
source: hosted
version: "1.15.0"
version: "1.16.0"
mime:
dependency: transitive
description:
@@ -834,10 +834,10 @@ packages:
dependency: "direct main"
description:
name: path
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
url: "https://pub.dev"
source: hosted
version: "1.9.0"
version: "1.9.1"
path_provider:
dependency: "direct main"
description:
@@ -1169,10 +1169,10 @@ packages:
dependency: transitive
description:
name: source_span
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.10.1"
sprintf:
dependency: transitive
description:
@@ -1241,10 +1241,10 @@ packages:
dependency: transitive
description:
name: stack_trace
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
url: "https://pub.dev"
source: hosted
version: "1.12.0"
version: "1.12.1"
state_notifier:
dependency: transitive
description:
@@ -1257,10 +1257,10 @@ packages:
dependency: transitive
description:
name: stream_channel
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
url: "https://pub.dev"
source: hosted
version: "2.1.2"
version: "2.1.4"
stream_transform:
dependency: transitive
description:
@@ -1273,10 +1273,10 @@ packages:
dependency: transitive
description:
name: string_scanner
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
url: "https://pub.dev"
source: hosted
version: "1.3.0"
version: "1.4.1"
synchronized:
dependency: transitive
description:
@@ -1297,18 +1297,18 @@ packages:
dependency: transitive
description:
name: term_glyph
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
url: "https://pub.dev"
source: hosted
version: "1.2.1"
version: "1.2.2"
test_api:
dependency: transitive
description:
name: test_api
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
url: "https://pub.dev"
source: hosted
version: "0.7.3"
version: "0.7.4"
timing:
dependency: transitive
description:
@@ -1425,10 +1425,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
url: "https://pub.dev"
source: hosted
version: "14.3.0"
version: "14.3.1"
watcher:
dependency: transitive
description:
@@ -1510,5 +1510,5 @@ packages:
source: hosted
version: "3.1.3"
sdks:
dart: ">=3.5.0 <4.0.0"
dart: ">=3.7.0-0 <4.0.0"
flutter: ">=3.24.0"