Ticket #23153: 23153.patch

File 23153.patch, 1.6 KB (added by taylor.smock, 3 years ago)

  • src/org/openstreetmap/josm/gui/io/UploadDialogModel.java 

    Subject: [PATCH] Fix #23153: Remote Control API call is adding hashtags many times
---
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/gui/io/UploadDialogModel.java b/src/org/openstreetmap/josm/gui/io/UploadDialogModel.java
    a b  
    7878        String hashtags = Arrays.stream(comment.split("\\s", -1))
    7979            .map(s -> Utils.strip(s, ",;"))
    8080            .filter(s -> s.matches("#[a-zA-Z0-9][-_a-zA-Z0-9]+"))
    81             .collect(Collectors.joining(";"));
     81            .distinct().collect(Collectors.joining(";"));
    8282        return hashtags.isEmpty() ? null : hashtags;
    8383    }
    8484
    … …  
    9595            if (hashtags != null) {
    9696                Set<String> sanitizedHashtags = new LinkedHashSet<>();
    9797                for (String hashtag : hashtags.split(";", -1)) {
    98                     sanitizedHashtags.add(hashtag.startsWith("#") ? hashtag : "#" + hashtag);
     98                    if (comment == null || !comment.contains(hashtag)) {
     99                        sanitizedHashtags.add(hashtag.startsWith("#") ? hashtag : "#" + hashtag);
     100                    }
    99101                }
    100102                if (!sanitizedHashtags.isEmpty()) {
    101103                    result.append(' ').append(String.join(" ", sanitizedHashtags));