bsherriff/siren
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored and fixed api endpoints

Browse Source
This commit is contained in:
Benjamin Sherriff
2023-12-02 13:52:01 -05:00
parent 046bf51697
commit dc2ff172b0
11 changed files with 238 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
service/src/bot/commands/oai.rs
View File

@@ -6,7 +6,7 @@ use serenity::model::Permissions;
use serenity::model::channel::Message;
use serenity::model::prelude::{ChannelType, PermissionOverwrite, PermissionOverwriteType};
use serenity::prelude::*;
use siren::{GetResponse, ServiceError};
use siren::{Response, ServiceError};
pub struct OAI {
pub client: reqwest::Client,
@@ -160,7 +160,7 @@ impl OAI {
Ok(response)
}
async fn get_messages(&self, guild_id: u64, channel_id: u64, author_id: u64) -> Result<GetResponse<Vec<siren::Message>>, ServiceError> {
async fn get_messages(&self, guild_id: u64, channel_id: u64, author_id: u64) -> Result<Response<Vec<siren::Message>>, ServiceError> {
let uri = format!("{}/messages?guild_id={}&channel_id={}&author_id={}&limit={}", self.service_url, guild_id, channel_id, author_id, self.max_context_questions);
let value = self.client
.get(&uri)
@@ -169,7 +169,7 @@ impl OAI {
.json::<Value>()
.await?;
let response = serde_json::from_value::<GetResponse<Vec<siren::Message>>>(value)?;
let response = serde_json::from_value::<Response<Vec<siren::Message>>>(value)?;
Ok(response)
}