Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 41196cc

Browse files
committedAug 31, 2023
account for customizable extra network separators in remove code
previous behavior only searched for leading spaces
1 parent 6adf2b7 commit 41196cc

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed
 

Diff for: ‎javascript/extraNetworks.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -141,17 +141,22 @@ function setupExtraNetworks() {
141141
onUiLoaded(setupExtraNetworks);
142142

143143
var re_extranet = /<([^:]+:[^:]+):[\d.]+>(.*)/;
144-
var re_extranet_g = /\s+<([^:]+:[^:]+):[\d.]+>/g;
144+
var re_extranet_str = '<([^:]+:[^:]+):[\\d.]+>';
145145

146146
function tryToRemoveExtraNetworkFromPrompt(textarea, text) {
147+
function reEscape(s) {
148+
return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
149+
}
147150
var m = text.match(re_extranet);
148151
var replaced = false;
149152
var newTextareaText;
150153
if (m) {
151154
var extraTextAfterNet = m[2];
152155
var partToSearch = m[1];
153156
var foundAtPosition = -1;
154-
newTextareaText = textarea.value.replaceAll(re_extranet_g, function(found, net, pos) {
157+
var escapedSeparator = reEscape(opts.extra_networks_add_text_separator);
158+
var re = new RegExp(escapedSeparator + re_extranet_str, 'g');
159+
newTextareaText = textarea.value.replaceAll(re, function(found, net, pos) {
155160
m = found.match(re_extranet);
156161
if (m[1] == partToSearch) {
157162
replaced = true;

0 commit comments

Comments
 (0)
Please sign in to comment.