TrixiEther | Refuge Dobrochan Support

Posting works a little, but after a time - need to investigate further

Author: TrixiEther

engines/vichan/src/chan/content/VichanChanLocator.java

@@ -2,10 +2,17 @@
 
 import android.net.Uri;
 
+import java.util.List;
+import java.util.regex.Pattern;
+
 public class VichanChanLocator extends ChanLocator {
 
     protected static String DEFAULT_SEGMENT_PRESET = "vichan";
 
+    private static final Pattern BOARD_PATH = Pattern.compile("/\\w+(?:/(?:(?:catalog|index|\\d+)\\.html)?)?");
+    private static final Pattern THREAD_PATH = Pattern.compile("/\\w+/{1,2}thread/(\\d+).*\\.html");
+    private static final Pattern ATTACHMENT_PATH = Pattern.compile("/\\w+/src/\\d+\\.\\w+");
+
     @Override
     public Uri createThreadUri(String boardName, String threadNumber) {
         return buildPath(DEFAULT_SEGMENT_PRESET, boardName, "res", threadNumber + ".json");
@@ -28,4 +35,51 @@ public Uri createThumbnailUri(String boardName, String thumbnail) {
         return buildPath(DEFAULT_SEGMENT_PRESET, boardName, "thumb", thumbnail);
     }
 
+    public Uri createAntispamUri(String boardName, String threadNumber) {
+        return threadNumber != null ? super.createThreadUri(boardName, threadNumber)
+                : super.createBoardUri(boardName, 0);
+    }
+
+    @Override
+    public String getThreadNumber(Uri uri) {
+        return uri != null ? getGroupValue(uri.getPath(), THREAD_PATH, 1) : null;
+    }
+
+    @Override
+    public String getPostNumber(Uri uri) {
+        String fragment = uri.getFragment();
+        if (fragment != null && fragment.startsWith("q")) {
+            return fragment.substring(1);
+        }
+        return fragment;
+    }
+
+    @Override
+    public boolean isBoardUri(Uri uri) {
+        return isChanHostOrRelative(uri) && isPathMatches(uri, BOARD_PATH);
+    }
+
+    @Override
+    public boolean isThreadUri(Uri uri) {
+        return isChanHostOrRelative(uri) && isPathMatches(uri, THREAD_PATH);
+    }
+
+    @Override
+    public boolean isAttachmentUri(Uri uri) {
+        return isChanHostOrRelative(uri) && isPathMatches(uri, ATTACHMENT_PATH);
+    }
+
+    @Override
+    public String getBoardName(Uri uri) {
+        if (uri != null) {
+            List<String> segments = uri.getPathSegments();
+            if (segments.size() > 0) {
+                return segments.get(0);
+            }
+        }
+        return null;
+    }
+
+
+
 }

engines/vichan/src/chan/content/VichanChanPerformer.java

@@ -1,6 +1,7 @@
 package chan.content;
 
 import android.net.Uri;
+import android.util.Log;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -204,6 +205,9 @@ public ReadPostsResult onReadPosts(ReadPostsData data) throws HttpException, Inv
 
     private static final String CAPTCHA_DATA_KEY_TYPE = "captchaType";
 
+    protected void parseAntispamFields(String text, MultipartEntity entity) throws ParseException {
+    }
+
     @Override
     public SendPostResult onSendPost(SendPostData data) throws HttpException, ApiException, InvalidResponseException {
         MultipartEntity entity = new MultipartEntity();
@@ -230,9 +234,13 @@ public SendPostResult onSendPost(SendPostData data) throws HttpException, ApiExc
         entity.add("json_response", "1");
 
         VichanChanLocator locator = ChanLocator.get(this);
-        Uri contentUri = data.threadNumber != null ? locator.createThreadUri(data.boardName, data.threadNumber)
-                : locator.createBoardUri(data.boardName, 0);
+        Uri contentUri = locator.createAntispamUri(data.boardName, data.threadNumber);
         String responseText = new HttpRequest(contentUri, data).perform().readString();
+        try {
+            parseAntispamFields(responseText, entity);
+        } catch (ParseException e) {
+            throw new InvalidResponseException();
+        }
 
         Uri uri = locator.buildPath("vichan","post.php");
         JSONObject jsonObject = null;

extensions/refugedobrochan/src/com/trixiether/dashchan/chan/refugedobrochan/RefugeDobrochanAntispamFieldsParser.java

@@ -0,0 +1,78 @@
+package com.trixiether.dashchan.chan.refugedobrochan;
+
+import android.util.Log;
+import android.util.Pair;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+
+import chan.http.RequestEntity;
+import chan.text.ParseException;
+import chan.text.TemplateParser;
+import chan.util.StringUtils;
+
+public class RefugeDobrochanAntispamFieldsParser {
+
+    private final HashSet<String> ignoreFields = new HashSet<>();
+    private final HashSet<String> hiddenInputsNames = new HashSet<>();
+    private final ArrayList<Pair<String, String>> fields = new ArrayList<>();
+
+    private boolean formParsing;
+    private String fieldName;
+
+    private RefugeDobrochanAntispamFieldsParser(String source, RequestEntity entity, String... ignoreFields) throws ParseException {
+        Collections.addAll(this.ignoreFields, ignoreFields);
+        Collections.addAll(this.hiddenInputsNames, "user", "username", "login", "search",
+                "q", "url", "firstname", "lastname", "text", "message", "hash");
+        PARSER.parse(source, this);
+        for (Pair<String, String> field : fields) {
+            entity.add(field.first, field.second);
+            Log.d("!!!", field.first + " - " + field.second);
+        }
+    }
+
+    public static void parseAndApply(String source, RequestEntity entity, String... ignoreFields)
+            throws ParseException {
+        new RefugeDobrochanAntispamFieldsParser(source, entity, ignoreFields);
+    }
+
+    private static final TemplateParser<RefugeDobrochanAntispamFieldsParser> PARSER = TemplateParser.<RefugeDobrochanAntispamFieldsParser>builder()
+            .equals("form", "name", "post").open((instance, holder, tagName, attributes) -> {
+                holder.formParsing = true;
+                return false;
+            })
+            .name("input").open((instance, holder, tagName, attributes) -> {
+                if (holder.formParsing) {
+                    String name = StringUtils.unescapeHtml(attributes.get("name"));
+                    boolean findTag = true;
+                    for (String s : holder.ignoreFields) {
+                        if (s.equals(name)) {
+                            findTag = false;
+                            break;
+                        }
+                    }
+                    if (findTag) {
+                        if (!name.contains("delete")) {
+                            String value = StringUtils.unescapeHtml(attributes.get("value"));
+                            holder.fields.add(new Pair<>(StringUtils.unescapeHtml(name), value));
+                        }
+                    }
+                }
+                return false;
+            })
+            .name("textarea").open((instance, holder, tagName, attributes) -> {
+                holder.fieldName = StringUtils.unescapeHtml(attributes.get("name"));
+                return true;
+            })
+            .content((instance, holder, source) -> {
+                if (holder.formParsing) {
+                    if (!source.isEmpty()) {
+                        for (String s : holder.hiddenInputsNames)
+                            if (s.equals(holder.fieldName))
+                                holder.fields.add(new Pair<>(holder.fieldName, StringUtils.unescapeHtml(source)));
+                    }
+                }
+            })
+            .prepare();
+}

extensions/refugedobrochan/src/com/trixiether/dashchan/chan/refugedobrochan/RefugeDobrochanChanLocator.java

@@ -1,5 +1,7 @@
 package com.trixiether.dashchan.chan.refugedobrochan;
 
+import android.net.Uri;
+
 import chan.content.VichanChanLocator;
 
 public class RefugeDobrochanChanLocator extends VichanChanLocator {
@@ -9,4 +11,10 @@ public RefugeDobrochanChanLocator() {
         setHttpsMode(HttpsMode.HTTPS_ONLY);
         DEFAULT_SEGMENT_PRESET = "vichan";
     }
+
+    @Override
+    public Uri createAntispamUri(String boardName, String threadNumber) {
+        return threadNumber != null ? super.buildPath(DEFAULT_SEGMENT_PRESET, boardName, "res", threadNumber + ".html")
+                : super.buildPath(DEFAULT_SEGMENT_PRESET, boardName);
+    }
 }

extensions/refugedobrochan/src/com/trixiether/dashchan/chan/refugedobrochan/RefugeDobrochanChanPerformer.java

@@ -1,5 +1,13 @@
 package com.trixiether.dashchan.chan.refugedobrochan;
 
 import chan.content.VichanChanPerformer;
+import chan.http.MultipartEntity;
+import chan.text.ParseException;
 
-public class RefugeDobrochanChanPerformer extends VichanChanPerformer {}
+public class RefugeDobrochanChanPerformer extends VichanChanPerformer {
+    @Override
+    protected void parseAntispamFields(String text, MultipartEntity entity) throws ParseException {
+        RefugeDobrochanAntispamFieldsParser.parseAndApply(text, entity, "board", "thread", "name", "email",
+                "subject", "body", "password", "file", "spoiler", "json_response", "reason", "report");
+    }
+}

settings.gradle

@@ -1,3 +1,4 @@
+include ':engines:vichan'
 includeBuild 'library'
 file('engines').listFiles().each { include ":engines:$it.name" }
 file('extensions').listFiles().each { include ":extensions:$it.name" }