psyc-mirrors
/
libpsyc
mirror of git://git.psyc.eu/libpsyc
1
0
Fork 0
Code Issues Releases Wiki Activity

_notice_peer_connect merger, gmake for BSD

This commit is contained in:
psyc://psyced.org/~lynX 2013-09-04 15:58:37 +02:00
parent c66ef5227f d37879cae5
commit ba5245a6b0
5 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bench/benchmark.org
View File

@ -97,11 +97,14 @@ for future projects:
#+INCLUDE: packets/chat_msg.json src js
#+INCLUDE: packets/chat_msg.psyc src psyc
Why PSYC doesn't have an id? Because packet counting from contexts
and circuits is automatic: The packet already has a number just by
being there.
# Why PSYC doesn't have an id? Because for most operations they aren't
# needed: PSYC has automatic packet counting from contexts and circuits.
# Therefore, the packet already has an id just by being there.
# Should you want to tag a packet anyway, you can do so by adding a _tag.
#
# Update: XMPP doesn't *need* to have an id there, so we can just remove it.
Also, PSYC by default doesn't mention a "resource" in XMPP terms,
Little difference: PSYC by default doesn't mention a "resource" in XMPP terms,
instead it allows for more addressing schemes than just PSYC.
** A new status updated activity

3
bench/packets/chat_msg.xml
View File

@ -1,4 +1,3 @@
<message from='juliet@example.com/balcony' to='romeo@example.net'
id='ktx72v49' type='chat'>
<message from='juliet@example.com/balcony' to='romeo@example.net' type='chat'>
<body>Art thou not Romeo, and a Montague?</body>
</message>

4
include/psyc/method.h
View File

@ -32,6 +32,8 @@ typedef enum {
PSYC_MC_NOTICE_CONTEXT_LEAVE,
PSYC_MC_NOTICE_FRIENDSHIP,
PSYC_MC_NOTICE_LINK,
PSYC_MC_NOTICE_PEER_CONNECT,
PSYC_MC_NOTICE_PEER_DISCONNECT,
PSYC_MC_NOTICE_SET,
PSYC_MC_NOTICE_UNLINK,
PSYC_MC_REQUEST,
@ -70,6 +72,8 @@ typedef union PsycTemplates {
PsycString _notice_context_leave;
PsycString _notice_friendship;
PsycString _notice_link;
PsycString _notice_peer_connect;
PsycString _notice_peer_disconnect;
PsycString _notice_set;
PsycString _notice_unlink;
PsycString _request;

10
src/templates.h
View File

@ -13,16 +13,16 @@
_("[_nick] is not an alias"),
._request_context_enter =
_("[_nick] asks for your permission to enter [_nick_place]"),
_("[_source] asks for your permission to enter [_context]"),
._echo_context_enter =
_("You enter [_nick_place]" ),
_("You enter [_source]" ),
._echo_context_leave =
_("You leave [_nick_place]"),
_("You leave [_source]"),
._notice_context_enter =
_("[_nick] enters [_nick_place]"),
_("[_source] enters [_context]"),
._notice_context_leave =
_("[_nick] leaves [_nick_place]"),
_("[_source] leaves [_context]"),
._echo_hello =
_("Received hello of psyc://[_key_public]:g/"),

2
src/variable.c
View File

@ -68,6 +68,8 @@ const PsycMapInt psyc_methods[] = {
{ PSYC_C2STRI("_notice_context_leave"), PSYC_MC_NOTICE_CONTEXT_LEAVE },
{ PSYC_C2STRI("_notice_friendship"), PSYC_MC_NOTICE_FRIENDSHIP },
{ PSYC_C2STRI("_notice_link"), PSYC_MC_NOTICE_LINK },
{ PSYC_C2STRI("_notice_peer_connect"), PSYC_MC_NOTICE_PEER_CONNECT },
{ PSYC_C2STRI("_notice_peer_disconnect"), PSYC_MC_NOTICE_PEER_DISCONNECT },
{ PSYC_C2STRI("_notice_set"), PSYC_MC_NOTICE_SET },
{ PSYC_C2STRI("_notice_unlink"), PSYC_MC_NOTICE_UNLINK },
{ PSYC_C2STRI("_notice"), PSYC_MC_NOTICE },