fix: allow users with a private profile to view their own posts
add: channels/messages models
This commit is contained in:
parent
0c814e95d7
commit
9e6c5c9726
6 changed files with 94 additions and 1 deletions
|
@ -9,6 +9,7 @@ use tera::Context;
|
||||||
use tetratto_core::{
|
use tetratto_core::{
|
||||||
config::Config,
|
config::Config,
|
||||||
model::auth::{DefaultTimelineChoice, User},
|
model::auth::{DefaultTimelineChoice, User},
|
||||||
|
PUBSUB_ENABLED,
|
||||||
};
|
};
|
||||||
use tetratto_l10n::LangFile;
|
use tetratto_l10n::LangFile;
|
||||||
use tetratto_shared::hash::salt;
|
use tetratto_shared::hash::salt;
|
||||||
|
@ -283,6 +284,8 @@ pub(crate) async fn initial_context(
|
||||||
) -> Context {
|
) -> Context {
|
||||||
let mut ctx = Context::new();
|
let mut ctx = Context::new();
|
||||||
ctx.insert("config", &config);
|
ctx.insert("config", &config);
|
||||||
|
ctx.insert("pubsub", &PUBSUB_ENABLED);
|
||||||
|
|
||||||
ctx.insert("user", &user);
|
ctx.insert("user", &user);
|
||||||
ctx.insert("use_user_theme", &true);
|
ctx.insert("use_user_theme", &true);
|
||||||
|
|
||||||
|
|
|
@ -202,7 +202,7 @@ impl DataManager {
|
||||||
let user = self.get_user_by_id(owner).await?;
|
let user = self.get_user_by_id(owner).await?;
|
||||||
|
|
||||||
// check relationship
|
// check relationship
|
||||||
if user.settings.private_profile {
|
if user.settings.private_profile && user.id != user_id {
|
||||||
if user_id == 0 {
|
if user_id == 0 {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,3 +4,10 @@ pub mod database;
|
||||||
pub mod model;
|
pub mod model;
|
||||||
|
|
||||||
pub use database::DataManager;
|
pub use database::DataManager;
|
||||||
|
|
||||||
|
/// Tells us if pubsub capabilities are provided (via Redis).
|
||||||
|
///
|
||||||
|
/// If we have access to pubsub, community channels/messages will be available.
|
||||||
|
///
|
||||||
|
/// This is mostly used a flag for the UI.
|
||||||
|
pub const PUBSUB_ENABLED: bool = cfg!(feature = "redis");
|
||||||
|
|
78
crates/core/src/model/channels.rs
Normal file
78
crates/core/src/model/channels.rs
Normal file
|
@ -0,0 +1,78 @@
|
||||||
|
use serde::{Serialize, Deserialize};
|
||||||
|
use tetratto_shared::{snow::AlmostSnowflake, unix_epoch_timestamp};
|
||||||
|
|
||||||
|
use super::communities_permissions::CommunityPermission;
|
||||||
|
|
||||||
|
/// A channel is a more "chat-like" feed in communities.
|
||||||
|
#[derive(Serialize, Deserialize)]
|
||||||
|
pub struct Channel {
|
||||||
|
pub id: usize,
|
||||||
|
pub community: usize,
|
||||||
|
pub owner: usize,
|
||||||
|
pub created: usize,
|
||||||
|
/// The minimum role (as bits) that can read this channel.
|
||||||
|
pub minimum_role_read: u32,
|
||||||
|
/// The minimum role (as bits) that can write to this channel.
|
||||||
|
pub minimum_role_write: u32,
|
||||||
|
/// The position of this channel in the UI.
|
||||||
|
///
|
||||||
|
/// Top (0) to bottom.
|
||||||
|
pub order: usize,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Channel {
|
||||||
|
/// Create a new [`Channel`].
|
||||||
|
pub fn new(community: usize, owner: usize, order: usize) -> Self {
|
||||||
|
Self {
|
||||||
|
id: AlmostSnowflake::new(1234567890)
|
||||||
|
.to_string()
|
||||||
|
.parse::<usize>()
|
||||||
|
.unwrap(),
|
||||||
|
community,
|
||||||
|
owner,
|
||||||
|
created: unix_epoch_timestamp() as usize,
|
||||||
|
minimum_role_read: (CommunityPermission::DEFAULT | CommunityPermission::MEMBER).bits(),
|
||||||
|
minimum_role_write: (CommunityPermission::DEFAULT | CommunityPermission::MEMBER).bits(),
|
||||||
|
order,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize)]
|
||||||
|
pub struct Message {
|
||||||
|
pub id: usize,
|
||||||
|
pub channel: usize,
|
||||||
|
pub owner: usize,
|
||||||
|
pub created: usize,
|
||||||
|
pub edited: usize,
|
||||||
|
pub content: String,
|
||||||
|
pub context: MessageContext,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Message {
|
||||||
|
pub fn new(channel: usize, owner: usize, content: String) -> Self {
|
||||||
|
let now = unix_epoch_timestamp() as usize;
|
||||||
|
|
||||||
|
Self {
|
||||||
|
id: AlmostSnowflake::new(1234567890)
|
||||||
|
.to_string()
|
||||||
|
.parse::<usize>()
|
||||||
|
.unwrap(),
|
||||||
|
channel,
|
||||||
|
owner,
|
||||||
|
created: now,
|
||||||
|
edited: now,
|
||||||
|
content,
|
||||||
|
context: MessageContext::default(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize)]
|
||||||
|
pub struct MessageContext;
|
||||||
|
|
||||||
|
impl Default for MessageContext {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self
|
||||||
|
}
|
||||||
|
}
|
|
@ -18,6 +18,8 @@ bitflags! {
|
||||||
const MANAGE_PINS = 1 << 7;
|
const MANAGE_PINS = 1 << 7;
|
||||||
const MANAGE_COMMUNITY = 1 << 8;
|
const MANAGE_COMMUNITY = 1 << 8;
|
||||||
const MANAGE_QUESTIONS = 1 << 9;
|
const MANAGE_QUESTIONS = 1 << 9;
|
||||||
|
const MANAGE_CHANNELS = 1 << 10;
|
||||||
|
const MANAGE_MESSAGES = 1 << 11;
|
||||||
|
|
||||||
const _ = !0;
|
const _ = !0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,9 @@ pub mod permissions;
|
||||||
pub mod reactions;
|
pub mod reactions;
|
||||||
pub mod requests;
|
pub mod requests;
|
||||||
|
|
||||||
|
#[cfg(feature = "redis")]
|
||||||
|
pub mod channels;
|
||||||
|
|
||||||
use std::fmt::Display;
|
use std::fmt::Display;
|
||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue