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

honoured time order for 140/141

Browse Source 
.. by using channel.lastUpdated which tracks which is the latest such event for a channel.
This commit is contained in:
Vishal 2022-10-30 13:24:13 +05:30
parent 644740ad25
commit 02a631faac
3 changed files with 56 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/console_ui.dart
View File

@ -689,13 +689,6 @@ Future<void> updateEncryptedChannel(Store node, String channelId,
String channelName, String channelAbout, String channelPic, String content, String tags,
Set<String> participants, Set<String> newParticipants) async {
int createdAt = DateTime.now().millisecondsSinceEpoch ~/1000;
EventData eventData = EventData('id', userPublicKey, createdAt, 141, content, [], [], [], [], {}, );
Event encryptedChannelCreateEvent = Event("EVENT", "id", eventData, [], "");
String newEncryptedChannelId = await sendEventWithTags(node, encryptedChannelCreateEvent, tags); // takes 400 ms
//print("updated encrypted channel $channelId with new 141 event with id: $newEncryptedChannelId");
//print("tags: $tags");
List<String> keys = getEncryptedChannelKeys(node.directRooms, node.allChildEventsMap, channelId);
if( keys.length == 2) {
String channelPriKey = keys[0], channelPubKey = keys[1];
@ -707,7 +700,12 @@ Future<void> updateEncryptedChannel(Store node, String channelId,
newParticipants.forEach((participant) async {
await sendDirectMessage(node, participant, messageToSend);
});
int createdAt = DateTime.now().millisecondsSinceEpoch ~/1000;
EventData eventData = EventData('id', userPublicKey, createdAt, 141, content, [], [], [], [], {}, );
Event encryptedChannelCreateEvent = Event("EVENT", "id", eventData, [], "");
String newEncryptedChannelId = await sendEventWithTags(node, encryptedChannelCreateEvent, tags); // takes 400 ms
await processAnyIncomingEvents(node, false); // get latest event, this takes 300 ms
} else {
print("warning: could not find keys for the channel. Could not update.");
@ -788,8 +786,8 @@ Future<void> encryptedChannelMenuUI(Store node) async {
bool justShowedChannels = false;
while(continueChatMenu) {
await processAnyIncomingEvents(node); // this takes 300 ms
//await processNotifications(node); // this takes 300 ms
if( !justShowedChannels) {
node.printChannelsOverview(node.encryptedChannels, 20, selectorShowAllRooms);
justShowedChannels = true;

16
lib/event_ds.dart
View File

@ -345,9 +345,11 @@ class EventData {
return null;
}
if( id == "b1ab66ac50f00f3c3bbc91e5b9e03fc8e79e3fdb9f6d5c9ae9777aa6ca3020a2") {
print("\n\ngoing to decrypt b1ab66ac50f00f3c3bbc91e5b9e03fc8e79e3fdb9f6d5c9ae9777aa6ca3020a2");
print(channel.participants);
if( id == "865c9352de11a3959c06fce5350c5a1b9fa0475d3234078a1bb45d152b370f0b") { // known issue
//print("\n\ngoing to decrypt b1ab66ac50f00f3c3bbc91e5b9e03fc8e79e3fdb9f6d5c9ae9777aa6ca3020a2");
//print(channel.participants);
return "";
}
//print("Going to decrypt event id: $id");
@ -367,6 +369,9 @@ class EventData {
return "";
}
//print("\nevent id: $id");
//print(keys);
String priKey = keys[0];
String pubKey = "02" + keys[1];
@ -1373,7 +1378,10 @@ List<String> getEncryptedChannelKeys(List<DirectMessageRoom> directRooms, Map<St
//print("len of evaluated content: ${evaluatedContent.length} ");
String priKey = evaluatedContent.substring(159, 159 + 64);
String pubKey = evaluatedContent.substring(224, 224 + 64);
return [priKey, pubKey];
if( priKey.length == 64 && pubKey.length == 64) {
return [priKey, pubKey];
}
}
}
} else {

58
lib/tree_ds.dart
View File

@ -169,10 +169,11 @@ class Channel extends ScrollableMessages {
String internalChatRoomName;
String about;
String picture;
int lastUpdated; // used for encryptedChannels
Set<String> participants; // pubkey of all participants - only for encrypted channels
Channel(this.channelId, this.internalChatRoomName, this.about, this.picture, List<String> messageIds, this.participants) :
Channel(this.channelId, this.internalChatRoomName, this.about, this.picture, List<String> messageIds, this.participants, this.lastUpdated) :
super ( internalChatRoomName.isEmpty? channelId: internalChatRoomName + "( " + channelId + " )" ,
messageIds);
@ -544,7 +545,7 @@ class Store {
channel.addMessageToRoom(eId, tempChildEventsMap);
} else {
Channel newChannel = Channel(channelId, "", "", "", [eId], {});
Channel newChannel = Channel(channelId, "", "", "", [eId], {}, 0);
rooms.add( newChannel);
}
}
@ -570,7 +571,7 @@ class Store {
roomAbout = json['about'];
}
List<String> emptyMessageList = [];
Channel room = Channel(chatRoomId, roomName, roomAbout, "", emptyMessageList, {});
Channel room = Channel(chatRoomId, roomName, roomAbout, "", emptyMessageList, {}, ce.eventData.createdAt);
//print("created room with id $chatRoomId");
rooms.add( room);
}
@ -603,7 +604,7 @@ class Store {
channel.addMessageToRoom(eId, tempChildEventsMap);
} else {
Channel newChannel = Channel(channelId, "", "", "", [eId], {});
Channel newChannel = Channel(channelId, "", "", "", [eId], {}, 0);
encryptedChannels.add( newChannel);
}
}
@ -614,10 +615,13 @@ class Store {
Set<String> participants = {};
ce.eventData.pTags.forEach((element) { participants.add(element);});
if( ce.eventData.id == "21779b82caf3628c83f382ad45a78ca0958e5edae7643d3fb222c03732c299d0") {
//printInColor("handling 141 : 21779b82caf3628c83f382ad45a78ca0958e5edae7643d3fb222c03732c299d0\n", redColor);
}
String chatRoomId = ce.eventData.getChannelIdForMessage();
print("--------\nIn handleEncryptedChannelEvents: processing kind 141 id with ${ce.eventData.id} with participants = $participants");
print("for original channel id: $chatRoomId");
//print("--------\nIn handleEncryptedChannelEvents: processing kind 141 id with ${ce.eventData.id} with participants = $participants");
//print("for original channel id: $chatRoomId");
try {
dynamic json = jsonDecode(ce.eventData.content);
Channel? channel = getChannel(encryptedChannels, chatRoomId);
@ -626,20 +630,26 @@ class Store {
// as channel entry already exists, then update its participants info, and name info
if( channel.chatRoomName == "" && json.containsKey('name')) {
channel.chatRoomName = json['name'];
print("renamed channel to ${channel.chatRoomName}");
//print("renamed channel to ${channel.chatRoomName}");
}
if( ce.eventData.id == "21779b82caf3628c83f382ad45a78ca0958e5edae7643d3fb222c03732c299d0") {
//printInColor("original: ${channel.participants}\n new participants: $participants \n chatRoomId:${chatRoomId}", redColor);
}
channel.participants = participants;
for(int i = 0; i < channel.messageIds.length; i++) {
Event ?e = tempChildEventsMap[channel.messageIds[i]]?.event;
if( e != null) {
//print("num directRooms = ${directRooms.length}");
e.eventData.translateAndExpand14x(directRooms, encryptedChannels, tempChildEventsMap);
if( channel.lastUpdated < ce.eventData.createdAt) {
channel.participants = participants;
channel.lastUpdated = ce.eventData.createdAt;
for(int i = 0; i < channel.messageIds.length; i++) {
Event ?e = tempChildEventsMap[channel.messageIds[i]]?.event;
if( e != null) {
//print("num directRooms = ${directRooms.length}");
e.eventData.translateAndExpand14x(directRooms, encryptedChannels, tempChildEventsMap);
}
}
}
} else {
print("In handleEncryptedChannelEvents: got 141 when 140 is not yet found");
//print("In handleEncryptedChannelEvents: got 141 when 140 is not yet found");
String roomName = "", roomAbout = "";
if( json.containsKey('name') ) {
roomName = json['name']??"";
@ -649,8 +659,8 @@ class Store {
roomAbout = json['about'];
}
List<String> emptyMessageList = [];
Channel room = Channel(chatRoomId, roomName, roomAbout, "", emptyMessageList, participants);
print("created encrypted room with id $chatRoomId and name $roomName");
Channel room = Channel(chatRoomId, roomName, roomAbout, "", emptyMessageList, participants, ce.eventData.createdAt);
//print("created encrypted room with id $chatRoomId and name $roomName");
encryptedChannels.add( room);
}
} on Exception catch(e) {
@ -676,7 +686,10 @@ class Store {
channel.chatRoomName = json['name'];
//print("renamed channel to ${channel.chatRoomName}");
}
channel.participants = participants;
if( channel.lastUpdated == 0) { // == 0 only when it was created using a 142 msg. otherwise, don't update it if it was created using 141
channel.participants = participants;
channel.lastUpdated = ce.eventData.createdAt;
}
} else {
String roomName = "", roomAbout = "";
@ -688,7 +701,7 @@ class Store {
roomAbout = json['about'];
}
List<String> emptyMessageList = [];
Channel room = Channel(chatRoomId, roomName, roomAbout, "", emptyMessageList, participants);
Channel room = Channel(chatRoomId, roomName, roomAbout, "", emptyMessageList, participants, ce.eventData.createdAt);
//print("created encrypted room with id $chatRoomId and name $roomName");
encryptedChannels.add( room);
}
@ -1041,7 +1054,7 @@ class Store {
break;
} else {
Channel newChannel = Channel(channelId, "", "", "", [], {});
Channel newChannel = Channel(channelId, "", "", "", [], {}, 0);
newChannel.addMessageToRoom(newTree.event.eventData.id, allChildEventsMap);
channels.add(newChannel);
}
@ -1069,7 +1082,7 @@ class Store {
} else {
Set<String> participants = {};
newTree.event.eventData.pTags.forEach((element) {participants.add(element);});
Channel newChannel = Channel(channelId, "", "", "", [], participants);
Channel newChannel = Channel(channelId, "", "", "", [], participants, 0);
newChannel.addMessageToRoom(newTree.event.eventData.id, allChildEventsMap);
encryptedChannels.add(newChannel);
newTree.event.eventData.translateAndExpand14x(directRooms, encryptedChannels, allChildEventsMap);
@ -1296,7 +1309,7 @@ class Store {
}
}
}
print(numRoomsSelected);
//print(numRoomsSelected);
if( numRoomsSelected == 0) {
return 0;
@ -1319,6 +1332,7 @@ class Store {
for(int j = 0; j < numToPrint; j++) {
if( channelstoPrint[j].participants.length > 0 && !channelstoPrint[j].participants.contains(userPublicKey)) {
//print(channelstoPrint[j].participants);
continue;
}
@ -1395,6 +1409,8 @@ class Store {
if( room.participants.length > 0) {
// enforce the participants-only rule
if( !room.participants.contains(userPublicKey)) {
print("\nnot a user: ${room.participants}");
print("room name: ${room.chatRoomName}");
return "";
}