t/tetratto
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add: channels, messages

Browse source
This commit is contained in:
trisua 2025-04-27 23:11:37 -04:00
parent 67492cf73f
commit 7774124bd0
40 changed files with 2238 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

50
Cargo.lock generated
View file

@ -210,6 +210,7 @@ checksum = "de45108900e1f9b9242f7f2e254aa3e2c029c921c258fe9e6b4217eeebd54288"
dependencies = [ dependencies = [
"axum-core", "axum-core",
"axum-macros", "axum-macros",
"base64",
"bytes", "bytes",
"form_urlencoded", "form_urlencoded",
"futures-util", "futures-util",
@ -229,8 +230,10 @@ dependencies = [
"serde_json", "serde_json",
"serde_path_to_error", "serde_path_to_error",
"serde_urlencoded", "serde_urlencoded",
"sha1",
"sync_wrapper", "sync_wrapper",
"tokio", "tokio",
"tokio-tungstenite",
"tower", "tower",
"tower-layer", "tower-layer",
"tower-service", "tower-service",
@ -812,6 +815,12 @@ dependencies = [
"syn", "syn",
] ]
[[package]]
name = "data-encoding"
version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f"
[[package]] [[package]]
name = "deranged" name = "deranged"
version = "0.4.0" version = "0.4.0"
@ -3224,13 +3233,14 @@ dependencies = [
[[package]] [[package]]
name = "tetratto" name = "tetratto"
version = "1.0.8" version = "2.0.0"
dependencies = [ dependencies = [
"ammonia", "ammonia",
"axum", "axum",
"axum-extra", "axum-extra",
"cf-turnstile", "cf-turnstile",
"contrasted", "contrasted",
"futures-util",
"image", "image",
"mime_guess", "mime_guess",
"pathbufd", "pathbufd",
@ -3250,12 +3260,14 @@ dependencies = [
[[package]] [[package]]
name = "tetratto-core" name = "tetratto-core"
version = "1.0.8" version = "2.0.0"
dependencies = [ dependencies = [
"async-recursion", "async-recursion",
"base16ct", "base16ct",
"base64",
"bb8-postgres", "bb8-postgres",
"bitflags 2.9.0", "bitflags 2.9.0",
"futures-util",
"md-5", "md-5",
"pathbufd", "pathbufd",
"redis", "redis",
@ -3272,7 +3284,7 @@ dependencies = [
[[package]] [[package]]
name = "tetratto-l10n" name = "tetratto-l10n"
version = "1.0.8" version = "2.0.0"
dependencies = [ dependencies = [
"pathbufd", "pathbufd",
"serde", "serde",
@ -3281,7 +3293,7 @@ dependencies = [
[[package]] [[package]]
name = "tetratto-shared" name = "tetratto-shared"
version = "1.0.8" version = "2.0.0"
dependencies = [ dependencies = [
"ammonia", "ammonia",
"chrono", "chrono",
@ -3485,6 +3497,18 @@ dependencies = [
"tokio", "tokio",
] ]
[[package]]
name = "tokio-tungstenite"
version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be4bf6fecd69fcdede0ec680aaf474cdab988f9de6bc73d3758f0160e3b7025a"
dependencies = [
"futures-util",
"log",
"tokio",
"tungstenite",
]
[[package]] [[package]]
name = "tokio-util" name = "tokio-util"
version = "0.7.14" version = "0.7.14"
@ -3670,6 +3694,24 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]]
name = "tungstenite"
version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "413083a99c579593656008130e29255e54dcaae495be556cc26888f211648c24"
dependencies = [
"byteorder",
"bytes",
"data-encoding",
"http",
"httparse",
"log",
"rand 0.8.5",
"sha1",
"thiserror 2.0.12",
"utf-8",
]
[[package]] [[package]]
name = "typed-arena" name = "typed-arena"
version = "2.0.2" version = "2.0.2"

5
crates/app/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "tetratto" name = "tetratto"
version = "1.0.8" version = "2.0.0"
edition = "2024" edition = "2024"
[features] [features]
@ -16,7 +16,7 @@ tera = "1.20.0"
tracing = "0.1.41" tracing = "0.1.41"
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] } tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
tower-http = { version = "0.6.2", features = ["trace", "fs"] } tower-http = { version = "0.6.2", features = ["trace", "fs"] }
axum = { version = "0.8.3", features = ["macros"] } axum = { version = "0.8.3", features = ["macros", "ws"] }
tokio = { version = "1.44.2", features = ["macros", "rt-multi-thread"] } tokio = { version = "1.44.2", features = ["macros", "rt-multi-thread"] }
axum-extra = { version = "0.10.1", features = ["cookie", "multipart"] } axum-extra = { version = "0.10.1", features = ["cookie", "multipart"] }
ammonia = "4.1.0" ammonia = "4.1.0"
@ -33,3 +33,4 @@ serde_json = "1.0.140"
mime_guess = "2.0.5" mime_guess = "2.0.5"
cf-turnstile = "0.2.0" cf-turnstile = "0.2.0"
contrasted = "0.1.2" contrasted = "0.1.2"
futures-util = "0.3.31"

8
crates/app/src/assets.rs
View file

@ -90,6 +90,10 @@ pub const MOD_IP_BANS: &str = include_str!("./public/html/mod/ip_bans.html");
pub const MOD_PROFILE: &str = include_str!("./public/html/mod/profile.html"); pub const MOD_PROFILE: &str = include_str!("./public/html/mod/profile.html");
pub const MOD_WARNINGS: &str = include_str!("./public/html/mod/warnings.html"); pub const MOD_WARNINGS: &str = include_str!("./public/html/mod/warnings.html");
pub const CHATS_APP: &str = include_str!("./public/html/chats/app.html");
pub const CHATS_STREAM: &str = include_str!("./public/html/chats/stream.html");
pub const CHATS_MESSAGE: &str = include_str!("./public/html/chats/message.html");
// langs // langs
pub const LANG_EN_US: &str = include_str!("./langs/en-US.toml"); pub const LANG_EN_US: &str = include_str!("./langs/en-US.toml");
@ -253,6 +257,10 @@ pub(crate) async fn write_assets(config: &Config) -> PathBufD {
write_template!(html_path->"mod/profile.html"(crate::assets::MOD_PROFILE) --config=config); write_template!(html_path->"mod/profile.html"(crate::assets::MOD_PROFILE) --config=config);
write_template!(html_path->"mod/warnings.html"(crate::assets::MOD_WARNINGS) --config=config); write_template!(html_path->"mod/warnings.html"(crate::assets::MOD_WARNINGS) --config=config);
write_template!(html_path->"chats/app.html"(crate::assets::CHATS_APP) -d "chats" --config=config);
write_template!(html_path->"chats/stream.html"(crate::assets::CHATS_STREAM) --config=config);
write_template!(html_path->"chats/message.html"(crate::assets::CHATS_MESSAGE) --config=config);
html_path html_path
} }

14
crates/app/src/langs/en-US.toml
View file

@ -60,6 +60,7 @@ version = "1.0.0"
"auth:action.cancel_follow_request" = "Cancel follow request" "auth:action.cancel_follow_request" = "Cancel follow request"
"auth:label.blocked_profile" = "You're blocked" "auth:label.blocked_profile" = "You're blocked"
"auth:label.blocked_profile_message" = "This user has blocked you." "auth:label.blocked_profile_message" = "This user has blocked you."
"auth:action.message" = "Message"
"communities:action.create" = "Create" "communities:action.create" = "Create"
"communities:action.select" = "Select" "communities:action.select" = "Select"
@ -100,6 +101,10 @@ version = "1.0.0"
"communities:label.join_new" = "Join new" "communities:label.join_new" = "Join new"
"communities:tab.posts" = "Posts" "communities:tab.posts" = "Posts"
"communities:tab.questions" = "Questions" "communities:tab.questions" = "Questions"
"communities:tab.channels" = "Channels"
"communities:action.create_channel" = "Create channel"
"communities:label.chats" = "Chats"
"communities:label.show_community" = "Show community"
"notifs:action.mark_as_read" = "Mark as read" "notifs:action.mark_as_read" = "Mark as read"
"notifs:action.mark_as_unread" = "Mark as unread" "notifs:action.mark_as_unread" = "Mark as unread"
@ -142,3 +147,12 @@ version = "1.0.0"
"requests:label.user_follow_request" = "User follow request" "requests:label.user_follow_request" = "User follow request"
"requests:action.view_profile" = "View profile" "requests:action.view_profile" = "View profile"
"requests:label.user_follow_request_message" = "Accepting this request will not allow them to see your profile. For that, you must follow them back." "requests:label.user_follow_request_message" = "Accepting this request will not allow them to see your profile. For that, you must follow them back."
"chats:label.my_chats" = "My chats"
"chats:action.move" = "Move"
"chats:action.rename" = "Rename"
"chats:label.view_older" = "View older"
"chats:label.view_more_recent" = "View more recent"
"chats:label.viewing_old_messages" = "You're viewing old messages!"
"chats:label.go_back" = "Go back"
"chats:action.leave" = "Leave"

2
crates/app/src/main.rs
View file

@ -34,7 +34,7 @@ fn check_supporter(value: &Value, _: &HashMap<String, Value>) -> tera::Result<Va
.into()) .into())
} }
#[tokio::main] #[tokio::main(flavor = "multi_thread", worker_threads = 16)]
async fn main() { async fn main() {
tracing_subscriber::fmt() tracing_subscriber::fmt()
.with_target(false) .with_target(false)

8
crates/app/src/public/css/style.css
View file

@ -107,7 +107,7 @@ article {
padding: 0; padding: 0;
} }
body .card:not(.card *), body .card:not(.card *):not(#stream *),
body .pillmenu:not(.card *) > a, body .pillmenu:not(.card *) > a,
body .card-nest:not(.card *) > .card, body .card-nest:not(.card *) > .card,
body .banner { body .banner {
@ -477,6 +477,12 @@ button.small,
font-size: 16px; font-size: 16px;
} }
button.big_icon svg,
.button.big_icon svg {
height: 16px;
min-width: 16px;
}
button:hover, button:hover,
.button:hover { .button:hover {
background: var(--color-primary-lowered); background: var(--color-primary-lowered);

2
crates/app/src/public/html/auth/connection.html
View file

@ -30,6 +30,7 @@ config.connections.spotify_client_id %}
refresh_token, refresh_token,
expires_in: expires_in.toString(), expires_in: expires_in.toString(),
name: profile.display_name, name: profile.display_name,
url: profile.external_urls.spotify,
}, },
]); ]);
@ -59,6 +60,7 @@ config.connections.last_fm_key %}
{ {
session_token: res.session.key, session_token: res.session.key,
name: res.session.name, name: res.session.name,
url: `https://last.fm/user/${res.session.name}`,
}, },
]); ]);

573
crates/app/src/public/html/chats/app.html Normal file
View file

@ -0,0 +1,573 @@
{% extends "root.html" %} {% block head %}
<title>Chats - {{ config.name }}</title>
{% endblock %} {% block body %} {{ macros::nav(selected="chats") }}
<nav class="chats_nav">
<button
class="flex gap-2 items-center active"
onclick="toggle_sidebars(event)"
>
{{ icon "panel-left" }} {% if community %}
<b class="name shorter">
{% if community.context.display_name %} {{
community.context.display_name }} {% else %} {{ community.title }}
{% endif %}
</b>
{% else %}
<b>{{ text "chats:label.my_chats" }}</b>
{% endif %}
</button>
</nav>
<div class="flex">
<div
class="sidebar flex flex-col items-center gap-2"
id="community_list"
style="width: var(--list-bar-width)"
>
<a
href="/chats/0/0"
class="button quaternary channel_icon {% if selected_community == 0 %}selected{% endif %}"
>
{{ icon "message-circle" }}
</a>
{% for community in communities %}
<a
href="/chats/{{ community.id }}/0"
class="button quaternary channel_icon {% if selected_community == community.id %}selected{% endif %}"
>
{{ components::community_avatar(id=community.id,
community=community, size="48px") }}
</a>
{% endfor %}
</div>
<div class="sidebar flex flex-col gap-2" id="channels_list">
<div class="title flex justify-between">
{% if community %}
<b class="name shorter">
{% if community.context.display_name %} {{
community.context.display_name }} {% else %} {{ community.title
}} {% endif %}
</b>
{% else %}
<b>{{ text "chats:label.my_chats" }}</b>
{% endif %}
<div class="dropdown">
<button
class="camo small"
onclick="trigger('atto::hooks::dropdown', [event])"
exclude="dropdown"
>
{{ icon "ellipsis" }}
</button>
<div class="inner">
<a href="/community/{{ selected_community }}">
{{ icon "book-heart" }}
<span
>{{ text "communities:label.show_community" }}</span
>
</a>
{% if can_manage_channels %}
<a href="/community/{{ selected_community }}/manage">
{{ icon "settings" }}
<span>{{ text "general:action.manage" }}</span>
</a>
{% endif %}
</div>
</div>
</div>
{% if can_manage_channels %}
<a
class="button w-full justify-start quaternary"
href="/community/{{ selected_community }}/manage#/channels"
>
{{ icon "plus" }}
<span>{{ text "communities:action.create_channel" }}</span>
</a>
{% endif %} {% for channel in channels %} {% if selected_community == 0
%}
<div class="flex flex-row gap-1">
<a
class="w-full justify-start button {% if selected_channel == channel.id %}quaternary{% else %}camo{% endif %}"
href="/chats/{{ selected_community }}/{{ channel.id }}"
data-turbo="false"
>
{{ icon "rss" }}
<b>{{ channel.title }}</b>
</a>
<div class="dropdown">
<button
class="big_icon {% if selected_channel == channel.id %}quaternary{% else %}camo{% endif %}"
onclick="trigger('atto::hooks::dropdown', [event])"
exclude="dropdown"
style="width: 32px"
>
{{ icon "ellipsis" }}
</button>
<div class="inner">
{% if user.id == channel.owner %}
<button
onclick="delete_channel('{{ channel.id }}')"
class="red"
>
{{ icon "trash" }}
<span>{{ text "general:action.delete" }}</span>
</button>
{% else %}
<button
onclick="kick_member('{{ channel.id }}', '{{ user.id }}')"
class="red"
>
{{ icon "door-open" }}
<span>{{ text "chats:action.leave" }}</span>
</button>
{% endif %}
</div>
</div>
</div>
{% else %}
<a
class="w-full justify-start button {% if selected_channel == channel.id %}quaternary{% else %}camo{% endif %}"
href="/chats/{{ selected_community }}/{{ channel.id }}"
data-turbo="false"
>
{{ icon "rss" }}
<b>{{ channel.title }}</b>
</a>
{% endif %} {% endfor %}
</div>
{% if channel %}
<div class="w-full flex flex-col gap-2" id="stream" style="padding: 1rem">
<turbo-frame
id="stream_body_frame"
src="/chats/{{ selected_community }}/{{ selected_channel }}/_stream?page={{ page }}"
></turbo-frame>
<form
class="card flex flex-row gap-2"
onsubmit="create_message_from_form(event)"
>
<textarea
type="text"
name="content"
id="content"
placeholder="message {{ channel.title }}"
required
minlength="2"
maxlength="2048"
style="min-height: 48px !important; height: 48px"
></textarea>
<button class="camo send_button" title="Send">
{{ icon "send-horizontal" }}
</button>
</form>
</div>
{% endif %}
<style>
:root {
--list-bar-width: 64px;
--channels-bar-width: 256px;
}
html,
body {
overflow: hidden;
}
.send_button {
width: 48px;
height: 48px;
}
.send_button .icon {
width: 2em;
height: 2em;
}
a.channel_icon {
width: 48px;
height: 48px;
}
a.channel_icon .icon {
min-width: 24px;
height: 24px;
}
a.channel_icon.small {
width: 24px;
height: 24px;
}
a.channel_icon.small .icon {
min-width: 12px;
height: 12px;
}
a.channel_icon:has(img) {
padding: 0;
}
a.channel_icon img {
min-width: 48px;
min-height: 48px;
}
a.channel_icon img,
a.channel_icon:has(.icon) {
transition:
outline 0.25s,
background 0.15s !important;
}
a.channel_icon:not(.selected):hover img,
a.channel_icon:not(.selected):hover:has(.icon) {
outline: solid 1px var(--color-text);
}
a.channel_icon.selected img,
a.channel_icon.selected:has(.icon) {
outline: solid 2px var(--color-text);
}
nav {
background: var(--color-raised);
color: var(--color-text-raised) !important;
height: 42px;
position: sticky !important;
}
nav::after {
display: block;
position: absolute;
background: var(--color-super-lowered);
height: 1px;
width: calc(100% - var(--list-bar-width));
bottom: 0;
left: var(--list-bar-width);
content: "";
}
nav .content_container {
max-width: 100% !important;
width: 100%;
}
.chats_nav {
display: none;
padding: 0;
}
.chats_nav button {
justify-content: flex-start;
width: 100% !important;
flex-direction: row !important;
font-size: 16px !important;
margin-top: -4px;
}
.chats_nav button svg {
margin-right: 1rem;
}
.sidebar {
background: var(--color-raised);
color: var(--color-text-raised);
border-right: solid 1px var(--color-super-lowered);
padding: 0.4rem;
width: max-content;
height: calc(100dvh - 42px);
overflow: auto;
transition: left 0.15s;
}
.sidebar .title {
padding: 1rem;
border-bottom: solid 1px var(--color-super-lowered);
}
.sidebar#channels_list {
width: var(--channels-bar-width);
background: var(--color-surface);
color: var(--color-text);
}
#stream {
width: calc(
100dvw - var(--list-bar-width) - var(--channels-bar-width)
) !important;
height: calc(100dvh - 42px);
}
.message {
transition: background 0.15s;
box-shadow: none;
}
.message:hover {
background: var(--color-raised);
}
.message:hover .hidden,
.message:focus .hidden,
.message:active .hidden {
display: flex !important;
}
turbo-frame {
display: contents;
}
@media screen and (max-width: 900px) {
body:not(.sidebars_shown) .sidebar {
position: absolute;
left: -200%;
}
body.sidebars_shown .sidebar {
position: absolute;
}
#stream {
width: 100dvw !important;
height: calc(100dvh - 42px * 2);
}
nav::after {
width: 100dvw;
left: 0;
}
.chats_nav {
display: flex;
}
}
</style>
<script>
window.CURRENT_PAGE = Number.parseInt("{{ page }}");
window.CHAT_PROPS = {
selected_community: "{{ selected_community }}",
selected_channel: "{{ selected_channel }}",
membership_role: Number.parseInt("{{ membership_role }}"),
};
if (
window.SIDEBARS_OPEN &&
!document.body.classList.contains("sidebars_shown")
) {
toggle_sidebars();
window.SIDEBARS_OPEN = true;
}
function toggle_sidebars() {
window.SIDEBARS_OPEN = !window.SIDEBARS_OPEN;
const community_list = document.getElementById("community_list");
const channels_list = document.getElementById("channels_list");
if (document.body.classList.contains("sidebars_shown")) {
// hide
document.body.classList.remove("sidebars_shown");
community_list.style.left = "-200%";
channels_list.style.left = "-200%";
} else {
// show
document.body.classList.add("sidebars_shown");
community_list.style.left = "0";
channels_list.style.left = "var(--list-bar-width)";
}
}
globalThis.kick_member = async (cid, uid) => {
if (
!(await trigger("atto::confirm", [
"Are you sure you would like to do this?",
]))
) {
return;
}
fetch(`/api/v1/channels/${cid}/kick`, {
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({
member: uid,
}),
})
.then((res) => res.json())
.then((res) => {
trigger("atto::toast", [
res.ok ? "success" : "error",
res.message,
]);
});
};
globalThis.delete_channel = async (id) => {
if (
!(await trigger("atto::confirm", [
"Are you sure you would like to do this?",
]))
) {
return;
}
fetch(`/api/v1/channels/${id}`, {
method: "DELETE",
})
.then((res) => res.json())
.then((res) => {
trigger("atto::toast", [
res.ok ? "success" : "error",
res.message,
]);
});
};
</script>
{% if selected_channel %}
<script>
if (window.socket) {
window.socket.close();
window.socket = undefined;
console.log("closed old");
}
setTimeout(() => {
if (window.socket) {
if (window.socket_id === "{{ selected_channel }}") {
console.log("cannot open; already in session");
return;
} else {
window.socket.close();
window.socket = undefined;
console.log("closed lingering");
}
}
const endpoint = `${window.location.origin.replace("http", "ws")}/api/v1/channels/{{ selected_channel }}/ws`;
const socket = new WebSocket(endpoint);
window.socket = socket;
window.socket_id = "{{ selected_channel }}";
socket.addEventListener("close", () => {
return socket.send("Close");
});
socket.addEventListener("open", () => {
// auth
socket.send(
JSON.stringify({
method: "Headers",
data: JSON.stringify({
// SocketHeaders
channel: "{{ selected_channel }}",
user: "{{ user.id }}",
}),
}),
);
});
socket.addEventListener("message", async (event) => {
if (event.data === "Ping") {
return socket.send("Pong");
}
const msg = JSON.parse(event.data);
const data = JSON.parse(msg.data);
if (msg.method === "Message" && window.CURRENT_PAGE === 0) {
const element = document.createElement("div");
element.style.display = "contents";
element.innerHTML = await (
await fetch(
"/chats/{{ selected_community }}/{{ selected_channel }}/_render",
{
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({ data: msg.data }),
},
)
).text();
document.getElementById("stream_body").prepend(element);
clean_text();
} else if (msg.method === "Delete") {
if (document.getElementById(`message-${data.id}`)) {
document.getElementById(`message-${data.id}`).remove();
}
}
});
globalThis.create_message_from_form = async (e) => {
e.preventDefault();
await trigger("atto::debounce", ["messages::create"]);
fetch("/api/v1/messages", {
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({
content: e.target.content.value,
channel: "{{ selected_channel }}",
}),
})
.then((res) => res.json())
.then((res) => {
if (!res.ok) {
trigger("atto::toast", ["error", res.message]);
}
e.target.reset();
});
};
globalThis.delete_message = async (id) => {
if (
!(await trigger("atto::confirm", [
"Are you sure you would like to do this?",
]))
) {
return;
}
fetch(`/api/v1/messages/${id}`, {
method: "DELETE",
})
.then((res) => res.json())
.then((res) => {
trigger("atto::toast", [
res.ok ? "success" : "error",
res.message,
]);
});
};
const clean_text = () => {
trigger("atto::clean_date_codes");
trigger("atto::hooks::online_indicator");
};
document.addEventListener("turbo:before-frame-render", (event) => {
setTimeout(clean_text, 50);
});
setTimeout(clean_text, 150);
}, 250);
</script>
{% endif %}
</div>
{% endblock %}

2
crates/app/src/public/html/chats/message.html Normal file
View file

@ -0,0 +1,2 @@
{%- import "components.html" as components -%} {{ components::message(user=user,
message=message) }}

44
crates/app/src/public/html/chats/stream.html Normal file
View file

@ -0,0 +1,44 @@
{%- import "components.html" as components -%}
<turbo-frame id="stream_body_frame">
<!-- prettier-ignore -->
<div class="gap-2" id="stream_body">
{% if page != 0 %}
<div class="card flex gap-2 small tertiary flex-wrap">
<b>{{ text "chats:label.viewing_old_messages" }}</b>
<a href="/chats/{{ community }}/{{ channel }}/_stream?page={{ page - 1}}" class="button small" onclick="window.CURRENT_PAGE -= 1">
{{ text "chats:label.go_back" }}
</a>
</div>
{% endif %}
{% for message in messages %}
{{ components::message(user=message[1], message=message[0]) }}
{% endfor %}
{% if messages|length > 0 %}
<div class="flex gap-2 w-full justify-center">
<a class="button" href="/chats/{{ community }}/{{ channel }}/_stream?page={{ page + 1 }}" onclick="window.CURRENT_PAGE += 1">
{{ icon "clock" }}
<span>{{ text "chats:label.view_older" }}</span>
</a>
{% if page != 0 %}
<a class="button quaternary" href="/chats/{{ community }}/{{ channel }}/_stream?page={{ page - 1 }}" onclick="window.CURRENT_PAGE -= 1">
{{ icon "rewind" }}
<span>{{ text "chats:label.view_more_recent" }}</span>
</a>
{% endif %}
</div>
{% endif %}
</div>
<style>
#stream_body {
height: 100%;
display: flex;
justify-content: flex-start;
flex-direction: column-reverse;
overflow: auto;
}
</style>
</turbo-frame>

8
crates/app/src/public/html/communities/base.html
View file

@ -179,6 +179,14 @@
<span>{{ text "communities:action.leave" }}</span> <span>{{ text "communities:action.leave" }}</span>
</button> </button>
<a
href="/chats/{{ community.id }}/0"
class="button quaternary"
>
{{ icon "message-circle" }}
<span>{{ text "communities:label.chats" }}</span>
</a>
<script> <script>
globalThis.leave_community = async () => { globalThis.leave_community = async () => {
if ( if (

183
crates/app/src/public/html/communities/settings.html
View file

@ -17,6 +17,13 @@
{{ icon "users-round" }} {{ icon "users-round" }}
<span>{{ text "communities:tab.members" }}</span> <span>{{ text "communities:tab.members" }}</span>
</a> </a>
{% if can_manage_channels %}
<a href="#/channels" data-tab-button="channels">
{{ icon "rss" }}
<span>{{ text "communities:tab.channels" }}</span>
</a>
{% endif %}
</div> </div>
<div class="w-full flex flex-col gap-2" data-tab="general"> <div class="w-full flex flex-col gap-2" data-tab="general">
@ -254,6 +261,182 @@
<div class="card flex flex-col gap-2 w-full" id="membership_info"></div> <div class="card flex flex-col gap-2 w-full" id="membership_info"></div>
</div> </div>
{% if can_manage_channels %}
<div
class="card tertiary w-full hidden flex flex-col gap-2"
data-tab="channels"
>
<div class="card-nest">
<div class="card small">
<b>{{ text "communities:action.create_channel" }}</b>
</div>
<form
class="card flex flex-col gap-2"
onsubmit="create_channel_from_form(event)"
>
<div class="flex flex-col gap-1">
<label for="title"
>{{ text "communities:label.name" }}</label
>
<input
type="text"
name="title"
id="title"
placeholder="name"
required
minlength="2"
maxlength="32"
/>
</div>
<button class="primary">
{{ text "communities:action.create" }}
</button>
</form>
</div>
{% for channel in channels %}
<div class="card-nest">
<div class="card small">
<b>{{ channel.position }}</b>
{{ channel.title }}
</div>
<div class="card flex gap-2">
<button
class="red quaternary small"
onclick="delete_channel('{{ channel.id }}')"
>
{{ text "general:action.delete" }}
</button>
<button
class="quaternary small"
onclick="update_channel_position('{{ channel.id }}')"
>
{{ text "chats:action.move" }}
</button>
<button
class="quaternary small"
onclick="update_channel_title('{{ channel.id }}')"
>
{{ text "chats:action.rename" }}
</button>
</div>
</div>
{% endfor %}
</div>
<script>
globalThis.delete_channel = async (id) => {
if (
!(await trigger("atto::confirm", [
"Are you sure you would like to do this?",
]))
) {
return;
}
fetch(`/api/v1/channels/${id}`, {
method: "DELETE",
})
.then((res) => res.json())
.then((res) => {
trigger("atto::toast", [
res.ok ? "success" : "error",
res.message,
]);
});
};
globalThis.update_channel_position = async (id) => {
await trigger("atto::debounce", ["channels::move"]);
const position = Number.parseInt(
await trigger("atto::prompt", [
"New channel position (number):",
]),
);
if (!position && position !== 0) {
return alert("Must be a number!");
}
fetch(`/api/v1/channels/${id}/move`, {
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({
position,
}),
})
.then((res) => res.json())
.then((res) => {
trigger("atto::toast", [
res.ok ? "success" : "error",
res.message,
]);
});
};
globalThis.update_channel_title = async (id) => {
await trigger("atto::debounce", ["channels::update_title"]);
const title = await trigger("atto::prompt", ["New channel title:"]);
if (!title) {
return;
}
fetch(`/api/v1/channels/${id}/title`, {
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({
title,
}),
})
.then((res) => res.json())
.then((res) => {
trigger("atto::toast", [
res.ok ? "success" : "error",
res.message,
]);
});
};
async function create_channel_from_form(e) {
e.preventDefault();
await trigger("atto::debounce", ["channels::create"]);
fetch("/api/v1/channels", {
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({
title: e.target.title.value,
community: "{{ community.id }}",
}),
})
.then((res) => res.json())
.then((res) => {
trigger("atto::toast", [
res.ok ? "success" : "error",
res.message,
]);
if (res.ok) {
window.location.reload();
}
});
}
</script>
{% endif %}
</main> </main>
<script> <script>

145
crates/app/src/public/html/components.html
View file

@ -54,8 +54,8 @@ community %}
class="card secondary w-full flex items-center gap-4" class="card secondary w-full flex items-center gap-4"
href="/community/{{ community.title }}" href="/community/{{ community.title }}"
> >
{{ components::community_avatar(id=community.id, community=community, {{ self::community_avatar(id=community.id, community=community, size="48px")
size="48px") }} }}
<div class="flex flex-col"> <div class="flex flex-col">
<h3 class="name lg:long">{{ community.context.display_name }}</h3> <h3 class="name lg:long">{{ community.context.display_name }}</h3>
<span class="fade"><b>{{ community.member_count }}</b> members</span> <span class="fade"><b>{{ community.member_count }}</b> members</span>
@ -92,11 +92,16 @@ secondary=false) -%}
</button> </button>
{% endif %} {%- endmacro %} {% macro full_username(user) -%} {% endif %} {%- endmacro %} {% macro full_username(user) -%}
<div class="flex items-center"> <div class="flex items-center">
<a href="/@{{ user.username }}" class="flush" style="font-weight: 600"> <a
{{ components::username(user=user) }} href="/@{{ user.username }}"
class="flush"
style="font-weight: 600"
target="_top"
>
{{ self::username(user=user) }}
</a> </a>
{{ components::online_indicator(user=user) }} {% if user.is_verified %} {{ self::online_indicator(user=user) }} {% if user.is_verified %}
<span <span
title="Verified" title="Verified"
style="color: var(--color-primary)" style="color: var(--color-primary)"
@ -112,7 +117,7 @@ community=false, show_community=true, can_manage_post=false) -%}
<!-- prettier-ignore --> <!-- prettier-ignore -->
<div style="display: none" id="repost-content:{{ post.id }}"> <div style="display: none" id="repost-content:{{ post.id }}">
{% if repost %} {% if repost %}
{{ components::post(post=repost[1], owner=repost[0], secondary=not secondary, community=false, show_community=false, can_manage_post=false) }} {{ self::post(post=repost[1], owner=repost[0], secondary=not secondary, community=false, show_community=false, can_manage_post=false) }}
{% else %} {% else %}
<div class="card tertiary red flex items-center gap-2"> <div class="card tertiary red flex items-center gap-2">
{{ icon "frown" }} {{ icon "frown" }}
@ -121,7 +126,7 @@ community=false, show_community=true, can_manage_post=false) -%}
{% endif %} {% endif %}
</div> </div>
{{ components::post(post=post, owner=owner, secondary=secondary, {{ self::post(post=post, owner=owner, secondary=secondary,
community=community, show_community=show_community, community=community, show_community=show_community,
can_manage_post=can_manage_post) }} can_manage_post=can_manage_post) }}
@ -149,15 +154,14 @@ community=false, show_community=true, can_manage_post=false) -%}
community=false, show_community=true, can_manage_post=false) -%} {% if community community=false, show_community=true, can_manage_post=false) -%} {% if community
and show_community and community.id != config.town_square or question %} and show_community and community.id != config.town_square or question %}
<div class="card-nest"> <div class="card-nest">
{% if question %} {{ components::question(question=question[0], {% if question %} {{ self::question(question=question[0], owner=question[1])
owner=question[1]) }} {% else %} }} {% else %}
<div class="card small"> <div class="card small">
<a <a
href="/api/v1/communities/find/{{ post.community }}" href="/api/v1/communities/find/{{ post.community }}"
class="flush flex gap-1 items-center" class="flush flex gap-1 items-center"
> >
{{ components::community_avatar(id=post.community, {{ self::community_avatar(id=post.community, community=community) }}
community=community) }}
<b> <b>
<!-- prettier-ignore --> <!-- prettier-ignore -->
{% if community.context.display_name %} {% if community.context.display_name %}
@ -178,14 +182,14 @@ and show_community and community.id != config.town_square or question %}
> >
<div class="w-full flex gap-2"> <div class="w-full flex gap-2">
<a href="/@{{ owner.username }}"> <a href="/@{{ owner.username }}">
{{ components::avatar(username=owner.username, size="52px", {{ self::avatar(username=owner.username, size="52px",
selector_type="username") }} selector_type="username") }}
</a> </a>
<div class="flex flex-col w-full gap-1"> <div class="flex flex-col w-full gap-1">
<div class="flex flex-wrap gap-2 items-center"> <div class="flex flex-wrap gap-2 items-center">
<span class="name" <span class="name"
>{{ components::full_username(user=owner) }}</span >{{ self::full_username(user=owner) }}</span
> >
{% if post.context.edited != 0 %} {% if post.context.edited != 0 %}
@ -239,7 +243,7 @@ and show_community and community.id != config.town_square or question %}
<!-- prettier-ignore --> <!-- prettier-ignore -->
{% if post.context.reactions_enabled %} {% if post.context.reactions_enabled %}
{% if post.content|length > 0 %} {% if post.content|length > 0 %}
{{ components::likes(id=post.id, asset_type="Post", likes=post.likes, dislikes=post.dislikes) }} {{ self::likes(id=post.id, asset_type="Post", likes=post.likes, dislikes=post.dislikes) }}
{% endif %} {% endif %}
{% endif %} {% endif %}
@ -399,14 +403,14 @@ and show_community and community.id != config.town_square or question %}
{%- endmacro %} {% macro user_card(user) -%} {%- endmacro %} {% macro user_card(user) -%}
<a class="card-nest w-full" href="/@{{ user.username }}"> <a class="card-nest w-full" href="/@{{ user.username }}">
<div class="card small" style="padding: 0"> <div class="card small" style="padding: 0">
{{ components::banner(username=user.username, border_radius="0px") }} {{ self::banner(username=user.username, border_radius="0px") }}
</div> </div>
<div class="card secondary flex items-center gap-4"> <div class="card secondary flex items-center gap-4">
{{ components::avatar(username=user.username, size="48px") }} {{ self::avatar(username=user.username, size="48px") }}
<div class="flex items-center"> <div class="flex items-center">
<b>{{ components::username(user=user) }}</b> <b>{{ self::username(user=user) }}</b>
{{ components::online_indicator(user=user) }} {{ self::online_indicator(user=user) }}
</div> </div>
</div> </div>
</a> </a>
@ -522,25 +526,25 @@ user %} {% if user.settings.theme_hue %}
{% endif %} {% endif %}
<!-- prettier-ignore --> <!-- prettier-ignore -->
<div style="display: none;"> <div style="display: none;">
{{ components::theme_color(color=user.settings.theme_color_surface, css="color-surface") }} {{ self::theme_color(color=user.settings.theme_color_surface, css="color-surface") }}
{{ components::theme_color(color=user.settings.theme_color_text, css="color-text") }} {{ self::theme_color(color=user.settings.theme_color_text, css="color-text") }}
{{ components::theme_color(color=user.settings.theme_color_text_link, css="color-link") }} {{ self::theme_color(color=user.settings.theme_color_text_link, css="color-link") }}
{{ components::theme_color(color=user.settings.theme_color_lowered, css="color-lowered") }} {{ self::theme_color(color=user.settings.theme_color_lowered, css="color-lowered") }}
{{ components::theme_color(color=user.settings.theme_color_text_lowered, css="color-text-lowered") }} {{ self::theme_color(color=user.settings.theme_color_text_lowered, css="color-text-lowered") }}
{{ components::theme_color(color=user.settings.theme_color_super_lowered, css="color-super-lowered") }} {{ self::theme_color(color=user.settings.theme_color_super_lowered, css="color-super-lowered") }}
{{ components::theme_color(color=user.settings.theme_color_raised, css="color-raised") }} {{ self::theme_color(color=user.settings.theme_color_raised, css="color-raised") }}
{{ components::theme_color(color=user.settings.theme_color_text_raised, css="color-text-raised") }} {{ self::theme_color(color=user.settings.theme_color_text_raised, css="color-text-raised") }}
{{ components::theme_color(color=user.settings.theme_color_super_raised, css="color-super-raised") }} {{ self::theme_color(color=user.settings.theme_color_super_raised, css="color-super-raised") }}
{{ components::theme_color(color=user.settings.theme_color_primary, css="color-primary") }} {{ self::theme_color(color=user.settings.theme_color_primary, css="color-primary") }}
{{ components::theme_color(color=user.settings.theme_color_text_primary, css="color-text-primary") }} {{ self::theme_color(color=user.settings.theme_color_text_primary, css="color-text-primary") }}
{{ components::theme_color(color=user.settings.theme_color_primary_lowered, css="color-primary-lowered") }} {{ self::theme_color(color=user.settings.theme_color_primary_lowered, css="color-primary-lowered") }}
{{ components::theme_color(color=user.settings.theme_color_secondary, css="color-secondary") }} {{ self::theme_color(color=user.settings.theme_color_secondary, css="color-secondary") }}
{{ components::theme_color(color=user.settings.theme_color_text_secondary, css="color-text-secondary") }} {{ self::theme_color(color=user.settings.theme_color_text_secondary, css="color-text-secondary") }}
{{ components::theme_color(color=user.settings.theme_color_secondary_lowered, css="color-secondary-lowered") }} {{ self::theme_color(color=user.settings.theme_color_secondary_lowered, css="color-secondary-lowered") }}
{% if user.permissions|has_supporter %} {% if user.permissions|has_supporter %}
<style>{{ user.settings.theme_custom_css }}</style> <style>{{ user.settings.theme_custom_css }}</style>
@ -609,12 +613,12 @@ show_community=true, secondary=false) -%}
loading="lazy" loading="lazy"
style="--size: 52px" style="--size: 52px"
/> />
{% else %} {{ components::avatar(username=owner.username, {% else %} {{ self::avatar(username=owner.username,
selector_type="username", size="52px") }} {% endif %} selector_type="username", size="52px") }} {% endif %}
</span> </span>
{% else %} {% else %}
<a href="/@{{ owner.username }}"> <a href="/@{{ owner.username }}">
{{ components::avatar(username=owner.username, selector_type="username", {{ self::avatar(username=owner.username, selector_type="username",
size="52px") }} size="52px") }}
</a> </a>
{% endif %} {% endif %}
@ -639,7 +643,7 @@ show_community=true, secondary=false) -%}
<b>anonymous</b> <b>anonymous</b>
{% endif %} {% endif %}
{% else %} {% else %}
{{ components::full_username(user=owner) }} {{ self::full_username(user=owner) }}
{% endif %} {% endif %}
</span> </span>
@ -666,8 +670,7 @@ show_community=true, secondary=false) -%}
href="/api/v1/communities/find/{{ question.community }}" href="/api/v1/communities/find/{{ question.community }}"
class="flex items-center" class="flex items-center"
> >
{{ components::community_avatar(id=question.community, {{ self::community_avatar(id=question.community, size="24px") }}
size="24px") }}
</a> </a>
{% endif %} {% if question.is_global %} {% endif %} {% if question.is_global %}
<a class="notification chip" href="/question/{{ question.id }}" <a class="notification chip" href="/question/{{ question.id }}"
@ -751,7 +754,7 @@ header="", is_global=false) -%}
{%- endmacro %} {% macro global_question(question, can_manage_questions=false, {%- endmacro %} {% macro global_question(question, can_manage_questions=false,
secondary=false, show_community=true) -%} secondary=false, show_community=true) -%}
<div class="card-nest"> <div class="card-nest">
{{ components::question(question=question[0], owner=question[1], {{ self::question(question=question[0], owner=question[1],
show_community=show_community) }} show_community=show_community) }}
<div <div
@ -762,7 +765,7 @@ secondary=false, show_community=true) -%}
hook="check_reactions" hook="check_reactions"
hook-arg:id="{{ question[0].id }}" hook-arg:id="{{ question[0].id }}"
> >
{{ components::likes(id=question[0].id, asset_type="Question", {{ self::likes(id=question[0].id, asset_type="Question",
likes=question[0].likes, dislikes=question[0].dislikes, likes=question[0].likes, dislikes=question[0].dislikes,
secondary=false) }} secondary=false) }}
</div> </div>
@ -895,4 +898,64 @@ if state and state.data %}
</div> </div>
</div> </div>
</div> </div>
{% endif %} {%- endmacro %} {% endif %} {%- endmacro %} {% macro connection_icon(key) -%}
<!-- prettier-ignore -->
<div style="display: contents;">
{% if key == "Spotify" %}
{{ icon "spotify" }}
{% elif key == "LastFm" %}
{{ icon "last_fm" }}
{% endif %}
</div>
{%- endmacro %} {% macro connection_url(key, value) -%} {% if value[0].data.url
%} {{ value[0].data.url }} {% elif key == "LastFm" %} https://last.fm/user/{{
value[0].data.name }} {% endif %} {%- endmacro %} {% macro message(user,
message, can_manage_message=false) -%}
<div class="card secondary message flex gap-2" id="message-{{ message.id }}">
<a href="/@{{ user.username }}" target="_top">
{{ self::avatar(username=user.username, size="52px") }}
</a>
<div class="flex flex-col gap-1 w-full">
<div class="flex gap-2 w-full justify-between">
<div class="flex gap-2">
{{ self::full_username(user=user) }} {% if message.edited !=
message.created %}
<span class="date"
>{{ message.edited }}<sup title="Edited">*</sup></span
>
{% else %}
<span class="date">{{ message.created }}</span>
{% endif %}
</div>
<div class="flex gap-2 hidden">
{% if can_manage_message or (user and user.id == message.owner)
%}
<div class="dropdown">
<button
class="camo small"
onclick="trigger('atto::hooks::dropdown', [event])"
exclude="dropdown"
>
{{ icon "ellipsis" }}
</button>
<div class="inner">
<button
class="red"
onclick="delete_message('{{ message.id }}')"
>
{{ icon "trash" }}
<span>{{ text "general:action.delete" }}</span>
</button>
</div>
</div>
{% endif %}
</div>
</div>
<span class="no_p_margin">{{ message.content|markdown|safe }}</span>
</div>
</div>
{%- endmacro %}

8
crates/app/src/public/html/macros.html
View file

@ -38,6 +38,14 @@
{{ icon "square-pen" }} {{ icon "square-pen" }}
</a> </a>
<a
href="/chats/0/0"
class="button {% if selected == 'chats' %}active{% endif %}"
title="Chats"
>
{{ icon "message-circle" }}
</a>
<a <a
href="/requests" href="/requests"
class="button {% if selected == 'requests' %}active{% endif %}" class="button {% if selected == 'requests' %}active{% endif %}"

52
crates/app/src/public/html/profile/base.html
View file

@ -192,6 +192,15 @@
{{ icon "shield-off" }} {{ icon "shield-off" }}
<span>{{ text "auth:action.unblock" }}</span> <span>{{ text "auth:action.unblock" }}</span>
</button> </button>
{% endif %} {% if not user.settings.private_chats or
is_following_you %}
<button
onclick="create_group_chat()"
class="quaternary"
>
{{ icon "message-circle" }}
<span>{{ text "auth:action.message" }}</span>
</button>
{% endif %} {% if is_helper %} {% endif %} {% if is_helper %}
<a <a
href="/mod_panel/profile/{{ profile.id }}" href="/mod_panel/profile/{{ profile.id }}"
@ -203,6 +212,30 @@
{% endif %} {% endif %}
<script> <script>
globalThis.create_group_chat = async () => {
fetch("/api/v1/channels/group", {
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({
title: "{{ user.username }} & {{ profile.username }}",
members: ["{{ profile.id }}"],
}),
})
.then((res) => res.json())
.then((res) => {
trigger("atto::toast", [
res.ok ? "success" : "error",
res.message,
]);
if (res.ok) {
window.location.href = `/chats/0/${res.payload}`;
}
});
};
globalThis.toggle_follow_user = async (e) => { globalThis.toggle_follow_user = async (e) => {
await trigger("atto::debounce", [ await trigger("atto::debounce", [
"users::follow", "users::follow",
@ -295,6 +328,25 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
<div class="flex flex-col gap-2" id="connections">
{% for key, value in profile.connections %} {% if
value[0].data.name and value[0].show_on_profile %}
<a
class="card small flush flex items-center justify-between gap-2"
href="{{ components::connection_url(key=key, value=value) }}"
>
<div class="flex items-center gap-2">
{{ components::connection_icon(key=key) }}
<b>{{ value[0].data.name }}</b>
</div>
<button class="camo small">
{{ icon "external-link" }}
</button>
</a>
{% endif %} {% endfor %}
</div>
</div> </div>
<div class="rhs w-full flex flex-col gap-4"> <div class="rhs w-full flex flex-col gap-4">

38
crates/app/src/public/html/profile/settings.html
View file

@ -530,22 +530,40 @@
{% for key, value in profile.connections %} {% for key, value in profile.connections %}
<div class="card-nest"> <div class="card-nest">
<div class="card small flex items-center gap-2"> <div class="card small flex items-center gap-2">
{% if key == "Spotify" %} {{ icon "spotify" }} {% elif key == {{ components::connection_icon(key=key) }}
"LastFm" %} {{ icon "last_fm" }} {% endif %}
<b> <!-- prettier-ignore -->
{% if value[0].data.name %} {{ value[0].data.name }} {% else <b class="flex items-center gap-2">
%} {{ key }} {% endif %} {% if value[0].data.name %}
<span>{{ value[0].data.name }}</span>
<span style="display: contents;" title="Verified connection">{{ icon "badge-check" }}</span>
{% else %}
<span>{{ key }}</span>
<span style="display: contents;">{{ icon "badge-alert" }}</span>
{% endif %}
</b> </b>
</div> </div>
<div class="card flex items-center gap-2"> <div class="card flex flex-col gap-2">
<button <button
class="quaternary red small" class="quaternary red small"
onclick="trigger('connections::delete', ['{{ key }}'])" onclick="trigger('connections::delete', ['{{ key }}'])"
> >
{{ text "general:action.delete" }} {{ text "general:action.delete" }}
</button> </button>
<label for="{{ key }}-shown" class="flex items-center gap-2">
<input
type="checkbox"
<!-- prettier-ignore -->
{% if value[0].show_on_profile %}checked{% endif %}
id="{{ key }}-shown"
onchange="trigger('connections::push_con_shown', ['{{ key }}', event.target.checked])"
class="w-content"
/>
<span>Shown on profile</span>
</label>
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
@ -911,6 +929,14 @@
"{{ profile.settings.private_profile }}", "{{ profile.settings.private_profile }}",
"checkbox", "checkbox",
], ],
[
[
"private_chats",
"Only allow users I'm following to add me to chats",
],
"{{ profile.settings.private_chats }}",
"checkbox",
],
[ [
[ [
"private_communities", "private_communities",

8
crates/app/src/public/html/root.html
View file

@ -125,6 +125,14 @@ macros -%}
<script data-turbo-permanent="true" id="update-seen-script"> <script data-turbo-permanent="true" id="update-seen-script">
document.documentElement.addEventListener("turbo:load", () => { document.documentElement.addEventListener("turbo:load", () => {
trigger("me::seen"); trigger("me::seen");
if (!window.location.pathname.startsWith("/chats/")) {
if (window.socket) {
window.socket.send("Close");
window.socket = undefined;
console.log("socket disconnect");
}
}
}); });
</script> </script>
{% endif %} {% endif %}

43
crates/app/src/public/js/me.js
View file

@ -364,18 +364,23 @@
}); });
self.define("push_con_shown", async (_, connection, shown) => { self.define("push_con_shown", async (_, connection, shown) => {
return await ( fetch("/api/v1/auth/user/connections/_shown", {
await fetch("/api/v1/auth/user/connections/_shown", { method: "POST",
method: "POST", headers: {
headers: { "Content-Type": "application/json",
"Content-Type": "application/json", },
}, body: JSON.stringify({
body: JSON.stringify({ connection,
connection, shown,
shown, }),
}), })
}) .then((res) => res.json())
).json(); .then((res) => {
trigger("atto::toast", [
res.ok ? "success" : "error",
res.message,
]);
});
}); });
})(); })();
@ -665,14 +670,9 @@
]); ]);
} }
const mb_info = await $.pull_track_info(
playing.artist.name,
playing.name,
);
if ( if (
window.localStorage.getItem("atto:connections.last_fm/name") === window.localStorage.getItem("atto:connections.last_fm/name") ===
playing.name + mb_info.id playing.name
) { ) {
// item already pushed to connection, no need right now // item already pushed to connection, no need right now
return; return;
@ -680,7 +680,12 @@
window.localStorage.setItem( window.localStorage.setItem(
"atto:connections.last_fm/name", "atto:connections.last_fm/name",
playing.name + mb_info.id, playing.name,
);
const mb_info = await $.pull_track_info(
playing.artist.name,
playing.name,
); );
return await trigger("connections::push_con_state", [ return await trigger("connections::push_con_state", [

204
crates/app/src/routes/api/v1/channels/channels.rs Normal file
View file

@ -0,0 +1,204 @@
use axum::{Extension, Json, extract::Path, response::IntoResponse};
use axum_extra::extract::CookieJar;
use tetratto_core::model::{channels::Channel, ApiReturn, Error};
use crate::{
get_user_from_token,
routes::api::v1::{
CreateChannel, CreateGroupChannel, KickMember, UpdateChannelPosition, UpdateChannelTitle,
},
State,
};
pub async fn create_request(
jar: CookieJar,
Extension(data): Extension<State>,
Json(req): Json<CreateChannel>,
) -> impl IntoResponse {
let data = &(data.read().await).0;
let user = match get_user_from_token!(jar, data) {
Some(ua) => ua,
None => return Json(Error::NotAllowed.into()),
};
match data
.create_channel(Channel::new(
match req.community.parse::<usize>() {
Ok(c) => c,
Err(e) => return Json(Error::MiscError(e.to_string()).into()),
},
user.id,
0,
req.title,
))
.await
{
Ok(_) => Json(ApiReturn {
ok: true,
message: "Channel created".to_string(),
payload: (),
}),
Err(e) => Json(e.into()),
}
}
pub async fn create_group_request(
jar: CookieJar,
Extension(data): Extension<State>,
Json(req): Json<CreateGroupChannel>,
) -> impl IntoResponse {
let data = &(data.read().await).0;
let user = match get_user_from_token!(jar, data) {
Some(ua) => ua,
None => return Json(Error::NotAllowed.into()),
};
let mut members: Vec<usize> = Vec::new();
for member in req.members {
members.push(match member.parse::<usize>() {
Ok(c) => c,
Err(e) => return Json(Error::MiscError(e.to_string()).into()),
})
}
// check for existing
if members.len() == 1 {
let other_user = members.get(0).unwrap().to_owned();
if let Ok(channel) = data.get_channel_by_owner_member(user.id, other_user).await {
return Json(ApiReturn {
ok: true,
message: "Channel exists".to_string(),
payload: Some(channel.id.to_string()),
});
}
}
// check member permissions
for member in &members {
let other_user = match data.get_user_by_id(member.to_owned()).await {
Ok(ua) => ua,
Err(e) => return Json(e.into()),
};
if other_user.settings.private_chats {
if data
.get_userfollow_by_initiator_receiver(other_user.id, user.id)
.await
.is_err()
{
return Json(Error::NotAllowed.into());
}
}
}
// ...
let mut props = Channel::new(0, user.id, 0, req.title);
props.members = members;
let id = props.id.clone();
match data.create_channel(props).await {
Ok(_) => Json(ApiReturn {
ok: true,
message: "Channel created".to_string(),
payload: Some(id.to_string()),
}),
Err(e) => Json(e.into()),
}
}
pub async fn delete_request(
jar: CookieJar,
Extension(data): Extension<State>,
Path(id): Path<usize>,
) -> impl IntoResponse {
let data = &(data.read().await).0;
let user = match get_user_from_token!(jar, data) {
Some(ua) => ua,
None => return Json(Error::NotAllowed.into()),
};
match data.delete_channel(id, &user).await {
Ok(_) => Json(ApiReturn {
ok: true,
message: "Channel deleted".to_string(),
payload: (),
}),
Err(e) => Json(e.into()),
}
}
pub async fn update_title_request(
jar: CookieJar,
Extension(data): Extension<State>,
Path(id): Path<usize>,
Json(req): Json<UpdateChannelTitle>,
) -> impl IntoResponse {
let data = &(data.read().await).0;
let user = match get_user_from_token!(jar, data) {
Some(ua) => ua,
None => return Json(Error::NotAllowed.into()),
};
match data.update_channel_title(id, user, &req.title).await {
Ok(_) => Json(ApiReturn {
ok: true,
message: "Channel updated".to_string(),
payload: (),
}),
Err(e) => Json(e.into()),
}
}
pub async fn update_position_request(
jar: CookieJar,
Extension(data): Extension<State>,
Path(id): Path<usize>,
Json(req): Json<UpdateChannelPosition>,
) -> impl IntoResponse {
let data = &(data.read().await).0;
let user = match get_user_from_token!(jar, data) {
Some(ua) => ua,
None => return Json(Error::NotAllowed.into()),
};
match data.update_channel_position(id, user, req.position).await {
Ok(_) => Json(ApiReturn {
ok: true,
message: "Channel updated".to_string(),
payload: (),
}),
Err(e) => Json(e.into()),
}
}
pub async fn kick_member_request(
jar: CookieJar,
Extension(data): Extension<State>,
Path(id): Path<usize>,
Json(req): Json<KickMember>,
) -> impl IntoResponse {
let data = &(data.read().await).0;
let user = match get_user_from_token!(jar, data) {
Some(ua) => ua,
None => return Json(Error::NotAllowed.into()),
};
match data
.remove_channel_member(
id,
user,
match req.member.parse::<usize>() {
Ok(c) => c,
Err(e) => return Json(Error::MiscError(e.to_string()).into()),
},
)
.await
{
Ok(_) => Json(ApiReturn {
ok: true,
message: "Member removed".to_string(),
payload: (),
}),
Err(e) => Json(e.into()),
}
}

236
crates/app/src/routes/api/v1/channels/messages.rs Normal file
View file

@ -0,0 +1,236 @@
use axum::{
extract::{
ws::{Message as WsMessage, WebSocket, WebSocketUpgrade},
Path,
},
response::{IntoResponse, Response},
Extension, Json,
};
use axum_extra::extract::CookieJar;
use tetratto_core::{
cache::Cache,
model::{
auth::User,
channels::Message,
socket::{SocketMessage, SocketMethod},
ApiReturn, Error,
},
};
use std::sync::mpsc;
use crate::{get_user_from_token, routes::api::v1::CreateMessage, State};
use serde::Deserialize;
use futures_util::{sink::SinkExt, stream::StreamExt};
#[derive(Deserialize)]
pub struct SocketHeaders {
pub channel: String,
pub user: String,
}
/// Handle a subscription to the websocket.
pub async fn subscription_handler(
ws: WebSocketUpgrade,
Extension(data): Extension<State>,
Path(channel_id): Path<usize>,
) -> Response {
ws.on_upgrade(move |socket| handle_socket(socket, data, channel_id))
}
pub async fn handle_socket(socket: WebSocket, state: State, channel_id: usize) {
let db = &(state.read().await).0;
let db = db.clone();
let (mut sink, mut stream) = socket.split();
let (sender, receiver) = mpsc::channel::<String>();
// forward messages from mpsc to the sink
tokio::spawn(async move {
while let Ok(message) = receiver.recv() {
if message == "Close" {
sink.close().await.unwrap();
drop(receiver);
break;
}
if sink.send(message.into()).await.is_err() {
break;
}
}
});
// ...
let mut user: Option<User> = None;
let mut con = db.2.clone().get_con().await;
// handle incoming messages on socket
let dbc = db.clone();
let recv_sender = sender.clone();
let mut recv_task = tokio::spawn(async move {
while let Some(Ok(WsMessage::Text(text))) = stream.next().await {
if text == "Pong" {
continue;
}
if text == "Close" {
recv_sender.send("Close".to_string()).unwrap();
break;
}
let data: SocketMessage = match serde_json::from_str(&text.to_string()) {
Ok(t) => t,
Err(_) => {
recv_sender.send("Close".to_string()).unwrap();
break;
}
};
if data.method != SocketMethod::Headers && user.is_none() {
// we've sent something else before authenticating... that's not right
recv_sender.send("Close".to_string()).unwrap();
break;
}
match data.method {
SocketMethod::Headers => {
let data: SocketHeaders = data.data();
user = Some(
match dbc
.get_user_by_id(match data.user.parse::<usize>() {
Ok(c) => c,
Err(_) => {
recv_sender.send("Close".to_string()).unwrap();
break;
}
})
.await
{
Ok(ua) => ua,
Err(_) => {
recv_sender.send("Close".to_string()).unwrap();
break;
}
},
);
let channel = match dbc
.get_channel_by_id(match data.channel.parse::<usize>() {
Ok(c) => c,
Err(_) => {
recv_sender.send("Close".to_string()).unwrap();
break;
}
})
.await
{
Ok(c) => c,
Err(_) => {
recv_sender.send("Close".to_string()).unwrap();
break;
}
};
let user = user.as_ref().unwrap();
let membership = match dbc
.get_membership_by_owner_community(user.id, channel.id)
.await
{
Ok(ua) => ua,
Err(_) => {
recv_sender.send("Close".to_string()).unwrap();
break;
}
};
if !channel.check_read(user.id, Some(membership.role)) {
recv_sender.send("Close".to_string()).unwrap();
break;
}
}
_ => {
recv_sender.send("Close".to_string()).unwrap();
break;
}
}
}
});
// forward messages from redis to the mpsc
let send_task_sender = sender.clone();
let mut send_task = tokio::spawn(async move {
let mut pubsub = con.as_pubsub();
pubsub.subscribe(channel_id).unwrap();
loop {
while let Ok(msg) = pubsub.get_message() {
// payload is a stringified SocketMessage
if send_task_sender.send(msg.get_payload().unwrap()).is_err() {
break;
}
}
}
});
// ...
let close_sender = sender.clone();
tokio::select! {
_ = (&mut send_task) => recv_task.abort(),
_ = (&mut recv_task) => {
let _ = close_sender.send("Close".to_string());
send_task.abort()
},
};
}
pub async fn create_request(
jar: CookieJar,
Extension(data): Extension<State>,
Json(req): Json<CreateMessage>,
) -> impl IntoResponse {
let data = &(data.read().await).0;
let user = match get_user_from_token!(jar, data) {
Some(ua) => ua,
None => return Json(Error::NotAllowed.into()),
};
match data
.create_message(Message::new(
match req.channel.parse::<usize>() {
Ok(c) => c,
Err(e) => return Json(Error::MiscError(e.to_string()).into()),
},
user.id,
req.content,
))
.await
{
Ok(_) => Json(ApiReturn {
ok: true,
message: "Message created".to_string(),
payload: (),
}),
Err(e) => Json(e.into()),
}
}
pub async fn delete_request(
jar: CookieJar,
Extension(data): Extension<State>,
Path(id): Path<usize>,
) -> impl IntoResponse {
let data = &(data.read().await).0;
let user = match get_user_from_token!(jar, data) {
Some(ua) => ua,
None => return Json(Error::NotAllowed.into()),
};
match data.delete_message(id, user).await {
Ok(_) => Json(ApiReturn {
ok: true,
message: "Message deleted".to_string(),
payload: (),
}),
Err(e) => Json(e.into()),
}
}

2
crates/app/src/routes/api/v1/channels/mod.rs Normal file
View file

@ -0,0 +1,2 @@
pub mod channels;
pub mod messages;

64
crates/app/src/routes/api/v1/mod.rs
View file

@ -6,9 +6,12 @@ pub mod reports;
pub mod requests; pub mod requests;
pub mod util; pub mod util;
#[cfg(feature = "redis")]
pub mod channels;
use axum::{ use axum::{
routing::{any, delete, get, post},
Router, Router,
routing::{delete, get, post},
}; };
use serde::Deserialize; use serde::Deserialize;
use tetratto_core::model::{ use tetratto_core::model::{
@ -266,6 +269,32 @@ pub fn routes() -> Router {
"/auth/user/connections/last_fm/api_proxy", "/auth/user/connections/last_fm/api_proxy",
post(auth::connections::last_fm::proxy_request), post(auth::connections::last_fm::proxy_request),
) )
// channels
.route("/channels", post(channels::channels::create_request))
.route(
"/channels/group",
post(channels::channels::create_group_request),
)
.route(
"/channels/{id}/title",
post(channels::channels::update_title_request),
)
.route(
"/channels/{id}/move",
post(channels::channels::update_position_request),
)
.route("/channels/{id}", delete(channels::channels::delete_request))
.route(
"/channels/{id}/kick",
post(channels::channels::kick_member_request),
)
// messages
.route(
"/channels/{id}/ws",
any(channels::messages::subscription_handler),
)
.route("/messages", post(channels::messages::create_request))
.route("/messages/{id}", delete(channels::messages::delete_request))
} }
#[derive(Deserialize)] #[derive(Deserialize)]
@ -419,3 +448,36 @@ pub struct CreateQuestion {
#[serde(default)] #[serde(default)]
pub community: String, pub community: String,
} }
#[derive(Deserialize)]
pub struct CreateChannel {
pub title: String,
pub community: String,
}
#[derive(Deserialize)]
pub struct CreateGroupChannel {
pub title: String,
pub members: Vec<String>,
}
#[derive(Deserialize)]
pub struct UpdateChannelTitle {
pub title: String,
}
#[derive(Deserialize)]
pub struct UpdateChannelPosition {
pub position: i32,
}
#[derive(Deserialize)]
pub struct CreateMessage {
pub content: String,
pub channel: String,
}
#[derive(Deserialize)]
pub struct KickMember {
pub member: String,
}

249
crates/app/src/routes/pages/chats.rs Normal file
View file

@ -0,0 +1,249 @@
use super::{render_error, PaginatedQuery};
use crate::{State, assets::initial_context, get_lang, get_user_from_token};
use axum::{
extract::{Path, Query},
response::{Html, IntoResponse, Redirect},
Extension, Json,
};
use axum_extra::extract::CookieJar;
use tetratto_core::model::{
channels::Message, communities_permissions::CommunityPermission, permissions::FinePermission,
Error,
};
use serde::Deserialize;
#[derive(Deserialize)]
pub struct RenderMessage {
pub data: String,
}
pub async fn redirect_request() -> impl IntoResponse {
Redirect::to("/chats/0/0")
}
/// `/chats/{community}/{channel}`
///
/// `/chats/0` is for channels the user is part of (not in a community)
pub async fn app_request(
jar: CookieJar,
Extension(data): Extension<State>,
Path((selected_community, selected_channel)): Path<(usize, usize)>,
Query(props): Query<PaginatedQuery>,
) -> impl IntoResponse {
let data = data.read().await;
let user = match get_user_from_token!(jar, data.0) {
Some(ua) => ua,
None => {
return Err(Html(
render_error(Error::NotAllowed, &jar, &data, &None).await,
));
}
};
let membership = match data
.0
.get_membership_by_owner_community(user.id, selected_community)
.await
{
Ok(m) => m,
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
};
let can_manage_channels = membership.role.check(CommunityPermission::MANAGE_CHANNELS)
| user.permissions.check(FinePermission::MANAGE_CHANNELS);
let communities = match data.0.get_memberships_by_owner(user.id).await {
Ok(p) => match data.0.fill_communities(p).await {
Ok(p) => p,
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
},
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
};
let channels = if selected_community == 0 {
match data.0.get_channels_by_user(user.id).await {
Ok(p) => p,
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
}
} else {
match data.0.get_channels_by_community(selected_community).await {
Ok(p) => p,
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
}
};
let community = if selected_community != 0 {
match data.0.get_community_by_id(selected_community).await {
Ok(p) => Some(p),
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
}
} else {
None
};
let channel = if selected_channel != 0 {
match data.0.get_channel_by_id(selected_channel).await {
Ok(p) => {
if !p.check_read(user.id, Some(membership.role)) {
return Err(Html(
render_error(Error::NotAllowed, &jar, &data, &Some(user)).await,
));
}
Some(p)
}
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
}
} else {
None
};
let lang = get_lang!(jar, data.0);
let mut context = initial_context(&data.0.0, lang, &Some(user.clone())).await;
context.insert("selected_community", &selected_community);
context.insert("selected_channel", &selected_channel);
context.insert("membership_role", &membership.role.bits());
context.insert("page", &props.page);
context.insert(
"can_manage_channels",
&if selected_community == 0 {
false
} else {
can_manage_channels
},
);
context.insert(
"can_manage_channel",
&if selected_community == 0 {
if let Some(ref channel) = channel {
channel.members.contains(&user.id) | (channel.owner == user.id)
} else {
false
}
} else {
can_manage_channels
},
);
context.insert("community", &community);
context.insert("channel", &channel);
context.insert("communities", &communities);
context.insert("channels", &channels);
// return
Ok(Html(data.1.render("chats/app.html", &context).unwrap()))
}
/// `/chats/{community}/{channel}/_stream`
pub async fn stream_request(
jar: CookieJar,
Extension(data): Extension<State>,
Path((community, channel)): Path<(usize, usize)>,
Query(props): Query<PaginatedQuery>,
) -> impl IntoResponse {
let data = data.read().await;
let user = match get_user_from_token!(jar, data.0) {
Some(ua) => ua,
None => {
return Err(Html(
render_error(Error::NotAllowed, &jar, &data, &None).await,
));
}
};
let ignore_users = data.0.get_userblocks_receivers(user.id).await;
let messages = match data
.0
.get_messages_by_channel(channel, 12, props.page)
.await
{
Ok(p) => match data.0.fill_messages(p, &ignore_users).await {
Ok(p) => p,
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
},
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
};
let membership = match data
.0
.get_membership_by_owner_community(user.id, community)
.await
{
Ok(m) => m,
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
};
let can_manage_messages = membership.role.check(CommunityPermission::MANAGE_MESSAGES)
| user.permissions.check(FinePermission::MANAGE_MESSAGES);
let lang = get_lang!(jar, data.0);
let mut context = initial_context(&data.0.0, lang, &Some(user)).await;
context.insert("messages", &messages);
context.insert("can_manage_messages", &can_manage_messages);
context.insert("page", &props.page);
context.insert("community", &community);
context.insert("channel", &channel);
// return
Ok(Html(data.1.render("chats/stream.html", &context).unwrap()))
}
/// `/chats/{community}/{channel}/_render`
pub async fn message_request(
jar: CookieJar,
Extension(data): Extension<State>,
Path((community, _)): Path<(usize, usize)>,
Json(req): Json<RenderMessage>,
) -> impl IntoResponse {
let data = data.read().await;
let user = match get_user_from_token!(jar, data.0) {
Some(ua) => ua,
None => {
return Err(Html(
render_error(Error::NotAllowed, &jar, &data, &None).await,
));
}
};
let message: Message = match serde_json::from_str(&req.data) {
Ok(m) => m,
Err(e) => {
return Err(Html(
render_error(Error::MiscError(e.to_string()), &jar, &data, &Some(user)).await,
));
}
};
let membership = match data
.0
.get_membership_by_owner_community(user.id, community)
.await
{
Ok(m) => m,
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
};
let can_manage_messages = membership.role.check(CommunityPermission::MANAGE_MESSAGES)
| user.permissions.check(FinePermission::MANAGE_MESSAGES);
let owner = match data.0.get_user_by_id(message.owner).await {
Ok(p) => p,
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
};
let lang = get_lang!(jar, data.0);
let mut context = initial_context(&data.0.0, lang, &Some(user)).await;
context.insert("can_manage_messages", &can_manage_messages);
context.insert("message", &message);
context.insert("user", &owner);
// return
Ok(Html(data.1.render("chats/message.html", &context).unwrap()))
}

11
crates/app/src/routes/pages/communities.rs
View file

@ -525,6 +525,14 @@ pub async fn settings_request(
)); ));
} }
let channels = match data.0.get_channels_by_community(community.id).await {
Ok(p) => p,
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
};
let can_manage_channels = membership.role.check(CommunityPermission::MANAGE_CHANNELS)
| user.permissions.check(FinePermission::MANAGE_CHANNELS);
// init context // init context
let lang = get_lang!(jar, data.0); let lang = get_lang!(jar, data.0);
let mut context = initial_context(&data.0.0, lang, &Some(user)).await; let mut context = initial_context(&data.0.0, lang, &Some(user)).await;
@ -535,6 +543,9 @@ pub async fn settings_request(
&clean_context(&community.context), &clean_context(&community.context),
); );
context.insert("can_manage_channels", &can_manage_channels);
context.insert("channels", &channels);
// return // return
Ok(Html( Ok(Html(
data.1 data.1

19
crates/app/src/routes/pages/mod.rs
View file

@ -4,7 +4,13 @@ pub mod misc;
pub mod mod_panel; pub mod mod_panel;
pub mod profile; pub mod profile;
use axum::{Router, routing::get}; #[cfg(feature = "redis")]
pub mod chats;
use axum::{
routing::{get, post},
Router,
};
use axum_extra::extract::CookieJar; use axum_extra::extract::CookieJar;
use serde::Deserialize; use serde::Deserialize;
use tetratto_core::{ use tetratto_core::{
@ -82,6 +88,17 @@ pub fn routes() -> Router {
.route("/post/{id}", get(communities::post_request)) .route("/post/{id}", get(communities::post_request))
.route("/post/{id}/reposts", get(communities::reposts_request)) .route("/post/{id}/reposts", get(communities::reposts_request))
.route("/question/{id}", get(communities::question_request)) .route("/question/{id}", get(communities::question_request))
// chats
.route("/chats", get(chats::redirect_request))
.route("/chats/{community}/{channel}", get(chats::app_request))
.route(
"/chats/{community}/{channel}/_stream",
get(chats::stream_request),
)
.route(
"/chats/{community}/{channel}/_render",
post(chats::message_request),
)
} }
pub async fn render_error( pub async fn render_error(

4
crates/core/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "tetratto-core" name = "tetratto-core"
version = "1.0.8" version = "2.0.0"
edition = "2024" edition = "2024"
[features] [features]
@ -29,3 +29,5 @@ rusqlite = { version = "0.35.0", optional = true }
tokio-postgres = { version = "0.7.13", optional = true } tokio-postgres = { version = "0.7.13", optional = true }
bb8-postgres = { version = "0.9.0", optional = true } bb8-postgres = { version = "0.9.0", optional = true }
base64 = "0.22.1"
futures-util = "0.3.31"

156
crates/core/src/database/channels.rs
View file

@ -1,5 +1,6 @@
use super::*; use super::*;
use crate::cache::Cache; use crate::cache::Cache;
use crate::model::moderation::AuditLogEntry;
use crate::model::{ use crate::model::{
Error, Result, auth::User, permissions::FinePermission, Error, Result, auth::User, permissions::FinePermission,
communities_permissions::CommunityPermission, channels::Channel, communities_permissions::CommunityPermission, channels::Channel,
@ -26,12 +27,14 @@ impl DataManager {
minimum_role_read: get!(x->4(i32)) as u32, minimum_role_read: get!(x->4(i32)) as u32,
minimum_role_write: get!(x->5(i32)) as u32, minimum_role_write: get!(x->5(i32)) as u32,
position: get!(x->6(i32)) as usize, position: get!(x->6(i32)) as usize,
members: serde_json::from_str(&get!(x->7(String))).unwrap(),
title: get!(x->8(String)),
} }
} }
auto_method!(get_channel_by_id(usize)@get_channel_from_row -> "SELECT * FROM channels WHERE id = $1" --name="channel" --returns=Channel --cache-key-tmpl="atto.channel:{}"); auto_method!(get_channel_by_id(usize as i64)@get_channel_from_row -> "SELECT * FROM channels WHERE id = $1" --name="channel" --returns=Channel --cache-key-tmpl="atto.channel:{}");
/// Get all channels by user. /// Get all channels by community.
/// ///
/// # Arguments /// # Arguments
/// * `community` - the ID of the community to fetch channels for /// * `community` - the ID of the community to fetch channels for
@ -43,7 +46,7 @@ impl DataManager {
let res = query_rows!( let res = query_rows!(
&conn, &conn,
"SELECT * FROM channels WHERE community = $1 ORDER BY position DESC", "SELECT * FROM channels WHERE community = $1 ORDER BY position ASC",
&[&(community as i64)], &[&(community as i64)],
|x| { Self::get_channel_from_row(x) } |x| { Self::get_channel_from_row(x) }
); );
@ -55,6 +58,59 @@ impl DataManager {
Ok(res.unwrap()) Ok(res.unwrap())
} }
/// Get all channels by user.
///
/// # Arguments
/// * `user` - the ID of the user to fetch channels for
pub async fn get_channels_by_user(&self, user: usize) -> Result<Vec<Channel>> {
let conn = match self.connect().await {
Ok(c) => c,
Err(e) => return Err(Error::DatabaseConnection(e.to_string())),
};
let res = query_rows!(
&conn,
"SELECT * FROM channels WHERE (owner = $1 OR members LIKE $2) AND community = 0 ORDER BY created DESC",
params![&(user as i64), &format!("%{user}%")],
|x| { Self::get_channel_from_row(x) }
);
if res.is_err() {
return Err(Error::GeneralNotFound("channel".to_string()));
}
Ok(res.unwrap())
}
/// Get a channel given its `owner` and a member.
///
/// # Arguments
/// * `owner` - the ID of the owner
/// * `member` - the ID of the member
pub async fn get_channel_by_owner_member(
&self,
owner: usize,
member: usize,
) -> Result<Channel> {
let conn = match self.connect().await {
Ok(c) => c,
Err(e) => return Err(Error::DatabaseConnection(e.to_string())),
};
let res = query_row!(
&conn,
"SELECT * FROM channels WHERE owner = $1 AND members = $2 AND community = 0 ORDER BY created DESC",
params![&(owner as i64), &format!("[{member}]")],
|x| { Ok(Self::get_channel_from_row(x)) }
);
if res.is_err() {
return Err(Error::GeneralNotFound("channel".to_string()));
}
Ok(res.unwrap())
}
/// Create a new channel in the database. /// Create a new channel in the database.
/// ///
/// # Arguments /// # Arguments
@ -63,14 +119,16 @@ impl DataManager {
let user = self.get_user_by_id(data.owner).await?; let user = self.get_user_by_id(data.owner).await?;
// check user permission in community // check user permission in community
let membership = self if data.community != 0 {
.get_membership_by_owner_community(user.id, data.community) let membership = self
.await?; .get_membership_by_owner_community(user.id, data.community)
.await?;
if !membership.role.check(CommunityPermission::MANAGE_CHANNELS) if !membership.role.check(CommunityPermission::MANAGE_CHANNELS)
&& !user.permissions.check(FinePermission::MANAGE_CHANNELS) && !user.permissions.check(FinePermission::MANAGE_CHANNELS)
{ {
return Err(Error::NotAllowed); return Err(Error::NotAllowed);
}
} }
// ... // ...
@ -81,7 +139,7 @@ impl DataManager {
let res = execute!( let res = execute!(
&conn, &conn,
"INSERT INTO channels VALUES ($1, $2, $3, $4, $5, $6, $7)", "INSERT INTO channels VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)",
params![ params![
&(data.id as i64), &(data.id as i64),
&(data.community as i64), &(data.community as i64),
@ -89,7 +147,9 @@ impl DataManager {
&(data.created as i64), &(data.created as i64),
&(data.minimum_role_read as i32), &(data.minimum_role_read as i32),
&(data.minimum_role_write as i32), &(data.minimum_role_write as i32),
&(data.position as i32) &(data.position as i32),
&serde_json::to_string(&data.members).unwrap(),
&data.title
] ]
); );
@ -100,16 +160,18 @@ impl DataManager {
Ok(()) Ok(())
} }
pub async fn delete_channel(&self, id: usize, user: User) -> Result<()> { pub async fn delete_channel(&self, id: usize, user: &User) -> Result<()> {
let channel = self.get_channel_by_id(id).await?; let channel = self.get_channel_by_id(id).await?;
// check user permission in community // check user permission in community
let membership = self if user.id != channel.owner {
.get_membership_by_owner_community(user.id, channel.community) let membership = self
.await?; .get_membership_by_owner_community(user.id, channel.community)
.await?;
if !membership.role.check(CommunityPermission::MANAGE_CHANNELS) { if !membership.role.check(CommunityPermission::MANAGE_CHANNELS) {
return Err(Error::NotAllowed); return Err(Error::NotAllowed);
}
} }
// ... // ...
@ -124,11 +186,63 @@ impl DataManager {
return Err(Error::DatabaseError(e.to_string())); return Err(Error::DatabaseError(e.to_string()));
} }
// delete messages
let res = execute!(
&conn,
"DELETE FROM messages WHERE channel = $1",
&[&(id as i64)]
);
if let Err(e) = res {
return Err(Error::DatabaseError(e.to_string()));
}
// ...
self.2.remove(format!("atto.channel:{}", id)).await; self.2.remove(format!("atto.channel:{}", id)).await;
Ok(()) Ok(())
} }
auto_method!(update_channel_position(i32)@get_channel_by_id:MANAGE_COMMUNITIES -> "UPDATE channels SET position = $1 WHERE id = $2" --cache-key-tmpl="atto.channel:{}"); pub async fn remove_channel_member(&self, id: usize, user: User, member: usize) -> Result<()> {
auto_method!(update_channel_minimum_role_read(i32)@get_channel_by_id:MANAGE_COMMUNITIES -> "UPDATE channels SET minimum_role_read = $1 WHERE id = $2" --cache-key-tmpl="atto.channel:{}"); let mut y = self.get_channel_by_id(id).await?;
auto_method!(update_channel_minimum_role_write(i32)@get_channel_by_id:MANAGE_COMMUNITIES -> "UPDATE channels SET minimum_role_write = $1 WHERE id = $2" --cache-key-tmpl="atto.channel:{}");
if user.id != y.owner && member != user.id {
if !user.permissions.check(FinePermission::MANAGE_CHANNELS) {
return Err(Error::NotAllowed);
} else {
self.create_audit_log_entry(AuditLogEntry::new(
user.id,
format!("invoked `remove_channel_member` with x value `{member}`"),
))
.await?
}
}
y.members
.remove(y.members.iter().position(|x| *x == member).unwrap());
let conn = match self.connect().await {
Ok(c) => c,
Err(e) => return Err(Error::DatabaseConnection(e.to_string())),
};
let res = execute!(
&conn,
"UPDATE channels SET members = $1 WHERE id = $2",
params![&serde_json::to_string(&y.members).unwrap(), &(id as i64)]
);
if let Err(e) = res {
return Err(Error::DatabaseError(e.to_string()));
}
self.2.remove(format!("atto.channel:{}", id)).await;
Ok(())
}
auto_method!(update_channel_title(&str)@get_channel_by_id:MANAGE_CHANNELS -> "UPDATE channels SET title = $1 WHERE id = $2" --cache-key-tmpl="atto.channel:{}");
auto_method!(update_channel_position(i32)@get_channel_by_id:MANAGE_CHANNELS -> "UPDATE channels SET position = $1 WHERE id = $2" --cache-key-tmpl="atto.channel:{}");
auto_method!(update_channel_minimum_role_read(i32)@get_channel_by_id:MANAGE_CHANNELS -> "UPDATE channels SET minimum_role_read = $1 WHERE id = $2" --cache-key-tmpl="atto.channel:{}");
auto_method!(update_channel_minimum_role_write(i32)@get_channel_by_id:MANAGE_CHANNELS -> "UPDATE channels SET minimum_role_write = $1 WHERE id = $2" --cache-key-tmpl="atto.channel:{}");
auto_method!(update_channel_members(Vec<usize>)@get_channel_by_id:MANAGE_CHANNELS -> "UPDATE channels SET members = $1 WHERE id = $2" --serde --cache-key-tmpl="atto.channel:{}");
} }

3
crates/core/src/database/common.rs
View file

@ -3,7 +3,6 @@ use crate::{
execute, execute,
model::{Error, Result}, model::{Error, Result},
}; };
use super::DataManager; use super::DataManager;
impl DataManager { impl DataManager {
@ -357,7 +356,7 @@ macro_rules! auto_method {
let res = execute!( let res = execute!(
&conn, &conn,
$query, $query,
&[&serde_json::to_string(&x).unwrap(), &(id as i64)] params![&serde_json::to_string(&x).unwrap(), &(id as i64)]
); );
if let Err(e) = res { if let Err(e) = res {

5
crates/core/src/database/communities.rs
View file

@ -330,6 +330,11 @@ impl DataManager {
return Err(Error::DatabaseError(e.to_string())); return Err(Error::DatabaseError(e.to_string()));
} }
// remove channels
for channel in self.get_channels_by_community(id).await? {
self.delete_channel(channel.id, &user).await?;
}
// remove images // remove images
let avatar = PathBufD::current().extend(&[ let avatar = PathBufD::current().extend(&[
self.0.dirs.media.as_str(), self.0.dirs.media.as_str(),

4
crates/core/src/database/drivers/sql/create_channels.sql
View file

@ -5,5 +5,7 @@ CREATE TABLE IF NOT EXISTS channels (
created BIGINT NOT NULL, created BIGINT NOT NULL,
minimum_role_read INT NOT NULL, minimum_role_read INT NOT NULL,
minimum_role_write INT NOT NULL, minimum_role_write INT NOT NULL,
position INT NOT NULL position INT NOT NULL,
members TEXT NOT NULL,
title TEXT NOT NULL
) )

91
crates/core/src/database/messages.rs
View file

@ -1,11 +1,23 @@
use std::collections::HashMap;
use super::*; use super::*;
use crate::cache::Cache; use crate::cache::Cache;
use crate::model::moderation::AuditLogEntry; use crate::model::moderation::AuditLogEntry;
use crate::model::socket::{SocketMessage, SocketMethod};
use crate::model::{ use crate::model::{
Error, Result, auth::User, permissions::FinePermission, Error, Result, auth::User, permissions::FinePermission,
communities_permissions::CommunityPermission, channels::Message, communities_permissions::CommunityPermission, channels::Message,
}; };
use crate::{auto_method, execute, get, query_row, query_rows, params}; use crate::{auto_method, execute, get, query_row, query_rows, params};
use serde::Serialize;
#[derive(Serialize)]
struct DeleteMessageEvent {
pub id: String,
}
#[cfg(feature = "redis")]
use redis::Commands;
#[cfg(feature = "sqlite")] #[cfg(feature = "sqlite")]
use rusqlite::Row; use rusqlite::Row;
@ -31,7 +43,35 @@ impl DataManager {
} }
} }
auto_method!(get_message_by_id(usize)@get_message_from_row -> "SELECT * FROM messages WHERE id = $1" --name="message" --returns=Message --cache-key-tmpl="atto.message:{}"); auto_method!(get_message_by_id(usize as i64)@get_message_from_row -> "SELECT * FROM messages WHERE id = $1" --name="message" --returns=Message --cache-key-tmpl="atto.message:{}");
/// Complete a vector of just messages with their owner as well.
pub async fn fill_messages(
&self,
messages: Vec<Message>,
ignore_users: &Vec<usize>,
) -> Result<Vec<(Message, User)>> {
let mut out: Vec<(Message, User)> = Vec::new();
let mut users: HashMap<usize, User> = HashMap::new();
for message in messages {
let owner = message.owner;
if ignore_users.contains(&owner) {
continue;
}
if let Some(user) = users.get(&owner) {
out.push((message, user.clone()));
} else {
let user = self.get_user_by_id(owner).await?;
users.insert(owner, user.clone());
out.push((message, user));
}
}
Ok(out)
}
/// Get all messages by channel (paginated). /// Get all messages by channel (paginated).
/// ///
@ -52,7 +92,7 @@ impl DataManager {
let res = query_rows!( let res = query_rows!(
&conn, &conn,
"SELECT * FROM messages WHERE channel = $1 ORDER BY created DESC LIMIT $1 OFFSET $2", "SELECT * FROM messages WHERE channel = $1 ORDER BY created DESC LIMIT $2 OFFSET $3",
&[&(channel as i64), &(batch as i64), &((page * batch) as i64)], &[&(channel as i64), &(batch as i64), &((page * batch) as i64)],
|x| { Self::get_message_from_row(x) } |x| { Self::get_message_from_row(x) }
); );
@ -69,6 +109,14 @@ impl DataManager {
/// # Arguments /// # Arguments
/// * `data` - a mock [`Message`] object to insert /// * `data` - a mock [`Message`] object to insert
pub async fn create_message(&self, data: Message) -> Result<()> { pub async fn create_message(&self, data: Message) -> Result<()> {
if data.content.len() < 2 {
return Err(Error::DataTooLong("content".to_string()));
}
if data.content.len() > 2048 {
return Err(Error::DataTooLong("content".to_string()));
}
let user = self.get_user_by_id(data.owner).await?; let user = self.get_user_by_id(data.owner).await?;
let channel = self.get_channel_by_id(data.channel).await?; let channel = self.get_channel_by_id(data.channel).await?;
@ -77,14 +125,8 @@ impl DataManager {
.get_membership_by_owner_community(user.id, channel.community) .get_membership_by_owner_community(user.id, channel.community)
.await?; .await?;
if !membership.role.check_member() {
return Err(Error::NotAllowed);
}
// check user permission to post in channel // check user permission to post in channel
let role = membership.role.bits(); if !channel.check_post(user.id, Some(membership.role)) {
if role < channel.minimum_role_write {
return Err(Error::NotAllowed); return Err(Error::NotAllowed);
} }
@ -112,6 +154,21 @@ impl DataManager {
return Err(Error::DatabaseError(e.to_string())); return Err(Error::DatabaseError(e.to_string()));
} }
// post event
let mut con = self.2.get_con().await;
if let Err(e) = con.publish::<usize, String, ()>(
data.channel,
serde_json::to_string(&SocketMessage {
method: SocketMethod::Message,
data: serde_json::to_string(&data).unwrap(),
})
.unwrap(),
) {
return Err(Error::MiscError(e.to_string()));
}
// ...
Ok(()) Ok(())
} }
@ -149,6 +206,22 @@ impl DataManager {
} }
self.2.remove(format!("atto.message:{}", id)).await; self.2.remove(format!("atto.message:{}", id)).await;
// post event
let mut con = self.2.get_con().await;
if let Err(e) = con.publish::<usize, String, ()>(
message.channel,
serde_json::to_string(&SocketMessage {
method: SocketMethod::Delete,
data: serde_json::to_string(&DeleteMessageEvent { id: id.to_string() }).unwrap(),
})
.unwrap(),
) {
return Err(Error::MiscError(e.to_string()));
}
// ...
Ok(()) Ok(())
} }

9
crates/core/src/model/auth.rs
View file

@ -190,9 +190,12 @@ pub struct UserSettings {
/// If dislikes are hidden for the user. /// If dislikes are hidden for the user.
#[serde(default)] #[serde(default)]
pub hide_dislikes: bool, pub hide_dislikes: bool,
/// The timeline that the "Home" button takes you to /// The timeline that the "Home" button takes you to.
#[serde(default)] #[serde(default)]
pub default_timeline: DefaultTimelineChoice, pub default_timeline: DefaultTimelineChoice,
/// If other users that you aren't following can add you to chats.
#[serde(default)]
pub private_chats: bool,
} }
impl Default for User { impl Default for User {
@ -352,10 +355,12 @@ pub enum ConnectionService {
#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)] #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
pub enum ConnectionType { pub enum ConnectionType {
/// A connection through a token with an expiration time. /// A connection through a token which never expires.
Token, Token,
/// <https://www.rfc-editor.org/rfc/rfc7636> /// <https://www.rfc-editor.org/rfc/rfc7636>
PKCE, PKCE,
/// A connection with no stored authentication.
None,
} }
#[derive(Clone, Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]

32
crates/core/src/model/channels.rs
View file

@ -18,11 +18,17 @@ pub struct Channel {
/// ///
/// Top (0) to bottom. /// Top (0) to bottom.
pub position: usize, pub position: usize,
/// The members of the chat (ids). Should be empty if `community > 0`.
///
/// The owner should not be a member of the channel since any member can update members.
pub members: Vec<usize>,
/// The title of the channel.
pub title: String,
} }
impl Channel { impl Channel {
/// Create a new [`Channel`]. /// Create a new [`Channel`].
pub fn new(community: usize, owner: usize, position: usize) -> Self { pub fn new(community: usize, owner: usize, position: usize, title: String) -> Self {
Self { Self {
id: AlmostSnowflake::new(1234567890) id: AlmostSnowflake::new(1234567890)
.to_string() .to_string()
@ -34,8 +40,32 @@ impl Channel {
minimum_role_read: (CommunityPermission::DEFAULT | CommunityPermission::MEMBER).bits(), minimum_role_read: (CommunityPermission::DEFAULT | CommunityPermission::MEMBER).bits(),
minimum_role_write: (CommunityPermission::DEFAULT | CommunityPermission::MEMBER).bits(), minimum_role_write: (CommunityPermission::DEFAULT | CommunityPermission::MEMBER).bits(),
position, position,
members: Vec::new(),
title,
} }
} }
/// Check if the given `uid` can post in the channel.
pub fn check_post(&self, uid: usize, membership: Option<CommunityPermission>) -> bool {
let mut is_member = false;
if let Some(membership) = membership {
is_member = membership.bits() >= self.minimum_role_write
}
(uid == self.owner) | is_member | self.members.contains(&uid)
}
/// Check if the given `uid` can post in the channel.
pub fn check_read(&self, uid: usize, membership: Option<CommunityPermission>) -> bool {
let mut is_member = false;
if let Some(membership) = membership {
is_member = membership.bits() >= self.minimum_role_read
}
(uid == self.owner) | is_member | self.members.contains(&uid)
}
} }
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]

4
crates/core/src/model/mod.rs
View file

@ -2,6 +2,7 @@ pub mod auth;
pub mod communities; pub mod communities;
pub mod communities_permissions; pub mod communities_permissions;
pub mod moderation; pub mod moderation;
pub mod oauth;
pub mod permissions; pub mod permissions;
pub mod reactions; pub mod reactions;
pub mod requests; pub mod requests;
@ -9,6 +10,9 @@ pub mod requests;
#[cfg(feature = "redis")] #[cfg(feature = "redis")]
pub mod channels; pub mod channels;
#[cfg(feature = "redis")]
pub mod socket;
use std::fmt::Display; use std::fmt::Display;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};

36
crates/core/src/model/oauth.rs Normal file
View file

@ -0,0 +1,36 @@
use base64::{engine::general_purpose::URL_SAFE as base64url, Engine};
use serde::{Serialize, Deserialize};
use tetratto_shared::hash::hash;
use super::{Result, Error};
#[derive(Serialize, Deserialize, PartialEq, Eq)]
pub enum PkceChallengeMethod {
S256,
}
#[derive(Serialize, Deserialize, PartialEq, Eq)]
pub enum AppScope {
#[serde(alias = "user-read-profile")]
UserReadProfile,
}
/// Check a verifier against the stored challenge (using the given [`PkceChallengeMethod`]).
pub fn check_verifier(verifier: &str, challenge: &str, method: PkceChallengeMethod) -> Result<()> {
if method != PkceChallengeMethod::S256 {
return Err(Error::MiscError("only S256 is supported".to_string()));
}
let decoded = match base64url.decode(challenge.as_bytes()) {
Ok(hash) => hash,
Err(e) => return Err(Error::MiscError(e.to_string())),
};
let hash = hash(verifier.to_string());
if hash.as_bytes() != decoded {
// the verifier we received does not match the verifier from the stored challenge
return Err(Error::NotAllowed);
}
Ok(())
}

23
crates/core/src/model/socket.rs Normal file
View file

@ -0,0 +1,23 @@
use serde::{Serialize, Deserialize, de::DeserializeOwned};
#[derive(Serialize, Deserialize, PartialEq, Eq)]
pub enum SocketMethod {
/// Authentication and channel identification.
Headers,
/// A message was sent in the channel.
Message,
/// A message was deleted in the channel.
Delete,
}
#[derive(Serialize, Deserialize)]
pub struct SocketMessage {
pub method: SocketMethod,
pub data: String,
}
impl SocketMessage {
pub fn data<T: DeserializeOwned>(&self) -> T {
serde_json::from_str(&self.data).unwrap()
}
}

2
crates/l10n/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "tetratto-l10n" name = "tetratto-l10n"
version = "1.0.8" version = "2.0.0"
edition = "2024" edition = "2024"
authors.workspace = true authors.workspace = true
repository.workspace = true repository.workspace = true

2
crates/shared/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "tetratto-shared" name = "tetratto-shared"
version = "1.0.8" version = "2.0.0"
edition = "2024" edition = "2024"
authors.workspace = true authors.workspace = true
repository.workspace = true repository.workspace = true

2
sql_changes/channels_members.sql Normal file
View file

@ -0,0 +1,2 @@
ALTER TABLE channels
ADD COLUMN members TEXT NOT NULL DEFAULT '[]';

2
sql_changes/channels_title.sql Normal file
View file

@ -0,0 +1,2 @@
ALTER TABLE channels
ADD COLUMN title TEXT NOT NULL DEFAULT '';