Add desktop notifications

meson.build

@@ -39,13 +39,13 @@ sources = files(
  'src/Services/Accounts/SecretAccountStore.vala',
  'src/Services/Accounts/AccountHolder.vala',
  'src/Services/Accounts/Mastodon/Account.vala',
- 'src/Services/Streams/Streams.vala',
- 'src/Services/Streams/Streamable.vala',
  'src/Services/Cache/AbstractCache.vala',
  'src/Services/Cache/EntityCache.vala',
  'src/Services/Cache/ImageCache.vala',
  'src/Services/Network/Network.vala',
  'src/Services/Network/Request.vala',
+ 'src/Services/Network/Streams.vala',
+ 'src/Services/Network/Streamable.vala',
  'src/Services/Settings.vala',
  'src/API/Account.vala',
  'src/API/AccountField.vala',

src/Services/Accounts/InstanceAccount.vala

@@ -10,18 +10,17 @@ public class Tootle.InstanceAccount : API.Account, Streamable {
  public string? access_token { get; set; }
  public Error? error { get; set; }
 
- public int64 last_seen_notification { get; set; default = 0; }
- public bool has_unread_notifications { get; set; default = false; }
- public ArrayList<API.Notification> cached_notifications { get; set; default = new ArrayList<API.Notification> (); }
+ public ArrayList<GLib.Notification> desktop_inbox { get; set; default = new ArrayList<GLib.Notification> (); }
+ public int64 last_read_notification { get; set; default = 0; }
+ public uint unread_notifications { get; set; default = 0; }
 
  public new string handle {
  owned get { return @"@$username@$domain"; }
  }
 
  construct {
- //TODO: Show notifications
- // on_notification.connect (show_notification);
  construct_streamable ();
+ stream_event[Mastodon.Account.EVENT_NOTIFICATION].connect (on_notification);
  }
 
  public InstanceAccount.empty (string instance){
@@ -57,27 +56,13 @@ public class Tootle.InstanceAccount : API.Account, Streamable {
  return entity;
  }
 
- // TODO: notification actions
- void show_notification (API.Notification obj) {
- // var title = HtmlUtils.remove_tags (obj.kind.get_desc (obj.account));
- // var notification = new GLib.Notification (title);
- // if (obj.status != null) {
- // var body = "";
- // body += domain;
- // body += "\n";
- // body += HtmlUtils.remove_tags (obj.status.content);
- // notification.set_body (body);
- // }
-
- // app.send_notification (app.application_id + ":" + obj.id.to_string (), notification);
- }
-
  public virtual void populate_user_menu (GLib.ListStore model) {}
 
- public virtual void describe_kind (string kind, out string? icon, out string? descr, API.Account account) {
- icon = null;
- descr = null;
- }
+ public virtual void describe_kind (string kind, out string? icon, out string? descr, API.Account account) {
+ icon = null;
+ descr = null;
+ }
+
 
 
  // Streamable
@@ -89,8 +74,29 @@ public class Tootle.InstanceAccount : API.Account, Streamable {
  return @"$instance/api/v1/streaming/?stream=user&access_token=$access_token";
  }
 
- public virtual void on_stream_event (Streamable.Event ev) {
+ public virtual void on_notification (Streamable.Event ev) {
+ var obj = Entity.from_json (typeof (API.Notification), ev.get_node ()) as API.Notification;
+ var toast = create_desktop_toast (obj);
+ app.send_notification (obj.id.to_string (), toast);
+ }
 
+ // TODO: notification actions
+ public virtual GLib.Notification create_desktop_toast (API.Notification obj) {
+ string descr;
+ describe_kind (obj.kind, null, out descr, obj.account);
+
+ var toast = new GLib.Notification ( HtmlUtils.remove_tags (descr) );
+ if (obj.status != null) {
+ var body = "";
+ body += HtmlUtils.remove_tags (obj.status.content);
+ toast.set_body (body);
+ }
+
+ var file = GLib.File.new_for_uri (avatar);
+ var icon = new FileIcon (file);
+ toast.set_icon (icon);
+
+ return toast;
  }
 
 }

src/Services/Streams/Streamable.vala → src/Services/Network/Streamable.vala

@@ -23,9 +23,11 @@ public abstract interface Tootle.Streamable : Object {
  public abstract string? _connection_url { get; set; }
  public abstract bool subscribed { get; set; default = false; }
 
- public abstract void on_stream_event (Event ev);
  public abstract string? get_stream_url ();
 
+ [Signal (detailed = true)]
+ public signal void stream_event (Event ev);
+
  void subscribe () {
  streams.unsubscribe (_connection_url, this);
  streams.subscribe (get_stream_url (), this);
@@ -63,8 +65,6 @@ public abstract interface Tootle.Streamable : Object {
  subscribe ();
  }
 
- protected virtual void on_streaming_policy_changed () {
-
- }
+ protected virtual void on_streaming_policy_changed () {}
 
 }

src/Services/Streams/Streams.vala → src/Services/Network/Streams.vala

@@ -117,8 +117,8 @@ public class Tootle.Streams : Object {
  decode (bytes, out ev);
 
  subscribers.@foreach (s => {
- // message (@"$(name): $(ev.type) for $(s.get_subscriber_name ())");
- s.on_stream_event (ev);
+ message (@"$(name): $(ev.type) for $(s.get_subscriber_name ())");
+ s.stream_event[ev.type] (ev);
  return true;
  });
  }

src/Views/Federated.vala

@@ -1,16 +1,16 @@
 public class Tootle.Views.Federated : Views.Timeline {
 
- public Federated () {
- Object (
-  url: "/api/v1/timelines/public",
-  is_public: true,
-  label: _("Federated"),
-  icon: "globe-symbolic"
- );
- }
+ public Federated () {
+ Object (
+  url: "/api/v1/timelines/public",
+  is_public: true,
+  label: _("Federated"),
+  icon: "globe-symbolic"
+ );
+ }
 
- public override string? get_stream_url () {
- return account != null ? @"$(account.instance)/api/v1/streaming/?stream=public&access_token=$(account.access_token)" : null;
- }
+ public override string? get_stream_url () {
+ return account != null ? @"$(account.instance)/api/v1/streaming/?stream=public&access_token=$(account.access_token)" : null;
+ }
 
 }

src/Views/Notifications.vala

@@ -3,8 +3,6 @@ using Gdk;
 
 public class Tootle.Views.Notifications : Views.Timeline, AccountHolder, Streamable {
 
- protected int64 last_id = 0;
-
  public Notifications () {
  Object (
  url: "/api/v1/notifications",
@@ -18,69 +16,57 @@ public class Tootle.Views.Notifications : Views.Timeline, AccountHolder, Streama
  return account.get_stream_url ();
  }
 
- public override void on_shown () {
- if (has_unread ()) {
- needs_attention = false;
- account.has_unread_notifications = false;
- account.last_seen_notification = last_id;
- accounts.safe_save ();
- }
- }
+ // public override void on_shown () {
+ //  if (has_unread ()) {
+ //  needs_attention = false;
+ //  account.has_unread_notifications = false;
+ //  account.last_seen_notification = last_id;
+ //  accounts.safe_save ();
+ //  }
+ // }
 
  //FIXME: Display unread dot
- // public override void append (Widget? w, bool reverse = false) {
- // base.append (w, reverse);
- // var nw = w as Widgets.Notification;
- // var notification = nw.notification;
 
- // if (int64.parse (notification.id) > last_id)
- // last_id = int64.parse (notification.id);
-
- // needs_attention = has_unread () && !current;
- // if (needs_attention)
- // accounts.safe_save ();
+ // public override void on_account_changed (InstanceAccount? acc) {
+ // base.on_account_changed (acc);
+ // if (account == null) {
+ // last_id = 0;
+ // needs_attention = false;
+ // }
+ // else {
+ // last_id = account.last_seen_notification;
+ // needs_attention = account.has_unread_notifications;
+ // }
  // }
 
- public override void on_account_changed (InstanceAccount? acc) {
- base.on_account_changed (acc);
- if (account == null) {
- last_id = 0;
- needs_attention = false;
- }
- else {
- last_id = account.last_seen_notification;
- needs_attention = account.has_unread_notifications;
- }
- }
+ // public override bool request () {
+ // if (account != null) {
+ // account.cached_notifications.@foreach (n => {
+ // model.append (n);
+ // return true;
+ // });
+ // }
+ // return base.request ();
+ // }
 
- public override bool request () {
- if (account != null) {
- account.cached_notifications.@foreach (n => {
- model.append (n);
- return true;
- });
- }
- return base.request ();
- }
-
- bool has_unread () {
- if (account == null)
- return false;
- return last_id > account.last_seen_notification || needs_attention;
- }
+ // bool has_unread () {
+ // if (account == null)
+ // return false;
+ // return last_id > account.last_seen_notification || needs_attention;
+ // }
 
- public override void on_stream_event (Streamable.Event ev) {
- try {
- switch (ev.type) {
- case Mastodon.Account.EVENT_NOTIFICATION:
- var entity = Entity.from_json (accepts, ev.get_node ());
- model.insert (0, entity);
- return;
- }
- }
- catch (Error e) {
- warning ("Couldn't process stream event: " + e.message);
- }
- }
+ // public override void on_stream_event (Streamable.Event ev) {
+ //  try {
+ //  switch (ev.type) {
+ //  case Mastodon.Account.EVENT_NOTIFICATION:
+ //  var entity = Entity.from_json (accepts, ev.get_node ());
+ //  model.insert (0, entity);
+ //  return;
+ //  }
+ //  }
+ //  catch (Error e) {
+ //  warning ("Couldn't process stream event: " + e.message);
+ //  }
+ // }
 
 }

src/Views/Timeline.vala

@@ -18,7 +18,10 @@ public class Tootle.Views.Timeline : AccountHolder, Streamable, Views.ContentBas
  status_button.clicked.connect (on_refresh);
 
  construct_account_holder ();
+
  construct_streamable ();
+ stream_event[Mastodon.Account.EVENT_NEW_POST].connect (on_new_post);
+ stream_event[Mastodon.Account.EVENT_DELETE_POST].connect (on_delete_post);
 
  content.bind_model (model, on_create_model_widget);
  }
@@ -144,22 +147,13 @@ public class Tootle.Views.Timeline : AccountHolder, Streamable, Views.ContentBas
  return null;
  }
 
- public virtual void on_stream_event (Streamable.Event ev) {
- try {
- switch (ev.type) {
- case Mastodon.Account.EVENT_NEW_POST:
- var entity = Entity.from_json (accepts, ev.get_node ());
- model.insert (0, entity);
- return;
- case Mastodon.Account.EVENT_DELETE_POST:
- return;
- default:
- return;
- }
- }
- catch (Error e) {
- warning (@"Couldn't process stream event \"$(ev.type)\": $(e.message)");
- }
+ public virtual void on_new_post (Streamable.Event ev) {
+ var entity = Entity.from_json (accepts, ev.get_node ());
+ model.insert (0, entity);
+ }
+
+ public virtual void on_delete_post (Streamable.Event ev) {
+ //TODO: This
  }
 
 }