Compare commits
No commits in common. "6af528ff9eb58339b1c828a77a38b4f613b33599" and "9efafd302a7376b3e1d1c2fa2ec794a49f325336" have entirely different histories.
6af528ff9e
...
9efafd302a
|
@ -1,4 +1,3 @@
|
||||||
# duplikate
|
# duplikate
|
||||||
|
|
||||||
Monitors a Discord server and notifies users if a duplicate link has been posted in the last week in
|
Duplicate Discord link monitor
|
||||||
the same channel.
|
|
116
flake.nix
116
flake.nix
|
@ -13,77 +13,81 @@
|
||||||
docker-utils.url = "github:collinarnett/docker-utils";
|
docker-utils.url = "github:collinarnett/docker-utils";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = {
|
outputs = { self, nixpkgs, crane, flake-utils, docker-utils, ... }:
|
||||||
self,
|
flake-utils.lib.eachDefaultSystem (system:
|
||||||
nixpkgs,
|
let
|
||||||
crane,
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
flake-utils,
|
|
||||||
docker-utils,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
flake-utils.lib.eachDefaultSystem (system: let
|
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
|
||||||
|
|
||||||
craneLib = crane.mkLib pkgs;
|
craneLib = crane.mkLib pkgs;
|
||||||
|
|
||||||
commonArgs = {
|
# Common arguments can be set here to avoid repeating them later
|
||||||
src = craneLib.cleanCargoSource ./.;
|
# Note: changes here will rebuild all dependency crates
|
||||||
strictDeps = true;
|
commonArgs = {
|
||||||
|
src = craneLib.cleanCargoSource ./.;
|
||||||
|
strictDeps = true;
|
||||||
|
|
||||||
buildInputs = with pkgs;
|
buildInputs = with pkgs;[
|
||||||
[
|
|
||||||
openssl
|
openssl
|
||||||
pkg-config
|
pkg-config
|
||||||
]
|
] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [
|
||||||
++ pkgs.lib.optionals pkgs.stdenv.isDarwin [
|
# Additional darwin specific inputs can be set here
|
||||||
pkgs.libiconv
|
pkgs.libiconv
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
my-crate = craneLib.buildPackage (commonArgs
|
my-crate = craneLib.buildPackage (commonArgs // {
|
||||||
// {
|
|
||||||
cargoArtifacts = craneLib.buildDepsOnly commonArgs;
|
cargoArtifacts = craneLib.buildDepsOnly commonArgs;
|
||||||
|
|
||||||
|
# Additional environment variables or build phases/hooks can be set
|
||||||
|
# here *without* rebuilding all dependency crates
|
||||||
|
# MY_CUSTOM_VAR = "some value";
|
||||||
});
|
});
|
||||||
|
|
||||||
dockerImage = pkgs.dockerTools.buildImage {
|
dockerImage = pkgs.dockerTools.buildImage {
|
||||||
name = "git.gmem.ca/arch/duplikate";
|
name = "git.gmem.ca/arch/duplikate";
|
||||||
tag = "latest-${system}";
|
tag = "latest-${system}";
|
||||||
config = {
|
config = {
|
||||||
Cmd = ["${my-crate}/bin/duplikate"];
|
Cmd = [ "${my-crate}/bin/duplikate" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
checks = {
|
||||||
|
inherit my-crate;
|
||||||
};
|
};
|
||||||
};
|
|
||||||
in {
|
|
||||||
checks = {
|
|
||||||
inherit my-crate;
|
|
||||||
};
|
|
||||||
|
|
||||||
packages.default = my-crate;
|
packages.default = my-crate;
|
||||||
packages.docker = dockerImage;
|
packages.docker = dockerImage;
|
||||||
|
|
||||||
apps.default = flake-utils.lib.mkApp {
|
apps.default = flake-utils.lib.mkApp {
|
||||||
drv = my-crate;
|
drv = my-crate;
|
||||||
};
|
};
|
||||||
|
|
||||||
apps.concatDocker = {
|
apps.concatDocker = {
|
||||||
type = "app";
|
type = "app";
|
||||||
program = toString (pkgs.writers.writeBash "concatDocker" ''
|
program = toString (pkgs.writers.writeBash "concatDocker" ''
|
||||||
amd64=git.gmem.ca/arch/duplikate:latest-x86_64-linux
|
amd64=git.gmem.ca/arch/duplikate:latest-x86_64-linux
|
||||||
arm64=git.gmem.ca/arch/duplikate:latest-aarch64-linux
|
arm64=git.gmem.ca/arch/duplikate:latest-aarch64-linux
|
||||||
docker load -i ${self.packages.x86_64-linux.docker}
|
docker load -i ${self.packages.x86_64-linux.docker}
|
||||||
docker load -i ${self.packages.aarch64-linux.docker}
|
docker load -i ${self.packages.aarch64-linux.docker}
|
||||||
docker push $amd64
|
docker push $amd64
|
||||||
docker push $arm64
|
docker push $arm64
|
||||||
docker manifest create --amend git.gmem.ca/arch/duplikate:latest $arm64 $amd64
|
docker manifest create --amend git.gmem.ca/arch/duplikate:latest $arm64 $amd64
|
||||||
docker manifest push git.gmem.ca/arch/duplikate:latest --purge
|
docker manifest push git.gmem.ca/arch/duplikate:latest --purge
|
||||||
'');
|
'');
|
||||||
};
|
};
|
||||||
|
|
||||||
devShells.default = craneLib.devShell {
|
devShells.default = craneLib.devShell {
|
||||||
checks = self.checks.${system};
|
# Inherit inputs from checks.
|
||||||
|
checks = self.checks.${system};
|
||||||
|
|
||||||
packages = with pkgs; [
|
# Additional dev-shell environment variables can be set directly
|
||||||
rust-analyzer
|
# MY_CUSTOM_DEVELOPMENT_VAR = "something else";
|
||||||
];
|
|
||||||
};
|
# Extra inputs can be added here; cargo and rustc are provided by default.
|
||||||
});
|
packages = with pkgs; [
|
||||||
|
rust-analyzer
|
||||||
|
];
|
||||||
|
};
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
26
src/main.rs
26
src/main.rs
|
@ -3,7 +3,7 @@ use std::time::Duration;
|
||||||
|
|
||||||
use dotenv::dotenv;
|
use dotenv::dotenv;
|
||||||
use once_cell::sync::Lazy;
|
use once_cell::sync::Lazy;
|
||||||
use redis::{Commands, SetExpiry, SetOptions};
|
use redis::Commands;
|
||||||
use regex::Regex;
|
use regex::Regex;
|
||||||
use serenity::all::{
|
use serenity::all::{
|
||||||
ChannelId, CreateButton, CreateEmbed, CreateEmbedFooter, CreateMessage, GuildId, ReactionType,
|
ChannelId, CreateButton, CreateEmbed, CreateEmbedFooter, CreateMessage, GuildId, ReactionType,
|
||||||
|
@ -23,11 +23,11 @@ impl EventHandler for Handler {
|
||||||
async fn message_delete(
|
async fn message_delete(
|
||||||
&self,
|
&self,
|
||||||
_ctx: Context,
|
_ctx: Context,
|
||||||
channel_id: ChannelId,
|
_channel_id: ChannelId,
|
||||||
deleted_message_id: MessageId,
|
deleted_message_id: MessageId,
|
||||||
_guild_id: Option<GuildId>,
|
guild_id: Option<GuildId>,
|
||||||
) {
|
) {
|
||||||
let meta = format!("{}-{}", channel_id.get(), deleted_message_id);
|
let meta = format!("{}-{}", guild_id.unwrap(), deleted_message_id);
|
||||||
let existing: Result<String, redis::RedisError> =
|
let existing: Result<String, redis::RedisError> =
|
||||||
self.redis.get_connection().unwrap().get(&meta);
|
self.redis.get_connection().unwrap().get(&meta);
|
||||||
|
|
||||||
|
@ -67,16 +67,14 @@ impl EventHandler for Handler {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if links.len() > 0 {
|
if links.len() > 0 {
|
||||||
let opts = SetOptions::default()
|
|
||||||
.with_expiration(SetExpiry::EX(60 * 60 * 24 * 7));
|
|
||||||
let mut exists = vec![];
|
let mut exists = vec![];
|
||||||
let channel_id = msg.channel_id.get();
|
let guild_id = msg.guild_id.unwrap();
|
||||||
for link in links {
|
for link in links {
|
||||||
let mut s = DefaultHasher::new();
|
let mut s = DefaultHasher::new();
|
||||||
format!("{}-{}", link, channel_id).hash(&mut s);
|
format!("{}-{}", link, guild_id).hash(&mut s);
|
||||||
let h = s.finish();
|
let h = s.finish();
|
||||||
let hash = format!("{:x}", h);
|
let hash = format!("{:x}", h);
|
||||||
let meta = format!("{}-{}", channel_id, msg.id.get());
|
let meta = format!("{}-{}", guild_id, msg.id.get());
|
||||||
let existing: Result<String, redis::RedisError> =
|
let existing: Result<String, redis::RedisError> =
|
||||||
self.redis.get_connection().unwrap().get(&hash);
|
self.redis.get_connection().unwrap().get(&hash);
|
||||||
if existing.is_ok() {
|
if existing.is_ok() {
|
||||||
|
@ -86,24 +84,24 @@ impl EventHandler for Handler {
|
||||||
.redis
|
.redis
|
||||||
.get_connection()
|
.get_connection()
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.set_options(&hash, &msg.link(), opts.clone())
|
.set(&hash, &msg.link())
|
||||||
.unwrap();
|
.unwrap();
|
||||||
let _: () = self
|
let _: () = self
|
||||||
.redis
|
.redis
|
||||||
.get_connection()
|
.get_connection()
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.set_options(meta, hash, opts)
|
.set(meta, hash)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if exists.len() > 0 {
|
if exists.len() > 0 {
|
||||||
// Links have already been posted, let's tell them
|
// Links have already been posted, let's tell them
|
||||||
let desc = format!(
|
let desc = format!(
|
||||||
"{} been posted in the last 7 days in this channel",
|
"{} have already been posted!",
|
||||||
if exists.len() > 1 {
|
if exists.len() > 1 {
|
||||||
"Some of these have"
|
"Some of these"
|
||||||
} else {
|
} else {
|
||||||
"One of these has"
|
"One of these"
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
let mut fields = vec![];
|
let mut fields = vec![];
|
||||||
|
|
Loading…
Reference in a new issue