Work on notifications

src/API/Notification.vala

@@ -3,24 +3,13 @@ public class Tootle.API.Notification : Entity, Widgetizable {
  public string id { get; set; }
  public API.Account account { get; set; }
  public string? kind { get; set; default = null; }
- public string created_at { get; set; }
+ // public string created_at { get; set; }
  public API.Status? status { get; set; default = null; }
 
  public override Gtk.Widget to_widget () {
  return new Widgets.Notification (this);
  }
 
- // public Soup.Message? dismiss () {
- // if (kind == NotificationType.FOLLOW_REQUEST)
- // return reject_follow_request ();
-
- // var req = new Request.POST ("/api/v1/notifications/dismiss")
- // .with_account (accounts.active)
- // .with_param ("id", id)
- // .exec ();
- // return req;
- // }
-
  public Soup.Message accept_follow_request () {
  var req = new Request.POST (@"/api/v1/follow_requests/$(account.id)/authorize")
  .with_account (accounts.active)

src/Services/Accounts/AccountStore.vala

@@ -54,6 +54,7 @@ public abstract class Tootle.AccountStore : GLib.Object {
 
  public virtual void remove (InstanceAccount account) throws GLib.Error {
  message (@"Removing account: $(account.handle)");
+ account.removed ();
  saved.remove (account);
  changed (saved);
  save ();
@@ -73,6 +74,9 @@ public abstract class Tootle.AccountStore : GLib.Object {
  }
 
  public void activate (InstanceAccount? account) {
+ if (active != null)
+ active.deactivated ();
+
  if (account == null) {
  message ("Reset active account");
  return;
@@ -94,6 +98,7 @@ public abstract class Tootle.AccountStore : GLib.Object {
  }
 
  accounts.active = account;
+ active.activated ();
  switched (active);
  }
 

src/Services/Accounts/InstanceAccount.vala

@@ -8,30 +8,42 @@ public class Tootle.InstanceAccount : API.Account, Streamable {
  public string? client_id { get; set; }
  public string? client_secret { get; set; }
  public string? access_token { get; set; }
- public Error? error { get; set; }
-
- 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 Error? error { get; set; } //TODO: use this field when server invalidates the auth token
 
  public new string handle {
  owned get { return @"@$username@$domain"; }
  }
 
+ public virtual signal void added () {
+ subscribed = true;
+ check_notifications ();
+ }
+ public virtual signal void removed () {
+ subscribed = false;
+ }
+
+ public virtual signal void activated () {}
+ public virtual signal void deactivated () {}
+
+
  construct {
  construct_streamable ();
  stream_event[Mastodon.Account.EVENT_NOTIFICATION].connect (on_notification);
  }
+ ~InstanceAccount () {
+ destruct_streamable ();
+ }
 
  public InstanceAccount.empty (string instance){
  Object (
  id: "",
  instance: instance
  );
  }
- ~InstanceAccount () {
- destruct_streamable ();
- }
+
+
+
+ // Core functions
 
  public bool is_current () {
  return accounts.active.access_token == access_token;
@@ -65,6 +77,41 @@ public class Tootle.InstanceAccount : API.Account, Streamable {
 
 
 
+ // Notifications
+
+ public int unread_count { get; set; default = 0; }
+ public int last_read_id { get; set; default = 0; }
+ public ArrayList<GLib.Notification> unread_toasts { get; set; default = new ArrayList<GLib.Notification> (); }
+ public ArrayList<Object> toast_inhibitors { get; set; default = new ArrayList<Object> (); }
+
+ public virtual void check_notifications () {
+ new Request.GET ("/api/v1/markers?timeline[]=notifications")
+ .with_account (this)
+ .then ((sess, msg) => {
+ var root = network.parse (msg);
+ var notifications = root.get_object_member ("notifications");
+ last_read_id = int.parse (notifications.get_string_member ("last_read_id") );
+
+ if (notifications.has_member ("pleroma")) {
+ var pleroma = notifications.get_object_member ("pleroma");
+ unread_count = (int)pleroma.get_int_member ("unread_count");
+ }
+ })
+ .exec ();
+ }
+
+ public virtual void read_notifications () {
+ message ("Read notifications");
+ unread_count = 0;
+ unread_toasts.@foreach (toast => {
+ var id = toast.get_data<string> ("id");
+ app.withdraw_notification (id);
+ return true;
+ });
+ }
+
+
+
  // Streamable
 
  public string? _connection_url { get; set; }
@@ -76,12 +123,13 @@ public class Tootle.InstanceAccount : API.Account, Streamable {
 
  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);
+ send_toast (obj);
  }
 
  // TODO: notification actions
- public virtual GLib.Notification create_desktop_toast (API.Notification obj) {
+ public void send_toast (API.Notification obj) {
+ if (!toast_inhibitors.is_empty) return;
+
  string descr;
  describe_kind (obj.kind, null, out descr, obj.account);
 
@@ -96,7 +144,10 @@ public class Tootle.InstanceAccount : API.Account, Streamable {
  var icon = new FileIcon (file);
  toast.set_icon (icon);
 
- return toast;
+ var id = obj.id.to_string ();
+ toast.set_data<string> ("id", id);
+ app.send_notification (id, toast);
+ unread_toasts.add (toast);
  }
 
 }

src/Services/Accounts/Mastodon/Account.vala

@@ -14,6 +14,19 @@ public class Tootle.Mastodon.Account : InstanceAccount {
  public const string KIND_FOLLOW_REQUEST = "__follow-request";
  public const string KIND_REMOTE_REBLOG = "__remote-reblog";
 
+ public Views.Sidebar.Item notifications_item;
+
+ construct {
+ notifications_item = new Views.Sidebar.Item () {
+ label = "Notifications",
+ icon = "bell-symbolic",
+ on_activated = () => {
+ app.main_window.open_view (new Views.Notifications ());
+ }
+ };
+ bind_property ("unread_count", notifications_item, "badge", BindingFlags.SYNC_CREATE);
+ }
+
  class Test : AccountStore.BackendTest {
 
  public override string? get_backend (Json.Object obj) {
@@ -36,13 +49,7 @@ public class Tootle.Mastodon.Account : InstanceAccount {
  label = "Timelines",
  icon = "user-home-symbolic"
  });
- model.append (new Views.Sidebar.Item () {
- label = "Notifications",
- icon = "bell-symbolic",
- on_activated = () => {
- app.main_window.open_view (new Views.Notifications ());
- }
- });
+ model.append (notifications_item);
  model.append (new Views.Sidebar.Item () {
  label = "Direct Messages",
  icon = API.Visibility.DIRECT.get_icon ()

src/Services/Accounts/SecretAccountStore.vala

@@ -37,7 +37,7 @@ public class Tootle.SecretAccountStore : AccountStore {
  var account = secret_to_account (item);
  if (account != null) {
  saved.add (account);
- account.subscribed = true;
+ account.added ();
  }
  });
  changed (saved);

src/Services/Cache/EntityCache.vala

@@ -1,22 +1,36 @@
 public class Tootle.EntityCache : AbstractCache {
 
- public Entity lookup_or_insert (owned Json.Node node, owned Type type) {
+ // Must return unique id for each JSON entity node
+ protected string? get_node_cache_id (owned Json.Node node) {
  var obj = node.get_object ();
- var id = obj.get_member ("uri").get_string ();
- var key = get_key (id);
-
- Entity entity;
- if (contains (key)) {
- entity = lookup (key) as Entity;
- message ("serving cached: "+id);
+ if (obj.has_member ("uri")) {
+ return obj.get_string_member ("uri");
  }
- else {
+
+ return null;
+ }
+
+ public Entity lookup_or_insert (owned Json.Node node, owned Type type) {
+ Entity entity = null;
+ var id = get_node_cache_id (node);
+
+ // Entity can't be cached
+ if (id == null) {
  entity = Entity.from_json (type, node);
- insert (id, entity);
  }
+ else {
 
- if (entity == null)
- warning ("lookup_or_insert() returned null. This should not happen.");
+ // Entity can be reused from cache
+ if (contains (id)) {
+ entity = lookup (get_key (id)) as Entity;
+ message ("Reused: "+id);
+ }
+ // It's a new instance and we need to store it
+ else {
+ entity = Entity.from_json (type, node);
+ insert (id, entity);
+ }
+ }
 
  return entity;
  }

src/Views/Notifications.vala

@@ -3,70 +3,45 @@ using Gdk;
 
 public class Tootle.Views.Notifications : Views.Timeline, AccountHolder, Streamable {
 
- public Notifications () {
- Object (
- url: "/api/v1/notifications",
- label: _("Notifications"),
- icon: "bell-symbolic"
- );
- accepts = typeof (API.Notification);
- }
-
- public override string? get_stream_url () {
- 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 ();
- // }
- // }
+ protected InstanceAccount? last_account = null;
 
  //FIXME: Display unread dot
-
- // 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 ();
- // }
-
- // 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 Notifications () {
+ Object (
+ url: "/api/v1/notifications",
+ label: _("Notifications"),
+ icon: "bell-symbolic"
+ );
+ accepts = typeof (API.Notification);
+ }
+
+ public override void on_account_changed (InstanceAccount? acc) {
+ base.on_account_changed (acc);
+
+ if (last_account != null) {
+ last_account.toast_inhibitors.remove (this);
+ acc.stream_event[Mastodon.Account.EVENT_NOTIFICATION].disconnect (on_new_post);
+ }
+
+ last_account = acc;
+ acc.stream_event[Mastodon.Account.EVENT_NOTIFICATION].connect (on_new_post);
+ }
+
+ public override void on_shown () {
+ base.on_shown ();
+ if (account != null) {
+ if (!account.toast_inhibitors.contains (this))
+ account.toast_inhibitors.add (this);
+
+ account.read_notifications ();
+ }
+ }
+ public override void on_hidden () {
+ base.on_hidden ();
+ if (account != null) {
+ if (account.toast_inhibitors.contains (this))
+ account.toast_inhibitors.remove (this);
+ }
+ }
 
 }