alemi/upub
alemi/upub
1
0
Fork 1
Code Issues 4 Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: context is an oid

Browse source
This commit is contained in:
əlemi 2024-05-29 04:43:02 +02:00
parent e6a687d427
commit 292cfe9011
Signed by: alemi
GPG key ID: A4895B84D311642C
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/routes/activitypub/context.rs
View file

@ -9,7 +9,7 @@ pub async fn get(
AuthIdentity(auth): AuthIdentity, AuthIdentity(auth): AuthIdentity,
) -> crate::Result<JsonLD<serde_json::Value>> { ) -> crate::Result<JsonLD<serde_json::Value>> {
let local_context_id = url!(ctx, "/context/{id}"); let local_context_id = url!(ctx, "/context/{id}");
let context = ctx.context_id(&id); let context = ctx.oid(&id);
let count = model::addressing::Entity::find_addressed(auth.my_id()) let count = model::addressing::Entity::find_addressed(auth.my_id())
.filter(auth.filter_condition()) .filter(auth.filter_condition())
@ -26,7 +26,7 @@ pub async fn page(
Query(page): Query<Pagination>, Query(page): Query<Pagination>,
AuthIdentity(auth): AuthIdentity, AuthIdentity(auth): AuthIdentity,
) -> crate::Result<JsonLD<serde_json::Value>> { ) -> crate::Result<JsonLD<serde_json::Value>> {
let context = ctx.context_id(&id); let context = ctx.oid(&id);
crate::server::builders::paginate( crate::server::builders::paginate(
url!(ctx, "/context/{id}/page"), url!(ctx, "/context/{id}/page"),

10
src/server/context.rs
View file

@ -76,6 +76,7 @@ impl Context {
&self.0.actor &self.0.actor
} }
#[allow(unused)]
pub fn instance(&self) -> &model::instance::Model { pub fn instance(&self) -> &model::instance::Model {
&self.0.instance &self.0.instance
} }
@ -123,15 +124,6 @@ impl Context {
uriproxy::uri(self.base(), UriClass::Activity, id) uriproxy::uri(self.base(), UriClass::Activity, id)
} }
// TODO remove this!!
//#[deprecated = "context is id of first post in thread"]
pub fn context_id(&self, id: &str) -> String {
if id.starts_with("tag:") {
return id.to_string();
}
uriproxy::uri(self.base(), UriClass::Context, id)
}
/// get bare id, which is uuid for local stuff and +{uri|base64} for remote stuff /// get bare id, which is uuid for local stuff and +{uri|base64} for remote stuff
pub fn id(&self, full_id: &str) -> String { pub fn id(&self, full_id: &str) -> String {
if self.is_local(full_id) { if self.is_local(full_id) {