Merge pull request #81 from Xyl-AU/soyjak-party-embed-styling

soyjak.party: support embeds, more text styling

Author: TrixiEther

extensions/sojakparty/res/values/strings.xml

@@ -1,4 +1,2 @@
 <resources>
-	<string name="preference_kaptcha_replies">Show Kaptcha for replies</string>
-	<string name="preference_kaptcha_replies_summary">Enable Kaptcha for replies instead of just new threads</string>
 </resources>

extensions/sojakparty/src/com/mishiranu/dashchan/chan/sojakparty/SojakpartyChanConfiguration.java

@@ -7,16 +7,11 @@
 public class SojakpartyChanConfiguration extends ChanConfiguration {
 
 	public static final String CAPTCHA_TYPE_NONE = "None";
-	public static final String CAPTCHA_TYPE_KAPTCHA = "Kaptcha";
-
-	public static final String KAPTCHA_REPLIES = "KaptchaReplies";
 
 	public SojakpartyChanConfiguration() {
 		request(OPTION_READ_POSTS_COUNT);
 		addCaptchaType(CAPTCHA_TYPE_NONE);
-		addCaptchaType(CAPTCHA_TYPE_KAPTCHA);
 		addCaptchaType(CAPTCHA_TYPE_RECAPTCHA_2);
-		addCustomPreference(KAPTCHA_REPLIES, false);
 		setDefaultName("Chud");
 	}
 
@@ -71,12 +66,6 @@ public Captcha obtainCustomCaptchaConfiguration(String captchaType) {
 		Captcha captcha;
 
 		switch (captchaType) {
-			case CAPTCHA_TYPE_KAPTCHA:
-				captcha = new Captcha();
-				captcha.title = captchaType;
-				captcha.input = Captcha.Input.ALL;
-				captcha.validity = Captcha.Validity.SHORT_LIFETIME;
-				break;
 			case CAPTCHA_TYPE_NONE:
 				captcha = new Captcha();
 				captcha.title = CAPTCHA_TYPE_NONE;
@@ -93,24 +82,6 @@ public Captcha obtainCustomCaptchaConfiguration(String captchaType) {
 
 	@Override
 	public CustomPreference obtainCustomPreferenceConfiguration(String key) {
-		Resources resources = getResources();
-		CustomPreference customPreference;
-
-		switch (key) {
-			case KAPTCHA_REPLIES:
-				customPreference = new CustomPreference();
-				customPreference.title = resources.getString(R.string.preference_kaptcha_replies);
-				customPreference.summary = resources.getString(R.string.preference_kaptcha_replies_summary);
-				break;
-			default:
-				customPreference = null;
-				break;
-		}
-
-		return customPreference;
-	}
-
-	public boolean isKaptchaRepliesEnabled() {
-		return get(null, KAPTCHA_REPLIES, false);
+		return null;
 	}
-}
+}

extensions/sojakparty/src/com/mishiranu/dashchan/chan/sojakparty/SojakpartyChanMarkup.java

@@ -19,6 +19,7 @@ public SojakpartyChanMarkup() {
 		addTag("code", TAG_CODE);
 		addTag("span", "spoiler", TAG_SPOILER);
 		addTag("span", "quote", TAG_QUOTE);
+		addTag("big", TAG_HEADING);
 		addColorable("div");
 		addColorable("span");
 	}

extensions/sojakparty/src/com/mishiranu/dashchan/chan/sojakparty/SojakpartyChanPerformer.java

@@ -1,7 +1,5 @@
 package com.mishiranu.dashchan.chan.sojakparty;
 
-import static com.mishiranu.dashchan.chan.sojakparty.SojakpartyChanConfiguration.CAPTCHA_TYPE_KAPTCHA;
-
 import static chan.content.ChanConfiguration.CAPTCHA_TYPE_RECAPTCHA_2;
 
 import java.io.IOException;
@@ -188,9 +186,6 @@ public SendPostResult onSendPost(SendPostData data) throws HttpException, ApiExc
 			String captchaType = data.captchaData.get(CAPTCHA_DATA_KEY_TYPE);
 			if (captchaType.equals(CAPTCHA_TYPE_RECAPTCHA_2)) {
 				entity.add("g-recaptcha-response", data.captchaData.get(CaptchaData.INPUT));
-			} else if (captchaType.equals(CAPTCHA_TYPE_KAPTCHA)) {
-				entity.add("_KAPTCHA_KEY", data.captchaData.get(CaptchaData.CHALLENGE));
-				entity.add("_KAPTCHA", StringUtils.emptyIfNull(data.captchaData.get(CaptchaData.INPUT)));
 			}
 		}
 
@@ -202,7 +197,7 @@ public SendPostResult onSendPost(SendPostData data) throws HttpException, ApiExc
 				.perform().readString();
 		try {
 			AntispamFieldsParser.parseAndApply(responseText, entity, "board", "thread", "name", "email",
-					"subject", "body", "password", "file", "spoiler", "json_response", "_KAPTCHA", "_KAPTCHA_NOJS", "_KAPTCHA_KEY");
+					"subject", "body", "password", "file", "spoiler", "json_response");
 		} catch (ParseException e) {
 			throw new InvalidResponseException();
 		}
@@ -337,18 +332,17 @@ public SendReportPostsResult onSendReportPosts(SendReportPostsData data) throws
 			return null;
 		}
 		String errorMessage = jsonObject.optString("error");
-		if (errorMessage != null) {
+		if (!errorMessage.isEmpty()) {
 			CommonUtils.writeLog("Soyjak.party report message", errorMessage);
 			throw new ApiException(errorMessage);
 		}
 		throw new InvalidResponseException();
 	}
 
 	@Override
-	public ReadCaptchaResult onReadCaptcha(ReadCaptchaData data) throws InvalidResponseException, HttpException {
+	public ReadCaptchaResult onReadCaptcha(ReadCaptchaData data) {
 		String captchaType = data.captchaType;
 		SojakpartyChanLocator locator = SojakpartyChanLocator.get(this);
-		SojakpartyChanConfiguration configuration = SojakpartyChanConfiguration.get(this);
 		ReadCaptchaResult result;
 		if (SojakpartyChanConfiguration.CAPTCHA_TYPE_RECAPTCHA_2.equals(captchaType)) {
 			CaptchaData captchaData = new CaptchaData();
@@ -360,33 +354,6 @@ public ReadCaptchaResult onReadCaptcha(ReadCaptchaData data) throws InvalidRespo
 		} else if (SojakpartyChanConfiguration.CAPTCHA_TYPE_NONE.equals(captchaType)) {
 			captchaType = null;
 			result = new ReadCaptchaResult(CaptchaState.SKIP, null);
-		} else if (CAPTCHA_TYPE_KAPTCHA.equals(captchaType)) {
-			if (data.threadNumber != null && !configuration.isKaptchaRepliesEnabled()) {
-				return new ReadCaptchaResult(CaptchaState.SKIP, null);
-			}
-			String chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789=-";
-			SecureRandom rnd = new SecureRandom();
-			StringBuilder keyBuilder = new StringBuilder(64);
-			for(int i = 0; i < 64; i++) {
-				keyBuilder.append(chars.charAt(rnd.nextInt(chars.length())));
-			}
-			String key = keyBuilder.toString();
-
-			Uri uri = Uri.parse("https://sys.kolyma.net/kaptcha/kaptcha.php?key=" + key);
-			Bitmap image;
-			String response = new HttpRequest(uri, data)
-					.addHeader(USER_AGENT_HTTP_HEADER_NAME, USER_AGENT_HTTP_HEADER_VALUE)
-					.perform().readString();
-			byte[] imageBytes = Base64.decode(response.split(", ")[1], 0);
-			image = imageBytes.length == 0 ? null
-					: BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.length);
-			if (image == null) {
-				throw new InvalidResponseException(new Exception("Image is null"));
-			}
-			CaptchaData captchaData = new CaptchaData();
-			captchaData.put(CAPTCHA_DATA_KEY_TYPE, CAPTCHA_TYPE_KAPTCHA);
-			captchaData.put(CaptchaData.CHALLENGE, key);
-			result = new ReadCaptchaResult(CaptchaState.CAPTCHA, captchaData).setImage(image);
 		} else {
 			throw new IllegalStateException();
 		}

extensions/sojakparty/src/com/mishiranu/dashchan/chan/sojakparty/SojakpartyModelMapper.java

@@ -7,6 +7,7 @@
 import java.util.Locale;
 
 import chan.content.model.Attachment;
+import chan.content.model.EmbeddedAttachment;
 import chan.content.model.FileAttachment;
 import chan.content.model.Icon;
 import chan.content.model.Post;
@@ -179,12 +180,28 @@ public static Post createPost(JsonSerial.Reader reader, SojakpartyChanLocator lo
 				case "com": {
 					String comment = reader.nextString()
 							.replaceAll("%23", "#")
-							.replaceAll("(?<=<a href=\\\")https://jump\\.kolyma\\.net/\\?", "")
-							.replaceAll("(?<=<div )class=\\\"glow", "style=\\\"color:#00FE20")
-							.replaceAll("(?<=<span )style=\\\"text-shadow:0px 0px 40px #fffb00, 0px 0px 2px #fffb00", "style=\\\"color:#FFFB00")
-							.replaceAll("(?<=<span )class=\\\"heading2", "style=\\\"color:#2424AD")
-							.replaceAll("(?<=<span )class=\\\"heading", "style=\\\"color:#AF0A0F")
-							.replaceAll("(?<=<span )class=\\\"quote2", "style=\\\"color:#F6750B");
+							.replaceAll("<div", "<span")
+							.replaceAll("</div", "</span")
+							// gemerald text
+							.replaceAll("<span style=\"background: linear-gradient\\(to left, red, orange , yellow, green, cyan, blue, violet\\);-webkit-background-clip: text;-webkit-text-fill-color: transparent;\"><span class=\"glow\">(<[^/]*>)*(.*?)</span></span>",
+									"<span style=\"color:#00FE20\">$1\uD83D\uDC8E $2 \uD83D\uDC8E</span>")
+							// diamond text
+							.replaceAll("<span style=\"background: linear-gradient\\(to left, red, orange , yellow, green, cyan, blue, violet\\);-webkit-background-clip: text;-webkit-text-fill-color: transparent;\"><span style=\"text-shadow:0px 0px 40px #36d7f7, 0px 0px 2px #36d7f7\">(<[^/]*>)*(.*?)</span></span>",
+									"<span style=\"color:#36D7F7\">$1\uD83D\uDC8E $2 \uD83D\uDC8E</span>")
+							// gold text
+							.replaceAll("<span style=\"background: linear-gradient\\(to left, red, orange , yellow, green, cyan, blue, violet\\);-webkit-background-clip: text;-webkit-text-fill-color: transparent;\"><span style=\"text-shadow:0px 0px 40px #fffb00, 0px 0px 2px #fffb00\">(<[^/]*>)*(.*?)</span></span>",
+									"<span style=\"color:#FFFB00\">$1\uD83C\uDFC6 $2 \uD83C\uDFC6</span>")
+							// rainbow text
+							.replaceAll("<span style=\"background: linear-gradient\\(to left, red, orange , yellow, green, cyan, blue, violet\\);-webkit-background-clip: text;-webkit-text-fill-color: transparent;\">(<[^/]*>)*(.*?)</span>",
+									"<span>$1\uD83C\uDF08 $2 \uD83C\uDF08</span>")
+							.replaceAll("<span class=\"rotate\">(<[^/]*>)*(.*?)</span>","<span>$1\uD83D\uDD03 $2 \uD83D\uDD03</span>") // spin text
+							.replaceAll("<span class=\"glow\">(.*?)</span>", "<span style=\"color:#00FE20\">$1</span>") // glow text
+							.replaceAll("<span style=\"text-shadow:0px 0px 40px #36d7f7, 0px 0px 2px #36d7f7\">(.*?)</span>", "<span style=\"color:#36D7F7\">$1</span>") // blue glow text
+							.replaceAll("<span style=\"text-shadow:0px 0px 40px #fffb00, 0px 0px 2px #fffb00\">(.*?)</span>", "<span style=\"color:#FFFB00\">$1</span>") // sneed text
+							.replaceAll("<span class=\"heading\">(.*?)</span>","<span style=\"color:#AF0A0F\">$1</span>") // red text
+							.replaceAll("<span class=\"heading2\">(.*?)</span>","<span style=\"color:#2424AD\">$1</span>") // blue text
+							.replaceAll("<span class=\"quote2\">(.*?)</span>", "<span style=\"color:#F6750B\">$1</span>") // orange quote
+							.replaceAll("<font color=\"FD3D98\"><b>(.*?)</b></font>", "<strong><span style=\"color:#FD3D98\">$1</span></strong>"); // pink text
 					post.setComment(comment);
 					break;
 				}
@@ -243,6 +260,15 @@ public static Post createPost(JsonSerial.Reader reader, SojakpartyChanLocator lo
 					}
 					break;
 				}
+				case "embed": {
+					String embedString = reader.nextString()
+							.replaceAll("vocaroo\\.com/embed", "vocaroo.com");
+					EmbeddedAttachment attachment = EmbeddedAttachment.obtain(embedString);
+					if (attachment != null) {
+						attachments.add(attachment);
+					}
+					break;
+				}
 				default: {
 					reader.skip();
 					break;
@@ -251,8 +277,8 @@ public static Post createPost(JsonSerial.Reader reader, SojakpartyChanLocator lo
 		}
 		if (tim != null && size >= 0) {
 			attachments.add(0, createFileAttachment(locator, boardName, tim, ext, filename, size, width, height));
-			post.setAttachments(attachments);
 		}
+		post.setAttachments(attachments);
 		if (CommonUtils.equals(post.getIdentifier(), post.getCapcode())) {
 			post.setIdentifier(null);
 		}