Merge lp:~roignac/gwibber/Bug616798 into lp:gwibber

[Vadim Rutkovsky]

A fix for incorrect 'Like' and 'Delete' implementation (at least, for Identica and Twitter). Not sure about one thing - after message is being deleted, it should be removed from Db/cache, maybe

=== modified file 'gwibber/actions.py'
--- gwibber/actions.py	2010-08-08 01:17:30 +0000
+++ gwibber/actions.py	2010-08-23 13:50:53 +0000
@@ -82,6 +82,12 @@
     image = resources.get_ui_asset("gwibber.svg")
     expire_timeout = 5000
     n = gwibber.microblog.util.notify(_("Liked"), _("You have marked this message as liked."), image, expire_timeout)
+  
+  @classmethod
+  def include(self, client, msg):
+    if "like" in client.model.services[msg["service"]]["features"]:
+      if msg.get("sender", {}).get("is_me", 0):
+        return True
 
 class delete(MessageAction):
   icon = "gtk-delete"
 
=== modified file 'gwibber/microblog/dispatcher.py'
--- gwibber/microblog/dispatcher.py	2010-08-19 15:55:03 +0000
+++ gwibber/microblog/dispatcher.py	2010-08-23 13:50:53 +0000
@@ -291,12 +291,13 @@
     params = ["account", "operation", "args", "transient"]
     operation = None
     
+    if "account" in o and self.collector.get_account(o["account"]):
+      account = self.collector.get_account(o["account"])
+    
     if "id" in o:
       operation = self.collector.get_operation_by_id(o["id"])
-    elif all(i in o for i in params):
-      operation = [tuple(o[i] for i in params)]
-    elif "account" in o and self.accounts.record_exists(o["account"]):
-      operation = self.collector.account_to_operations(o["account"])
+    elif "operation" in o and self.collector.validate_operation(account, o["operation"]):
+        operation = util.compact([(account, o["operation"], o["args"], None)])
 
     if operation:
       MapAsync(perform_operation, operation, self.loading_complete, self.loading_failed)