mirror of
git://git.psyced.org/git/psyced
synced 2024-08-15 03:25:10 +00:00
look at what the cat brought in
This commit is contained in:
parent
fa03bd1bad
commit
ad482ece44
2 changed files with 5 additions and 1 deletions
|
@ -135,7 +135,7 @@ volatile mapping share = ([
|
||||||
]),
|
]),
|
||||||
#endif
|
#endif
|
||||||
// this table defines variable names to go into the routing layer
|
// this table defines variable names to go into the routing layer
|
||||||
// of PSYC. default is to handle them locally in the routing layer
|
// of PSYC. default is to handle them locally in the routing layer.
|
||||||
// PSYC_ROUTING_MERGE means to merge them into end-to-end vars at
|
// PSYC_ROUTING_MERGE means to merge them into end-to-end vars at
|
||||||
// parsing time. PSYC_ROUTING_RENDER to accept and render them from
|
// parsing time. PSYC_ROUTING_RENDER to accept and render them from
|
||||||
// application provided vars. same data structure also in Net::PSYC.pm
|
// application provided vars. same data structure also in Net::PSYC.pm
|
||||||
|
@ -143,6 +143,9 @@ volatile mapping share = ([
|
||||||
"_amount_fragments" : PSYC_ROUTING,
|
"_amount_fragments" : PSYC_ROUTING,
|
||||||
"_context" : PSYC_ROUTING + PSYC_ROUTING_MERGE,
|
"_context" : PSYC_ROUTING + PSYC_ROUTING_MERGE,
|
||||||
"_count" : PSYC_ROUTING + PSYC_ROUTING_MERGE,
|
"_count" : PSYC_ROUTING + PSYC_ROUTING_MERGE,
|
||||||
|
// the name for this is supposed to be _count, not _counter
|
||||||
|
// this is brought in by ppp - let's ignore it for now
|
||||||
|
"_counter" : PSYC_ROUTING, // don't merge, don't render..
|
||||||
"_fragment" : PSYC_ROUTING,
|
"_fragment" : PSYC_ROUTING,
|
||||||
"_length" : PSYC_ROUTING,
|
"_length" : PSYC_ROUTING,
|
||||||
"_source" : PSYC_ROUTING + PSYC_ROUTING_MERGE,
|
"_source" : PSYC_ROUTING + PSYC_ROUTING_MERGE,
|
||||||
|
|
|
@ -775,6 +775,7 @@ insert_member(source, mc, data, vars, ni, neu, again) {
|
||||||
// semantically it looks ok
|
// semantically it looks ok
|
||||||
mc = "_echo" + mc[7..];
|
mc = "_echo" + mc[7..];
|
||||||
//if (v("_filter_conversation")) mc += "_filtered";
|
//if (v("_filter_conversation")) mc += "_filtered";
|
||||||
|
m_delete(vars, "_group"); // why are we merging vars from a _do anyway?
|
||||||
sendmsg(source, mc, data, vars);
|
sendmsg(source, mc, data, vars);
|
||||||
// ensure that a client knows this room has been entered
|
// ensure that a client knows this room has been entered
|
||||||
// before any room details like topic etc. are sent
|
// before any room details like topic etc. are sent
|
||||||
|
|
Loading…
Reference in a new issue