sr2/link-stack
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Signal and Docker updates

Browse source
This commit is contained in:
Darren Clarke 2024-06-28 12:28:11 +02:00
parent 0cf1c3b8fd
commit dbf3a95bbb
4 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/bridge-worker/tasks/fetch-signal-messages.ts
View file

@ -16,13 +16,17 @@ const fetchSignalMessagesTask = async (): Promise<void> => {
for (const msg of messages) { for (const msg of messages) {
const { envelope } = msg as any; const { envelope } = msg as any;
const { source } = envelope; const { source, sourceUuid, dataMessage } = envelope;
const message = envelope?.dataMessage?.message; const messageID = sourceUuid;
const message = dataMessage?.message;
const timestamp = new Date(dataMessage?.timestamp);
if (source !== number && message) { if (source !== number && message) {
await worker.addJob("signal/receive-signal-message", { await worker.addJob("signal/receive-signal-message", {
token: id, token: id,
sender: source, sender: source,
messageID,
message, message,
timestamp: timestamp.toISOString(),
}); });
} }
} }

13
apps/bridge-worker/tasks/signal/receive-signal-message.ts
View file

@ -4,14 +4,18 @@ interface ReceiveSignalMessageTaskOptions {
token: string; token: string;
sender: string; sender: string;
message: string; message: string;
messageID: string;
timestamp: string;
} }
const receiveSignalMessageTask = async ({ const receiveSignalMessageTask = async ({
token, token,
sender, sender,
message, message,
messageID,
timestamp,
}: ReceiveSignalMessageTaskOptions): Promise<void> => { }: ReceiveSignalMessageTaskOptions): Promise<void> => {
console.log({ token, sender, message }); console.log({ token, sender, message, messageID, timestamp });
const worker = await getWorkerUtils(); const worker = await getWorkerUtils();
const row = await db const row = await db
.selectFrom("SignalBot") .selectFrom("SignalBot")
@ -20,11 +24,14 @@ const receiveSignalMessageTask = async ({
.executeTakeFirstOrThrow(); .executeTakeFirstOrThrow();
console.log(row); console.log(row);
console.log(message);
const backendId = row.id; const backendId = row.id;
const payload = { const payload = {
to: row.phoneNumber,
from: sender,
sent_at: timestamp,
message, message,
recipient: sender, message_id: messageID,
}; };
await worker.addJob("common/notify-webhooks", { backendId, payload }); await worker.addJob("common/notify-webhooks", { backendId, payload });

3
apps/link/middleware.ts
View file

@ -60,7 +60,8 @@ export default withAuth(checkRewrites, {
}, },
callbacks: { callbacks: {
authorized: ({ token, req }) => { authorized: ({ token, req }) => {
if (req.nextUrl.pathname === "/api/v1") { console.log({ p: req.nextUrl.pathname });
if (req.nextUrl.pathname.startsWith("/api/v1/")) {
return true; return true;
} }

10
docker/zammad/Dockerfile
View file

@ -19,11 +19,11 @@ RUN sed -i '/script\/build\/cleanup\.sh/d' contrib/docker/setup.sh
RUN contrib/docker/setup.sh builder RUN contrib/docker/setup.sh builder
ARG EMBEDDED=false ARG EMBEDDED=false
RUN if [ "$EMBEDDED" = "true" ] ; then sed -i '/proxy_set_header X-Forwarded-User "";/d' ${ZAMMAD_DIR}/contrib/nginx/zammad.conf; fi RUN if [ "$EMBEDDED" = "true" ] ; then sed -i '/proxy_set_header X-Forwarded-User "";/d' ${ZAMMAD_DIR}/contrib/nginx/zammad.conf; fi
RUN sed -i '/^[[:space:]]*# es config/ i\ RUN sed -i '/^[[:space:]]*# es config/a\
echo "about to reinstall..."\n\ echo "about to reinstall..."\
bundle exec rails runner /opt/zammad/contrib/link/setup.rb\n\ bundle exec rails runner /opt/zammad/contrib/link/setup.rb\
bundle exec rake zammad:package:migrate\n\ bundle exec rake zammad:package:migrate\
' /docker-entrypoint.sh bundle exec rails r "Setting.set(\"es_ssl_verify\", \"${ELASTICSEARCH_SSL_VERIFY}\")"'\ /docker-entrypoint.sh
RUN ZAMMAD_SAFE_MODE=1 DATABASE_URL=postgresql://zammad:/zammad bundle exec rails runner /opt/zammad/contrib/link/install.rb RUN ZAMMAD_SAFE_MODE=1 DATABASE_URL=postgresql://zammad:/zammad bundle exec rails runner /opt/zammad/contrib/link/install.rb
RUN ZAMMAD_SAFE_MODE=1 DATABASE_URL=postgresql://zammad:/zammad bundle exec rake assets:precompile RUN ZAMMAD_SAFE_MODE=1 DATABASE_URL=postgresql://zammad:/zammad bundle exec rake assets:precompile