Mirrors/Frost-for-Facebook
1
0
Fork 0
mirror of https://github.com/AllanWang/Frost-for-Facebook.git synced 2024-11-08 20:12:39 +01:00
Code Issues Releases Activity

Merge pull request #1679 from AllanWang/query-encode

Browse Source
This commit is contained in:
Allan Wang 2020-05-23 17:56:26 -07:00 committed by GitHub
commit 1a2add1d0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/kotlin/com/pitchedapps/frost/facebook/FbUrlFormatter.kt
View File

@ -18,6 +18,7 @@ package com.pitchedapps.frost.facebook
import android.net.Uri
import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.utils.urlEncode
import java.net.URLDecoder
import java.nio.charset.StandardCharsets
@ -89,21 +90,19 @@ class FbUrlFormatter(url: String) {
return cleanedUrl
}
override fun toString(): String {
val builder = StringBuilder()
builder.append(cleaned)
override fun toString(): String = buildString {
append(cleaned)
if (queries.isNotEmpty()) {
builder.append("?")
append("?")
queries.forEach { (k, v) ->
if (v.isEmpty()) {
builder.append("$k&")
append("${k.urlEncode()}&")
} else {
builder.append("$k=$v&")
append("${k.urlEncode()}=${v.urlEncode()}&")
}
}
}
return builder.removeSuffix("&").toString()
}
}.removeSuffix("&")
fun toLogList(): List<String> {
val list = mutableListOf(cleaned)

3
app/src/main/kotlin/com/pitchedapps/frost/facebook/parsers/SearchParser.kt
View File

@ -23,6 +23,7 @@ import com.pitchedapps.frost.facebook.FbItem
import com.pitchedapps.frost.facebook.formattedFbUrl
import com.pitchedapps.frost.facebook.parsers.FrostSearch.Companion.create
import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.utils.urlEncode
import org.jsoup.nodes.Document
import org.jsoup.nodes.Element
@ -31,7 +32,7 @@ import org.jsoup.nodes.Element
*/
object SearchParser : FrostParser<FrostSearches> by SearchParserImpl() {
fun query(cookie: String?, input: String): ParseResponse<FrostSearches>? {
val url = "${FbItem._SEARCH_PARSE.url}?q=${if (input.isNotBlank()) input else "a"}"
val url = "${FbItem._SEARCH_PARSE.url}/?q=${if (input.isNotBlank()) input.urlEncode() else "a"}"
L._i { "Search Query $url" }
return parseFromUrl(cookie, url)
}

7
app/src/test/kotlin/com/pitchedapps/frost/facebook/FbUrlTest.kt
View File

@ -163,6 +163,13 @@ class FbUrlTest {
assertFbFormat(expected, url)
}
@Test
fun queryUrlEncode() {
val url = "${ FB_URL_BASE}sample/?q=#foo"
val expected = "${ FB_URL_BASE}sample/?q=%23foo"
assertFbFormat(expected, url)
}
// @Test
// fun viewFullImageIndirect() {
// val urlBase = "photo/view_full_size/?fbid=1234&ref_component=mbasic_photo_permalink&ref_page=%2Fwap%2Fphoto.php&refid=13&_ft_=qid.1234%3Amf_story_key.1234%3Atop_level_post_id"

5
app/src/test/kotlin/com/pitchedapps/frost/utils/UrlTests.kt
View File

@ -56,4 +56,9 @@ class UrlTests {
assertFalse(GOOGLE.isFacebookUrl, "google")
assertTrue(FACEBOOK_COM.isFacebookUrl, "facebook")
}
@Test
fun queryEncoding() {
assertEquals("%23foo", "#foo".urlEncode())
}
}