diff --git a/src/Dialogs/Compose.vala b/src/Dialogs/Compose.vala
index cc31b52..67787bd 100644
--- a/src/Dialogs/Compose.vala
+++ b/src/Dialogs/Compose.vala
@@ -290,17 +290,17 @@ public class Tootle.Dialogs.Compose : Hdy.Window {
var req = new Request.POST (@"/api/v1/statuses?$media_param")
.with_account (accounts.active)
- .with_param ("visibility", visibility_popover.selected.to_string ())
- .with_param ("status", HtmlUtils.uri_encode (status.content));
+ .with_form_data ("visibility", visibility_popover.selected.to_string ())
+ .with_form_data ("status", status.content);
if (cw_button.active) {
- req.with_param ("sensitive", "true");
- req.with_param ("spoiler_text", HtmlUtils.uri_encode (cw.text));
+ req.with_form_data ("sensitive", "true");
+ req.with_form_data ("spoiler_text", cw.text);
}
if (status.in_reply_to_id != null)
- req.with_param ("in_reply_to_id", status.in_reply_to_id);
+ req.with_form_data ("in_reply_to_id", status.in_reply_to_id);
if (status.in_reply_to_account_id != null)
- req.with_param ("in_reply_to_account_id", status.in_reply_to_account_id);
+ req.with_form_data ("in_reply_to_account_id", status.in_reply_to_account_id);
yield req.await ();
diff --git a/src/Dialogs/NewAccount.vala b/src/Dialogs/NewAccount.vala
index 1c60d40..5353d39 100644
--- a/src/Dialogs/NewAccount.vala
+++ b/src/Dialogs/NewAccount.vala
@@ -3,7 +3,7 @@ using Gtk;
[GtkTemplate (ui = "/com/github/bleakgrey/tootle/ui/dialogs/new_account.ui")]
public class Tootle.Dialogs.NewAccount: Hdy.Window {
- const string scopes = "read%20write%20follow";
+ const string scopes = "read write follow";
protected bool is_working { get; set; default = false; }
protected string? redirect_uri { get; set; }
@@ -131,10 +131,10 @@ public class Tootle.Dialogs.NewAccount: Hdy.Window {
var msg = new Request.POST (@"/api/v1/apps")
.with_account (account)
- .with_param ("client_name", Build.NAME)
- .with_param ("website", Build.WEBSITE)
- .with_param ("scopes", scopes)
- .with_param ("redirect_uris", redirect_uri = setup_redirect_uri ());
+ .with_form_data ("client_name", Build.NAME)
+ .with_form_data ("website", Build.WEBSITE)
+ .with_form_data ("scopes", scopes)
+ .with_form_data ("redirect_uris", redirect_uri = setup_redirect_uri ());
yield msg.await ();
var root = network.parse (msg);
diff --git a/src/Html.vala b/src/Html.vala
index 71db98d..0f6c060 100644
--- a/src/Html.vala
+++ b/src/Html.vala
@@ -23,11 +23,14 @@ public class Tootle.HtmlUtils {
var divided = str
.replace("
", "\n")
.replace("", "")
+ .replace("
", "\n")
.replace("
", "\n")
.replace("
", "") - .replace("
", "\n\n"); + .replace("", "\n\n") + .replace("", "") + .replace("", ""); - var html_params = new Regex ("(class|target|rel)=\"(.|\n)*?\"", RegexCompileFlags.CASELESS); + var html_params = new Regex ("(class|target|rel|data-user|data-tag)=\"(.|\n)*?\"", RegexCompileFlags.CASELESS); var simplified = html_params.replace (divided, -1, 0, ""); while (simplified.has_suffix ("\n")) @@ -41,6 +44,18 @@ public class Tootle.HtmlUtils { } } + public static string replace_with_pango_markup (string str) { + return str + .replace("", "") + .replace("", "") + .replace("", "") + .replace("", "") + .replace("
", "")
+ .replace("
", "\n")
+ .replace("