mirror of
https://forge.fsky.io/lda/Parsee.git
synced 2026-03-13 16:55:10 +00:00
[MOD] Start separating build config, HTML in edits
This commit is contained in:
parent
1f3d738bb4
commit
80bab890f6
4 changed files with 21 additions and 6 deletions
6
Makefile
6
Makefile
|
|
@ -9,10 +9,7 @@
|
||||||
|
|
||||||
# =========================== Parsee Flags =============================
|
# =========================== Parsee Flags =============================
|
||||||
|
|
||||||
# phantasmagoria - test runs without an actual code
|
include build.conf
|
||||||
CODE=phantasmagoria
|
|
||||||
NAME=Parsee
|
|
||||||
VERSION=0.0.0
|
|
||||||
|
|
||||||
REPOSITORY=$(shell git remote get-url origin)
|
REPOSITORY=$(shell git remote get-url origin)
|
||||||
|
|
||||||
|
|
@ -32,7 +29,6 @@ CC ?=cc
|
||||||
CFLAGS=-I$(SOURCE) -I$(INCLUDES) -I$(CYTO_INC) -DNAME="\"$(NAME)\"" -DVERSION="\"$(VERSION)\"" -DREPOSITORY=\"$(REPOSITORY)\" -DCODE=\"$(CODE)\" -O3 -g -Wall -Werror
|
CFLAGS=-I$(SOURCE) -I$(INCLUDES) -I$(CYTO_INC) -DNAME="\"$(NAME)\"" -DVERSION="\"$(VERSION)\"" -DREPOSITORY=\"$(REPOSITORY)\" -DCODE=\"$(CODE)\" -O3 -g -Wall -Werror
|
||||||
LDFLAGS=-L $(CYTO_LIB) -lCytoplasm -O3 -g
|
LDFLAGS=-L $(CYTO_LIB) -lCytoplasm -O3 -g
|
||||||
AFLAGS=-C "$(ETC)/ayadoc/style.css" -p "$(NAME)"
|
AFLAGS=-C "$(ETC)/ayadoc/style.css" -p "$(NAME)"
|
||||||
BINARY=parsee
|
|
||||||
# ============================ Compilation =================================
|
# ============================ Compilation =================================
|
||||||
SRC_FILES:=$(shell find $(SOURCE) -name '*.c') $(shell find $(ETC)/media -name '*.png')
|
SRC_FILES:=$(shell find $(SOURCE) -name '*.c') $(shell find $(ETC)/media -name '*.png')
|
||||||
OBJ_FILES:=${subst $(ETC)/media/,$(OBJECT)/,${subst $(SOURCE)/,$(OBJECT)/,$(patsubst %.png, %.o, $(patsubst %.c, %.o, $(SRC_FILES)))}}
|
OBJ_FILES:=${subst $(ETC)/media/,$(OBJECT)/,${subst $(SOURCE)/,$(OBJECT)/,$(patsubst %.png, %.o, $(patsubst %.c, %.o, $(SRC_FILES)))}}
|
||||||
|
|
|
||||||
4
build.conf
Normal file
4
build.conf
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
CODE=phantasmagoria
|
||||||
|
NAME=Parsee
|
||||||
|
VERSION=0.0.0
|
||||||
|
BINARY=parsee
|
||||||
12
src/Events.c
12
src/Events.c
|
|
@ -180,6 +180,18 @@ MatrixCreateReplace(char *event, char *body)
|
||||||
HashMapSet(map, "m.new_content", JsonValueObject(new));
|
HashMapSet(map, "m.new_content", JsonValueObject(new));
|
||||||
HashMapSet(map, "m.relates_to", JsonValueObject(rel));
|
HashMapSet(map, "m.relates_to", JsonValueObject(rel));
|
||||||
|
|
||||||
|
{
|
||||||
|
XEP393Element *e = XEP393(body);
|
||||||
|
char *text = XEP393ToXMLString(e);
|
||||||
|
XEP393FreeElement(e);
|
||||||
|
|
||||||
|
HashMapSet(map, "formatted_body", JsonValueString(text));
|
||||||
|
HashMapSet(map, "format", JsonValueString("org.matrix.custom.html"));
|
||||||
|
HashMapSet(new, "formatted_body", JsonValueString(text));
|
||||||
|
HashMapSet(new, "format", JsonValueString("org.matrix.custom.html"));
|
||||||
|
Free(text);
|
||||||
|
}
|
||||||
|
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
HashMap *
|
HashMap *
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,9 @@ RetrieveStanza(XMPPThread *thread)
|
||||||
{
|
{
|
||||||
XMLElement *ret = NULL;
|
XMLElement *ret = NULL;
|
||||||
|
|
||||||
|
/* TODO: We're polling here... Parsee should avoid doing that,
|
||||||
|
* in favour of condition variables, which should lower the system
|
||||||
|
* load of Parsee as a whole. */
|
||||||
pthread_mutex_lock(&thread->info->lock);
|
pthread_mutex_lock(&thread->info->lock);
|
||||||
ret = ArrayDelete(thread->info->stanzas, 0);
|
ret = ArrayDelete(thread->info->stanzas, 0);
|
||||||
pthread_mutex_unlock(&thread->info->lock);
|
pthread_mutex_unlock(&thread->info->lock);
|
||||||
|
|
@ -54,7 +57,7 @@ XMPPDispatcher(void *argp)
|
||||||
|
|
||||||
if (!stanza)
|
if (!stanza)
|
||||||
{
|
{
|
||||||
UtilSleepMillis(5);
|
UtilSleepMillis(10);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue