Skip to content
This repository has been archived by the owner on Sep 25, 2021. It is now read-only.

Commit

Permalink
Merge pull request #558 from anselmov/dev
Browse files Browse the repository at this point in the history 
add support for 2ch.hk
  • Loading branch information
@floens
floens committed Oct 17, 2018
2 parents 52829ae + dc4f373 commit 5fd9904
Show file tree
Hide file tree
Showing 5 changed files with 659 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Clover/app/src/main/java/org/floens/chan/core/site/SiteRegistry.java
View file
Expand Up @@ -24,6 +24,7 @@
import org.floens.chan.core.site.sites.chan8.Chan8;
import org.floens.chan.core.site.sites.arisuchan.Arisuchan;
import org.floens.chan.core.site.sites.sushichan.Sushichan;
import org.floens.chan.core.site.sites.dvach.Dvach;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -41,6 +42,7 @@ public class SiteRegistry {
URL_HANDLERS.add(Lainchan.URL_HANDLER);
URL_HANDLERS.add(Arisuchan.URL_HANDLER);
URL_HANDLERS.add(Sushichan.URL_HANDLER);
URL_HANDLERS.add(Dvach.URL_HANDLER);
}

static {
Expand All @@ -53,5 +55,6 @@ public class SiteRegistry {
SITE_CLASSES.put(2, Lainchan.class);
SITE_CLASSES.put(3, Arisuchan.class);
SITE_CLASSES.put(4, Sushichan.class);
SITE_CLASSES.put(5, Dvach.class);
}
}
213 changes: 213 additions & 0 deletions Clover/app/src/main/java/org/floens/chan/core/site/sites/dvach/Dvach.java
View file
@@ -0,0 +1,213 @@
package org.floens.chan.core.site.sites.dvach;

import android.support.annotation.Nullable;

import org.floens.chan.core.model.Post;
import org.floens.chan.core.model.orm.Board;
import org.floens.chan.core.model.orm.Loadable;
import org.floens.chan.core.settings.OptionsSetting;
import org.floens.chan.core.site.Boards;
import org.floens.chan.core.site.Site;
import org.floens.chan.core.site.SiteAuthentication;
import org.floens.chan.core.site.SiteIcon;
import org.floens.chan.core.site.SiteSetting;
import org.floens.chan.core.site.common.CommonReplyHttpCall;
import org.floens.chan.core.site.common.CommonSite;
import org.floens.chan.core.site.common.MultipartHttpCall;
import org.floens.chan.core.site.common.vichan.VichanActions;
import org.floens.chan.core.site.common.vichan.VichanCommentParser;
import org.floens.chan.core.site.common.vichan.VichanEndpoints;
import org.floens.chan.core.site.http.DeleteRequest;
import org.floens.chan.core.site.http.HttpCall;
import org.floens.chan.core.site.http.Reply;
import org.floens.chan.core.site.sites.chan4.Chan4;
import org.floens.chan.utils.Logger;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;

import okhttp3.HttpUrl;

import static android.support.constraint.Constraints.TAG;

public class Dvach extends CommonSite {
public static final CommonSiteUrlHandler URL_HANDLER = new CommonSiteUrlHandler() {
@Override
public Class<? extends Site> getSiteClass() {
return Dvach.class;
}

@Override
public HttpUrl getUrl() {
return HttpUrl.parse("https:/2ch.hk");
}

@Override
public String[] getNames() {
return new String[]{"dvach", "2ch"};
}

@Override
public String desktopUrl(Loadable loadable, @Nullable Post post) {
if (loadable.isCatalogMode()) {
return getUrl().newBuilder().addPathSegment(loadable.boardCode).toString();
} else if (loadable.isThreadMode()) {
return getUrl().newBuilder()
.addPathSegment(loadable.boardCode).addPathSegment("res")
.addPathSegment(String.valueOf(loadable.no) + ".html")
.toString();
} else {
return getUrl().toString();
}
}
};

static final String CAPTCHA_KEY = "6LeQYz4UAAAAAL8JCk35wHSv6cuEV5PyLhI6IxsM";

private OptionsSetting<Chan4.CaptchaType> captchaType;

@Override
public void initializeSettings() {
super.initializeSettings();
captchaType = new OptionsSetting<>(settingsProvider,
"preference_captcha_type",
Chan4.CaptchaType.class, Chan4.CaptchaType.V2JS);
}

@Override
public List<SiteSetting> settings() {
return Arrays.asList(
SiteSetting.forOption(
captchaType,
"Captcha type",
Arrays.asList("Javascript", "Noscript"))
);
}

@Override
public void setup() {
setName("2ch.hk");
setIcon(SiteIcon.fromFavicon(HttpUrl.parse("https://2ch.hk/favicon.ico")));
setBoardsType(BoardsType.DYNAMIC);

setResolvable(URL_HANDLER);

setConfig(new CommonConfig() {
@Override
public boolean feature(Feature feature) {
return feature == Feature.POSTING;
}
});

setEndpoints(new VichanEndpoints(this,
"https://2ch.hk",
"https://2ch.hk") {
@Override
public HttpUrl imageUrl(Post.Builder post, Map<String, String> arg) {
return root.builder().s(arg.get("path")).url();
}

@Override
public HttpUrl thumbnailUrl(Post.Builder post, boolean spoiler, Map<String, String> arg) {
return root.builder().s(arg.get("thumbnail")).url();
}

@Override
public HttpUrl boards() {
return new HttpUrl.Builder().scheme("https").host("2ch.hk").addPathSegment("boards.json").build();
}

@Override
public HttpUrl reply(Loadable loadable) {
return new HttpUrl.Builder().scheme("https").host("2ch.hk").addPathSegment("makaba").addPathSegment("posting.fcgi").addQueryParameter("json", "1").build();
}
});

setActions(new VichanActions(this) {

@Override
public void setupPost(Reply reply, MultipartHttpCall call) {
super.setupPost(reply, call);

if (reply.loadable.isThreadMode()) {
// "thread" is already added in VichanActions.
call.parameter("post", "New Reply");
} else {
call.parameter("post", "New Thread");
call.parameter("page", "1");
}
}

@Override
public boolean requirePrepare() {
return false;
}

@Override
public void post(Reply reply, final PostListener postListener) {
httpCallManager.makeHttpCall(new DvachReplyCall(Dvach.this, reply), new HttpCall.HttpCallback<CommonReplyHttpCall>() {
@Override
public void onHttpSuccess(CommonReplyHttpCall httpPost) {
postListener.onPostComplete(httpPost, httpPost.replyResponse);
}

@Override
public void onHttpFail(CommonReplyHttpCall httpPost, Exception e) {
postListener.onPostError(httpPost, e);
}
});
}

@Override
public boolean postRequiresAuthentication() {
return !isLoggedIn();
}

@Override
public SiteAuthentication postAuthenticate() {
if (isLoggedIn()) {
return SiteAuthentication.fromNone();
} else {
switch (captchaType.get()) {
case V2JS:
return SiteAuthentication.fromCaptcha2(CAPTCHA_KEY, "https://2ch.hk/api/captcha/recaptcha/mobile");
case V2NOJS:
return SiteAuthentication.fromCaptcha2nojs(CAPTCHA_KEY, "https://2ch.hk/api/captcha/recaptcha/mobile");
default:
throw new IllegalArgumentException();
}
}
}

@Override
public void delete(DeleteRequest deleteRequest, DeleteListener deleteListener) {
super.delete(deleteRequest, deleteListener);
}

@Override
public void boards(final BoardsListener listener) {
requestQueue.add(new DvachBoardsRequest(Dvach.this, response -> {
listener.onBoardsReceived(new Boards(response));
}, (error) -> {
Logger.e(TAG, "Failed to get boards from server", error);

// API fail, provide some default boards
List<Board> list = new ArrayList<>();
list.add(Board.fromSiteNameCode(Dvach.this, "бред", "b"));
list.add(Board.fromSiteNameCode(Dvach.this, "Видеоигры, general, официальные треды", "vg"));
list.add(Board.fromSiteNameCode(Dvach.this, "новости", "news"));
list.add(Board.fromSiteNameCode(Dvach.this, "политика, новости, ольгинцы, хохлы, либерахи, рептилоиды.. oh shi", "po"));
Collections.shuffle(list);
listener.onBoardsReceived(new Boards(list));
}));
}
});

setApi(new DvachApi(this));

setParser(new VichanCommentParser());
}
}

0 comments on commit 5fd9904

Please sign in to comment.