Changeset 66

Timestamp:

04/09/06 14:03:37 (4 years ago)

Author:

bradfitz

Message:

start extending RosterStorage.pm to deal with new hooks

Location:

trunk

Files:

• djabberd (modified) (1 diff)
• lib/DJabberd/IQ.pm (modified) (1 diff)
• lib/DJabberd/RosterStorage.pm (modified) (2 diffs)
• lib/DJabberd/RosterStorage/SQLite.pm (modified) (1 diff)

trunk/djabberd

@@ -38 +38 @@
                                          DJabberd::Delivery::Local->new(),
                                          DJabberd::Delivery::S2S->new(),
-                                         #DJabberd::RosterStorage::SQLite->new("$Bin/roster.sqlite"),
+                                         DJabberd::RosterStorage::SQLite->new("$Bin/roster.sqlite"),
                                          #DJabberd::RosterStorage::Dummy->new,
-                                         DJabberd::RosterStorage::LiveJournal->new,
+                                         #DJabberd::RosterStorage::LiveJournal->new,
                                          ],
                            );

trunk/lib/DJabberd/IQ.pm

@@ -109 +109 @@
 
     # {=xmpp-ip-7.6-must-ignore-subscription-values}
-    my $subattr  = $item->attr('subscription') || "";
+    my $subattr  = $item->attr('{jabber:iq:roster}subscription') || "";
     my $removing = $subattr eq "remove" ? 1 : 0;
 

trunk/lib/DJabberd/RosterStorage.pm

@@ -12 +12 @@
 }
 
+# don't override, or at least call SUPER to this if you do.
 sub register {
     my ($self, $vhost) = @_;
@@ -19 +20 @@
         $self->get_roster($cb, $conn, $jid);
     });
+    $vhost->register_hook("RosterSetItem", sub {
+        my ($conn, $cb, $ritem) = @_;
+        my $jid = $conn->bound_jid;
+        $self->set_roster_item($cb, $conn, $jid, $ritem);
+    });
+    $vhost->register_hook("RosterRemoveItem", sub {
+        my ($conn, $cb, $ritem) = @_;
+        my $jid = $conn->bound_jid;
+        $self->delete_roster_item($cb, $conn, $jid, $ritem);
+    });
 }
 
+# override this.
 sub get_roster {
     my ($self, $cb, $conn, $jid) = @_;
-    die "NOT IMPLEMENTED BY '$_[0]'.  SUBCLASSES MUST IMPLEMENT.";
+    $cb->declined;
+}
+
+# override this.
+sub set_roster_item {
+    my ($self, $cb, $conn, $jid, $ritem) = @_;
+    $cb->declined;
+}
+
+# override this.
+sub delete_roster_item {
+    my ($self, $cb, $conn, $jid, $ritem) = @_;
+    $cb->declined;
 }
 

trunk/lib/DJabberd/RosterStorage/SQLite.pm

@@ -110 +110 @@
 }
 
+sub set_roster_item {
+    my ($self, $cb, $conn, $jid, $ritem) = @_;
+    warn "set roster item!\n";
+    $cb->declined;
+}
+
+sub delete_roster_item {
+    my ($self, $cb, $conn, $jid, $ritem) = @_;
+    warn "delete roster item!\n";
+    $cb->declined;
+}
+
 1;