diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/config/files.h | 1 | ||||
| -rw-r--r-- | src/event/server_events.c | 6 | ||||
| -rw-r--r-- | src/tools/bookmark_ignore.c | 86 | ||||
| -rw-r--r-- | src/tools/bookmark_ignore.h | 41 |
5 files changed, 136 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index bab161ea..92ba39ee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,6 +42,8 @@ core_sources = \ src/tools/parser.h \ src/tools/http_upload.c \ src/tools/http_upload.h \ + src/tools/bookmark_ignore.c \ + src/tools/bookmark_ignore.h \ src/tools/autocomplete.c src/tools/autocomplete.h \ src/tools/tinyurl.c src/tools/tinyurl.h \ src/tools/clipboard.c src/tools/clipboard.h \ diff --git a/src/config/files.h b/src/config/files.h index 1e16802a..0abd7f6f 100644 --- a/src/config/files.h +++ b/src/config/files.h @@ -46,6 +46,7 @@ #define FILE_PLUGIN_THEMES "plugin_themes" #define FILE_CAPSCACHE "capscache" #define FILE_PROFANITY_IDENTIFIER "profident" +#define FILE_BOOKMARK_AUTOJOIN_IGNORE "bookmark_ignore" #define DIR_THEMES "themes" #define DIR_ICONS "icons" diff --git a/src/event/server_events.c b/src/event/server_events.c index c1f7b90e..9129562b 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -51,6 +51,7 @@ #include "event/common.h" #include "plugins/plugins.h" #include "ui/window_list.h" +#include "tools/bookmark_ignore.h" #include "xmpp/xmpp.h" #include "xmpp/muc.h" #include "xmpp/chat_session.h" @@ -1432,7 +1433,12 @@ sv_ev_lastactivity_response(const char *const from, const int seconds, const cha void sv_ev_bookmark_autojoin(Bookmark *bookmark) { + if (bookmark_ignored(bookmark)) { + return; + } + char *nick = NULL; + if (bookmark->nick) { nick = strdup(bookmark->nick); } else { diff --git a/src/tools/bookmark_ignore.c b/src/tools/bookmark_ignore.c new file mode 100644 index 00000000..18dfb869 --- /dev/null +++ b/src/tools/bookmark_ignore.c @@ -0,0 +1,86 @@ +/* + * bookmark_ignore.c + * vim: expandtab:ts=4:sts=4:sw=4 + * + * Copyright (C) 2020 Michael Vetter <jubalh@iodoru.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 <glib.h> +#include <glib/gstdio.h> +#include <stdlib.h> +#include "config/files.h" +#include "config/preferences.h" + +#include "log.h" + +static gchar** +bookmark_ignore_get_list(gsize *len) +{ + char *bi_loc; + GKeyFile *bi; + + bi_loc = files_get_data_path(FILE_BOOKMARK_AUTOJOIN_IGNORE); + + if (g_file_test(bi_loc, G_FILE_TEST_EXISTS)) { + g_chmod(bi_loc, S_IRUSR | S_IWUSR); + } + + bi = g_key_file_new(); + g_key_file_load_from_file(bi, bi_loc, G_KEY_FILE_KEEP_COMMENTS, NULL); + + if (!g_key_file_has_group(bi, "ignore")) { + return NULL; + } + + gchar **keys = g_key_file_get_keys(bi, "ignore"/*PREF_GROUP_ALIAS*/, len, NULL); + + return keys; +} + +gboolean +bookmark_ignored(Bookmark *bookmark) +{ + gsize len; + gchar **ignored = bookmark_ignore_get_list(&len); + int i; + + for (i=0; i<len; i++) { + if (g_strcmp0(bookmark->barejid, ignored[i]) == 0) { + g_strfreev(ignored); + return TRUE; + } + } + + g_strfreev(ignored); + return FALSE; +} diff --git a/src/tools/bookmark_ignore.h b/src/tools/bookmark_ignore.h new file mode 100644 index 00000000..ea37f0c6 --- /dev/null +++ b/src/tools/bookmark_ignore.h @@ -0,0 +1,41 @@ +/* + * bookmark_ignore.h + * vim: expandtab:ts=4:sts=4:sw=4 + * + * Copyright (C) 2020 Michael Vetter <jubalh@iodoru.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. + * + */ + +#ifndef BOOKMARK_IGNORE_H +#define BOOKMARK_IGNORE_H + +gboolean bookmark_ignored(Bookmark *bookmark); + +#endif |