How long has that been there, wtf

Signed-off-by: fbt <fbt@fleshless.org>

README.md

@@ -16,7 +16,7 @@ ufw
 ufw can upload files to 8fw.me, shorten urls and show you your ip.  
 Call ufw -h for help.
 
-Dependencies: curl, jshon
+Dependencies: curl, jq
 
 ufwd
 ----

ufw

@@ -51,7 +51,6 @@ usage() {
 		        cfg_url_regex
 		        cfg_tmp_dir
 		        cfg_service_url
-		        cfg_api_path
 	EOF
 }
 
@@ -78,12 +77,12 @@ get_max_filesize() {
 get_album_id() {
 	declare api_response api_status api_status_message
 
-	api_response=$( curl -fsL "$cfg_service_url/$cfg_api_path/album?a=new&name=$1&format=json&secret=$secret" )
+	api_response=$( curl -fsL "$cfg_service_url/albumctl.json?m=new&name=$1&secret=$secret" )
 
 	get_api_status <<< "$api_response"
 
 	if (( api_status == 200 )); then
-		album_id=$( jshon -e data -e album -e id -u <<< "$api_response" )
+		album_id=$( jq -r '.data.album.id' <<< "$api_response" )
 		misc_curl_args+=( -F album_id="$album_id" )
 	else
 		printf 'Error [album]: %s %s\n' "$api_status" "$api_status_message"
@@ -111,7 +110,7 @@ upload() {
 
 			get_max_filesize || { return 1; }
 
-			curl --max-filesize "$max_filesize_bytes" -skL "$target" > "$file"
+			curl --max-filesize "$max_filesize_bytes" -sL "$target" > "$file"
 			curl_result=$?
 
 			if (( curl_result )); then
@@ -148,26 +147,26 @@ upload() {
 		-F submit="" \
 		"${misc_curl_args[@]}" \
 		-A 'zerofiles.org upload script' \
-		"$cfg_service_url/$cfg_api_path/upload" )
+		"$cfg_service_url/maw.json" )
 
 	if (( flag_shortlink )); then
 		if (( flag_directlink )); then
-			file_url_request='short_url_direct'
-		else
 			file_url_request='short_url'
+		else
+			file_url_request='page_short_url'
 		fi
 	else
-		if (( flag_directlink )); then
+		file_url_request='url'
-			file_url_request='direct_url'
-		else
-			file_url_request='page_url'
-		fi
 	fi
 
 	get_api_status <<< "$api_response"
 
 	if (( api_status == 200 )); then
-		file_link=$( jshon -e data -e file -e "$file_url_request" -u <<< "$api_response" )
+		file_link=$( jq -r ".data.${file_url_request}" <<< "$api_response" )
+
+		(( flag_shortlink )) || {
+			(( flag_directlink )) || file_link="${file_link#*.}"
+		}
 
 		printf '%s\n' "$file_link"
 
@@ -184,13 +183,12 @@ upload() {
 get_shortlink() {
 	declare url=$1 api_response api_status api_status_message
 
-	api_response=$( curl -sL "$cfg_service_url/$cfg_api_path/url?a=add&url=${url}&format=json&secret=$secret" )
+	api_response=$( curl -sL "$cfg_service_url/shrink.json?url=${url}&secret=$secret" )
-
 	get_api_status <<< "$api_response"
 
 	if (( api_status == 200 )); then
 		read -r short_url real_url < <(
-			jshon -e data -e URL -e shorturl -u <<< "$api_response"
+			jq -r '.data.short_url' <<< "$api_response"
 		)
 
 		printf '%s\n' "$short_url"
@@ -223,7 +221,7 @@ take_screenshot() {
 
 get_api_status() {
 	read -d '' -r api_status api_status_message < <(
-		jshon -e status -e code -u -p -e message -u
+		jq -r '.status.code, .status.message'
 	)
 
 	if ! (( api_status == 200 )); then
@@ -254,7 +252,7 @@ get_my_ip() {
 	get_api_status <<< "$api_response"
 
 	if (( api_status == 200 )); then
-		my_ip=$( jshon -e data -e ip -u <<< "$api_response" )
+		my_ip=$( jq -r '.data.ip' <<< "$api_response" )
 		printf '%s\n' "$my_ip"
 	else
 		printf 'Error: %s %s\n' "$api_status" "$api_status_message"
@@ -264,7 +262,7 @@ get_my_ip() {
 login() {
 	declare api_response
 
-	api_response=$( curl -sl "$cfg_service_url/$cfg_api_path/get_login_token?login=$login&format=json" )
+	api_response=$( curl -sl "$cfg_service_url/token_request.json?login=$login" )
 
 	if get_api_status <<< "$api_response"; then
 		printf 'Check your email.\n'
@@ -326,7 +324,6 @@ main() {
 	cfg_service_url='https://8fw.me'
 	cfg_screenshot_ext='png'
 	cfg_max_filesize='200M'
-	cfg_api_path='/api/2'
 
 	flag_shortlink=0
 	flag_directlink=1