Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(explore): link timelines #1113

Merged
merged 3 commits into from
Sep 14, 2024
Merged

feat(explore): link timelines #1113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1c7b78
feat(explore): link timelines
GeopJr Sep 14, 2024
4e5b8c3
fix: remove flat style
GeopJr Sep 14, 2024
6c364c5
feat: lock to mastodon api version >= 1
GeopJr Sep 14, 2024
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: 2 additions & 0 deletions data/gresource.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@
<file>ui/widgets/status.ui</file>
<file>ui/widgets/votebox.ui</file>
<file>ui/widgets/preview_card.ui</file>
<file>ui/widgets/preview_card_internal.ui</file>
<file>ui/widgets/preview_card_explore.ui</file>
<file>ui/widgets/profile.ui</file>
<file>ui/dialogs/admin_dashboard.ui</file>
<file>ui/dialogs/list_edit.ui</file>
Expand Down
69 changes: 1 addition & 68 deletions data/ui/widgets/preview_card.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,74 +12,7 @@
<class name="flat" />
</style>
<child>
<object class="GtkBox" id="box">
<property name="orientation">vertical</property>
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<property name="valign">center</property>
<property name="hexpand">1</property>
<property name="margin-top">12</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-bottom">12</property>
<child>
<object class="GtkLabel" id="author_label">
<property name="ellipsize">end</property>
<property name="halign">start</property>
<property name="single-line-mode">1</property>
<style>
<class name="dim-label" />
<class name="caption" />
</style>
</object>
</child>
<child>
<object class="GtkLabel" id="title_label">
<property name="visible">0</property>
<property name="ellipsize">end</property>
<property name="halign">fill</property>
<property name="xalign">0</property>
<property name="lines">2</property>
<property name="wrap">1</property>
<property name="wrap-mode">word-char</property>
<style>
<class name="font-bold" />
</style>
</object>
</child>
<child>
<object class="GtkLabel" id="description_label">
<property name="visible">0</property>
<property name="ellipsize">end</property>
<property name="halign">fill</property>
<property name="xalign">0</property>
<property name="lines">3</property>
<property name="wrap">1</property>
<property name="wrap-mode">word-char</property>
<property name="single-line-mode">1</property>
<style>
<class name="caption" />
</style>
</object>
</child>
<child>
<object class="GtkLabel" id="used_times_label">
<property name="visible">0</property>
<property name="halign">fill</property>
<property name="xalign">0</property>
<property name="wrap">1</property>
<property name="wrap-mode">word-char</property>
<style>
<class name="dim-label" />
<class name="caption" />
</style>
</object>
</child>
</object>
</child>
</object>
<object class="TubaWidgetsPreviewCardInternal" id="box" />
</child>
</object>
</child>
Expand Down
16 changes: 16 additions & 0 deletions data/ui/widgets/preview_card_explore.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0" />
<template class="TubaWidgetsPreviewCardExplore" parent="GtkListBoxRow">
<style>
<class name="preview_card" />
<class name="explore" />
</style>
<child>
<object class="TubaWidgetsPreviewCardInternal" id="box">
<property name="orientation">horizontal</property>
<property name="homogeneous">1</property>
</object>
</child>
</template>
</interface>
59 changes: 59 additions & 0 deletions data/ui/widgets/preview_card_internal.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0" />
<template class="TubaWidgetsPreviewCardInternal" parent="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="internal_box">
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<property name="valign">center</property>
<property name="hexpand">1</property>
<property name="margin-top">12</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-bottom">12</property>
<child>
<object class="GtkLabel" id="author_label">
<property name="ellipsize">end</property>
<property name="halign">start</property>
<property name="single-line-mode">1</property>
<style>
<class name="dim-label" />
<class name="caption" />
</style>
</object>
</child>
<child>
<object class="GtkLabel" id="title_label">
<property name="visible">0</property>
<property name="ellipsize">end</property>
<property name="halign">fill</property>
<property name="xalign">0</property>
<property name="lines">2</property>
<property name="wrap">1</property>
<property name="wrap-mode">word-char</property>
<style>
<class name="font-bold" />
</style>
</object>
</child>
<child>
<object class="GtkLabel" id="description_label">
<property name="visible">0</property>
<property name="ellipsize">end</property>
<property name="halign">fill</property>
<property name="xalign">0</property>
<property name="lines">3</property>
<property name="wrap">1</property>
<property name="wrap-mode">word-char</property>
<property name="single-line-mode">1</property>
<style>
<class name="caption" />
</style>
</object>
</child>
</object>
</child>
</template>
</interface>
1 change: 1 addition & 0 deletions src/API/Instance.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public class Tuba.API.Instance : Entity {
public Gee.ArrayList<Rule>? rules { get; set; }

public bool tuba_can_translate { get; set; default=false; }
public int8 tuba_mastodon_version { get; set; default=0; }

public override Type deserialize_array_type (string prop) {
switch (prop) {
Expand Down
5 changes: 5 additions & 0 deletions src/API/InstanceV2.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ public class Tuba.API.InstanceV2 : Entity {
public Translation translation { get; set; default = null; }
}

public class APIVersions : Entity {
public int8 mastodon { get; set; default = 0; }
}

public Configuration configuration { get; set; default = null; }
public APIVersions? api_versions { get; set; default = null; }

public static InstanceV2 from (Json.Node node) throws Error {
return Entity.from_json (typeof (API.InstanceV2), node) as API.InstanceV2;
Expand Down
2 changes: 2 additions & 0 deletions src/API/Status/PreviewCard.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ public class Tuba.API.PreviewCard : Entity, Widgetizable {
}

public override Gtk.Widget to_widget () {
if (this.kind == "link" && this.history != null) return new Widgets.PreviewCardExplore (this);

return new Widgets.PreviewCard (this);
}

Expand Down
8 changes: 6 additions & 2 deletions src/Services/Accounts/InstanceAccount.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,8 +466,12 @@ public class Tuba.InstanceAccount : API.Account, Streamable {
this.probably_has_notification_filters = true;
var instance_v2 = API.InstanceV2.from (node);

if (instance_v2 != null && instance_v2.configuration != null && instance_v2.configuration.translation != null) {
this.instance_info.tuba_can_translate = instance_v2.configuration.translation.enabled;
if (instance_v2 != null) {
if (instance_v2.configuration != null && instance_v2.configuration.translation != null)
this.instance_info.tuba_can_translate = instance_v2.configuration.translation.enabled;

if (instance_v2.api_versions != null && instance_v2.api_versions.mastodon > 0)
this.instance_info.tuba_mastodon_version = instance_v2.api_versions.mastodon;
}
})
.exec ();
Expand Down
23 changes: 7 additions & 16 deletions src/Views/ContentBase.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,22 +122,13 @@ public class Tuba.Views.ContentBase : Views.Base {

#if !USE_LISTVIEW
Gtk.Widget widget = obj_widgetable.to_widget ();
if (widget as Widgets.PreviewCard == null) {
widget.add_css_class ("card");
widget.add_css_class ("card-spacing");
widget.focusable = true;

// Thread lines overflow slightly
widget.overflow = Gtk.Overflow.HIDDEN;
return widget;
}

return new Gtk.ListBoxRow () {
css_classes = { "card", "card-spacing" },
focusable = false,
overflow = Gtk.Overflow.HIDDEN,
child = widget
};
widget.add_css_class ("card");
widget.add_css_class ("card-spacing");
widget.focusable = true;

// Thread lines overflow slightly
widget.overflow = Gtk.Overflow.HIDDEN;
return widget;
#else
return obj_widgetable.to_widget ();
#endif
Expand Down
9 changes: 9 additions & 0 deletions src/Views/Link.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
public class Tuba.Views.Link : Views.Timeline {
public Link (string link) {
Object (
url: @"/api/v1/timelines/link?url=$(Uri.escape_string (link))",
label: link,
icon: "tuba-globe-symbolic"
);
}
}
1 change: 1 addition & 0 deletions src/Views/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ sources += files(
'Hashtag.vala',
'Hashtags.vala',
'Home.vala',
'Link.vala',
'List.vala',
'Lists.vala',
'Local.vala',
Expand Down
56 changes: 7 additions & 49 deletions src/Widgets/PreviewCard.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@ public class Tuba.Widgets.PreviewCard : Gtk.Box {
}

[GtkChild] public unowned Gtk.Button button;
[GtkChild] unowned Gtk.Box box;
[GtkChild] unowned Gtk.Label author_label;
[GtkChild] unowned Gtk.Label title_label;
[GtkChild] unowned Gtk.Label description_label;
[GtkChild] unowned Gtk.Label used_times_label;
[GtkChild] unowned Widgets.PreviewCardInternal box;

private Gee.ArrayList<API.PreviewCard.AuthorEntity>? verified_authors = null;
private string? author_url = null;
Expand Down Expand Up @@ -73,57 +69,19 @@ public class Tuba.Widgets.PreviewCard : Gtk.Box {
if (host != null) author = host;
} catch {}
}
author_label.label = author;
box.author_label.label = author;

if (card_obj.title != "") {
title_label.label = title_label.tooltip_text = card_obj.title.replace ("\n", " ").strip ();
title_label.visible = true;
box.title_label.label = box.title_label.tooltip_text = card_obj.title.replace ("\n", " ").strip ();
box.title_label.visible = true;
}

if (card_obj.description != "") {
description_label.label = description_label.tooltip_text = card_obj.description;
description_label.visible = true;
box.description_label.label = box.description_label.tooltip_text = card_obj.description;
box.description_label.visible = true;
}

if (card_obj.kind == "link" && card_obj.history != null && card_obj.history.size > 0) {
box.orientation = Gtk.Orientation.HORIZONTAL;
box.homogeneous = true;
image_widget.height_request = 70;
image_widget.add_css_class ("preview_card_h");
image_widget.remove_css_class ("preview_card_v");

button.add_css_class ("explore");
button.remove_css_class ("frame");
button.clicked.connect (() => Host.open_url (card_obj.url));

if (description_label.visible) {
if (description_label.label.length > 109)
description_label.label = description_label.label.replace ("\n", " ").substring (0, 109) + "…";
description_label.single_line_mode = false;
description_label.ellipsize = Pango.EllipsizeMode.NONE;
description_label.wrap = true;
description_label.wrap_mode = Pango.WrapMode.WORD_CHAR;
}

var last_history_entry = card_obj.history.get (0);
var total_uses = int.parse (last_history_entry.uses);
var total_accounts = int.parse (last_history_entry.accounts);
// translators: the variables are numbers
var subtitle = _("Discussed %d times by %d people yesterday").printf (total_uses, total_accounts);

if (card_obj.history.size > 1) {
last_history_entry = card_obj.history.get (1);
total_uses += int.parse (last_history_entry.uses);
total_accounts += int.parse (last_history_entry.accounts);

// translators: the variables are numbers
subtitle = _("Discussed %d times by %d people in the past 2 days")
.printf (total_uses, total_accounts);
}

used_times_label.label = subtitle;
used_times_label.visible = true;
} else if (card_obj.authors != null && card_obj.authors.size > 0) {
if (card_obj.authors != null && card_obj.authors.size > 0) {
bool should_add = true;

Gtk.Widget more_from_button = new Gtk.Button () {
Expand Down
Loading
Loading