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

no functional change

Browse Source
This commit is contained in:
Vishal 2022-09-12 11:33:55 +05:30
parent cd4abb6f9c
commit c2900a56eb
3 changed files with 2 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/console_ui.dart
View File

@ -42,7 +42,6 @@ Future<void> sendReplyPostLike(Store node, String replyToId, String replyKind, S
String id = getShaId(userPublicKey, createdAt, replyKind, strTags, content);
// generate POW if required
String vanityTag = strTags;
if (replyKind == "1" && gDifficulty > 0) {
if( gDebug > 0) log.info("Starting pow");
@ -68,7 +67,6 @@ Future<void> sendReplyPostLike(Store node, String replyToId, String replyKind, S
String sig = sign(userPrivateKey, id, "12345612345612345612345612345612");
String toSendMessage = '["EVENT",{"id":"$id","pubkey":"$userPublicKey","created_at":$createdAt,"kind":$replyKind,"tags":[$vanityTag],"content":"$content","sig":"$sig"}]';
//relays.sendRequest(defaultServerUrl, toSendMessage);
sendRequest( gListRelayUrls1, toSendMessage);
}
@ -83,8 +81,6 @@ Future<void> sendChatMessage(Store node, String channelId, String messageToSend)
String sig = sign(userPrivateKey, id, "12345612345612345612345612345612");
String toSendMessage = '["EVENT",{"id":"$id","pubkey":"$userPublicKey","created_at":$createdAt,"kind":$replyKind,"tags":[$strTags],"content":"$messageToSend","sig":"$sig"}]';
//relays.sendRequest(defaultServerUrl, toSendMessage);
sendRequest( gListRelayUrls1, toSendMessage);
}
@ -93,12 +89,6 @@ Future<void> sendDirectMessage(Store node, String otherPubkey, String messageToS
String otherPubkey02 = "02" + otherPubkey;
String encryptedMessageToSend = myEncrypt(userPrivateKey, otherPubkey02, messageToSend);
/* int ivIndex = encryptedMessageToSend.indexOf("?iv=");
var iv = encryptedMessageToSend.substring( ivIndex + 4, encryptedMessageToSend.length);
var enc_str = encryptedMessageToSend.substring(0, ivIndex);
String decrypted = myPrivateDecrypt(userPrivateKey, otherPubkey02, enc_str, iv);
*/
String replyKind = "4";
String strTags = '["p","$otherPubkey"]';
strTags += gWhetherToSendClientTag?',["client","nostr_console"]':'';
@ -193,21 +183,8 @@ void reAdjustAlignment() {
}
Store.reCalculateMarkerStr();
/* int depth = 0;
Store.startMarkerStr = getDepthSpaces(depth);
Store.startMarkerStr += ("▄────────────\n"); // bottom half ▄
int endMarkerDepth = depth + 2 + gTextWidth~/ gSpacesPerDepth - 1;
Store.endMarkerStr = getDepthSpaces(endMarkerDepth);
Store.endMarkerStr += "█\n";
Store.endMarkerStr += "────────────▀".padLeft((endMarkerDepth) * gSpacesPerDepth + gNumLeftMarginSpaces + 1) ;
Store.endMarkerStr += "\n";
*/
}
void printProfile(Store node, String profilePubkey) {
bool onlyUserPostAndLike (Tree t) => t.treeSelectorUserPostAndLike(profilePubkey);
node.printTree(0, DateTime.now().subtract(Duration(days:gNumLastDays)), onlyUserPostAndLike);
@ -294,7 +271,6 @@ int showMenu(List<String> menuOptions, String menuName) {
}
Future<void> otherMenuUi(Store node) async {
//gDebug = 1;
bool continueOtherMenu = true;
while(continueOtherMenu) {
int option = showMenu([ 'Show user profile', // 1
@ -599,13 +575,9 @@ Future<void> PrivateMenuUI(Store node) async {
await processNotifications(node); // this takes 300 ms
// bool fromClient (Tree t) => t.fromClientSelector(clientName);
// node.printTree(0, DateTime.now().subtract(Duration(days:gNumLastDays)), fromClient); // search for last gNumLastDays only
bool showAllRooms (ScrollableMessages room) => selectorShowAllRooms(room);
node.printDirectRoomInfo(showAllRooms);
int option = showMenu([
'Reply or Send a direct message',
'Create hub group chat',
@ -613,10 +585,7 @@ Future<void> PrivateMenuUI(Store node) async {
"Private Message Menu"); // name of menu
print('You picked: $option');
switch(option) {
// case 1:
//print("total direct rooms = ${node.directRooms.length}");
// break;
case 1:
// in case the program was invoked with --pubkey, then user can't send messages
if( userPrivateKey == "") {

68
lib/event_ds.dart
View File

@ -252,10 +252,8 @@ class EventData {
return null;
}
}
//print("going to decrypt eventid : $id to be decrypted content: $enc_str");
//print("original message: $content");
var decrypted = myPrivateDecrypt( userKey, otherUserPubKey, enc_str, iv); // use bob's privatekey and alic's publickey means bob can read message from alic
//print("decrypted: $evaluatedContent\n---------------");
return decrypted;
}
@ -307,26 +305,16 @@ class EventData {
commentColor = gCommentColor;
}
//name = "$name";
//name = name.padLeft(gNameLengthInPost);
int tempEffectiveLen = name.length < gNameLengthInPost? name.length: gNameLengthInPost;
name = name.substring(0,tempEffectiveLen);
String nameInside = " ";
int effectiveNameFieldLen = gNameLengthInPost + 3; // get this before name is mangled by color
String nameColor = getNameColor(pubkey);
// odd len names need an extra dash
// if( name.length %2 == 1 ) name = name + nameInside;
//name = getNumDashes((gNameLengthInPost - name.length)~/2, nameInside ) + getStrInColor(name, nameColor) + getNumDashes((gNameLengthInPost - name.length)~/2 , nameInside);
name = name.padLeft(gNameLengthInPost);
name = name.substring(0, gNameLengthInPost);
name = getStrInColor(name, nameColor);
String strToPrint = "";
if(!topPost) {
//strToPrint += "\n";
@ -414,10 +402,8 @@ class EventData {
int contentDepth = depth + 2 + timeWidthDepth + nameWidthDepth;
String contentShifted = makeParagraphAtDepth(tempEvaluatedContent==""?tempContent: tempEvaluatedContent, gSpacesPerDepth * contentDepth);
//strToPrint += contentShifted;
if( isNotification) {
strToPrint = "$gNotificationColor${getDepthSpaces(depth)} $dateToPrint $nameToPrint: $gNotificationColor" + contentShifted + gColorEndMarker;
//strToPrint = "$gNotificationColor$strToPrint$gColorEndMarker";
isNotification = false;
} else {
strToPrint = "${getDepthSpaces(depth)} $dateToPrint $nameToPrint: " + contentShifted;
@ -459,7 +445,6 @@ class EventData {
newLikes.clear();
reactorNames += "";
}
return reactorNames;
}
@ -468,7 +453,6 @@ class EventData {
if( id == "non") {
return '';
}
String max3(String v) => v.length > 3? v.substring(0,3) : v.substring(0, v.length);
DateTime dTime = DateTime.fromMillisecondsSinceEpoch(createdAt *1000);
if( createdAt == 0) {
@ -519,7 +503,6 @@ class Event {
void printEvent(int depth, bool topPost) {
eventData.printEventData(depth, topPost);
//print("\n$seenOnRelays");
//stdout.write("\n$originalJson --------------------------------\n\n");
}
@ -575,7 +558,6 @@ List<String> getpTags(Set<Event> events, int numMostFrequent) {
listHistogram.sort(HistogramEntry.histogramSorter);
List<String> ptags = [];
for( int i = 0; i < listHistogram.length && i < numMostFrequent; i++ ) {
//print ( "${listHistogram[i].str} ${listHistogram[i].count} ");
ptags.add(listHistogram[i].str);
}
@ -611,7 +593,6 @@ String getRelayOfUser(String userPubkey, String contactPubkey) {
//if( gDebug > 0) print( contacts[i].toString() );
if( contacts[i].id == contactPubkey) {
relay = contacts[i].relay;
//if(gDebug > 0) print("In getRelayOfUser: found relay $relay for contact $contactPubkey" );
return relay;
}
}
@ -715,12 +696,8 @@ Set<String> getPublicKeyFromName(String inquiredName) {
return {};
}
Set<String> pubkeys = {};
//if(gDebug > 0) print("In getPublicKeyFromName: doing lookup for $userName len of gKindONames= ${gKindONames.length}");
gKindONames.forEach((pubkey, userInfo) {
// check both the user name, and the pubkey to search for the user
// check username
if( userInfo.name != null) {
int minNameLen = min( inquiredName.length, (userInfo.name?.length)??0);
@ -772,7 +749,6 @@ String getDepthSpaces(int d) {
return str;
}
String getNumSpaces(int num) {
String s = "";
for( int i = 0; i < num; i++) {
@ -789,20 +765,6 @@ String getNumDashes(int num, [String dashType = "-"]) {
return s;
}
String makeParagraphAtDepth3(String s, int depthInSpaces) {
String newString = "";
String spacesString = getNumSpaces(depthInSpaces + gNumLeftMarginSpaces);
int lenPerLine = gTextWidth - depthInSpaces;
List<String> lines = s.split("\n");
lines.forEach((line) {
newString += line.replaceAll("\n", "\n" + spacesString );
});
return newString;
}
// make a paragraph of s that starts at numSpaces ( from screen left), and does not extend beyond gTextWidth+gNumLeftMarginSpaces. break it, or add
// a newline if it goes beyond gTextWidth + gNumLeftMarginSpaces
String makeParagraphAtDepth(String s, int depthInSpaces) {
@ -818,22 +780,18 @@ String makeParagraphAtDepth(String s, int depthInSpaces) {
String line = listCulledLine[0];
int lenReturned = listCulledLine[1] as int;
//print("returned len = $lenReturned");
if( line.length == 0 || lenReturned == 0) break;
newString += line;
startIndex += lenReturned;
}
//print("Returning newString with len = ${newString.length}");
return newString;
}
// returns from string[startIndex:] the first len number of chars. no newline is added.
List getLineWithMaxLen(String s, int startIndex, int lenPerLine, String spacesString) {
//print("====================in getLineWithMaxlen. strlen = ${s.length} startIndex = $startIndex len = $len ");
if( startIndex >= s.length)
return ["", 0];
@ -842,9 +800,6 @@ List getLineWithMaxLen(String s, int startIndex, int lenPerLine, String spacesSt
int firstLineLen = -1;
// if length required is greater than the length of string remaing, return whatever remains
//if( len > (s.length - startIndex))
// return [s.substring(startIndex), s.length - startIndex];
int numCharsInLine = 0;
int i = startIndex;
@ -853,7 +808,6 @@ List getLineWithMaxLen(String s, int startIndex, int lenPerLine, String spacesSt
numCharsInLine ++;
if( s[i] == "\n") {
//print(" found newline. also inserting spacesString");
i++;
numCharsInLine = 0;
line += spacesString;
@ -866,11 +820,6 @@ List getLineWithMaxLen(String s, int startIndex, int lenPerLine, String spacesSt
if( numCharsInLine > lenPerLine || ( (numCharsInLine == lenPerLine) && (s.length > startIndex + numCharsInLine) )) {
bool lineBroken = false;
//print(" line longer than $lenPerLine at $numCharsInLine.");
//print(" first check if it needs to be broken.");
//print("line.length = ${line.length} lenPerLine = $lenPerLine");
// break line at end if its cutting words; like is broken only if the returned line is the longest it can be, and
// if its length is greater than the gMaxLenBrokenWord constant
if( line.length >= lenPerLine && line.length > gMaxLenUnbrokenWord ) {
@ -881,16 +830,13 @@ List getLineWithMaxLen(String s, int startIndex, int lenPerLine, String spacesSt
for( ; i > 0 && !isWordSeparater(line[i]); i--);
// for ended
//print(" for ended with i = $i");
if( line.length - i < gMaxLenUnbrokenWord) {
// break the line here if its not a word separator
if( isWordSeparater(line[i])) {
//print(" line[i] = ${line[i]} is not a word separator");
firstLineLen = i;
line = line.substring(0, i) + "\n" + spacesString + line.substring(i + 1, line.length);
lineBroken = true;
//print(" line does get broken");
}
}
}
@ -904,10 +850,6 @@ List getLineWithMaxLen(String s, int startIndex, int lenPerLine, String spacesSt
}
}
//print(" returning with inserted: ${i - startIndex}");
//print(" returning: |$line|");
//print(" Returning line with len = ${line.length} first line len = ${firstLineLen}");
return [line, i - startIndex];
}
@ -1123,7 +1065,6 @@ try {
assert(offset == cipherText.length);
return finalPlainText.sublist(0, offset);
} catch(e) {
//print("cannot open file $gEventsFilename");
if( gDebug >= 0) print("Decryption error = $e");
return Uint8List(0);
}
@ -1133,11 +1074,9 @@ try {
String myEncrypt( String privateString,
String publicString,
String plainText) {
//Uint8List encdData = convert.base64.decode(b64encoded);
Uint8List uintInputText = convert.Utf8Encoder().convert(plainText);
final encryptedString = myEncryptRaw(privateString, publicString, uintInputText);
return encryptedString;
//return convert.Utf8Decoder().convert(rawData.toList());
}
String myEncryptRaw( String privateString,
@ -1152,7 +1091,6 @@ String myEncryptRaw( String privateString,
fr.seed(KeyParameter(
Uint8List.fromList(List.generate(32, (_) => _sGen.nextInt(255)))));
final iv = fr.nextBytes(16); //Uint8List.fromList(secretIV[1]);
//print("iv = $iv");
CipherParameters params = new PaddedBlockCipherParameters(
new ParametersWithIV(new KeyParameter(key), iv), null);
@ -1167,9 +1105,7 @@ String myEncryptRaw( String privateString,
final Uint8List outputEncodedText = Uint8List(uintInputText.length + 16); // allocate space
var offset = 0;
//print(" uintInputText len = ${uintInputText.length} ");
while (offset < uintInputText.length - 16) {
//print(" in while offset: $offset");
offset += cipherImpl.processBlock(uintInputText, offset, outputEncodedText, offset);
}
@ -1177,11 +1113,9 @@ String myEncryptRaw( String privateString,
offset += cipherImpl.doFinal(uintInputText, offset, outputEncodedText, offset);
assert(offset == uintInputText.length);
final Uint8List finalEncodedText = outputEncodedText.sublist(0, offset);
//print(" final offset after doFinal in encrypting: $offset finalEncodedText.lenth = ${finalEncodedText.length}");
String stringIv = convert.base64.encode(iv);;
String outputPlainText = convert.base64.encode(finalEncodedText);
//print(" outputPlainText = $outputPlainText len = ${outputPlainText.length}");
outputPlainText = outputPlainText + "?iv=" + stringIv;
return outputPlainText;
}

25
lib/tree_ds.dart
View File

@ -35,7 +35,6 @@ int getLatestMessageTime(List<String> _messageIds) {
}
}
}
return latest;
}
@ -75,7 +74,6 @@ int scrollableCompareTo(ScrollableMessages a, ScrollableMessages b) {
return -1;
}
}
}
class ScrollableMessages {
@ -83,8 +81,6 @@ class ScrollableMessages {
List<String> messageIds;
ScrollableMessages(this.topHeader, this.messageIds);
void printOnePage(Map<String, Tree> tempChildEventsMap, [int page = 1]) {
if( page < 1) {
if( gDebug > 0) log.info("In ScrollableMessages::printOnepage got page = $page");
@ -111,7 +107,6 @@ class ScrollableMessages {
Event? e = tempChildEventsMap[eId]?.event;
if( e!= null) {
print(e.eventData.getStrForChannel(0));
//print("");
}
}
@ -151,7 +146,6 @@ class Channel extends ScrollableMessages {
super ( internalChatRoomName.isEmpty? channelId: internalChatRoomName + "( " + channelId + " )" ,
messageIds);
//addMessageToChannel(eId, tempChildEventsMap, rooms);
void addMessageToChannel(String messageId, Map<String, Tree> tempChildEventsMap) {
int newEventTime = (tempChildEventsMap[messageId]?.event.eventData.createdAt??0);
@ -189,7 +183,6 @@ class DirectMessageRoom extends ScrollableMessages{
DirectMessageRoom(this.otherPubkey, List<String> messageIds):
super ( "${getAuthorName(otherPubkey)} ($otherPubkey)", messageIds) {
//print ("Created direct room with otherPubkey = $otherPubkey");
}
void addMessageToDirectRoom(String messageId, Map<String, Tree> tempChildEventsMap) {
@ -541,7 +534,6 @@ class Store {
channel.addMessageToChannel(eId, tempChildEventsMap);
} else {
//if( gCheckEventId == ce.eventData.id) print("Adding new message $eId to NEW chat room $channelId. ");
Channel newChannel = Channel(channelId, "", "", "", [eId]);
rooms.add( newChannel);
}
@ -550,14 +542,12 @@ class Store {
break;
case 40:
{
//numKind40Events++;
String chatRoomId = eId;
try {
dynamic json = jsonDecode(ce.eventData.content);
Channel? channel = getChannel(rooms, chatRoomId);
if( channel != null) {
if( channel.chatRoomName == "") {
//if( gDebug > 0) print('Added room name = ${json['name']} for $chatRoomId' );
channel.chatRoomName = json['name'];
}
} else {
@ -754,7 +744,6 @@ class Store {
// 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) {
//print("going to call processRreactin");
if( processReaction(newEvent, allChildEventsMap) == "") {
if(gDebug > 0) print("In insertEvents: For new reaction ${newEvent.eventData.id} could not find reactedTo or reaction was already present by this reactor");
return;
@ -778,12 +767,10 @@ class Store {
processKind0Event(newEvent);
}
//print("Before culling");
// only kind 0, 1, 3, 4, 5( delete), 7, 40, 42 events are added to map-store, return otherwise
if( !typesInEventMap.contains(newEvent.eventData.kind) ) {
return;
}
//print("after culling");
// expand mentions ( and translate if flag is set) and then add event to main event map
newEvent.eventData.translateAndExpandMentions(); // this also handles dm decryption for kind 4 messages, for kind 1 will do translation/expansion;
@ -846,7 +833,6 @@ class Store {
case 4:
// add kind 4 direct chat message event to its direct massage room
String directRoomId = getDirectRoomId(newTree.event.eventData);
//print("in insert events: got directRoomId = ${directRoomId}");
if( directRoomId != "") {
DirectMessageRoom? room = getDirectRoom(directRooms, directRoomId);
@ -854,7 +840,6 @@ class Store {
if( gDebug > 0) print("added event to direct room $directRoomId in insert event");
room.addMessageToDirectRoom(newTree.event.eventData.id, allChildEventsMap);
newTree.event.eventData.isNotification = true; // highlight it too in next printing
//print(" in from event: added it to a direct room");
break;
}
}
@ -1027,9 +1012,7 @@ class Store {
// comment starts at Sd , then depth = Sd - S1 / gSpacesPerDepth
// Depth is in gSpacesPerDepth
for( int i = 0; i < topPosts.length; i++) {
// continue if this children isn't going to get printed anyway; selector is only called for top most tree
if( treeSelector(topPosts[i]) == false) {
continue;
@ -1083,7 +1066,6 @@ class Store {
numToPrint = channels.length;
}
//print("\n\nDirect messages inbox:");
printUnderlined(" Channel Name Num of Messages Latest Message ");
for(int j = 0; j < numToPrint; j++) {
@ -1143,7 +1125,6 @@ class Store {
if( room.chatRoomName.length < channelId.length) {
continue;
}
//if( gDebug > 0) print("room = ${room.chatRoomName} channelId = $channelId");
if( room.chatRoomName.substring(0, channelId.length) == channelId ) {
fullChannelId.add(room.channelId);
}
@ -1217,7 +1198,6 @@ class Store {
// shows the given directRoomId, where directRoomId is prefix-id or pubkey of the other user. returns full id of other user.
String showDirectRoom( String directRoomId, [int page = 1]) {
//print("In show DirectRoom to show with id: $directRoomId");
if( directRoomId.length > 64) { // TODO revisit cause if name is > 64 should not return
return "";
}
@ -1226,12 +1206,10 @@ class Store {
// TODO improve lookup logic.
for( int j = 0; j < directRooms.length; j++) {
String roomId = directRooms[j].otherPubkey;
//print("looking up $directRoomId in $roomId ${directRoom.otherPubkey}");
if( directRoomId == roomId) {
lookedUpName.add(roomId);
}
//print("directRoom.otherPubkey = ${directRoom.otherPubkey} len = ${directRoom.otherPubkey.length}");
if( directRooms[j].otherPubkey.substring(0, directRoomId.length) == directRoomId){
lookedUpName.add(roomId);
}
@ -1273,7 +1251,6 @@ class Store {
directRooms.add(DirectMessageRoom(directRoomId, []));
}
// Write the tree's events to file as one event's json per line
Future<void> writeEventsToFile(String filename) async {
if( gDebug > 0) print("opening $filename to write to.");
@ -1330,7 +1307,6 @@ class Store {
} // end for
if( eventCounter > linesWritten) {
//print("writing..");
await file.writeAsString(nLinesStr, mode: FileMode.append).then( (file) => file);
nLinesStr = "";
}
@ -1606,7 +1582,6 @@ class Store {
if(gDebug > 0 && event.eventData.id == gCheckEventId) print("$gCheckEventId milestone 3");
if( event.eventData.isNotification) {
//print("is a notification");
// if the reaction is new ( a notification) then the comment it is reacting to also becomes a notification in form of newLikes
if( gDebug > 0 && event.eventData.id == gCheckEventId) print("milestone 2 for $gCheckEventId");