*Add log entry formatter.

MER-C · MER-C · commit 6d42d240d018 · 2025-03-29T17:55:08.000Z
*Wiki: in requests, don't overwrite supplied parameters with the default ones. Fixes #198.
diff --git a/src/org/wikipedia/LogEntries.java b/src/org/wikipedia/LogEntries.java
@@ -0,0 +1,101 @@
+/**
+ *  @(#)LogEntries.java 0.01 02/06/2024
+ *  Copyright (C) 2024-20XX MER-C and contributors
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 3
+ *  of the License, or (at your option) any later version. Additionally
+ *  this file is subject to the "Classpath" exception.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software Foundation,
+ *  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package org.wikipedia;
+
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+
+/**
+ *  Utility class for {@link Wiki.LogEntry}. For utility methods and data specific 
+ *  to {@link Wiki.Revision}s, see {@link Revisions}.
+ *  @author MER-C
+ *  @version 0.01
+ */
+public class LogEntries
+{
+    /**
+     *  Turns a list of revisions into human-readable wikitext. Be careful, as
+     *  slowness may result when copying large amounts of wikitext produced by
+     *  this method, or by the wiki trying to parse it. Takes the form of:
+     *
+     *  <p>*2009-01-01 00:00 User (talk | contribs) [action] [target] (comment)
+     *  @param logs a bunch of log entries
+     *  @return those log entries formatted as wikitext
+     */
+    public static String toWikitext(Iterable<Wiki.LogEntry> logs)
+    {
+        StringBuilder buffer = new StringBuilder(100000);
+        buffer.append("<div style=\"font-family: monospace; font-size: 120%\">\n");
+        for (Wiki.LogEntry log : logs)
+        {
+            // timestamp
+            buffer.append("*");
+            buffer.append(DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(log.getTimestamp()));
+            buffer.append(" ");
+            
+            // user
+            String user2 = log.getUser();
+            if (user2 == null || user2.equals(Wiki.Event.USER_DELETED))
+                buffer.append(Events.DELETED_EVENT_HTML);
+            else
+            {
+                buffer.append(Users.generateWikitextSummaryLinksShort(user2));
+                buffer.append(" ");
+            }
+            
+            // action
+            buffer.append(log.getAction());
+            buffer.append(" ");
+            
+            // target
+            String target = log.getTitle();
+            if (target != null)
+            {
+                buffer.append("[[:");
+                buffer.append(target);
+                buffer.append("]] ");
+            }
+            
+            // comment
+            String summary = log.getComment();
+            if (summary == null || summary.equals(Wiki.Event.COMMENT_DELETED))
+                buffer.append(Events.DELETED_EVENT_HTML);
+            else
+            {
+                // kill wikimarkup
+                buffer.append("(<nowiki>");
+                buffer.append(summary);
+                buffer.append("</nowiki>)");
+            }
+            
+            // details
+            Map details = log.getDetails();
+            if (details != null && !details.isEmpty())
+            {
+                buffer.append(" ");
+                buffer.append(details.toString());
+            }
+            buffer.append("\n");
+        }
+        buffer.append("</div>");
+        return buffer.toString();
+    }
+}
diff --git a/src/org/wikipedia/Wiki.java b/src/org/wikipedia/Wiki.java
@@ -8413,9 +8413,9 @@ public String makeApiCall(Map<String, String> getparams, Map<String, Object> pos
     {
         // build the URL
         StringBuilder urlbuilder = new StringBuilder(apiUrl + "?");
-        getparams = new HashMap<>(getparams); // ensure this map is mutable
-        getparams.putAll(defaultApiParams);
-        for (Map.Entry<String, String> entry : getparams.entrySet())
+        HashMap<String, String> getparams2 = new HashMap<>(defaultApiParams);
+        getparams2.putAll(getparams);
+        for (Map.Entry<String, String> entry : getparams2.entrySet())
         {
             urlbuilder.append(entry.getKey());
             urlbuilder.append('=');

Original file line number	Diff line number	Diff line change
`@@ -8413,9 +8413,9 @@ public String makeApiCall(Map<String, String> getparams, Map<String, Object> pos`
`8413`	`8413`	`{`
`8414`	`8414`	`// build the URL`
`8415`	`8415`	`StringBuilder urlbuilder = new StringBuilder(apiUrl + "?");`
`8416`		`- getparams = new HashMap<>(getparams); // ensure this map is mutable`
`8417`		`- getparams.putAll(defaultApiParams);`
`8418`		`- for (Map.Entry<String, String> entry : getparams.entrySet())`
	`8416`	`+ HashMap<String, String> getparams2 = new HashMap<>(defaultApiParams);`
	`8417`	`+ getparams2.putAll(getparams);`
	`8418`	`+ for (Map.Entry<String, String> entry : getparams2.entrySet())`
`8419`	`8419`	`{`
`8420`	`8420`	`urlbuilder.append(entry.getKey());`
`8421`	`8421`	`urlbuilder.append('=');`