Merge pull request #1047 from absurd-shaman/develop

Fix 370ch support
K1rakishou · Mar 26, 2024 · ddfe877 · ddfe877
2 parents 58d3cbc + ad37b32
commit ddfe877
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 13 deletions.
diff --git a/Kuroba/app/src/main/AndroidManifest.xml b/Kuroba/app/src/main/AndroidManifest.xml
@@ -120,8 +120,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 <data android:host="wired-7.org" />
                 <data android:host="www.wired-7.org" />
 
-                <data android:host="370chan.info" />
-                <data android:host="www.370chan.info" />
+                <data android:host="370ch.lt" />
+                <data android:host="www.370ch.lt" />
 
                 <data android:host="vhschan.org" />
                 <data android:host="www.vhschan.org" />

diff --git a/Kuroba/app/src/main/java/com/github/k1rakishou/chan/core/site/sites/Chan370.java b/Kuroba/app/src/main/java/com/github/k1rakishou/chan/core/site/sites/Chan370.java
@@ -35,6 +35,8 @@
 
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Map;
+
 import okhttp3.HttpUrl;
 
 @DoNotStrip
@@ -44,7 +46,7 @@ public class Chan370
     public static final String SITE_NAME = "370chan";
 
     public static final CommonSiteUrlHandler URL_HANDLER = new CommonSiteUrlHandler() {
-        private static final String ROOT = "https://370chan.info/";
+        private static final String ROOT = "https://370ch.lt/";
 
         @Override
         public Class<? extends Site> getSiteClass() {
@@ -92,31 +94,47 @@ public Chan370() {
     public void setup() {
         setEnabled(true);
         setName(SITE_NAME);
-        setIcon(SiteIcon.fromFavicon(getImageLoaderV2(), HttpUrl.parse("https://370chan.info/favicon.ico")));
+        setIcon(SiteIcon.fromFavicon(getImageLoaderV2(), HttpUrl.parse("https://370ch.lt/favicon.ico")));
 
         setBoards(
-                ChanBoard.create(BoardDescriptor.create(siteDescriptor().getSiteName(), "a"), "anime"),
+                ChanBoard.create(BoardDescriptor.create(siteDescriptor().getSiteName(), "a"), "anime ir manga"),
                 ChanBoard.create(BoardDescriptor.create(siteDescriptor().getSiteName(), "b"), "apie viską"),
-                ChanBoard.create(BoardDescriptor.create(siteDescriptor().getSiteName(), "ž"), "kompiuteriniai žaidimai"),
-                ChanBoard.create(BoardDescriptor.create(siteDescriptor().getSiteName(), "tv"), "televizija & filmai"),
-                ChanBoard.create(BoardDescriptor.create(siteDescriptor().getSiteName(), "pol"), "politika"),
-                ChanBoard.create(BoardDescriptor.create(siteDescriptor().getSiteName(), "g"), "technologijos"),
-                ChanBoard.create(BoardDescriptor.create(siteDescriptor().getSiteName(), "fa"), "mada & stilius"),
+                ChanBoard.create(BoardDescriptor.create(siteDescriptor().getSiteName(), "g"), "technologijos ir žaidimai"),
                 ChanBoard.create(BoardDescriptor.create(siteDescriptor().getSiteName(), "fo"), "fotografija"),
                 ChanBoard.create(BoardDescriptor.create(siteDescriptor().getSiteName(), "mu"), "muzika"),
-                ChanBoard.create(BoardDescriptor.create(siteDescriptor().getSiteName(), "int"), "International")
+                ChanBoard.create(BoardDescriptor.create(siteDescriptor().getSiteName(), "int"), "internacionalus"),
+                ChanBoard.create(BoardDescriptor.create(siteDescriptor().getSiteName(), "t"), "teptukas"),
+                ChanBoard.create(BoardDescriptor.create(siteDescriptor().getSiteName(), "meta"), "svetainės aptarimas")
         );
 
         setResolvable(URL_HANDLER);
 
         setConfig(new CommonConfig() {
             @Override
             public boolean siteFeature(SiteFeature siteFeature) {
-                return super.siteFeature(siteFeature) || siteFeature == SiteFeature.POSTING;
+                return super.siteFeature(siteFeature); //features are not implemented.
             }
         });
 
-        setEndpoints(new VichanEndpoints(this, "https://370chan.info/", "https://370chan.info/"));
+        setEndpoints(new VichanEndpoints(this, "https://370ch.lt/", "https://370ch.lt/")
+        {
+            @Override
+            public HttpUrl thumbnailUrl(BoardDescriptor boardDescriptor, boolean spoiler, int customSpoilers, Map<String, String> arg) {
+                String extension = switch (arg.get("ext")){
+                    // for an unknown reason, not all media files follow the same rules
+                    // i.e. some jpg images have png thumbnails, others have jpg
+                    // this makes some amount of media files have 404 thumbnails
+                    case "jpg", "jpeg" -> "." + arg.get("ext");
+                    case "webm", "mp4", "gif" -> ".gif";
+                    default -> ".png";
+                };
+                return root.builder()
+                        .s(boardDescriptor.getBoardCode())
+                        .s("thumb")
+                        .s(arg.get("tim") + extension)
+                        .url();
+            }
+        });
         setActions(new VichanActions(this, getProxiedOkHttpClient(), getSiteManager(), getReplyManager()));
         setApi(new VichanApi(getSiteManager(), getBoardManager(), this));
         setParser(new VichanCommentParser());