no more api/2

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

ufw

@@ -51,7 +51,6 @@ usage() {
 		        cfg_url_regex
 		        cfg_tmp_dir
 		        cfg_service_url
-		        cfg_api_path
 	EOF
 }
 
@@ -78,7 +77,7 @@ 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"
 
@@ -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=$( jshon -e data -e "$file_url_request" -u <<< "$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"
+			jshon -e data -e short_url -u <<< "$api_response"
 		)
 
 		printf '%s\n' "$short_url"
@@ -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