Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename various things #3

Open
wants to merge 7 commits into
base: production
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Makefile.config
fn-rotatelogs
lc-rotatelogs
*.so
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ROADMAP
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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:
Expand Down
14 changes: 7 additions & 7 deletions cs_successor_freenodestaff.c → cs_successor_placeholder.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
* Copyright (c) 2012 Marien Zwart <marien.zwart@gmail.com>.
* 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)
Expand All @@ -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.
Expand All @@ -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 <http://freenode.net>"
"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 <https://libera.chat>"
);
40 changes: 0 additions & 40 deletions help/.svn/entries

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ information attached to it, such as contacts, namespaces and marks.
Syntax: SET <project> NAME <new>

Examples:
/msg &nick& SET OpenProjectsNet NAME freenode
/msg &nick& SET freenode NAME libera
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion help/nickserv/set_unfiltered
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions include/fn-compat.h → include/lc-compat.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 <atheme.h>

Expand Down
2 changes: 1 addition & 1 deletion fn-rotatelogs.in → lc-rotatelogs.in
Original file line number Diff line number Diff line change
@@ -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]);
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions log_sasl_fail.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "fn-compat.h"
#include "lc-compat.h"
#include "atheme.h"
#ifdef NEED_OLD_COMPAT_INCLUDES
#include "pmodule.h"
Expand Down Expand Up @@ -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 <http://www.freenode.net>"
"libera/log_sasl_fail", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit,
"", "libera chat <https://libera.chat>"
);
10 changes: 5 additions & 5 deletions noemailnotice.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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 <http://freenode.net>"
"libera chat <https://libera.chat>"
);
4 changes: 2 additions & 2 deletions os_klinechan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions os_regts.c
Original file line number Diff line number Diff line change
Expand Up @@ -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[])
Expand Down Expand Up @@ -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 <https://freenode.net>"
"libera chat <https://libera.chat>"
);
8 changes: 4 additions & 4 deletions projectns/audit.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Command to audit incompletely registered projects
*/

#include "fn-compat.h"
#include "lc-compat.h"
#include "atheme.h"
#include "projectns.h"

Expand All @@ -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[])
Expand Down Expand Up @@ -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 <http://www.freenode.net>"
"libera/projectns/audit", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit,
"", "libera chat <https://libera.chat>"
);
8 changes: 4 additions & 4 deletions projectns/channel.c
Original file line number Diff line number Diff line change
Expand Up @@ -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[])
{
Expand Down Expand Up @@ -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 <http://www.freenode.net>"
"libera/projectns/channel", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit,
"", "libera chat <https://libera.chat>"
);
8 changes: 4 additions & 4 deletions projectns/cloak.c
Original file line number Diff line number Diff line change
Expand Up @@ -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[])
{
Expand Down Expand Up @@ -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 <http://www.freenode.net>"
"libera/projectns/cloak", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit,
"", "libera chat <https://libera.chat>"
);
8 changes: 4 additions & 4 deletions projectns/contact.c
Original file line number Diff line number Diff line change
Expand Up @@ -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[])
{
Expand Down Expand Up @@ -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 <http://www.freenode.net>"
"libera/projectns/contact", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit,
"", "libera chat <https://libera.chat>"
);
8 changes: 4 additions & 4 deletions projectns/cs_claim.c
Original file line number Diff line number Diff line change
Expand Up @@ -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[])
{
Expand Down Expand Up @@ -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 <http://www.freenode.net>"
"libera/projectns/cs_claim", MODULE_UNLOAD_CAPABILITY_OK, mod_init, mod_deinit,
"", "libera chat <https://libera.chat>"
);
Loading