… | |
… | |
2518 | |
2518 | |
2519 | if (ref $channel) { |
2519 | if (ref $channel) { |
2520 | # send meta info to client, if not yet sent |
2520 | # send meta info to client, if not yet sent |
2521 | unless (exists $self->{channel}{$channel->{id}}) { |
2521 | unless (exists $self->{channel}{$channel->{id}}) { |
2522 | $self->{channel}{$channel->{id}} = $channel; |
2522 | $self->{channel}{$channel->{id}} = $channel; |
2523 | $self->ext_msg (channel_info => %$channel); |
2523 | $self->ext_msg (channel_info => $channel); |
2524 | } |
2524 | } |
2525 | |
2525 | |
2526 | $channel = $channel->{id}; |
2526 | $channel = $channel->{id}; |
2527 | } |
2527 | } |
2528 | |
2528 | |
… | |
… | |
2865 | # TODO: for gcfclient pleasure, we should give resources |
2865 | # TODO: for gcfclient pleasure, we should give resources |
2866 | # that gcfclient doesn't grok a >10000 face index. |
2866 | # that gcfclient doesn't grok a >10000 face index. |
2867 | my $res = $facedata->{resource}; |
2867 | my $res = $facedata->{resource}; |
2868 | my $enc = JSON::XS->new->utf8->canonical; |
2868 | my $enc = JSON::XS->new->utf8->canonical; |
2869 | |
2869 | |
|
|
2870 | if (my $soundconf = delete $res->{"res/sound.conf"}) { |
|
|
2871 | $soundconf = $enc->decode (delete $soundconf->{data}); |
|
|
2872 | # todo |
|
|
2873 | } |
|
|
2874 | |
2870 | while (my ($name, $info) = each %$res) { |
2875 | while (my ($name, $info) = each %$res) { |
2871 | my $meta = $enc->encode ({ |
2876 | my $meta = $enc->encode ({ |
2872 | name => $name, |
2877 | name => $name, |
2873 | copyright => $info->{copyright}, #TODO# |
2878 | %{ $info->{meta} || {} }, |
2874 | }); |
2879 | }); |
2875 | |
2880 | |
2876 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
2881 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
2877 | |
2882 | |
2878 | if ($info->{type} & 1) { |
2883 | if ($info->{type} & 1) { |