diff --git a/.gitignore b/.gitignore index e6959ef..aebc2d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ Makefile.config -fn-rotatelogs +lc-rotatelogs *.so diff --git a/Makefile b/Makefile index 99120e9..350ff5a 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ default: all SRCS = \ log_sasl_fail.c \ - cs_successor_freenodestaff.c \ + cs_successor_liberastaff.c \ regnotice.c \ noemailnotice.c \ os_regts.c \ @@ -63,15 +63,15 @@ PROJECTNS_MAIN_SRCS = \ projectns/main/util.c OBJS = ${SRCS:.c=.so} projectns/main.so -OTHER = fn-rotatelogs fn-sendemail +OTHER = lc-rotatelogs lc-sendemail all: ${OBJS} ${OTHER} install: - ${INSTALL} -m 755 -d $(DESTDIR)${MODDIR}/modules/freenode - ${INSTALL} -m 755 *.so $(DESTDIR)${MODDIR}/modules/freenode - ${INSTALL} -m 755 -d $(DESTDIR)${MODDIR}/modules/freenode/projectns - ${INSTALL} -m 755 projectns/*.so $(DESTDIR)${MODDIR}/modules/freenode/projectns + ${INSTALL} -m 755 -d $(DESTDIR)${MODDIR}/modules/libera + ${INSTALL} -m 755 *.so $(DESTDIR)${MODDIR}/modules/libera + ${INSTALL} -m 755 -d $(DESTDIR)${MODDIR}/modules/libera/projectns + ${INSTALL} -m 755 projectns/*.so $(DESTDIR)${MODDIR}/modules/libera/projectns ${INSTALL} -m 755 -d $(DESTDIR)${bindir} ${INSTALL} -m 755 ${OTHER} $(DESTDIR)${bindir} $(INSTALL) -m 755 -d $(DESTDIR)$(SHAREDIR)/help @@ -95,8 +95,8 @@ install: projectns/main.so: ${PROJECTNS_MAIN_SRCS} ${CC} ${PICFLAGS} ${CPPFLAGS} ${CFLAGS} $^ -o $@ -fn-rotatelogs: fn-rotatelogs.in - sed -e 's!@prefix@!${prefix}!g' fn-rotatelogs.in > fn-rotatelogs +lc-rotatelogs: lc-rotatelogs.in + sed -e 's!@prefix@!${prefix}!g' lc-rotatelogs.in > lc-rotatelogs .PHONY: depend clean distclean # This sed command sucks but I don't know a better way -- jilles diff --git a/ROADMAP b/ROADMAP index 41812c7..774e106 100644 --- a/ROADMAP +++ b/ROADMAP @@ -1,7 +1,7 @@ [x] Theia database loader [ ] Testing with large amounts of users, channels, etc [ ] Missing features - [x] message "freenode is a service of ..." on registration + [x] message "libera is a service of ..." on registration [x] umode +e on grouped nicks [x] nickserv/set_unfiltered (not needed) [x] nickserv/extendchans @@ -26,7 +26,7 @@ [ ] a command that allows helpers to drop nicks "expired" according to the policy [ ] look into accountability of channel ops towards channel ops - [ ] *!*@freenode/staff/* entries outside network channels seem more like + [ ] *!*@libera/staff/* entries outside network channels seem more like some sort of flag, not a regular access entry Things that will (most likely) go away: diff --git a/cs_successor_freenodestaff.c b/cs_successor_placeholder.c similarity index 68% rename from cs_successor_freenodestaff.c rename to cs_successor_placeholder.c index d316460..be34943 100644 --- a/cs_successor_freenodestaff.c +++ b/cs_successor_placeholder.c @@ -2,11 +2,11 @@ * Copyright (c) 2012 Marien Zwart . * Rights to this code are as documented in doc/LICENSE. * - * Forces the successor for single-# channels to be freenode-staff, - * if an account by that name exists. + * Forces the successor for single-# channels to be + * libera-placeholder-account, if an account by that name exists. */ -#include "fn-compat.h" +#include "lc-compat.h" #include "atheme.h" static void channel_pick_successor_hook(hook_channel_succession_req_t *req) @@ -18,7 +18,7 @@ static void channel_pick_successor_hook(hook_channel_succession_req_t *req) if (req->mc->name[0] == '#' && req->mc->name[1] == '#') return; - /* Use freenode-staff if it exists. + /* Use ?AAAAAAABB (libera-placeholder-account) if it exists. * If myuser_find_ext returns NULL the normal successor logic is used. * If some other user of this hook picked a successor * we intentionally overrule it. @@ -38,7 +38,7 @@ static void mod_deinit(module_unload_intent_t intent) DECLARE_MODULE_V1 ( - "freenode/cs_successor_freenodestaff", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, - "$Id: cs_successor_freenodestaff.c 65 2012-06-09 12:25:31Z stephen $", - "freenode " + "libera/cs_successor_placeholder", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, + "$Id: cs_successor_placeholder.c 65 2012-06-09 12:25:31Z stephen $", + "libera chat " ); diff --git a/help/.svn/entries b/help/.svn/entries deleted file mode 100644 index 9784276..0000000 --- a/help/.svn/entries +++ /dev/null @@ -1,40 +0,0 @@ -10 - -dir -68 -svn+ssh://stephen@dev.freenode.net/srv/svn/atheme+fn/trunk/help -svn+ssh://stephen@dev.freenode.net/srv/svn/atheme+fn - - - -2012-06-16T14:45:57.668856Z -66 -stephen - - - - - - - - - - - - - - -0d7f35cd-bd30-0410-8657-eaad79ef79fa - -oservice -dir - -cservice -dir - -nickserv -dir - -freenode -dir - diff --git a/help/freenode/cs_access b/help/libera/cs_access similarity index 100% rename from help/freenode/cs_access rename to help/libera/cs_access diff --git a/help/freenode/cs_claim b/help/libera/cs_claim similarity index 100% rename from help/freenode/cs_claim rename to help/libera/cs_claim diff --git a/help/freenode/os_regts b/help/libera/os_regts similarity index 100% rename from help/freenode/os_regts rename to help/libera/os_regts diff --git a/help/freenode/project_audit b/help/libera/project_audit similarity index 100% rename from help/freenode/project_audit rename to help/libera/project_audit diff --git a/help/freenode/project_channel b/help/libera/project_channel similarity index 100% rename from help/freenode/project_channel rename to help/libera/project_channel diff --git a/help/freenode/project_cloak b/help/libera/project_cloak similarity index 100% rename from help/freenode/project_cloak rename to help/libera/project_cloak diff --git a/help/freenode/project_contact b/help/libera/project_contact similarity index 100% rename from help/freenode/project_contact rename to help/libera/project_contact diff --git a/help/freenode/project_drop b/help/libera/project_drop similarity index 100% rename from help/freenode/project_drop rename to help/libera/project_drop diff --git a/help/freenode/project_info b/help/libera/project_info similarity index 100% rename from help/freenode/project_info rename to help/libera/project_info diff --git a/help/freenode/project_list b/help/libera/project_list similarity index 100% rename from help/freenode/project_list rename to help/libera/project_list diff --git a/help/freenode/project_listchannel b/help/libera/project_listchannel similarity index 100% rename from help/freenode/project_listchannel rename to help/libera/project_listchannel diff --git a/help/freenode/project_listcloak b/help/libera/project_listcloak similarity index 100% rename from help/freenode/project_listcloak rename to help/libera/project_listcloak diff --git a/help/freenode/project_mark b/help/libera/project_mark similarity index 100% rename from help/freenode/project_mark rename to help/libera/project_mark diff --git a/help/freenode/project_register b/help/libera/project_register similarity index 100% rename from help/freenode/project_register rename to help/libera/project_register diff --git a/help/freenode/project_set_name b/help/libera/project_set_name similarity index 80% rename from help/freenode/project_set_name rename to help/libera/project_set_name index 3d144dc..1de4570 100644 --- a/help/freenode/project_set_name +++ b/help/libera/project_set_name @@ -6,4 +6,4 @@ information attached to it, such as contacts, namespaces and marks. Syntax: SET NAME Examples: - /msg &nick& SET OpenProjectsNet NAME freenode + /msg &nick& SET freenode NAME libera diff --git a/help/freenode/project_set_openreg b/help/libera/project_set_openreg similarity index 100% rename from help/freenode/project_set_openreg rename to help/libera/project_set_openreg diff --git a/help/freenode/project_set_reginfo b/help/libera/project_set_reginfo similarity index 100% rename from help/freenode/project_set_reginfo rename to help/libera/project_set_reginfo diff --git a/help/nickserv/set_unfiltered b/help/nickserv/set_unfiltered index 366d840..a7d2be7 100644 --- a/help/nickserv/set_unfiltered +++ b/help/nickserv/set_unfiltered @@ -2,7 +2,7 @@ Help for SET UNFILTERED: SET UNFILTERED allows you to receive messages from unregistered users. These messages are turned off -by default on freenode at this time because of spambot +by default on libera at this time because of spambot abuse. Syntax: SET UNFILTERED ON|OFF diff --git a/include/fn-compat.h b/include/lc-compat.h similarity index 96% rename from include/fn-compat.h rename to include/lc-compat.h index f3902b1..7d5cb02 100644 --- a/include/fn-compat.h +++ b/include/lc-compat.h @@ -7,8 +7,8 @@ * using 7.3 exclusively. */ -#ifndef ATHEME_FREENODE_COMPAT_H -#define ATHEME_FREENODE_COMPAT_H +#ifndef ATHEME_LIBERA_COMPAT_H +#define ATHEME_LIBERA_COMPAT_H #include diff --git a/fn-rotatelogs.in b/lc-rotatelogs.in similarity index 93% rename from fn-rotatelogs.in rename to lc-rotatelogs.in index f750d48..54bd59f 100644 --- a/fn-rotatelogs.in +++ b/lc-rotatelogs.in @@ -1,7 +1,7 @@ #!/usr/bin/perl # Atheme log rotate script # Note: this script assumes --enable-fhs-paths is not in use. -# $Id: fn-rotatelogs.in 51 2008-03-03 18:26:18Z jilles $ +# $Id: lc-rotatelogs.in 51 2008-03-03 18:26:18Z jilles $ my @arr = gmtime(time-86399); my $yesterday = sprintf('%04u%02u%02u', $arr[5] + 1900, $arr[4] + 1, $arr[3]); diff --git a/fn-sendemail b/lc-sendemail similarity index 100% rename from fn-sendemail rename to lc-sendemail diff --git a/log_sasl_fail.c b/log_sasl_fail.c index 868d44a..e6cc337 100644 --- a/log_sasl_fail.c +++ b/log_sasl_fail.c @@ -1,4 +1,4 @@ -#include "fn-compat.h" +#include "lc-compat.h" #include "atheme.h" #ifdef NEED_OLD_COMPAT_INCLUDES #include "pmodule.h" @@ -32,6 +32,6 @@ static void mod_deinit(module_unload_intent_t intentvoid) } DECLARE_MODULE_V1 ( - "freenode/log_sasl_fail", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, - "", "freenode " + "libera/log_sasl_fail", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, + "", "libera chat " ); diff --git a/noemailnotice.c b/noemailnotice.c index 2536cdf..15b6e75 100644 --- a/noemailnotice.c +++ b/noemailnotice.c @@ -2,11 +2,11 @@ * Copyright (c) 2016 Mike Quin * Rights to this code are as documented in doc/LICENSE. * - * freenode on-identify notice to users with no valid email address set + * libera on-identify notice to users with no valid email address set * */ -#include "fn-compat.h" +#include "lc-compat.h" #include "atheme.h" static void user_identify_notice(user_t *u); @@ -33,13 +33,13 @@ static void user_identify_notice(user_t *u) notice(nicksvs.nick, u->nick, "WARNING: Your NickServ account does not have a valid email address set."); notice(nicksvs.nick, u->nick, "Should you forget your password it may not be possible to recover your acccount."); notice(nicksvs.nick, u->nick, "For help setting an email address, see \2/msg NickServ HELP SET EMAIL\2."); - notice(nicksvs.nick, u->nick, "Should you need more assistance you can /join #freenode to find network staff."); + notice(nicksvs.nick, u->nick, "Should you need more assistance you can /join #libera to find network staff."); } } DECLARE_MODULE_V1 ( - "freenode/noemailnotice", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, + "libera/noemailnotice", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, PACKAGE_STRING, - "freenode " + "libera chat " ); diff --git a/os_klinechan.c b/os_klinechan.c index e6e2159..c0e0d23 100644 --- a/os_klinechan.c +++ b/os_klinechan.c @@ -199,7 +199,7 @@ static struct command os_klinechan = { .access = PRIV_MASS_AKILL, .maxparc = 3, .cmd = &os_cmd_klinechan, - .help = { .path = "contrib/klinechan" }, + .help = { .path = "libera/klinechan" }, }; static struct command os_listklinechans = { @@ -208,7 +208,7 @@ static struct command os_listklinechans = { .access = PRIV_MASS_AKILL, .maxparc = 1, .cmd = &os_cmd_listklinechans, - .help = { .path = "contrib/listklinechans" }, + .help = { .path = "libera/listklinechans" }, }; static void diff --git a/os_regts.c b/os_regts.c index 570db44..eea7316 100644 --- a/os_regts.c +++ b/os_regts.c @@ -5,12 +5,12 @@ * Allows network staff to manipulate registration timestamps. */ -#include "fn-compat.h" +#include "lc-compat.h" #include "atheme.h" static void os_cmd_regts(sourceinfo_t *si, int parc, char *parv[]); -command_t os_regts = { "REGTS", N_("Adjusts registration timestamps."), PRIV_ADMIN, 3, os_cmd_regts, { .path = "freenode/os_regts" } }; +command_t os_regts = { "REGTS", N_("Adjusts registration timestamps."), PRIV_ADMIN, 3, os_cmd_regts, { .path = "libera/os_regts" } }; static void os_cmd_regts(sourceinfo_t *si, int parc, char *parv[]) @@ -208,7 +208,7 @@ mod_deinit(const module_unload_intent_t unused) DECLARE_MODULE_V1 ( - "freenode/os_regts", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, + "libera/os_regts", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, PACKAGE_STRING, - "freenode " + "libera chat " ); diff --git a/projectns/audit.c b/projectns/audit.c index 3c48488..6b4ecab 100644 --- a/projectns/audit.c +++ b/projectns/audit.c @@ -6,7 +6,7 @@ * Command to audit incompletely registered projects */ -#include "fn-compat.h" +#include "lc-compat.h" #include "atheme.h" #include "projectns.h" @@ -18,7 +18,7 @@ command_t ps_audit = { .access = PRIV_PROJECT_AUSPEX, .maxparc = 1, .cmd = cmd_audit, - .help = { .path = "freenode/project_audit" }, + .help = { .path = "libera/project_audit" }, }; static void cmd_audit(sourceinfo_t *si, int parc, char *parv[]) @@ -107,6 +107,6 @@ static void mod_deinit(const module_unload_intent_t unused) DECLARE_MODULE_V1 ( - "freenode/projectns/audit", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, - "", "freenode " + "libera/projectns/audit", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, + "", "libera chat " ); diff --git a/projectns/channel.c b/projectns/channel.c index e82e523..e6eb09e 100644 --- a/projectns/channel.c +++ b/projectns/channel.c @@ -6,13 +6,13 @@ * Commands to manage channel namespaces */ -#include "fn-compat.h" +#include "lc-compat.h" #include "atheme.h" #include "projectns.h" static void cmd_channel(sourceinfo_t *si, int parc, char *parv[]); -command_t ps_channel = { "CHANNEL", N_("Manages project channel namespaces."), PRIV_PROJECT_ADMIN, 4, cmd_channel, { .path = "freenode/project_channel" } }; +command_t ps_channel = { "CHANNEL", N_("Manages project channel namespaces."), PRIV_PROJECT_ADMIN, 4, cmd_channel, { .path = "libera/project_channel" } }; static void cmd_channel(sourceinfo_t *si, int parc, char *parv[]) { @@ -141,6 +141,6 @@ static void mod_deinit(const module_unload_intent_t unused) DECLARE_MODULE_V1 ( - "freenode/projectns/channel", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, - "", "freenode " + "libera/projectns/channel", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, + "", "libera chat " ); diff --git a/projectns/cloak.c b/projectns/cloak.c index 7c5b160..ce8f12a 100644 --- a/projectns/cloak.c +++ b/projectns/cloak.c @@ -6,13 +6,13 @@ * Commands to manage cloak namespaces */ -#include "fn-compat.h" +#include "lc-compat.h" #include "atheme.h" #include "projectns.h" static void cmd_cloak(sourceinfo_t *si, int parc, char *parv[]); -command_t ps_cloak = { "CLOAK", N_("Manages project cloak namespaces."), PRIV_PROJECT_ADMIN, 4, cmd_cloak, { .path = "freenode/project_cloak" } }; +command_t ps_cloak = { "CLOAK", N_("Manages project cloak namespaces."), PRIV_PROJECT_ADMIN, 4, cmd_cloak, { .path = "libera/project_cloak" } }; static void cmd_cloak(sourceinfo_t *si, int parc, char *parv[]) { @@ -150,6 +150,6 @@ static void mod_deinit(const module_unload_intent_t unused) DECLARE_MODULE_V1 ( - "freenode/projectns/cloak", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, - "", "freenode " + "libera/projectns/cloak", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, + "", "libera chat " ); diff --git a/projectns/contact.c b/projectns/contact.c index 1086bad..4ca5fd7 100644 --- a/projectns/contact.c +++ b/projectns/contact.c @@ -6,13 +6,13 @@ * Commands to manage registered contacts */ -#include "fn-compat.h" +#include "lc-compat.h" #include "atheme.h" #include "projectns.h" static void cmd_contact(sourceinfo_t *si, int parc, char *parv[]); -command_t ps_contact = { "CONTACT", N_("Manages project contacts."), PRIV_PROJECT_ADMIN, 5, cmd_contact, { .path = "freenode/project_contact" } }; +command_t ps_contact = { "CONTACT", N_("Manages project contacts."), PRIV_PROJECT_ADMIN, 5, cmd_contact, { .path = "libera/project_contact" } }; static void cmd_contact(sourceinfo_t *si, int parc, char *parv[]) { @@ -214,6 +214,6 @@ static void mod_deinit(const module_unload_intent_t unused) DECLARE_MODULE_V1 ( - "freenode/projectns/contact", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, - "", "freenode " + "libera/projectns/contact", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, + "", "libera chat " ); diff --git a/projectns/cs_claim.c b/projectns/cs_claim.c index 0fdcd64..6731198 100644 --- a/projectns/cs_claim.c +++ b/projectns/cs_claim.c @@ -6,13 +6,13 @@ * ChanServ command for contacts to claim channels */ -#include "fn-compat.h" +#include "lc-compat.h" #include "atheme.h" #include "projectns.h" static void cmd_claim(sourceinfo_t *si, int parc, char *parv[]); -command_t cs_claim = { "CLAIM", N_("Grants you access to a channel belonging to your project."), AC_AUTHENTICATED, 2, cmd_claim, { .path = "freenode/cs_claim" } }; +command_t cs_claim = { "CLAIM", N_("Grants you access to a channel belonging to your project."), AC_AUTHENTICATED, 2, cmd_claim, { .path = "libera/cs_claim" } }; static void cmd_claim(sourceinfo_t *si, int parc, char *parv[]) { @@ -157,6 +157,6 @@ static void mod_deinit(const module_unload_intent_t unused) DECLARE_MODULE_V1 ( - "freenode/projectns/cs_claim", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, - "", "freenode " + "libera/projectns/cs_claim", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, + "", "libera chat " ); diff --git a/projectns/help.c b/projectns/help.c index 66c7ff4..0445a28 100644 --- a/projectns/help.c +++ b/projectns/help.c @@ -8,7 +8,7 @@ * Help command, adapted from the operserv/help code */ -#include "fn-compat.h" +#include "lc-compat.h" #include "atheme.h" #include "projectns.h" @@ -59,6 +59,6 @@ static void mod_deinit(const module_unload_intent_t unused) DECLARE_MODULE_V1 ( - "freenode/projectns/help", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, - "", "freenode " + "libera/projectns/help", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, + "", "libera chat " ); diff --git a/projectns/hooks.c b/projectns/hooks.c index 6cdc9c4..7a67226 100644 --- a/projectns/hooks.c +++ b/projectns/hooks.c @@ -6,7 +6,7 @@ * Hooks into existing functionality */ -#include "fn-compat.h" +#include "lc-compat.h" #include "atheme.h" #include "projectns.h" @@ -278,6 +278,6 @@ static void mod_deinit(const module_unload_intent_t unused) DECLARE_MODULE_V1 ( - "freenode/projectns/hooks", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, - "", "freenode " + "libera/projectns/hooks", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, + "", "libera chat " ); diff --git a/projectns/info.c b/projectns/info.c index f4455e3..e152946 100644 --- a/projectns/info.c +++ b/projectns/info.c @@ -6,13 +6,13 @@ * Command to display information about registered projects */ -#include "fn-compat.h" +#include "lc-compat.h" #include "atheme.h" #include "projectns.h" static void cmd_info(sourceinfo_t *si, int parc, char *parv[]); -command_t ps_info = { "INFO", N_("Displays information about a project registration."), PRIV_PROJECT_AUSPEX, 1, cmd_info, { .path = "freenode/project_info" } }; +command_t ps_info = { "INFO", N_("Displays information about a project registration."), PRIV_PROJECT_AUSPEX, 1, cmd_info, { .path = "libera/project_info" } }; struct info_item { @@ -191,6 +191,6 @@ static void mod_deinit(const module_unload_intent_t unused) DECLARE_MODULE_V1 ( - "freenode/projectns/info", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, - "", "freenode " + "libera/projectns/info", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, + "", "libera chat " ); diff --git a/projectns/list.c b/projectns/list.c index a7c6b63..2bb0886 100644 --- a/projectns/list.c +++ b/projectns/list.c @@ -6,13 +6,13 @@ * Command to display information about registered projects */ -#include "fn-compat.h" +#include "lc-compat.h" #include "atheme.h" #include "projectns.h" static void cmd_list(sourceinfo_t *si, int parc, char *parv[]); -command_t ps_list = { "LIST", N_("Lists project registrations."), PRIV_PROJECT_AUSPEX, 1, cmd_list, { .path = "freenode/project_list" } }; +command_t ps_list = { "LIST", N_("Lists project registrations."), PRIV_PROJECT_AUSPEX, 1, cmd_list, { .path = "libera/project_list" } }; static void cmd_list(sourceinfo_t *si, int parc, char *parv[]) { @@ -80,6 +80,6 @@ static void mod_deinit(const module_unload_intent_t unused) DECLARE_MODULE_V1 ( - "freenode/projectns/list", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, - "", "freenode " + "libera/projectns/list", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, + "", "libera chat " ); diff --git a/projectns/listchannel.c b/projectns/listchannel.c index cdee87b..3c9d968 100644 --- a/projectns/listchannel.c +++ b/projectns/listchannel.c @@ -7,13 +7,13 @@ * Command to display information about registered projects */ -#include "fn-compat.h" +#include "lc-compat.h" #include "atheme.h" #include "projectns.h" static void cmd_listchannel(sourceinfo_t *si, int parc, char *parv[]); -command_t ps_listchannel = { "LISTCHANNEL", N_("Lists channel namespaces."), PRIV_PROJECT_AUSPEX, 1, cmd_listchannel, { .path = "freenode/project_listchannel" } }; +command_t ps_listchannel = { "LISTCHANNEL", N_("Lists channel namespaces."), PRIV_PROJECT_AUSPEX, 1, cmd_listchannel, { .path = "libera/project_listchannel" } }; struct each_channel_state { @@ -91,6 +91,6 @@ static void mod_deinit(const module_unload_intent_t unused) DECLARE_MODULE_V1 ( - "freenode/projectns/listchannel", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, - "", "freenode " + "libera/projectns/listchannel", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, + "", "libera chat " ); diff --git a/projectns/listcloak.c b/projectns/listcloak.c index faa529e..c1ba0e0 100644 --- a/projectns/listcloak.c +++ b/projectns/listcloak.c @@ -7,13 +7,13 @@ * Command to display information about registered projects */ -#include "fn-compat.h" +#include "lc-compat.h" #include "atheme.h" #include "projectns.h" static void cmd_listcloak(sourceinfo_t *si, int parc, char *parv[]); -command_t ps_listcloak = { "LISTCLOAK", N_("Lists cloak namespaces."), PRIV_PROJECT_AUSPEX, 1, cmd_listcloak, { .path = "freenode/project_listcloak" } }; +command_t ps_listcloak = { "LISTCLOAK", N_("Lists cloak namespaces."), PRIV_PROJECT_AUSPEX, 1, cmd_listcloak, { .path = "libera/project_listcloak" } }; struct each_cloak_state { @@ -91,6 +91,6 @@ static void mod_deinit(const module_unload_intent_t unused) DECLARE_MODULE_V1 ( - "freenode/projectns/listcloak", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, - "", "freenode " + "libera/projectns/listcloak", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, + "", "libera chat " ); diff --git a/projectns/main/db.c b/projectns/main/db.c index ca02608..6caa321 100644 --- a/projectns/main/db.c +++ b/projectns/main/db.c @@ -6,7 +6,7 @@ * Core functionality - Database handling */ -#include "fn-compat.h" +#include "lc-compat.h" #include "main.h" #define DB_TYPE_PROJECT "FNGROUP" diff --git a/projectns/main/main.c b/projectns/main/main.c index 3e20b1c..565e903 100644 --- a/projectns/main/main.c +++ b/projectns/main/main.c @@ -6,7 +6,7 @@ * Core functionality - Module declaration */ -#include "fn-compat.h" +#include "lc-compat.h" #include "main.h" unsigned int projectns_abirev = PROJECTNS_ABIREV; @@ -49,6 +49,6 @@ static void mod_deinit(const module_unload_intent_t intent) DECLARE_MODULE_V1 ( - "freenode/projectns/main", MODULE_UNLOAD_CAPABILITY_RELOAD_ONLY, mod_init, mod_deinit, - "", "freenode " + "libera/projectns/main", MODULE_UNLOAD_CAPABILITY_RELOAD_ONLY, mod_init, mod_deinit, + "", "libera chat " ); diff --git a/projectns/main/main.h b/projectns/main/main.h index ce5c3db..5bbfe59 100644 --- a/projectns/main/main.h +++ b/projectns/main/main.h @@ -9,7 +9,7 @@ #ifndef PROJECTNS_MAIN_H #define PROJECTNS_MAIN_H -#include "fn-compat.h" +#include "lc-compat.h" #include "../projectns_common.h" #define MYUSER_PRIVDATA_NAME "freenode:projects" diff --git a/projectns/main/objects.c b/projectns/main/objects.c index 594b035..7f612a7 100644 --- a/projectns/main/objects.c +++ b/projectns/main/objects.c @@ -6,7 +6,7 @@ * Core functionality - Data structure management */ -#include "fn-compat.h" +#include "lc-compat.h" #include "main.h" struct project_contact *contact_new(struct projectns * const p, myuser_t * const mu) diff --git a/projectns/main/persist.c b/projectns/main/persist.c index 37386ef..04c2c86 100644 --- a/projectns/main/persist.c +++ b/projectns/main/persist.c @@ -6,7 +6,7 @@ * Core functionality - Persistence when reloading */ -#include "fn-compat.h" +#include "lc-compat.h" #include "main.h" #define PERSIST_STORAGE_NAME "atheme.freenode.projectns.main.persist" @@ -38,8 +38,8 @@ bool persist_load_data(module_t *m) // Disallow live downgrading if (rec->version > PROJECTNS_ABIREV) { - slog(LG_ERROR, "freenode/projectns/main: attempted to load data from newer module (%u > %u)", rec->version, PROJECTNS_ABIREV); - slog(LG_ERROR, "freenode/projectns/main: This module cannot be safely reloaded without restarting services"); + slog(LG_ERROR, "libera/projectns/main: attempted to load data from newer module (%u > %u)", rec->version, PROJECTNS_ABIREV); + slog(LG_ERROR, "libera/projectns/main: This module cannot be safely reloaded without restarting services"); /* (among other things, it would cause us memory leaks as there may be pointers in the * newer struct projectns that we won't know to free, plus data might be lost. * Best to play it safe.) @@ -47,7 +47,7 @@ bool persist_load_data(module_t *m) m->mflags = MODFLAG_FAIL; return false; } - slog(LG_DEBUG, "freenode/projectns/main: restoring pre-reload structures (old: %u; new: %u)", rec->version, PROJECTNS_ABIREV); + slog(LG_DEBUG, "libera/projectns/main: restoring pre-reload structures (old: %u; new: %u)", rec->version, PROJECTNS_ABIREV); projectsvs.me = rec->service; /* If rec->version == PROJECTNS_ABIREV, we could probably re-use rec->projects safely. diff --git a/projectns/main/util.c b/projectns/main/util.c index 4d34721..e4bb351 100644 --- a/projectns/main/util.c +++ b/projectns/main/util.c @@ -6,7 +6,7 @@ * Core functionality - Utility functions */ -#include "fn-compat.h" +#include "lc-compat.h" #include "main.h" bool is_valid_project_name(const char * const name) diff --git a/projectns/manage.c b/projectns/manage.c index 0b68639..29b12ad 100644 --- a/projectns/manage.c +++ b/projectns/manage.c @@ -6,15 +6,15 @@ * Commands to register and drop projects */ -#include "fn-compat.h" +#include "lc-compat.h" #include "atheme.h" #include "projectns.h" static void cmd_register(sourceinfo_t *si, int parc, char *parv[]); static void cmd_drop(sourceinfo_t *si, int parc, char *parv[]); -command_t ps_register = { "REGISTER", N_("Adds a project registration."), PRIV_PROJECT_ADMIN, 2, cmd_register, { .path = "freenode/project_register" } }; -command_t ps_drop = { "DROP", N_("Deletes a project registration."), PRIV_PROJECT_ADMIN, 1, cmd_drop, { .path = "freenode/project_drop" } }; +command_t ps_register = { "REGISTER", N_("Adds a project registration."), PRIV_PROJECT_ADMIN, 2, cmd_register, { .path = "libera/project_register" } }; +command_t ps_drop = { "DROP", N_("Deletes a project registration."), PRIV_PROJECT_ADMIN, 1, cmd_drop, { .path = "libera/project_drop" } }; static void cmd_register(sourceinfo_t *si, int parc, char *parv[]) { @@ -97,6 +97,6 @@ static void mod_deinit(const module_unload_intent_t unused) DECLARE_MODULE_V1 ( - "freenode/projectns/manage", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, - "", "freenode " + "libera/projectns/manage", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, + "", "libera chat " ); diff --git a/projectns/mark.c b/projectns/mark.c index 0abfd65..0e841fc 100644 --- a/projectns/mark.c +++ b/projectns/mark.c @@ -6,13 +6,13 @@ * Commands to set marks on projects */ -#include "fn-compat.h" +#include "lc-compat.h" #include "atheme.h" #include "projectns.h" static void cmd_mark(sourceinfo_t *si, int parc, char *parv[]); -command_t ps_mark = { "MARK", N_("Sets internal notes on projects."), PRIV_PROJECT_ADMIN, 3, cmd_mark, { .path = "freenode/project_mark" } }; +command_t ps_mark = { "MARK", N_("Sets internal notes on projects."), PRIV_PROJECT_ADMIN, 3, cmd_mark, { .path = "libera/project_mark" } }; static unsigned int get_last_mark_id(struct projectns *p) { @@ -157,6 +157,6 @@ static void mod_deinit(const module_unload_intent_t unused) DECLARE_MODULE_V1 ( - "freenode/projectns/mark", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, - "", "freenode " + "libera/projectns/mark", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, + "", "libera chat " ); diff --git a/projectns/projectns.h b/projectns/projectns.h index caa6482..847c9b1 100644 --- a/projectns/projectns.h +++ b/projectns/projectns.h @@ -9,13 +9,13 @@ #ifndef PROJECTNS_H #define PROJECTNS_H -#include "fn-compat.h" +#include "lc-compat.h" #include "atheme.h" #include "projectns_common.h" struct projectsvs *projectsvs; -#define MAIN_MODULE "freenode/projectns/main" +#define MAIN_MODULE "libera/projectns/main" static inline void projectns_main_symbol_impl(module_t *m) { diff --git a/projectns/projectns_common.h b/projectns/projectns_common.h index 107e325..e08d934 100644 --- a/projectns/projectns_common.h +++ b/projectns/projectns_common.h @@ -9,7 +9,7 @@ #ifndef PROJECTNS_COMMON_H #define PROJECTNS_COMMON_H -#include "fn-compat.h" +#include "lc-compat.h" #include "atheme.h" #define PRIV_PROJECT_ADMIN "project:admin" diff --git a/projectns/set.c b/projectns/set.c index aca5b04..11cb13a 100644 --- a/projectns/set.c +++ b/projectns/set.c @@ -6,7 +6,7 @@ * Commands to manipulate projects' settings */ -#include "fn-compat.h" +#include "lc-compat.h" #include "atheme.h" #include "projectns.h" @@ -17,9 +17,9 @@ static void set_reginfo(sourceinfo_t *si, int parc, char *parv[]); static void set_name(sourceinfo_t *si, int parc, char *parv[]); command_t ps_set = { "SET", N_("Manipulates basic project settings."), PRIV_PROJECT_ADMIN, 3, cmd_set, { .func = help_set } }; -command_t ps_set_name = { "NAME", N_("Changes the name used to identify the project."), PRIV_PROJECT_ADMIN, 2, set_name, { .path = "freenode/project_set_name" } }; -command_t ps_set_openreg = { "OPENREG", N_("Allow non-contacts to register channels."), PRIV_PROJECT_ADMIN, 2, set_openreg, { .path = "freenode/project_set_openreg" } }; -command_t ps_set_reginfo = { "REGINFO", N_("Public information about the project namespace."), PRIV_PROJECT_ADMIN, 2, set_reginfo, { .path = "freenode/project_set_reginfo" } }; +command_t ps_set_name = { "NAME", N_("Changes the name used to identify the project."), PRIV_PROJECT_ADMIN, 2, set_name, { .path = "libera/project_set_name" } }; +command_t ps_set_openreg = { "OPENREG", N_("Allow non-contacts to register channels."), PRIV_PROJECT_ADMIN, 2, set_openreg, { .path = "libera/project_set_openreg" } }; +command_t ps_set_reginfo = { "REGINFO", N_("Public information about the project namespace."), PRIV_PROJECT_ADMIN, 2, set_reginfo, { .path = "libera/project_set_reginfo" } }; mowgli_patricia_t *set_cmdtree; @@ -223,6 +223,6 @@ static void mod_deinit(const module_unload_intent_t unused) DECLARE_MODULE_V1 ( - "freenode/projectns/set", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, - "", "freenode " + "libera/projectns/set", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, + "", "libera chat " ); diff --git a/regnotice.c b/regnotice.c index 9923a2e..0b70ca7 100644 --- a/regnotice.c +++ b/regnotice.c @@ -2,20 +2,20 @@ * Copyright (c) 2007 Jilles Tjoelker * Rights to this code are as documented in doc/LICENSE. * - * freenode on-registration notices and default settings + * libera on-registration notices and default settings * * $Id: regnotice.c 69 2013-03-25 13:07:19Z stephen $ */ -#include "fn-compat.h" +#include "lc-compat.h" #include "atheme.h" static void nick_reg_notice(myuser_t *mu) { myuser_notice(nicksvs.nick, mu, " "); - myuser_notice(nicksvs.nick, mu, "For frequently-asked questions about the network, please see the"); - myuser_notice(nicksvs.nick, mu, "Knowledge Base page (https://freenode.net/kb/all). Should you need more"); - myuser_notice(nicksvs.nick, mu, "help you can /join #freenode to find network staff."); + myuser_notice(nicksvs.nick, mu, "For frequently-asked questions about the network, please see our"); + myuser_notice(nicksvs.nick, mu, "Guides page (https://libera.chat/guides/). Should you need more"); + myuser_notice(nicksvs.nick, mu, "help you can /join #libera to find network staff."); } static void chan_reg_notice(hook_channel_req_t *hdata) @@ -27,21 +27,8 @@ static void chan_reg_notice(hook_channel_req_t *hdata) return; command_success_nodata(si, " "); - command_success_nodata(si, "Channel guidelines can be found on the freenode website:"); - command_success_nodata(si, "https://freenode.net/changuide"); - if (mc->name[1] != '#') - { - command_success_nodata(si, "This is a primary namespace channel as per\n" - "https://freenode.net/policies#channel-ownership"); - command_success_nodata(si, "If you do not own this name, please consider\n" - "dropping %s and using #%s instead.", - mc->name, mc->name); - } - else - { - command_success_nodata(si, "This is an \"about\" channel as per"); - command_success_nodata(si, "https://freenode.net/policies#channel-ownership"); - } + command_success_nodata(si, "Channel guidelines can be found on the Libera Chat website:"); + command_success_nodata(si, "https://libera.chat/changuide"); mc->mlock_on = CMODE_NOEXT | CMODE_TOPIC | mode_to_flag('c'); mc->mlock_off |= CMODE_SEC; @@ -63,7 +50,7 @@ static void mod_deinit(module_unload_intent_t intentvoid) DECLARE_MODULE_V1 ( - "freenode/regnotice", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, + "libera/regnotice", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit, "$Id: regnotice.c 69 2013-03-25 13:07:19Z stephen $", - "freenode " + "libera chat " );