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

feat: move status kind to InstanceAccount from Mastodon.Account 

feat: enable KIND_FOLLOW_REQUEST

KINDs are not really Mastodon exclusive
This commit is contained in:
Evangelos Paterakis 2023-01-05 05:51:45 +02:00
parent 26ce911394
commit d2f2621612
No known key found for this signature in database
GPG Key ID: FE5185F095BFC8C9
3 changed files with 53 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/Services/Accounts/InstanceAccount.vala
View File

@ -7,6 +7,14 @@ public class Tooth.InstanceAccount : API.Account, Streamable {
public const string EVENT_DELETE_POST = "delete";
public const string EVENT_NOTIFICATION = "notification";
public const string KIND_MENTION = "mention";
public const string KIND_REBLOG = "reblog";
public const string KIND_FAVOURITE = "favourite";
public const string KIND_FOLLOW = "follow";
public const string KIND_POLL = "poll";
public const string KIND_FOLLOW_REQUEST = "follow_request";
public const string KIND_REMOTE_REBLOG = "__remote-reblog";
public string? backend { set; get; }
public string? instance { get; set; }
public string? client_id { get; set; }
@ -114,9 +122,48 @@ public class Tooth.InstanceAccount : API.Account, Streamable {
}
public virtual void describe_kind (string kind, out string? icon, out string? descr, API.Account account, out string? descr_url) {
icon = null;
descr = null;
descr_url = null;
switch (kind) {
case KIND_MENTION:
icon = "tooth-chat-symbolic";
descr = _("%s mentioned you").printf (account.display_name);
descr_url = account.url;
break;
case KIND_REBLOG:
icon = "tooth-media-playlist-repeat-symbolic";
descr = _("%s boosted your status").printf (account.display_name);
descr_url = account.url;
break;
case KIND_REMOTE_REBLOG:
icon = "tooth-media-playlist-repeat-symbolic";
descr = _("%s boosted").printf (account.display_name);
descr_url = account.url;
break;
case KIND_FAVOURITE:
icon = "tooth-starred-symbolic";
descr = _("%s favorited your status").printf (account.display_name);
descr_url = account.url;
break;
case KIND_FOLLOW:
icon = "tooth-contact-new-symbolic";
descr = _("%s now follows you").printf (account.display_name);
descr_url = account.url;
break;
case KIND_FOLLOW_REQUEST:
icon = "tooth-contact-new-symbolic";
descr = _("%s wants to follow you").printf (account.display_name);
descr_url = account.url;
break;
case KIND_POLL:
icon = "tooth-check-round-outline-symbolic";
descr = _("Poll results");
descr_url = null;
break;
default:
icon = null;
descr = null;
descr_url = null;
break;
}
}
public virtual void register_known_places (GLib.ListStore places) {}
@ -237,8 +284,7 @@ public class Tooth.InstanceAccount : API.Account, Streamable {
unread_count++;
has_unread = true;
send_toast (entity);
}
else {
} else {
read_notifications (last_received_id);
}
}

54
src/Services/Accounts/Mastodon/Account.vala
View File

@ -2,14 +2,6 @@ public class Tooth.Mastodon.Account : InstanceAccount {
public const string BACKEND = "Mastodon";
public const string KIND_MENTION = "mention";
public const string KIND_REBLOG = "reblog";
public const string KIND_FAVOURITE = "favourite";
public const string KIND_FOLLOW = "follow";
public const string KIND_POLL = "poll";
public const string KIND_FOLLOW_REQUEST = "__follow-request";
public const string KIND_REMOTE_REBLOG = "__remote-reblog";
class Test : AccountStore.BackendTest {
public override string? get_backend (Json.Object obj) {
return BACKEND; // Always treat instances as compatible with Mastodon
@ -150,50 +142,4 @@ public class Tooth.Mastodon.Account : InstanceAccount {
view.is_sidebar_item = true;
return view;
}
public override void describe_kind (string kind, out string? icon, out string? descr, API.Account account, out string? descr_url) {
switch (kind) {
case KIND_MENTION:
icon = "tooth-chat-symbolic";
descr = _("%s mentioned you").printf (account.display_name);
descr_url = account.url;
break;
case KIND_REBLOG:
icon = "tooth-media-playlist-repeat-symbolic";
descr = _("%s boosted your status").printf (account.display_name);
descr_url = account.url;
break;
case KIND_REMOTE_REBLOG:
icon = "tooth-media-playlist-repeat-symbolic";
descr = _("%s boosted").printf (account.display_name);
descr_url = account.url;
break;
case KIND_FAVOURITE:
icon = "tooth-starred-symbolic";
descr = _("%s favorited your status").printf (account.display_name);
descr_url = account.url;
break;
case KIND_FOLLOW:
icon = "tooth-contact-new-symbolic";
descr = _("%s now follows you").printf (account.display_name);
descr_url = account.url;
break;
case KIND_FOLLOW_REQUEST:
icon = "tooth-contact-new-symbolic";
descr = _("%s wants to follow you").printf (account.display_name);
descr_url = account.url;
break;
case KIND_POLL:
icon = "tooth-check-round-outline-symbolic";
descr = _("Poll results");
descr_url = null;
break;
default:
icon = null;
descr = null;
descr_url = null;
break;
}
}
}

4
src/Widgets/Status.vala
View File

@ -86,7 +86,7 @@ public class Tooth.Widgets.Status : ListBoxRow {
);
if (kind == null && status.reblog != null) {
kind = Mastodon.Account.KIND_REMOTE_REBLOG;
kind = InstanceAccount.KIND_REMOTE_REBLOG;
}
check_actions();
@ -96,7 +96,7 @@ public class Tooth.Widgets.Status : ListBoxRow {
}
private void check_actions() {
if (kind == Mastodon.Account.KIND_FOLLOW || kind == Mastodon.Account.KIND_FOLLOW_REQUEST) {
if (kind == InstanceAccount.KIND_FOLLOW || kind == InstanceAccount.KIND_FOLLOW_REQUEST) {
actions.visible = false;
}
}