Skip to content

Commit

Permalink
Improved character name matching accuracy.
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronshenhao committed May 26, 2024
1 parent ef21a6f commit 342360b
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10267,7 +10267,8 @@
}

//examine context to try to determine if there's an existing botname
var othernamesregex = new RegExp("\n(?!" + localsettings.chatname + ").+?\: ", "gi");
var othernamesregex = new RegExp("\n(" + localsettings.chatopponent.split("||$||").join("|") + ")\: ", "gi");

var tempfullsearchable = current_memory + current_anote + truncated_context;
var foundopponent = tempfullsearchable.match(othernamesregex);

Expand Down Expand Up @@ -13072,9 +13073,9 @@
let m_name = "\n" + localsettings.chatname + ": ";

//match anything that is NOT us, ie. opponents
var regex = new RegExp("\n(?!" + localsettings.chatname + ").+?\: ", "gi");
var othernamesregex = new RegExp("\n(" + localsettings.chatopponent.split("||$||").join("|") + ")\: ", "gi");
let colormap = {}, colidx = 0;
fulltxt = fulltxt.replace(regex, function (m) {
fulltxt = fulltxt.replace(othernamesregex, function (m) {
let oname = escapeHtml(m);
let onametrim = oname.trim();
if(colormap[onametrim]==null)
Expand Down Expand Up @@ -13349,8 +13350,7 @@
let newbodystr = "";
let myturnchat = false; //who is currently speaking?


var othernamesregex = new RegExp("(?!" + localsettings.chatname + ").+?\: ", "gi");
var othernamesregex = new RegExp("(" + localsettings.chatopponent.split("||$||").join("|") + ")\: ", "gi");

//a quick fix that adds a newline if there's none before opponent chat and a picture
var othernamesregexreplace = new RegExp("\\|[d|p]\\|>(?!" + localsettings.chatname + ").+?\\: ", "gi");
Expand Down Expand Up @@ -14526,8 +14526,7 @@
var mynameregex = new RegExp("\n(" + localsettings.chatname + ")\: ", "gi");
var mynameregex2 = new RegExp("(" + localsettings.chatname + ")\: ", "gi");
var mynameregex3 = new RegExp("\n(" + localsettings.chatname + ") ", "gi");
var othernamesregex = new RegExp("\n(?!" + localsettings.chatname + ").+?\: ", "gi");
//var othernamesregex2 = new RegExp("(?!" + localsettings.chatname + ").+?\: ", "gi");
var othernamesregex = new RegExp("\n(" + localsettings.chatopponent.split("||$||").join("|") + ")\: ", "gi");
input = input.replaceAll(mynameregex, '{{userplaceholder}}');
input = input.replaceAll(mynameregex2, '{{userplaceholder}}');
input = input.replaceAll(mynameregex3, '{{userplaceholder}}');
Expand Down

0 comments on commit 342360b

Please sign in to comment.