Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Dialogs/ListEdit.vala
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public class Tuba.Dialogs.ListEdit : Adw.PreferencesWindow {

if (memebers_to_be_removed.size > 0) {
var id_array = Request.array2string (memebers_to_be_removed, "account_ids");
new Request.DELETE (@"/api/v1/lists/$(list.id)/accounts/?$id_array")
new Request.DELETE (@"/api/v1/lists/$(list.id)/accounts?$id_array")
.with_account (accounts.active)
.exec ();
}
Expand Down
2 changes: 1 addition & 1 deletion src/Services/Accounts/InstanceAccount.vala
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ public class Tuba.InstanceAccount : API.Account, Streamable {

public virtual string? get_stream_url () {
if (instance == null || access_token == null) return null;
return @"$instance/api/v1/streaming/?stream=user:notification&access_token=$access_token";
return @"$instance/api/v1/streaming?stream=user:notification&access_token=$access_token";
}

public virtual void on_notification_event (Streamable.Event ev) {
Expand Down
2 changes: 1 addition & 1 deletion src/Views/Conversations.vala
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class Tuba.Views.Conversations : Views.Timeline {

public override string? get_stream_url () {
return account != null
? @"$(account.instance)/api/v1/streaming/?stream=direct&access_token=$(account.access_token)"
? @"$(account.instance)/api/v1/streaming?stream=direct&access_token=$(account.access_token)"
: null;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Views/Federated.vala
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class Tuba.Views.Federated : Views.Timeline {

public override string? get_stream_url () {
return account != null
? @"$(account.instance)/api/v1/streaming/?stream=public&access_token=$(account.access_token)"
? @"$(account.instance)/api/v1/streaming?stream=public&access_token=$(account.access_token)"
: null;
}
}
2 changes: 1 addition & 1 deletion src/Views/Hashtag.vala
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public class Tuba.Views.Hashtag : Views.Timeline {
var split_url = url.split ("/");
var tag = split_url[split_url.length - 1];
return account != null
? @"$(account.instance)/api/v1/streaming/?stream=hashtag&tag=$tag&access_token=$(account.access_token)"
? @"$(account.instance)/api/v1/streaming?stream=hashtag&tag=$tag&access_token=$(account.access_token)"
: null;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Views/Home.vala
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public class Tuba.Views.Home : Views.Timeline {

public override string? get_stream_url () {
return account != null
? @"$(account.instance)/api/v1/streaming/?stream=user&access_token=$(account.access_token)"
? @"$(account.instance)/api/v1/streaming?stream=user&access_token=$(account.access_token)"
: null;
}
}
2 changes: 1 addition & 1 deletion src/Views/List.vala
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class Tuba.Views.List : Views.Timeline {
if (list == null)
return null;
return account != null
? @"$(account.instance)/api/v1/streaming/?stream=list&list=$(list.id)&access_token=$(account.access_token)"
? @"$(account.instance)/api/v1/streaming?stream=list&list=$(list.id)&access_token=$(account.access_token)"
: null;
}
}
2 changes: 1 addition & 1 deletion src/Views/Local.vala
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class Tuba.Views.Local : Views.Federated {

public override string? get_stream_url () {
return account != null
? @"$(account.instance)/api/v1/streaming/?stream=public:local&access_token=$(account.access_token)"
? @"$(account.instance)/api/v1/streaming?stream=public:local&access_token=$(account.access_token)"
: null;
}
}
2 changes: 1 addition & 1 deletion src/Views/Notifications.vala
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public class Tuba.Views.Notifications : Views.Timeline, AccountHolder, Streamabl

public override string? get_stream_url () {
return account != null
? @"$(account.instance)/api/v1/streaming/?stream=user:notification&access_token=$(account.access_token)"
? @"$(account.instance)/api/v1/streaming?stream=user:notification&access_token=$(account.access_token)"
: null;
}
}
2 changes: 1 addition & 1 deletion src/Views/Profile.vala
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ public class Tuba.Views.Profile : Views.Accounts {
public void handle_list_edit (API.List list, Adw.ActionRow row, Adw.ToastOverlay toast_overlay, RowButton button) {
row.sensitive = false;

var endpoint = @"/api/v1/lists/$(list.id)/accounts/?account_ids[]=$(profile.account.id)";
var endpoint = @"/api/v1/lists/$(list.id)/accounts?account_ids[]=$(profile.account.id)";
var req = button.remove ? new Request.DELETE (endpoint) : new Request.POST (endpoint);
req
.with_account (accounts.active)
Expand Down