highperfocused/nostr_console
1
0
Fork 0
mirror of https://github.com/vishalxl/nostr_console.git synced 2025-04-03 09:28:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved contact saving/access

Browse Source 
.. by saving latest contact info in global structure with kind 0 info ( meta information). Makes profiles faster.
This commit is contained in:
Vishal 2022-08-31 22:15:17 +05:30
parent b9b1a5723c
commit eacc3bc1d0
6 changed files with 86 additions and 46 deletions

7
bin/nostr_console.dart

@ -219,7 +219,7 @@ Future<void> main(List<String> arguments) async {
if( gDebug > 0) stdout.write("Total events of kind 1 in created tree: ${node.count()} events\n");
clearEvents();
mainMenuUi(node, []);
mainMenuUi(node);
});
return;
}
@ -245,8 +245,9 @@ Future<void> main(List<String> arguments) async {
stdout.write("...received $numUserEvents new posts made by the user\n");
if( gDebug > 0) log.info("Received user events.");
getRecievedEvents().forEach((e) => processKind3Event(e)); // first process the kind 3 event
// get the latest kind 3 event for the user, which lists his 'follows' list
Event? contactEvent = getContactEvent(getRecievedEvents(), userPublicKey);
Event? contactEvent = getContactEvent(userPublicKey);
// if contact list was found, get user's feed, and keep the contact list for later use
List<String> contactList = [];
@ -288,7 +289,7 @@ Future<void> main(List<String> arguments) async {
// call the mein UI function
clearEvents();
mainMenuUi(node, contactList);
mainMenuUi(node);
});
});
});

31
lib/console_ui.dart

@ -155,7 +155,7 @@ int showMenu(List<String> menuOptions, String menuName) {
}
}
Future<void> otherMenuUi(Tree node, var contactList) async {
Future<void> otherMenuUi(Tree node) async {
//gDebug = 1;
bool continueOtherMenu = true;
while(continueOtherMenu) {
@ -193,7 +193,7 @@ Future<void> otherMenuUi(Tree node, var contactList) async {
node.printTree(0, DateTime.now().subtract(Duration(days:gNumLastDays)), onlyUserPostAndLike);
// get the latest kind 3 event for the user, which lists his 'follows' list
Event? contactEvent = node.getContactEvent(pubkey.first);
Event? contactEvent = getContactEvent(pubkey.first);
// if contact list was found, get user's feed, and keep the contact list for later use
String authorName = gKindONames[pubkey.first]?.name??"";
@ -215,11 +215,11 @@ Future<void> otherMenuUi(Tree node, var contactList) async {
// print social distance info.
node.printSocialDistance(pubkey.first, authorName);
print("\n");
print("");
stdout.write("They follows ${contactEvent.eventData.contactList.length} accounts: ");
contactEvent.eventData.contactList.forEach((x) => stdout.write("${getAuthorName(x.id)}, "));
print("\n\n");
print("\n");
List<String> followers = node.getFollowers(pubkey.first);
stdout.write("They have ${followers.length} followers: ");
@ -235,9 +235,12 @@ Future<void> otherMenuUi(Tree node, var contactList) async {
case 2:
String authorName = getAuthorName(userPublicKey);
print("\nHere is the contact list for user $userPublicKey ($authorName), which has ${contactList.length} profiles in it:\n");
contactList.forEach((x) => stdout.write("${getAuthorName(x)}, "));
print("");
List<Contact>? contactList = gKindONames[userPublicKey]?.latestContactEvent?.eventData.contactList;
if( contactList != null) {
print("\nHere is the contact list for user $userPublicKey ($authorName), which has ${contactList.length} profiles in it:\n");
contactList.forEach((Contact contact) => stdout.write("${getAuthorName(contact.id)}, "));
print("");
}
break;
case 3:
@ -271,7 +274,7 @@ Future<void> otherMenuUi(Tree node, var contactList) async {
String pk = pubkey.first;
// get this users latest contact list event ( kind 3 event)
Event? contactEvent = node.getContactEvent(userPublicKey);
Event? contactEvent = getContactEvent(userPublicKey);
if( contactEvent != null) {
Event newContactEvent = contactEvent;
@ -392,7 +395,7 @@ Future<void> otherMenuUi(Tree node, var contactList) async {
return;
}
Future<void> channelMenuUI(Tree node, var contactList) async {
Future<void> channelMenuUI(Tree node) async {
//gDebug = 0;
bool continueChatMenu = true;
while(continueChatMenu) {
@ -464,7 +467,7 @@ Future<void> channelMenuUI(Tree node, var contactList) async {
return;
}
Future<void> mainMenuUi(Tree node, var contactList) async {
Future<void> mainMenuUi(Tree node) async {
//gDebug = 0;
// at the very beginning, show the tree as it is, and then show the options menu
@ -532,19 +535,19 @@ Future<void> mainMenuUi(Tree node, var contactList) async {
break;
case 3:
await channelMenuUI(node, contactList);
await channelMenuUI(node);
break;
case 4:
await otherMenuUi(node, contactList);
await otherMenuUi(node);
break;
case 5:
default:
userContinue = false;
String authorName = getAuthorName(userPublicKey);
print("\nFinished fetching feed for user $userPublicKey ($authorName), whose contact list has ${contactList.length} profiles.\n ");
contactList.forEach((x) => stdout.write("${getAuthorName(x)}, "));
print("\nFinished Nostr session for user with publick key: $userPublicKey ($authorName). Exiting");
//contactList.forEach((x) => stdout.write("${getAuthorName(x)}, "));
stdout.write("\n");
if( gEventsFilename != "") {
await node.writeEventsToFile(gEventsFilename);

72
lib/event_ds.dart

@ -14,9 +14,11 @@ bool gTranslate = false; // translate flag
// Structure to store kind 0 event meta data for each user. Typically will have info from latest kind 0 event only.
class UserNameInfo {
int createdAt;
String name, about, picture;
UserNameInfo(this.createdAt, this.name, this.about, this.picture);
int? createdAt;
String? name, about, picture;
int? createdAtKind3;
Event ?latestContactEvent;
UserNameInfo(this.createdAt, this.name, this.about, this.picture, this.latestContactEvent, [this.createdAtKind3 = null]);
}
/*
@ -561,19 +563,15 @@ Set<Event> readEventsFromFile(String filename) {
}
// From the list of events provided, lookup the lastst contact information for the given user/pubkey
Event? getContactEvent(Set<Event> events, String pubkey) {
Event? getContactEvent(String pubkey) {
// get the latest kind 3 event for the user, which lists his 'follows' list
Event? latestContactEvent = null;
int latestContactsTime = 0;
for( var e in events) {
if( e.eventData.pubkey == pubkey && e.eventData.kind == 3 && latestContactsTime < e.eventData.createdAt) {
latestContactsTime = e.eventData.createdAt;
latestContactEvent = e;
}
if( gKindONames.containsKey(pubkey)) {
Event? e = (gKindONames[pubkey]?.latestContactEvent)??null;
return e;
}
return latestContactEvent;
return null;
}
// for the user userPubkey, returns the relay of its contact contactPubkey
@ -631,16 +629,15 @@ bool processKind0Event(Event e) {
}
}
bool newEntry = false, entryModified = false;
if( !gKindONames.containsKey(e.eventData.pubkey)) {
gKindONames[e.eventData.pubkey] = UserNameInfo(e.eventData.createdAt, name, about, picture);
gKindONames[e.eventData.pubkey] = UserNameInfo(e.eventData.createdAt, name, about, picture, null);
newEntry = true;;
//print("Created meta data for name: $name about: $about picture: $picture");
} else {
int oldTime = gKindONames[e.eventData.pubkey]?.createdAt??0;
if( oldTime < e.eventData.createdAt) {
gKindONames[e.eventData.pubkey] = UserNameInfo(e.eventData.createdAt, name, about, picture);
Event? oldContactEvent = gKindONames[e.eventData.pubkey]?.latestContactEvent;
gKindONames[e.eventData.pubkey] = UserNameInfo(e.eventData.createdAt, name, about, picture, oldContactEvent);
entryModified = true;;
}
}
@ -651,6 +648,36 @@ bool processKind0Event(Event e) {
return newEntry || entryModified;
}
// If given event is kind 3 event, then populates gKindONames with contact info
// returns true if entry was created or modified, false otherwise
bool processKind3Event(Event newContactEvent) {
if( newContactEvent.eventData.kind != 3) {
return false;
}
bool newEntry = false, entryModified = false;
if( !gKindONames.containsKey(newContactEvent.eventData.pubkey)) {
gKindONames[newContactEvent.eventData.pubkey] = UserNameInfo(null, null, null, null, newContactEvent, newContactEvent.eventData.createdAt);
newEntry = true;;
} else {
// if entry already exists, then check its old time and update only if we have a newer entry now
int oldTime = gKindONames[newContactEvent.eventData.pubkey]?.createdAtKind3??0;
if( oldTime < newContactEvent.eventData.createdAt) {
int? createdAt = gKindONames[newContactEvent.eventData.pubkey]?.createdAt??null;
String? name = gKindONames[newContactEvent.eventData.pubkey]?.name, about = gKindONames[newContactEvent.eventData.pubkey]?.about, picture = gKindONames[newContactEvent.eventData.pubkey]?.picture;
gKindONames[newContactEvent.eventData.pubkey] = UserNameInfo(createdAt, name, about, picture, newContactEvent, newContactEvent.eventData.createdAt );
entryModified = true;;
}
}
if(gDebug > 0) {
print("At end of processKind3Events: ${newEntry? "added entry": ( entryModified?"modified entry": "No change done")} ");
}
return newEntry || entryModified;
}
// returns name by looking up global list gKindONames, which is populated by kind 0 events
String getAuthorName(String pubkey) {
String max3(String v) => v.length > 3? v.substring(0,3) : v.substring(0, v.length);
@ -662,19 +689,22 @@ String getAuthorName(String pubkey) {
Set<String> getPublicKeyFromName(String userName) {
Set<String> pubkeys = {};
gKindONames.forEach((key, value) {
print("In getPublicKeyFromName: doing lookup for $userName len of gKindONames= ${gKindONames.length}");
gKindONames.forEach((pk, value) {
// check both the user name, and the pubkey to search for the user
if( userName == value.name) {
pubkeys.add(key);
pubkeys.add(pk);
}
if( userName.length <= key.length) {
if( key.substring(0, userName.length) == userName) {
pubkeys.add(key);
if( userName.length <= pk.length) {
if( pk.substring(0, userName.length) == userName) {
pubkeys.add(pk);
}
}
});
print("returning $pubkeys");
return pubkeys;
}

2
lib/settings.dart

@ -3,7 +3,7 @@ import 'package:logging/logging.dart';
final log = Logger('ExampleLogger');
// for debugging
String gCheckEventId = "a4479de655094679cdfb10f347521aa58f24717cdc5ddba89fb346453a8a99ed";
String gCheckEventId = "15d86a36a620fc1f735f2322f31366b2adde786361f568faf6a0dc8368f7e534";
const int gDefaultNumWaitSeconds = 3000; // is used in main()

16
lib/tree_ds.dart

@ -188,7 +188,7 @@ class Tree {
return;
}
// handle reaction events and return
// handle reaction events and return if we could not find the reacted to. Continue otherwise to add this to notification set newEventIdsSet
if( newEvent.eventData.kind == 7) {
if( processReaction(newEvent) == "") {
if(gDebug > 0) print("In insertEvents: For new reaction ${newEvent.eventData.id} could not find reactedTo or reaction was already present by this reactor");
@ -211,7 +211,7 @@ class Tree {
}
});
// now go over the newly inserted event, and add its to the tree. only for kind 1 events. add 42 events to channels.
// now go over the newly inserted event, and add its to the tree for kind 1 events, add 42 events to channels. rest ( such as kind 0, kind 3, kind 7) are ignored.
newEventIdsSet.forEach((newId) {
Tree? newTree = allChildEventsMap[newId]; // this should return true because we just inserted this event in the allEvents in block above
if( newTree != null) {
@ -871,6 +871,7 @@ class Tree {
return false;
}
/*
Event? getContactEvent(String pkey) {
// get the latest kind 3 event for the user, which lists his 'follows' list
int latestContactsTime = 0;
@ -894,7 +895,7 @@ class Tree {
return null;
}
*/
// TODO inefficient; fix
List<String> getFollowers(String pubkey) {
if( gDebug > 0) print("Finding followrs for $pubkey");
@ -928,7 +929,7 @@ class Tree {
void printSocialDistance(String otherPubkey, String otherName) {
String otherName = getAuthorName(otherPubkey);
Event? contactEvent = this.getContactEvent(userPublicKey);
Event? contactEvent = getContactEvent(userPublicKey);
bool isFollow = false;
int numSecond = 0; // number of your follows who follow the other
@ -943,7 +944,7 @@ class Tree {
}
// count the number of your contacts who know or follow the other account
List<Contact> followContactList = [];
Event? followContactEvent = this.getContactEvent(contacts[i].id);
Event? followContactEvent = getContactEvent(contacts[i].id);
if( followContactEvent != null) {
followContactList = followContactEvent.eventData.contactList;
for(int j = 0; j < followContactList.length; j++) {
@ -1106,6 +1107,11 @@ Tree getTree(Set<Event> events) {
events.forEach( (event) => processKind0Event(event)? totalKind0Processed++: notProcessed++);
if( gDebug > 0) print("In getTree: totalKind0Processed = $totalKind0Processed notProcessed = $notProcessed gKindONames.length = ${gKindONames.length}");
// process kind 3 events which is contact list. Update global info about the user (with meta data)
int totalKind3Processed = 0, notProcessed3 = 0;
events.forEach( (event) => processKind3Event(event)? totalKind3Processed++: notProcessed3++);
if( gDebug > 0) print("In getTree: totalKind3Processed = $totalKind3Processed notProcessed = $notProcessed3 gKindONames.length = ${gKindONames.length}");
// process kind 7 events or reactions
processReactions(events);

4
pubspec.yaml

@ -1,6 +1,6 @@
name: nostr_console
description: A nostr client built for terminal/console.
version: 0.0.7
description: A multi-platform nostr client built for terminal/console.
version: 0.0.7-beta
homepage: https://github.com/vishalxl/nostr_console
# testing pubspec action based on path, test build