diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/chatlog.c | 515 | ||||
| -rw-r--r-- | src/chatlog.h | 69 | ||||
| -rw-r--r-- | src/config/cafile.c | 1 | ||||
| -rw-r--r-- | src/database.c | 2 | ||||
| -rw-r--r-- | src/event/client_events.c | 1 | ||||
| -rw-r--r-- | src/event/server_events.c | 1 | ||||
| -rw-r--r-- | src/log.c | 565 | ||||
| -rw-r--r-- | src/log.h | 28 | ||||
| -rw-r--r-- | src/otr/otr.c | 1 | ||||
| -rw-r--r-- | src/profanity.c | 1 | ||||
| -rw-r--r-- | src/tools/bookmark_ignore.c | 2 | ||||
| -rw-r--r-- | src/tools/editor.c | 2 | ||||
| -rw-r--r-- | tests/unittests/chatlog/stub_chatlog.c | 92 | ||||
| -rw-r--r-- | tests/unittests/config/stub_cafile.c | 1 | ||||
| -rw-r--r-- | tests/unittests/log/stub_log.c | 65 |
16 files changed, 740 insertions, 608 deletions
diff --git a/Makefile.am b/Makefile.am index 0e35a518..6c1d88c1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ core_sources = \ src/xmpp/contact.c src/xmpp/contact.h \ src/log.c src/common.c \ + src/chatlog.c src/chatlog.h \ src/database.h src/database.c \ src/log.h src/profanity.c src/common.h \ src/profanity.h src/xmpp/chat_session.c \ @@ -123,6 +124,7 @@ unittest_sources = \ tests/unittests/xmpp/stub_message.c \ tests/unittests/ui/stub_ui.c tests/unittests/ui/stub_ui.h \ tests/unittests/log/stub_log.c \ + tests/unittests/chatlog/stub_chatlog.c \ tests/unittests/database/stub_database.c \ tests/unittests/config/stub_accounts.c \ tests/unittests/config/stub_cafile.c \ diff --git a/src/chatlog.c b/src/chatlog.c new file mode 100644 index 00000000..da5c7e2b --- /dev/null +++ b/src/chatlog.c @@ -0,0 +1,515 @@ +/* + * log.c + * vim: expandtab:ts=4:sts=4:sw=4 + * + * Copyright (C) 2012 - 2019 James Booth <boothj5@gmail.com> + * Copyright (C) 2018 - 2022 Michael Vetter <jubalh@idoru.org> + * + * This file is part of Profanity. + * + * Profanity is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Profanity is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Profanity. If not, see <https://www.gnu.org/licenses/>. + * + * In addition, as a special exception, the copyright holders give permission to + * link the code of portions of this program with the OpenSSL library under + * certain conditions as described in each individual source file, and + * distribute linked combinations including the two. + * + * You must obey the GNU General Public License in all respects for all of the + * code used other than OpenSSL. If you modify file(s) with this exception, you + * may extend this exception to your version of the file(s), but you are not + * obligated to do so. If you do not wish to do so, delete this exception + * statement from your version. If you delete this exception statement from all + * source files in the program, then also delete it here. + * + */ + +#include "config.h" + +#include <assert.h> +#include <errno.h> +#include <fcntl.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#include "glib.h" +#include "glib/gstdio.h" + +#include "log.h" +#include "chatlog.h" +#include "common.h" +#include "config/files.h" +#include "config/preferences.h" +#include "xmpp/xmpp.h" +#include "xmpp/muc.h" + +static GHashTable* logs; +static GHashTable* groupchat_logs; +static GDateTime* session_started; + +struct dated_chat_log +{ + gchar* filename; + GDateTime* date; +}; + +static gboolean _log_roll_needed(struct dated_chat_log* dated_log); +static struct dated_chat_log* _create_chatlog(const char* const other, const char* const login); +static struct dated_chat_log* _create_groupchat_log(const char* const room, const char* const login); +static void _free_chat_log(struct dated_chat_log* dated_log); +static gboolean _key_equals(void* key1, void* key2); +static void _chat_log_chat(const char* const login, const char* const other, const gchar* const msg, + chat_log_direction_t direction, GDateTime* timestamp, const char* const resourcepart); +static void _groupchat_log_chat(const gchar* const login, const gchar* const room, const gchar* const nick, + const gchar* const msg); +void +chat_log_init(void) +{ + session_started = g_date_time_new_now_local(); + log_info("Initialising chat logs"); + logs = g_hash_table_new_full(g_str_hash, (GEqualFunc)_key_equals, free, + (GDestroyNotify)_free_chat_log); +} + +void +chat_log_msg_out(const char* const barejid, const char* const msg, const char* const resource) +{ + if (prefs_get_boolean(PREF_CHLOG)) { + char* mybarejid = connection_get_barejid(); + _chat_log_chat(mybarejid, barejid, msg, PROF_OUT_LOG, NULL, resource); + free(mybarejid); + } +} + +void +chat_log_otr_msg_out(const char* const barejid, const char* const msg, const char* const resource) +{ + if (prefs_get_boolean(PREF_CHLOG)) { + char* mybarejid = connection_get_barejid(); + char* pref_otr_log = prefs_get_string(PREF_OTR_LOG); + if (strcmp(pref_otr_log, "on") == 0) { + _chat_log_chat(mybarejid, barejid, msg, PROF_OUT_LOG, NULL, resource); + } else if (strcmp(pref_otr_log, "redact") == 0) { + _chat_log_chat(mybarejid, barejid, "[redacted]", PROF_OUT_LOG, NULL, resource); + } + g_free(pref_otr_log); + free(mybarejid); + } +} + +void +chat_log_pgp_msg_out(const char* const barejid, const char* const msg, const char* const resource) +{ + if (prefs_get_boolean(PREF_CHLOG)) { + char* mybarejid = connection_get_barejid(); + char* pref_pgp_log = prefs_get_string(PREF_PGP_LOG); + if (strcmp(pref_pgp_log, "on") == 0) { + _chat_log_chat(mybarejid, barejid, msg, PROF_OUT_LOG, NULL, resource); + } else if (strcmp(pref_pgp_log, "redact") == 0) { + _chat_log_chat(mybarejid, barejid, "[redacted]", PROF_OUT_LOG, NULL, resource); + } + g_free(pref_pgp_log); + free(mybarejid); + } +} + +void +chat_log_omemo_msg_out(const char* const barejid, const char* const msg, const char* const resource) +{ + if (prefs_get_boolean(PREF_CHLOG)) { + char* mybarejid = connection_get_barejid(); + char* pref_omemo_log = prefs_get_string(PREF_OMEMO_LOG); + if (strcmp(pref_omemo_log, "on") == 0) { + _chat_log_chat(mybarejid, barejid, msg, PROF_OUT_LOG, NULL, resource); + } else if (strcmp(pref_omemo_log, "redact") == 0) { + _chat_log_chat(mybarejid, barejid, "[redacted]", PROF_OUT_LOG, NULL, resource); + } + g_free(pref_omemo_log); + free(mybarejid); + } +} + +void +chat_log_otr_msg_in(ProfMessage* message) +{ + if (prefs_get_boolean(PREF_CHLOG)) { + char* mybarejid = connection_get_barejid(); + char* pref_otr_log = prefs_get_string(PREF_OTR_LOG); + if (message->enc == PROF_MSG_ENC_NONE || (strcmp(pref_otr_log, "on") == 0)) { + if (message->type == PROF_MSG_TYPE_MUCPM) { + _chat_log_chat(mybarejid, message->from_jid->barejid, message->plain, PROF_IN_LOG, message->timestamp, message->from_jid->resourcepart); + } else { + _chat_log_chat(mybarejid, message->from_jid->barejid, message->plain, PROF_IN_LOG, message->timestamp, NULL); + } + } else if (strcmp(pref_otr_log, "redact") == 0) { + if (message->type == PROF_MSG_TYPE_MUCPM) { + _chat_log_chat(mybarejid, message->from_jid->barejid, "[redacted]", PROF_IN_LOG, message->timestamp, message->from_jid->resourcepart); + } else { + _chat_log_chat(mybarejid, message->from_jid->barejid, "[redacted]", PROF_IN_LOG, message->timestamp, NULL); + } + } + g_free(pref_otr_log); + free(mybarejid); + } +} + +void +chat_log_pgp_msg_in(ProfMessage* message) +{ + if (prefs_get_boolean(PREF_CHLOG)) { + char* mybarejid = connection_get_barejid(); + char* pref_pgp_log = prefs_get_string(PREF_PGP_LOG); + if (strcmp(pref_pgp_log, "on") == 0) { + if (message->type == PROF_MSG_TYPE_MUCPM) { + _chat_log_chat(mybarejid, message->from_jid->barejid, message->plain, PROF_IN_LOG, message->timestamp, message->from_jid->resourcepart); + } else { + _chat_log_chat(mybarejid, message->from_jid->barejid, message->plain, PROF_IN_LOG, message->timestamp, NULL); + } + } else if (strcmp(pref_pgp_log, "redact") == 0) { + if (message->type == PROF_MSG_TYPE_MUCPM) { + _chat_log_chat(mybarejid, message->from_jid->barejid, "[redacted]", PROF_IN_LOG, message->timestamp, message->from_jid->resourcepart); + } else { + _chat_log_chat(mybarejid, message->from_jid->barejid, "[redacted]", PROF_IN_LOG, message->timestamp, NULL); + } + } + g_free(pref_pgp_log); + free(mybarejid); + } +} + +void +chat_log_omemo_msg_in(ProfMessage* message) +{ + if (prefs_get_boolean(PREF_CHLOG)) { + char* mybarejid = connection_get_barejid(); + char* pref_omemo_log = prefs_get_string(PREF_OMEMO_LOG); + if (strcmp(pref_omemo_log, "on") == 0) { + if (message->type == PROF_MSG_TYPE_MUCPM) { + _chat_log_chat(mybarejid, message->from_jid->barejid, message->plain, PROF_IN_LOG, message->timestamp, message->from_jid->resourcepart); + } else { + _chat_log_chat(mybarejid, message->from_jid->barejid, message->plain, PROF_IN_LOG, message->timestamp, NULL); + } + } else if (strcmp(pref_omemo_log, "redact") == 0) { + if (message->type == PROF_MSG_TYPE_MUCPM) { + _chat_log_chat(mybarejid, message->from_jid->barejid, "[redacted]", PROF_IN_LOG, message->timestamp, message->from_jid->resourcepart); + } else { + _chat_log_chat(mybarejid, message->from_jid->barejid, "[redacted]", PROF_IN_LOG, message->timestamp, message->from_jid->resourcepart); + } + } + g_free(pref_omemo_log); + free(mybarejid); + } +} + +void +chat_log_msg_in(ProfMessage* message) +{ + if (prefs_get_boolean(PREF_CHLOG)) { + char* mybarejid = connection_get_barejid(); + + if (message->type == PROF_MSG_TYPE_MUCPM) { + _chat_log_chat(mybarejid, message->from_jid->barejid, message->plain, PROF_IN_LOG, message->timestamp, message->from_jid->resourcepart); + } else { + _chat_log_chat(mybarejid, message->from_jid->barejid, message->plain, PROF_IN_LOG, message->timestamp, NULL); + } + + free(mybarejid); + } +} + +static void +_chat_log_chat(const char* const login, const char* const other, const char* const msg, + chat_log_direction_t direction, GDateTime* timestamp, const char* const resourcepart) +{ + char* other_name; + GString* other_str = NULL; + + if (resourcepart) { + other_str = g_string_new(other); + g_string_append(other_str, "_"); + g_string_append(other_str, resourcepart); + + other_name = other_str->str; + } else { + other_name = (char*)other; + } + + struct dated_chat_log* dated_log = g_hash_table_lookup(logs, other_name); + + // no log for user + if (dated_log == NULL) { + dated_log = _create_chatlog(other_name, login); + g_hash_table_insert(logs, strdup(other_name), dated_log); + + // log entry exists but file removed + } else if (!g_file_test(dated_log->filename, G_FILE_TEST_EXISTS)) { + dated_log = _create_chatlog(other_name, login); + g_hash_table_replace(logs, strdup(other_name), dated_log); + + // log file needs rolling + } else if (_log_roll_needed(dated_log)) { + dated_log = _create_chatlog(other_name, login); + g_hash_table_replace(logs, strdup(other_name), dated_log); + } + + if (resourcepart) { + g_string_free(other_str, TRUE); + } + + if (timestamp == NULL) { + timestamp = g_date_time_new_now_local(); + } else { + g_date_time_ref(timestamp); + } + + gchar* date_fmt = g_date_time_format_iso8601(timestamp); + FILE* chatlogp = fopen(dated_log->filename, "a"); + g_chmod(dated_log->filename, S_IRUSR | S_IWUSR); + if (chatlogp) { + if (direction == PROF_IN_LOG) { + if (strncmp(msg, "/me ", 4) == 0) { + if (resourcepart) { + fprintf(chatlogp, "%s - *%s %s\n", date_fmt, resourcepart, msg + 4); + } else { + fprintf(chatlogp, "%s - *%s %s\n", date_fmt, other, msg + 4); + } + } else { + if (resourcepart) { + fprintf(chatlogp, "%s - %s: %s\n", date_fmt, resourcepart, msg); + } else { + fprintf(chatlogp, "%s - %s: %s\n", date_fmt, other, msg); + } + } + } else { + if (strncmp(msg, "/me ", 4) == 0) { + fprintf(chatlogp, "%s - *me %s\n", date_fmt, msg + 4); + } else { + fprintf(chatlogp, "%s - me: %s\n", date_fmt, msg); + } + } + fflush(chatlogp); + int result = fclose(chatlogp); + if (result == EOF) { + log_error("Error closing file %s, errno = %d", dated_log->filename, errno); + } + } + + g_free(date_fmt); + g_date_time_unref(timestamp); +} + +void +groupchat_log_init(void) +{ + log_info("Initialising groupchat logs"); + groupchat_logs = g_hash_table_new_full(g_str_hash, (GEqualFunc)_key_equals, free, + (GDestroyNotify)_free_chat_log); +} + +void +groupchat_log_msg_out(const gchar* const room, const gchar* const msg) +{ + if (prefs_get_boolean(PREF_GRLOG)) { + char* mybarejid = connection_get_barejid(); + char* mynick = muc_nick(room); + _groupchat_log_chat(mybarejid, room, mynick, msg); + free(mybarejid); + } +} + +void +groupchat_log_msg_in(const gchar* const room, const gchar* const nick, const gchar* const msg) +{ + if (prefs_get_boolean(PREF_GRLOG)) { + char* mybarejid = connection_get_barejid(); + _groupchat_log_chat(mybarejid, room, nick, msg); + free(mybarejid); + } +} + +void +groupchat_log_omemo_msg_out(const gchar* const room, const gchar* const msg) +{ + if (prefs_get_boolean(PREF_CHLOG)) { + char* mybarejid = connection_get_barejid(); + char* pref_omemo_log = prefs_get_string(PREF_OMEMO_LOG); + char* mynick = muc_nick(room); + + if (strcmp(pref_omemo_log, "on") == 0) { + _groupchat_log_chat(mybarejid, room, mynick, msg); + } else if (strcmp(pref_omemo_log, "redact") == 0) { + _groupchat_log_chat(mybarejid, room, mynick, "[redacted]"); + } + + g_free(pref_omemo_log); + free(mybarejid); + } +} + +void +groupchat_log_omemo_msg_in(const gchar* const room, const gchar* const nick, const gchar* const msg) +{ + if (prefs_get_boolean(PREF_CHLOG)) { + char* mybarejid = connection_get_barejid(); + char* pref_omemo_log = prefs_get_string(PREF_OMEMO_LOG); + + if (strcmp(pref_omemo_log, "on") == 0) { + _groupchat_log_chat(mybarejid, room, nick, msg); + } else if (strcmp(pref_omemo_log, "redact") == 0) { + _groupchat_log_chat(mybarejid, room, nick, "[redacted]"); + } + + g_free(pref_omemo_log); + free(mybarejid); + } +} + +void +_groupchat_log_chat(const gchar* const login, const gchar* const room, const gchar* const nick, + const gchar* const msg) +{ + struct dated_chat_log* dated_log = g_hash_table_lookup(groupchat_logs, room); + + // no log for room + if (dated_log == NULL) { + dated_log = _create_groupchat_log(room, login); + g_hash_table_insert(groupchat_logs, strdup(room), dated_log); + + // log exists but needs rolling + } else if (_log_roll_needed(dated_log)) { + dated_log = _create_groupchat_log(room, login); + g_hash_table_replace(logs, strdup(room), dated_log); + } + + GDateTime* dt_tmp = g_date_time_new_now_local(); + + gchar* date_fmt = g_date_time_format_iso8601(dt_tmp); + + FILE* grpchatlogp = fopen(dated_log->filename, "a"); + g_chmod(dated_log->filename, S_IRUSR | S_IWUSR); + if (grpchatlogp) { + if (strncmp(msg, "/me ", 4) == 0) { + fprintf(grpchatlogp, "%s - *%s %s\n", date_fmt, nick, msg + 4); + } else { + fprintf(grpchatlogp, "%s - %s: %s\n", date_fmt, nick, msg); + } + + fflush(grpchatlogp); + int result = fclose(grpchatlogp); + if (result == EOF) { + log_error("Error closing file %s, errno = %d", dated_log->filename, errno); + } + } + + g_free(date_fmt); + g_date_time_unref(dt_tmp); +} + +void +chat_log_close(void) +{ + g_hash_table_destroy(logs); + g_hash_table_destroy(groupchat_logs); + g_date_time_unref(session_started); +} + +static char* +_get_log_filename(const char* const other, const char* const login, GDateTime* dt, gboolean is_room) +{ + gchar* chatlogs_dir = files_file_in_account_data_path(DIR_CHATLOGS, login, is_room ? "rooms" : NULL); + gchar* logfile_name = g_date_time_format(dt, "%Y_%m_%d.log"); + gchar* other_ = str_replace(other, "@", "_at_"); + gchar* logs_path = g_strdup_printf("%s/%s", chatlogs_dir, other_); + gchar* logfile_path = NULL; + + if (create_dir(logs_path)) { + logfile_path = g_strdup_printf("%s/%s", logs_path, logfile_name); + } + + g_free(logs_path); + g_free(other_); + g_free(logfile_name); + g_free(chatlogs_dir); + + return logfile_path; +} + +static struct dated_chat_log* +_create_chatlog(const char* const other, const char* const login) +{ + GDateTime* now = g_date_time_new_now_local(); + char* filename = _get_log_filename(other, login, now, FALSE); + + struct dated_chat_log* new_log = malloc(sizeof(struct dated_chat_log)); + new_log->filename = strdup(filename); + new_log->date = now; + + free(filename); + + return new_log; +} + +static struct dated_chat_log* +_create_groupchat_log(const char* const room, const char* const login) +{ + GDateTime* now = g_date_time_new_now_local(); + char* filename = _get_log_filename(room, login, now, TRUE); + + struct dated_chat_log* new_log = malloc(sizeof(struct dated_chat_log)); + new_log->filename = strdup(filename); + new_log->date = now; + + free(filename); + + return new_log; +} + +static gboolean +_log_roll_needed(struct dated_chat_log* dated_log) +{ + gboolean result = FALSE; + GDateTime* now = g_date_time_new_now_local(); + if (g_date_time_get_day_of_year(dated_log->date) != g_date_time_get_day_of_year(now)) { + result = TRUE; + } + g_date_time_unref(now); + + return result; +} + +static void +_free_chat_log(struct dated_chat_log* dated_log) +{ + if (dated_log) { + if (dated_log->filename) { + g_free(dated_log->filename); + dated_log->filename = NULL; + } + if (dated_log->date) { + g_date_time_unref(dated_log->date); + dated_log->date = NULL; + } + free(dated_log); + } +} + +static gboolean +_key_equals(void* key1, void* key2) +{ + gchar* str1 = (gchar*)key1; + gchar* str2 = (gchar*)key2; + + return (g_strcmp0(str1, str2) == 0); +} diff --git a/src/chatlog.h b/src/chatlog.h new file mode 100644 index 00000000..af61c8a5 --- /dev/null +++ b/src/chatlog.h @@ -0,0 +1,69 @@ +/* + * chatlog.h + * vim: expandtab:ts=4:sts=4:sw=4 + * + * Copyright (C) 2012 - 2019 James Booth <boothj5@gmail.com> + * + * This file is part of Profanity. + * + * Profanity is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Profanity is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Profanity. If not, see <https://www.gnu.org/licenses/>. + * + * In addition, as a special exception, the copyright holders give permission to + * link the code of portions of this program with the OpenSSL library under + * certain conditions as described in each individual source file, and + * distribute linked combinations including the two. + * + * You must obey the GNU General Public License in all respects for all of the + * code used other than OpenSSL. If you modify file(s) with this exception, you + * may extend this exception to your version of the file(s), but you are not + * obligated to do so. If you do not wish to do so, delete this exception + * statement from your version. If you delete this exception statement from all + * source files in the program, then also delete it here. + * + */ + +#ifndef CHATLOG_H +#define CHATLOG_H + +#include <glib.h> + +#include "xmpp/message.h" + +typedef enum { + PROF_IN_LOG, + PROF_OUT_LOG +} chat_log_direction_t; + +void chat_log_init(void); + +void chat_log_msg_out(const char* const barejid, const char* const msg, const char* resource); +void chat_log_otr_msg_out(const char* const barejid, const char* const msg, const char* resource); +void chat_log_pgp_msg_out(const char* const barejid, const char* const msg, const char* resource); +void chat_log_omemo_msg_out(const char* const barejid, const char* const msg, const char* resource); + +void chat_log_msg_in(ProfMessage* message); +void chat_log_otr_msg_in(ProfMessage* message); +void chat_log_pgp_msg_in(ProfMessage* message); +void chat_log_omemo_msg_in(ProfMessage* message); + +void chat_log_close(void); + +void groupchat_log_init(void); + +void groupchat_log_msg_out(const gchar* const room, const gchar* const msg); +void groupchat_log_msg_in(const gchar* const room, const gchar* const nick, const gchar* const msg); +void groupchat_log_omemo_msg_out(const gchar* const room, const gchar* const msg); +void groupchat_log_omemo_msg_in(const gchar* const room, const gchar* const nick, const gchar* const msg); + +#endif diff --git a/src/config/cafile.c b/src/config/cafile.c index 2bb3c4d0..542740d0 100644 --- a/src/config/cafile.c +++ b/src/config/cafile.c @@ -44,6 +44,7 @@ #include "common.h" #include "config/files.h" #include "log.h" +#include "xmpp/xmpp.h" static gchar* _cafile_name(void) diff --git a/src/database.c b/src/database.c index 6e10b222..0ccd422a 100644 --- a/src/database.c +++ b/src/database.c @@ -46,6 +46,8 @@ #include "log.h" #include "common.h" #include "config/files.h" +#include "xmpp/xmpp.h" +#include "xmpp/message.h" static sqlite3* g_chatlog_database; diff --git a/src/event/client_events.c b/src/event/client_events.c index ac52c6fe..8e2c7a0f 100644 --- a/src/event/client_events.c +++ b/src/event/client_events.c @@ -40,6 +40,7 @@ #include <glib.h> #include "log.h" +#include "chatlog.h" #include "database.h" #include "config/preferences.h" #include "event/common.h" diff --git a/src/event/server_events.c b/src/event/server_events.c index 0f18c4e9..6dae4d9f 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -43,6 +43,7 @@ #include "config/accounts.h" #include "profanity.h" #include "log.h" +#include "chatlog.h" #include "database.h" #include "config/preferences.h" #include "config/tlscerts.h" diff --git a/src/log.c b/src/log.c index d2ab58ac..b85f1005 100644 --- a/src/log.c +++ b/src/log.c @@ -51,8 +51,6 @@ #include "common.h" #include "config/files.h" #include "config/preferences.h" -#include "xmpp/xmpp.h" -#include "xmpp/muc.h" #define PROF "prof" @@ -61,10 +59,6 @@ static gchar* mainlogfile = NULL; static gboolean user_provided_log = FALSE; static log_level_t level_filter; -static GHashTable* logs; -static GHashTable* groupchat_logs; -static GDateTime* session_started; - static int stderr_inited; static log_level_t stderr_level; static int stderr_pipe[2]; @@ -76,24 +70,58 @@ enum { STDERR_RETRY_NR = 5, }; -struct dated_chat_log +static void +_rotate_log_file(void) { - gchar* filename; - GDateTime* date; -}; + gchar* log_file = g_strdup(mainlogfile); + size_t len = strlen(log_file); + gchar* log_file_new = malloc(len + 5); + + // the mainlog file should always end in '.log', lets remove this last part + // so that we can have profanity.001.log later + if (len > 4) { + log_file[len - 4] = '\0'; + } + + // find an empty name. from .log -> log.001 -> log.999 + for (int i = 1; i < 1000; i++) { + g_sprintf(log_file_new, "%s.%03d.log", log_file, i); + if (!g_file_test(log_file_new, G_FILE_TEST_EXISTS)) + break; + } + + log_close(); + + if (len > 4) { + log_file[len - 4] = '.'; + } + + rename(log_file, log_file_new); + + log_init(log_get_filter(), NULL); + + free(log_file_new); + free(log_file); + log_info("Log has been rotated"); +} -static gboolean _log_roll_needed(struct dated_chat_log* dated_log); -static struct dated_chat_log* _create_log(const char* const other, const char* const login); -static struct dated_chat_log* _create_groupchat_log(const char* const room, const char* const login); -static void _free_chat_log(struct dated_chat_log* dated_log); -static gboolean _key_equals(void* key1, void* key2); -static char* _get_log_filename(const char* const other, const char* const login, GDateTime* dt, gboolean is_room); -static void _rotate_log_file(void); -static char* _log_abbreviation_string_from_level(log_level_t level); -static void _chat_log_chat(const char* const login, const char* const other, const gchar* const msg, - chat_log_direction_t direction, GDateTime* timestamp, const char* const resourcepart); -static void _groupchat_log_chat(const gchar* const login, const gchar* const room, const gchar* const nick, - const gchar* const msg); +// abbreviation string is the prefix thats used in the log file +static char* +_log_abbreviation_string_from_level(log_level_t level) +{ + switch (level) { + case PROF_LEVEL_ERROR: + return "ERR"; + case PROF_LEVEL_WARN: + return "WRN"; + case PROF_LEVEL_INFO: + return "INF"; + case PROF_LEVEL_DEBUG: + return "DBG"; + default: + return "LOG"; + } +} void log_debug(const char* const msg, ...) @@ -242,499 +270,6 @@ log_string_from_level(log_level_t level) } } -static void -_rotate_log_file(void) -{ - gchar* log_file = g_strdup(mainlogfile); - size_t len = strlen(log_file); - gchar* log_file_new = malloc(len + 5); - - // the mainlog file should always end in '.log', lets remove this last part - // so that we can have profanity.001.log later - if (len > 4) { - log_file[len - 4] = '\0'; - } - - // find an empty name. from .log -> log.001 -> log.999 - for (int i = 1; i < 1000; i++) { - g_sprintf(log_file_new, "%s.%03d.log", log_file, i); - if (!g_file_test(log_file_new, G_FILE_TEST_EXISTS)) - break; - } - - log_close(); - - if (len > 4) { - log_file[len - 4] = '.'; - } - - rename(log_file, log_file_new); - - log_init(log_get_filter(), NULL); - - free(log_file_new); - free(log_file); - log_info("Log has been rotated"); -} - -void -chat_log_init(void) -{ - session_started = g_date_time_new_now_local(); - log_info("Initialising chat logs"); - logs = g_hash_table_new_full(g_str_hash, (GEqualFunc)_key_equals, free, - (GDestroyNotify)_free_chat_log); -} - -void -groupchat_log_init(void) -{ - log_info("Initialising groupchat logs"); - groupchat_logs = g_hash_table_new_full(g_str_hash, (GEqualFunc)_key_equals, free, - (GDestroyNotify)_free_chat_log); -} - -void -chat_log_msg_out(const char* const barejid, const char* const msg, const char* const resource) -{ - if (prefs_get_boolean(PREF_CHLOG)) { - char* mybarejid = connection_get_barejid(); - _chat_log_chat(mybarejid, barejid, msg, PROF_OUT_LOG, NULL, resource); - free(mybarejid); - } -} - -void -chat_log_otr_msg_out(const char* const barejid, const char* const msg, const char* const resource) -{ - if (prefs_get_boolean(PREF_CHLOG)) { - char* mybarejid = connection_get_barejid(); - char* pref_otr_log = prefs_get_string(PREF_OTR_LOG); - if (strcmp(pref_otr_log, "on") == 0) { - _chat_log_chat(mybarejid, barejid, msg, PROF_OUT_LOG, NULL, resource); - } else if (strcmp(pref_otr_log, "redact") == 0) { - _chat_log_chat(mybarejid, barejid, "[redacted]", PROF_OUT_LOG, NULL, resource); - } - g_free(pref_otr_log); - free(mybarejid); - } -} - -void -chat_log_pgp_msg_out(const char* const barejid, const char* const msg, const char* const resource) -{ - if (prefs_get_boolean(PREF_CHLOG)) { - char* mybarejid = connection_get_barejid(); - char* pref_pgp_log = prefs_get_string(PREF_PGP_LOG); - if (strcmp(pref_pgp_log, "on") == 0) { - _chat_log_chat(mybarejid, barejid, msg, PROF_OUT_LOG, NULL, resource); - } else if (strcmp(pref_pgp_log, "redact") == 0) { - _chat_log_chat(mybarejid, barejid, "[redacted]", PROF_OUT_LOG, NULL, resource); - } - g_free(pref_pgp_log); - free(mybarejid); - } -} - -void -chat_log_omemo_msg_out(const char* const barejid, const char* const msg, const char* const resource) -{ - if (prefs_get_boolean(PREF_CHLOG)) { - char* mybarejid = connection_get_barejid(); - char* pref_omemo_log = prefs_get_string(PREF_OMEMO_LOG); - if (strcmp(pref_omemo_log, "on") == 0) { - _chat_log_chat(mybarejid, barejid, msg, PROF_OUT_LOG, NULL, resource); - } else if (strcmp(pref_omemo_log, "redact") == 0) { - _chat_log_chat(mybarejid, barejid, "[redacted]", PROF_OUT_LOG, NULL, resource); - } - g_free(pref_omemo_log); - free(mybarejid); - } -} - -void -chat_log_otr_msg_in(ProfMessage* message) -{ - if (prefs_get_boolean(PREF_CHLOG)) { - char* mybarejid = connection_get_barejid(); - char* pref_otr_log = prefs_get_string(PREF_OTR_LOG); - if (message->enc == PROF_MSG_ENC_NONE || (strcmp(pref_otr_log, "on") == 0)) { - if (message->type == PROF_MSG_TYPE_MUCPM) { - _chat_log_chat(mybarejid, message->from_jid->barejid, message->plain, PROF_IN_LOG, message->timestamp, message->from_jid->resourcepart); - } else { - _chat_log_chat(mybarejid, message->from_jid->barejid, message->plain, PROF_IN_LOG, message->timestamp, NULL); - } - } else if (strcmp(pref_otr_log, "redact") == 0) { - if (message->type == PROF_MSG_TYPE_MUCPM) { - _chat_log_chat(mybarejid, message->from_jid->barejid, "[redacted]", PROF_IN_LOG, message->timestamp, message->from_jid->resourcepart); - } else { - _chat_log_chat(mybarejid, message->from_jid->barejid, "[redacted]", PROF_IN_LOG, message->timestamp, NULL); - } - } - g_free(pref_otr_log); - free(mybarejid); - } -} - -void -chat_log_pgp_msg_in(ProfMessage* message) -{ - if (prefs_get_boolean(PREF_CHLOG)) { - char* mybarejid = connection_get_barejid(); - char* pref_pgp_log = prefs_get_string(PREF_PGP_LOG); - if (strcmp(pref_pgp_log, "on") == 0) { - if (message->type == PROF_MSG_TYPE_MUCPM) { - _chat_log_chat(mybarejid, message->from_jid->barejid, message->plain, PROF_IN_LOG, message->timestamp, message->from_jid->resourcepart); - } else { - _chat_log_chat(mybarejid, message->from_jid->barejid, message->plain, PROF_IN_LOG, message->timestamp, NULL); - } - } else if (strcmp(pref_pgp_log, "redact") == 0) { - if (message->type == PROF_MSG_TYPE_MUCPM) { - _chat_log_chat(mybarejid, message->from_jid->barejid, "[redacted]", PROF_IN_LOG, message->timestamp, message->from_jid->resourcepart); - } else { - _chat_log_chat(mybarejid, message->from_jid->barejid, "[redacted]", PROF_IN_LOG, message->timestamp, NULL); - } - } - g_free(pref_pgp_log); - free(mybarejid); - } -} - -void -chat_log_omemo_msg_in(ProfMessage* message) -{ - if (prefs_get_boolean(PREF_CHLOG)) { - char* mybarejid = connection_get_barejid(); - char* pref_omemo_log = prefs_get_string(PREF_OMEMO_LOG); - if (strcmp(pref_omemo_log, "on") == 0) { - if (message->type == PROF_MSG_TYPE_MUCPM) { - _chat_log_chat(mybarejid, message->from_jid->barejid, message->plain, PROF_IN_LOG, message->timestamp, message->from_jid->resourcepart); - } else { - _chat_log_chat(mybarejid, message->from_jid->barejid, message->plain, PROF_IN_LOG, message->timestamp, NULL); - } - } else if (strcmp(pref_omemo_log, "redact") == 0) { - if (message->type == PROF_MSG_TYPE_MUCPM) { - _chat_log_chat(mybarejid, message->from_jid->barejid, "[redacted]", PROF_IN_LOG, message->timestamp, message->from_jid->resourcepart); - } else { - _chat_log_chat(mybarejid, message->from_jid->barejid, "[redacted]", PROF_IN_LOG, message->timestamp, message->from_jid->resourcepart); - } - } - g_free(pref_omemo_log); - free(mybarejid); - } -} - -void -chat_log_msg_in(ProfMessage* message) -{ - if (prefs_get_boolean(PREF_CHLOG)) { - char* mybarejid = connection_get_barejid(); - - if (message->type == PROF_MSG_TYPE_MUCPM) { - _chat_log_chat(mybarejid, message->from_jid->barejid, message->plain, PROF_IN_LOG, message->timestamp, message->from_jid->resourcepart); - } else { - _chat_log_chat(mybarejid, message->from_jid->barejid, message->plain, PROF_IN_LOG, message->timestamp, NULL); - } - - free(mybarejid); - } -} - -static void -_chat_log_chat(const char* const login, const char* const other, const char* const msg, - chat_log_direction_t direction, GDateTime* timestamp, const char* const resourcepart) -{ - char* other_name; - GString* other_str = NULL; - - if (resourcepart) { - other_str = g_string_new(other); - g_string_append(other_str, "_"); - g_string_append(other_str, resourcepart); - - other_name = other_str->str; - } else { - other_name = (char*)other; - } - - struct dated_chat_log* dated_log = g_hash_table_lookup(logs, other_name); - - // no log for user - if (dated_log == NULL) { - dated_log = _create_log(other_name, login); - g_hash_table_insert(logs, strdup(other_name), dated_log); - - // log entry exists but file removed - } else if (!g_file_test(dated_log->filename, G_FILE_TEST_EXISTS)) { - dated_log = _create_log(other_name, login); - g_hash_table_replace(logs, strdup(other_name), dated_log); - - // log file needs rolling - } else if (_log_roll_needed(dated_log)) { - dated_log = _create_log(other_name, login); - g_hash_table_replace(logs, strdup(other_name), dated_log); - } - - if (resourcepart) { - g_string_free(other_str, TRUE); - } - - if (timestamp == NULL) { - timestamp = g_date_time_new_now_local(); - } else { - g_date_time_ref(timestamp); - } - - gchar* date_fmt = g_date_time_format_iso8601(timestamp); - FILE* chatlogp = fopen(dated_log->filename, "a"); - g_chmod(dated_log->filename, S_IRUSR | S_IWUSR); - if (chatlogp) { - if (direction == PROF_IN_LOG) { - if (strncmp(msg, "/me ", 4) == 0) { - if (resourcepart) { - fprintf(chatlogp, "%s - *%s %s\n", date_fmt, resourcepart, msg + 4); - } else { - fprintf(chatlogp, "%s - *%s %s\n", date_fmt, other, msg + 4); - } - } else { - if (resourcepart) { - fprintf(chatlogp, "%s - %s: %s\n", date_fmt, resourcepart, msg); - } else { - fprintf(chatlogp, "%s - %s: %s\n", date_fmt, other, msg); - } - } - } else { - if (strncmp(msg, "/me ", 4) == 0) { - fprintf(chatlogp, "%s - *me %s\n", date_fmt, msg + 4); - } else { - fprintf(chatlogp, "%s - me: %s\n", date_fmt, msg); - } - } - fflush(chatlogp); - int result = fclose(chatlogp); - if (result == EOF) { - log_error("Error closing file %s, errno = %d", dated_log->filename, errno); - } - } - - g_free(date_fmt); - g_date_time_unref(timestamp); -} - -void -groupchat_log_msg_out(const gchar* const room, const gchar* const msg) -{ - if (prefs_get_boolean(PREF_GRLOG)) { - char* mybarejid = connection_get_barejid(); - char* mynick = muc_nick(room); - _groupchat_log_chat(mybarejid, room, mynick, msg); - free(mybarejid); - } -} - -void -groupchat_log_msg_in(const gchar* const room, const gchar* const nick, const gchar* const msg) -{ - if (prefs_get_boolean(PREF_GRLOG)) { - char* mybarejid = connection_get_barejid(); - _groupchat_log_chat(mybarejid, room, nick, msg); - free(mybarejid); - } -} - -void -groupchat_log_omemo_msg_out(const gchar* const room, const gchar* const msg) -{ - if (prefs_get_boolean(PREF_CHLOG)) { - char* mybarejid = connection_get_barejid(); - char* pref_omemo_log = prefs_get_string(PREF_OMEMO_LOG); - char* mynick = muc_nick(room); - - if (strcmp(pref_omemo_log, "on") == 0) { - _groupchat_log_chat(mybarejid, room, mynick, msg); - } else if (strcmp(pref_omemo_log, "redact") == 0) { - _groupchat_log_chat(mybarejid, room, mynick, "[redacted]"); - } - - g_free(pref_omemo_log); - free(mybarejid); - } -} - -void -groupchat_log_omemo_msg_in(const gchar* const room, const gchar* const nick, const gchar* const msg) -{ - if (prefs_get_boolean(PREF_CHLOG)) { - char* mybarejid = connection_get_barejid(); - char* pref_omemo_log = prefs_get_string(PREF_OMEMO_LOG); - - if (strcmp(pref_omemo_log, "on") == 0) { - _groupchat_log_chat(mybarejid, room, nick, msg); - } else if (strcmp(pref_omemo_log, "redact") == 0) { - _groupchat_log_chat(mybarejid, room, nick, "[redacted]"); - } - - g_free(pref_omemo_log); - free(mybarejid); - } -} - -void -_groupchat_log_chat(const gchar* const login, const gchar* const room, const gchar* const nick, - const gchar* const msg) -{ - struct dated_chat_log* dated_log = g_hash_table_lookup(groupchat_logs, room); - - // no log for room - if (dated_log == NULL) { - dated_log = _create_groupchat_log(room, login); - g_hash_table_insert(groupchat_logs, strdup(room), dated_log); - - // log exists but needs rolling - } else if (_log_roll_needed(dated_log)) { - dated_log = _create_groupchat_log(room, login); - g_hash_table_replace(logs, strdup(room), dated_log); - } - - GDateTime* dt_tmp = g_date_time_new_now_local(); - - gchar* date_fmt = g_date_time_format_iso8601(dt_tmp); - - FILE* grpchatlogp = fopen(dated_log->filename, "a"); - g_chmod(dated_log->filename, S_IRUSR | S_IWUSR); - if (grpchatlogp) { - if (strncmp(msg, "/me ", 4) == 0) { - fprintf(grpchatlogp, "%s - *%s %s\n", date_fmt, nick, msg + 4); - } else { - fprintf(grpchatlogp, "%s - %s: %s\n", date_fmt, nick, msg); - } - - fflush(grpchatlogp); - int result = fclose(grpchatlogp); - if (result == EOF) { - log_error("Error closing file %s, errno = %d", dated_log->filename, errno); - } - } - - g_free(date_fmt); - g_date_time_unref(dt_tmp); -} - -void -chat_log_close(void) -{ - g_hash_table_destroy(logs); - g_hash_table_destroy(groupchat_logs); - g_date_time_unref(session_started); -} - -static struct dated_chat_log* -_create_log(const char* const other, const char* const login) -{ - GDateTime* now = g_date_time_new_now_local(); - char* filename = _get_log_filename(other, login, now, FALSE); - - struct dated_chat_log* new_log = malloc(sizeof(struct dated_chat_log)); - new_log->filename = strdup(filename); - new_log->date = now; - - free(filename); - - return new_log; -} - -static struct dated_chat_log* -_create_groupchat_log(const char* const room, const char* const login) -{ - GDateTime* now = g_date_time_new_now_local(); - char* filename = _get_log_filename(room, login, now, TRUE); - - struct dated_chat_log* new_log = malloc(sizeof(struct dated_chat_log)); - new_log->filename = strdup(filename); - new_log->date = now; - - free(filename); - - return new_log; -} - -static gboolean -_log_roll_needed(struct dated_chat_log* dated_log) -{ - gboolean result = FALSE; - GDateTime* now = g_date_time_new_now_local(); - if (g_date_time_get_day_of_year(dated_log->date) != g_date_time_get_day_of_year(now)) { - result = TRUE; - } - g_date_time_unref(now); - - return result; -} - -static void -_free_chat_log(struct dated_chat_log* dated_log) -{ - if (dated_log) { - if (dated_log->filename) { - g_free(dated_log->filename); - dated_log->filename = NULL; - } - if (dated_log->date) { - g_date_time_unref(dated_log->date); - dated_log->date = NULL; - } - free(dated_log); - } -} - -static gboolean -_key_equals(void* key1, void* key2) -{ - gchar* str1 = (gchar*)key1; - gchar* str2 = (gchar*)key2; - - return (g_strcmp0(str1, str2) == 0); -} - -static char* -_get_log_filename(const char* const other, const char* const login, GDateTime* dt, gboolean is_room) -{ - gchar* chatlogs_dir = files_file_in_account_data_path(DIR_CHATLOGS, login, is_room ? "rooms" : NULL); - gchar* logfile_name = g_date_time_format(dt, "%Y_%m_%d.log"); - gchar* other_ = str_replace(other, "@", "_at_"); - gchar* logs_path = g_strdup_printf("%s/%s", chatlogs_dir, other_); - gchar* logfile_path = NULL; - - if (create_dir(logs_path)) { - logfile_path = g_strdup_printf("%s/%s", logs_path, logfile_name); - } - - g_free(logs_path); - g_free(other_); - g_free(logfile_name); - g_free(chatlogs_dir); - - return logfile_path; -} - -// abbreviation string is the prefix thats used in the log file -static char* -_log_abbreviation_string_from_level(log_level_t level) -{ - switch (level) { - case PROF_LEVEL_ERROR: - return "ERR"; - case PROF_LEVEL_WARN: - return "WRN"; - case PROF_LEVEL_INFO: - return "INF"; - case PROF_LEVEL_DEBUG: - return "DBG"; - default: - return "LOG"; - } -} - void log_stderr_handler(void) { diff --git a/src/log.h b/src/log.h index 596227d2..2a955c90 100644 --- a/src/log.h +++ b/src/log.h @@ -38,8 +38,6 @@ #include <glib.h> -#include "xmpp/message.h" - // log levels typedef enum { PROF_LEVEL_DEBUG, @@ -48,11 +46,6 @@ typedef enum { PROF_LEVEL_ERROR } log_level_t; -typedef enum { - PROF_IN_LOG, - PROF_OUT_LOG -} chat_log_direction_t; - void log_init(log_level_t filter, char* log_file); log_level_t log_get_filter(void); void log_close(void); @@ -69,25 +62,4 @@ void log_stderr_init(log_level_t level); void log_stderr_close(void); void log_stderr_handler(void); -void chat_log_init(void); - -void chat_log_msg_out(const char* const barejid, const char* const msg, const char* resource); -void chat_log_otr_msg_out(const char* const barejid, const char* const msg, const char* resource); -void chat_log_pgp_msg_out(const char* const barejid, const char* const msg, const char* resource); -void chat_log_omemo_msg_out(const char* const barejid, const char* const msg, const char* resource); - -void chat_log_msg_in(ProfMessage* message); -void chat_log_otr_msg_in(ProfMessage* message); -void chat_log_pgp_msg_in(ProfMessage* message); -void chat_log_omemo_msg_in(ProfMessage* message); - -void chat_log_close(void); - -void groupchat_log_init(void); - -void groupchat_log_msg_out(const gchar* const room, const gchar* const msg); -void groupchat_log_msg_in(const gchar* const room, const gchar* const nick, const gchar* const msg); -void groupchat_log_omemo_msg_out(const gchar* const room, const gchar* const msg); -void groupchat_log_omemo_msg_in(const gchar* const room, const gchar* const nick, const gchar* const msg); - #endif diff --git a/src/otr/otr.c b/src/otr/otr.c index 562914a2..e6015bc0 100644 --- a/src/otr/otr.c +++ b/src/otr/otr.c @@ -42,6 +42,7 @@ #include <glib.h> #include "log.h" +#include "chatlog.h" #include "database.h" #include "config/preferences.h" #include "config/files.h" diff --git a/src/profanity.c b/src/profanity.c index 14a1adb5..1bf734b8 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -53,6 +53,7 @@ #include "profanity.h" #include "common.h" #include "log.h" +#include "chatlog.h" #include "config/files.h" #include "config/tlscerts.h" #include "config/accounts.h" diff --git a/src/tools/bookmark_ignore.c b/src/tools/bookmark_ignore.c index 040d0036..7f5375ba 100644 --- a/src/tools/bookmark_ignore.c +++ b/src/tools/bookmark_ignore.c @@ -44,6 +44,8 @@ #include "log.h" +#include "xmpp/xmpp.h" + static GKeyFile* bookmark_ignore_keyfile = NULL; static gchar* account_jid = NULL; diff --git a/src/tools/editor.c b/src/tools/editor.c index 6fcc08bb..d7d5102e 100644 --- a/src/tools/editor.c +++ b/src/tools/editor.c @@ -44,6 +44,8 @@ #include "config/files.h" #include "config/preferences.h" #include "log.h" +#include "common.h" +#include "xmpp/xmpp.h" // Returns true if an error occurred gboolean diff --git a/tests/unittests/chatlog/stub_chatlog.c b/tests/unittests/chatlog/stub_chatlog.c new file mode 100644 index 00000000..33251f57 --- /dev/null +++ b/tests/unittests/chatlog/stub_chatlog.c @@ -0,0 +1,92 @@ +/* + * mock_log.c + * + * Copyright (C) 2012 - 2019 James Booth <boothj5@gmail.com> + * + * This file is part of Profanity. + * + * Profanity is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Profanity is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Profanity. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <glib.h> +#include <setjmp.h> +#include <cmocka.h> + +#include <xmpp/xmpp.h> + +void +chat_log_init(void) +{ +} + +void +chat_log_msg_out(const char* const barejid, const char* const msg, const char* const resource) +{ +} +void +chat_log_otr_msg_out(const char* const barejid, const char* const msg, const char* const resource) +{ +} +void +chat_log_pgp_msg_out(const char* const barejid, const char* const msg, const char* const resource) +{ +} +void +chat_log_omemo_msg_out(const char* const barejid, const char* const msg, const char* const resource) +{ +} + +void +chat_log_msg_in(ProfMessage* message) +{ +} +void +chat_log_otr_msg_in(ProfMessage* message) +{ +} +void +chat_log_pgp_msg_in(ProfMessage* message) +{ +} +void +chat_log_omemo_msg_in(ProfMessage* message) +{ +} + +void +chat_log_close(void) +{ +} + +void +groupchat_log_init(void) +{ +} +void +groupchat_log_msg_in(const gchar* const room, const gchar* const nick, const gchar* const msg) +{ +} +void +groupchat_log_msg_out(const gchar* const room, const gchar* const msg) +{ +} +void +groupchat_log_omemo_msg_in(const gchar* const room, const gchar* const nick, const gchar* const msg) +{ +} +void +groupchat_log_omemo_msg_out(const gchar* const room, const gchar* const msg) +{ +} diff --git a/tests/unittests/config/stub_cafile.c b/tests/unittests/config/stub_cafile.c index ea31de11..032cdaf3 100644 --- a/tests/unittests/config/stub_cafile.c +++ b/tests/unittests/config/stub_cafile.c @@ -41,6 +41,7 @@ #include "common.h" #include "config/files.h" +#include "xmpp/xmpp.h" #include "log.h" void diff --git a/tests/unittests/log/stub_log.c b/tests/unittests/log/stub_log.c index 4770eef0..dfa2619a 100644 --- a/tests/unittests/log/stub_log.c +++ b/tests/unittests/log/stub_log.c @@ -85,68 +85,3 @@ void log_stderr_handler(void) { } - -void -chat_log_init(void) -{ -} - -void -chat_log_msg_out(const char* const barejid, const char* const msg, const char* const resource) -{ -} -void -chat_log_otr_msg_out(const char* const barejid, const char* const msg, const char* const resource) -{ -} -void -chat_log_pgp_msg_out(const char* const barejid, const char* const msg, const char* const resource) -{ -} -void -chat_log_omemo_msg_out(const char* const barejid, const char* const msg, const char* const resource) -{ -} - -void -chat_log_msg_in(ProfMessage* message) -{ -} -void -chat_log_otr_msg_in(ProfMessage* message) -{ -} -void -chat_log_pgp_msg_in(ProfMessage* message) -{ -} -void -chat_log_omemo_msg_in(ProfMessage* message) -{ -} - -void -chat_log_close(void) -{ -} - -void -groupchat_log_init(void) -{ -} -void -groupchat_log_msg_in(const gchar* const room, const gchar* const nick, const gchar* const msg) -{ -} -void -groupchat_log_msg_out(const gchar* const room, const gchar* const msg) -{ -} -void -groupchat_log_omemo_msg_in(const gchar* const room, const gchar* const nick, const gchar* const msg) -{ -} -void -groupchat_log_omemo_msg_out(const gchar* const room, const gchar* const msg) -{ -} |