TakeV
/
Tooth
mirror of https://github.com/TakeV-Lambda/Tooth.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: update instance account info on start

This commit is contained in:
Evangelos Paterakis 2023-02-26 08:16:51 +02:00
parent 5eb82025a1
commit bb38f7ff0e
No known key found for this signature in database
GPG Key ID: FE5185F095BFC8C9
3 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Services/Accounts/SecretAccountStore.vala
View File

@ -36,6 +36,16 @@ public class Tooth.SecretAccountStore : AccountStore {
secrets.foreach (item => {
var account = secret_to_account (item);
if (account != null) {
new Request.GET (@"/api/v1/accounts/$(account.id)")
.with_account (account)
.then ((sess, msg) => {
var node = network.parse_node (msg);
var acc = API.Account.from (node);
account.display_name = acc.display_name;
account.avatar = acc.avatar;
})
.exec ();
saved.add (account);
account.added ();
}

39
src/Views/Sidebar.vala
View File

@ -79,15 +79,25 @@ public class Tooth.Views.Sidebar : Box, AccountHolder {
}
}
private Binding sidebar_display_name;
private Binding sidebar_handle_short;
private Binding sidebar_avatar;
private ulong sidebar_private_signal;
protected virtual void on_account_changed (InstanceAccount? account) {
if (this.account != null) {
sidebar_display_name.unbind();
sidebar_handle_short.unbind();
sidebar_avatar.unbind();
this.account.disconnect(sidebar_private_signal);
}
this.account = account;
accounts_button.active = false;
if (account != null) {
this.account.bind_property("display-name", title, "label", BindingFlags.SYNC_CREATE);
this.account.notify["locked"].connect(() => {
sidebar_private_signal = this.account.notify["locked"].connect(() => {
uint indx;
var found = this.account.known_places.find (Mastodon.Account.PLACE_FOLLOW_REQUESTS, out indx);
var found = this.account.known_places.find (Mastodon.Account.PLACE_FOLLOW_REQUESTS, out indx);
if (this.account.locked == false && found == true) {
this.account.known_places.remove(indx);
@ -95,14 +105,15 @@ public class Tooth.Views.Sidebar : Box, AccountHolder {
this.account.known_places.append(Mastodon.Account.PLACE_FOLLOW_REQUESTS);
}
});
sidebar_display_name = this.account.bind_property("display-name", title, "label", BindingFlags.SYNC_CREATE);
sidebar_handle_short = this.account.bind_property("handle_short", subtitle, "label", BindingFlags.SYNC_CREATE);
sidebar_avatar = this.account.bind_property("avatar", avatar, "avatar-url", BindingFlags.SYNC_CREATE);
// FIXME: Wrapping
// this.account.notify["display-name"].connect(() => {
// title.instance_emojis = this.account.emojis_map;
// title.label = this.account.display_name;
// });
this.account.bind_property("handle_short", subtitle, "label", BindingFlags.SYNC_CREATE);
this.bind_property("account", avatar, "account", BindingFlags.SYNC_CREATE);
account_items.model = account.known_places;
} else {
saved_accounts.unselect_all ();
@ -184,12 +195,22 @@ public class Tooth.Views.Sidebar : Box, AccountHolder {
[GtkChild] unowned Widgets.Avatar avatar;
[GtkChild] unowned Button forget;
private Binding switcher_display_name;
private Binding switcher_handle;
private Binding switcher_avatar;
public AccountRow (InstanceAccount? _account) {
if (account != null) {
switcher_display_name.unbind();
switcher_handle.unbind();
switcher_avatar.unbind();
}
account = _account;
if (account != null) {
title = account.display_name;
subtitle = account.handle;
avatar.account = account;
switcher_display_name = this.account.bind_property("display-name", this, "title", BindingFlags.SYNC_CREATE);
switcher_handle = this.account.bind_property("handle", this, "subtitle", BindingFlags.SYNC_CREATE);
switcher_avatar = this.account.bind_property("avatar", avatar, "avatar-url", BindingFlags.SYNC_CREATE);
}
else {
title = _("Add Account");

8
src/Widgets/Avatar.vala
View File

@ -15,6 +15,7 @@ public class Tooth.Widgets.Avatar : Button {
protected Adw.Avatar? avatar {
get { return child as Adw.Avatar; }
}
public string? avatar_url { get; set; }
construct {
child = new Adw.Avatar (48, null, true);
@ -25,9 +26,16 @@ public class Tooth.Widgets.Avatar : Button {
add_css_class ("ttl-flat-button");
notify["account"].connect (on_invalidated);
notify["avatar-url"].connect (on_avatar_url_change);
on_invalidated ();
}
void on_avatar_url_change () {
if (avatar_url == null) return;
image_cache.request_paintable (avatar_url, on_cache_response);
}
void on_invalidated () {
if (account == null) {
avatar.text = "d";