Backing out changes to the protocol pending discussion with Mark.
Patch by afuna.
diffs (60 lines):
diff -r 86e9c7645063 -r 6607f002c944 cgi-bin/ljprotocol.pl
--- a/cgi-bin/ljprotocol.pl Wed Jun 10 15:23:52 2009 +0000
+++ b/cgi-bin/ljprotocol.pl Thu Jun 11 00:04:06 2009 +0000
@@ -550,9 +550,9 @@ sub login
## report what shared journals this user may post in
$res->{'usejournals'} = list_usejournals($u);
- ## return their trust groups
- $res->{'friendgroups'} = list_trustgroups($u);
- return fail($err, 502, "Error loading trust groups") unless
$res->{'friendgroups'};
+ ## return their friend groups
+ $res->{'friendgroups'} = list_friendgroups($u);
+ return fail($err, 502, "Error loading friend groups") unless
$res->{'friendgroups'};
if ($ver >= 1) {
foreach (@{$res->{'friendgroups'}}) {
LJ::text_out(\$_->{'name'});
@@ -655,8 +655,8 @@ sub getfriendgroups
return undef unless authenticate($req, $err, $flags);
my $u = $flags->{'u'};
my $res = {};
- $res->{'friendgroups'} = list_trustgroups($u);
- return fail($err, 502, "Error loading trust groups") unless
$res->{'friendgroups'};
+ $res->{'friendgroups'} = list_friendgroups($u);
+ return fail($err, 502, "Error loading friend groups") unless
$res->{'friendgroups'};
if ($req->{'ver'} >= 1) {
foreach (@{$res->{'friendgroups'} || []}) {
LJ::text_out(\$_->{'name'});
@@ -687,8 +687,8 @@ sub getfriends
my $u = $flags->{'u'};
my $res = {};
if ($req->{'includegroups'}) {
- $res->{'friendgroups'} = list_trustgroups($u);
- return fail($err, 502, "Error loading trust groups") unless
$res->{'friendgroups'};
+ $res->{'friendgroups'} = list_friendgroups($u);
+ return fail($err, 502, "Error loading friend groups") unless
$res->{'friendgroups'};
if ($req->{'ver'} >= 1) {
foreach (@{$res->{'friendgroups'} || []}) {
LJ::text_out(\$_->{'name'});
@@ -2509,12 +2509,19 @@ sub login_message
return $msg->("hello_test") if grep { $u->{user} eq $_ }
@LJ::TESTACCTS;
}
-sub list_trustgroups
+sub list_friendgroups
{
my $u = shift;
+ warn "ljprotocol.pl: list_friendgroups called.\n";
+ return [];
+
+# TODO(mark): this needs updating to determine if we should send trust groups?
+# answer is yes, but we also need to move this to list_trustgroups
+# so clients don't think those are friend groups.
+
# get the groups for this user, return undef if error
- my $groups = $u->trust_groups;
+ my $groups = LJ::get_friend_group($u);
return undef unless $groups;
# we got all of the groups, so put them into an arrayref sorted by the
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
