Bytemalte/marstemedia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Rss feed

Browse Source
This commit is contained in:
Bytemalte
2026-01-22 13:37:48 +01:00
parent ba72e8118f
commit 6d201280ed
6 changed files with 312 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -21,6 +21,8 @@ pulldown-cmark = "0.13.0"
rand = "0.9.2"
getrandom = { version = "0.3", features = ["wasm_js"] }
ron = "0.8"
feed-rs = "2.3.1"
uuid = { version = "1.19", features = ["js"] }
[workspace]
members = ["src-tauri"]

1
src-tauri/Cargo.toml
View File

@@ -19,6 +19,7 @@ serde = { version = "1", features = ["derive"] }
serde_json = "1"
easy-nostr = { path = "./easy-nostr" }
tokio = { version = "1", features = ["full"] }
feed-rs = "2.3.1"
# FIX: default-features entfernt und rustls-tls hinzugefügt
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }

2
src-tauri/src/lib.rs
View File

@@ -11,6 +11,8 @@ pub fn run() {
home::fetch_nostr_posts,
news::save_openrouter_key,
news::fetch_ai_news,
news::fetch_rss_news,
news::save_rss_url,
])
.run(tauri::generate_context!())
.expect("error while running tauri application");

75
src-tauri/src/news.rs
View File

@@ -5,6 +5,7 @@ use tauri::State;
#[derive(Default)]
pub struct NewsState {
pub openrouter_key: Mutex<String>,
pub rss_url: Mutex<String>, // Neu: Speicher für die RSS-URL
}
#[derive(Serialize, Deserialize, Clone)]
@@ -15,26 +16,29 @@ pub struct NewsArticle {
pub created_at: u64,
}
// Bestehender Command für den API Key
#[tauri::command]
pub async fn save_openrouter_key(key: String, state: State<'_, NewsState>) -> Result<(), String> {
let mut lock = state
.openrouter_key
.lock()
.map_err(|_| "Lock failed".to_string())?;
let mut lock = state.openrouter_key.lock().map_err(|_| "Lock failed")?;
*lock = key.trim().to_string();
Ok(())
}
// NEU: Command zum Speichern der RSS URL
#[tauri::command]
pub async fn save_rss_url(url: String, state: State<'_, NewsState>) -> Result<(), String> {
let mut lock = state.rss_url.lock().map_err(|_| "Lock failed")?;
*lock = url.trim().to_string();
Ok(())
}
#[tauri::command]
pub async fn fetch_ai_news(state: State<'_, NewsState>) -> Result<Vec<NewsArticle>, String> {
let key = {
let lock = state
let key = state
.openrouter_key
.lock()
.map_err(|_| "Lock failed".to_string())?;
lock.clone()
};
.map_err(|_| "Lock failed")?
.clone();
if key.is_empty() {
return Err("API Key fehlt.".to_string());
}
@@ -51,21 +55,15 @@ pub async fn fetch_ai_news(state: State<'_, NewsState>) -> Result<Vec<NewsArticl
let response = client
.post("https://openrouter.ai/api/v1/chat/completions")
.header("Authorization", format!("Bearer {}", key))
.header("HTTP-Referer", "http://localhost:1420")
.json(&body)
.send()
.await
.map_err(|e| e.to_string())?;
if !response.status().is_success() {
return Err(format!("API Fehler: {}", response.status()));
}
let json_res: serde_json::Value = response.json().await.map_err(|e| e.to_string())?;
let content = json_res["choices"][0]["message"]["content"]
.as_str()
.ok_or_else(|| "Kein Content im JSON".to_string())?
.unwrap_or("Fehler")
.to_string();
Ok(vec![NewsArticle {
@@ -74,3 +72,46 @@ pub async fn fetch_ai_news(state: State<'_, NewsState>) -> Result<Vec<NewsArticl
created_at: 0,
}])
}
// VERBESSERT: Lädt nun den echten Feed von der gespeicherten URL
#[tauri::command]
pub async fn fetch_rss_news(state: State<'_, NewsState>) -> Result<Vec<NewsArticle>, String> {
let url = state.rss_url.lock().map_err(|_| "Lock failed")?.clone();
if url.is_empty() {
return Err("RSS URL fehlt. Bitte in den Einstellungen eintragen.".to_string());
}
let response = reqwest::get(&url)
.await
.map_err(|e| e.to_string())?
.bytes()
.await
.map_err(|e| e.to_string())?;
let feed = feed_rs::parser::parse(&response[..]).map_err(|e| e.to_string())?;
let articles = feed
.entries
.into_iter()
.take(5)
.map(|entry| NewsArticle {
content: format!(
"### {}\n\n{}",
entry.title.map(|t| t.content).unwrap_or_default(),
entry
.summary
.map(|s| s.content)
.unwrap_or_else(|| "Kein Inhalt".to_string())
),
author: feed
.title
.as_ref()
.map(|t| t.content.clone())
.unwrap_or_else(|| "RSS".into()),
created_at: entry.updated.map(|d| d.timestamp() as u64).unwrap_or(0),
})
.collect();
Ok(articles)
}

144
src/pages/news.rs
View File

@@ -11,6 +11,12 @@ extern "C" {
async fn invoke(cmd: &str, args: JsValue) -> Result<JsValue, JsValue>;
}
#[derive(PartialEq, Clone, Copy)]
pub enum NewsMode {
Ai,
Rss,
}
#[derive(Serialize, Deserialize, Clone, PartialEq, Debug)]
#[serde(rename_all = "camelCase")]
pub struct NewsArticle {
@@ -20,36 +26,50 @@ pub struct NewsArticle {
}
#[derive(Serialize)]
#[serde(rename_all = "camelCase")]
struct ApiKeyArgs {
struct StringArgs {
pub key: String,
}
#[derive(Serialize)]
struct UrlArgs {
pub url: String,
}
#[function_component(News)]
pub fn news() -> Html {
let articles = use_state(|| None::<Vec<NewsArticle>>);
let error_msg = use_state(|| None::<String>);
let show_config = use_state(|| false);
let current_mode = use_state(|| NewsMode::Ai);
let api_key_ref = use_node_ref();
let rss_url_ref = use_node_ref();
let load_news = {
let articles = articles.clone();
let error_msg = error_msg.clone();
let current_mode = current_mode.clone();
Callback::from(move |_e: MouseEvent| {
let articles = articles.clone();
let error_msg = error_msg.clone();
let mode = *current_mode;
articles.set(None);
error_msg.set(None);
spawn_local(async move {
match invoke("fetch_ai_news", JsValue::NULL).await {
let command = match mode {
NewsMode::Ai => "fetch_ai_news",
NewsMode::Rss => "fetch_rss_news",
};
match invoke(command, JsValue::NULL).await {
Ok(res) => match serde_wasm_bindgen::from_value::<Vec<NewsArticle>>(res) {
Ok(new_news) => articles.set(Some(new_news)),
Err(e) => error_msg.set(Some(format!("Datenfehler: {}", e))),
},
Err(e) => {
let msg = e.as_string().unwrap_or_else(|| "API Fehler".into());
let msg = e.as_string().unwrap_or_else(|| "Fehler beim Laden".into());
error_msg.set(Some(msg));
}
}
@@ -57,26 +77,40 @@ pub fn news() -> Html {
})
};
let save_key = {
let save_settings = {
let show_config = show_config.clone();
let api_key_ref = api_key_ref.clone();
let rss_url_ref = rss_url_ref.clone();
let load_news = load_news.clone();
Callback::from(move |_| {
let input = api_key_ref.cast::<HtmlInputElement>().unwrap();
let key = input.value();
let key = api_key_ref.cast::<HtmlInputElement>().unwrap().value();
let url = rss_url_ref.cast::<HtmlInputElement>().unwrap().value();
let show_config_handle = show_config.clone();
let load_news_handle = load_news.clone();
spawn_local(async move {
let args = serde_wasm_bindgen::to_value(&ApiKeyArgs { key }).unwrap();
if invoke("save_openrouter_key", args).await.is_ok() {
let key_args = serde_wasm_bindgen::to_value(&StringArgs { key }).unwrap();
let url_args = serde_wasm_bindgen::to_value(&UrlArgs { url }).unwrap();
let _ = invoke("save_openrouter_key", key_args).await;
let _ = invoke("save_rss_url", url_args).await;
show_config_handle.set(false);
load_news_handle.emit(MouseEvent::new("click").unwrap());
}
});
})
};
let switch_mode = {
let current_mode = current_mode.clone();
let load_news = load_news.clone();
Callback::from(move |mode: NewsMode| {
current_mode.set(mode);
load_news.emit(MouseEvent::new("click").unwrap());
})
};
{
let load_news = load_news.clone();
use_effect_with((), move |_| {
@@ -85,17 +119,33 @@ pub fn news() -> Html {
});
}
let mode = *current_mode;
let is_config_visible = *show_config;
let toggle_config_handle = show_config.clone();
let current_error = (*error_msg).clone();
let articles_list = (*articles).clone();
html! {
<div class="feed-container">
<div class="feed-header">
<h1 class="feed-title">{"📰 KI News"}</h1>
<div style="display: flex; gap: 10px;">
<button class="reload-btn" onclick={move |_| toggle_config_handle.set(!is_config_visible)}>
<h1 class="feed-title">
{ if mode == NewsMode::Ai { "📰 KI News" } else { "📻 RSS Feed" } }
</h1>
<div style="display: flex; gap: 10px; align-items: center;">
<div class="mode-switch">
<button
class={if mode == NewsMode::Ai { "switch-btn active-ai" } else { "switch-btn" }}
onclick={let switch = switch_mode.clone(); move |_| switch.emit(NewsMode::Ai)}
>
{"KI"}
</button>
<button
class={if mode == NewsMode::Rss { "switch-btn active-rss" } else { "switch-btn" }}
onclick={let switch = switch_mode.clone(); move |_| switch.emit(NewsMode::Rss)}
>
{"RSS"}
</button>
</div>
<button class="reload-btn" onclick={let sc = show_config.clone(); move |_| sc.set(!*sc)}>
{"⚙️"}
</button>
<button class="reload-btn" onclick={load_news.clone()}>
@@ -105,39 +155,54 @@ pub fn news() -> Html {
</div>
if is_config_visible {
<div class="post-card" style="border-color: #4a90e2; animation: slideIn 0.3s ease;">
<h3 style="margin-top: 0;">{"Modell: OpenRouter"}</h3>
<div class="config-panel">
<h3>{"Einstellungen"}</h3>
<div style="margin-bottom: 10px;">
<label style="font-size: 0.7rem; color: #4a90e2; display: block; margin-bottom: 4px;">{"OPENROUTER KEY"}</label>
<input
ref={api_key_ref}
type="password"
placeholder="OpenRouter API Key..."
class="recipient-input"
style="margin-bottom: 12px;"
placeholder="sk-or-v1-..."
class="config-input"
/>
<button class="reload-btn-large" onclick={save_key}>{"Key Speichern"}</button>
</div>
<div style="margin-bottom: 15px;">
<label style="font-size: 0.7rem; color: #facc15; display: block; margin-bottom: 4px;">{"RSS URL"}</label>
<input
ref={rss_url_ref}
type="text"
placeholder="https://zum-rss-feed.xml"
class="config-input"
/>
</div>
<button class="save-btn" onclick={save_settings}>{"Alles Speichern"}</button>
</div>
}
{
if let Some(msg) = current_error {
if let Some(msg) = (*error_msg).clone() {
html! {
<div class="post-card" style="border-color: #ef4444;">
<p style="color: #ef4444; margin: 0;">{ format!("⚠️ {}", msg) }</p>
<div class="error-card">
<p>{ format!("⚠️ {}", msg) }</p>
</div>
}
} else if let Some(list) = articles_list {
} else if let Some(list) = (*articles).clone() {
html! {
<div class="posts-list">
{ for list.iter().map(|a| html! { <NewsCard article={a.clone()} /> }) }
{ for list.iter().map(|a| html! { <NewsCard article={a.clone()} mode={mode} /> }) }
<div class="footer-action">
<button class="reload-btn-large" onclick={load_news}>
{"Mehr News generieren"}
{ if mode == NewsMode::Ai { "Mehr News generieren" } else { "Feed aktualisieren" } }
</button>
</div>
</div>
}
} else {
html! { <p class="status-msg">{"KI schreibt gerade News..."}</p> }
html! {
<p class="status-msg">
{ if mode == NewsMode::Ai { "KI schreibt gerade News..." } else { "RSS Feeds werden geladen..." } }
</p>
}
}
}
</div>
@@ -147,13 +212,14 @@ pub fn news() -> Html {
#[derive(Properties, PartialEq)]
pub struct NewsProps {
pub article: NewsArticle,
pub mode: NewsMode,
}
#[function_component(NewsCard)]
pub fn news_card(props: &NewsProps) -> Html {
let a = &props.article;
let mode = props.mode;
// Markdown zu HTML konvertieren
let markdown_html = {
let mut options = Options::empty();
options.insert(Options::ENABLE_STRIKETHROUGH);
@@ -163,22 +229,16 @@ pub fn news_card(props: &NewsProps) -> Html {
html_output
};
// Das HTML sicher in ein AttrValue packen
let div = web_sys::window()
.unwrap()
.document()
.unwrap()
.create_element("div")
.unwrap();
div.set_inner_html(&markdown_html);
html! {
<div class="post-card">
<div class="post-header">
<span class="post-author" style="color: #facc15;">{ &a.author }</span>
<span class="post-date">{"AI Generated"}</span>
<span class="post-author" style={if mode == NewsMode::Ai { "color: #4a90e2;" } else { "color: #facc15;" }}>
{ &a.author }
</span>
<span class="post-date">
{ if mode == NewsMode::Ai { "✨ AI Generated" } else { "📡 RSS Source" } }
</span>
</div>
// Hier nutzen wir das div-Element von oben als VNode
<div class="post-content markdown-body">
{ Html::from_html_unchecked(AttrValue::from(markdown_html)) }
</div>

139
styles.css
View File

@@ -232,3 +232,142 @@ html {
transform: translateY(0px);
}
}
/* --- Mode Switcher (KI / RSS) --- */
.mode-switch {
display: flex;
background: rgba(255, 255, 255, 0.05);
border-radius: 20px;
padding: 4px;
border: 1px solid rgba(255, 255, 255, 0.1);
}
.switch-btn {
border: none;
border-radius: 16px;
padding: 6px 16px;
cursor: pointer;
transition: all 0.2s ease;
background: transparent;
color: #a0a0b0;
font-weight: 700;
font-size: 0.8rem;
}
.switch-btn.active-ai {
background: #4a90e2;
color: white;
box-shadow: 0 4px 12px rgba(74, 144, 226, 0.3);
}
.switch-btn.active-rss {
background: #facc15;
color: #0f0f13;
box-shadow: 0 4px 12px rgba(250, 204, 21, 0.3);
}
/* --- Config Panel (API Key Eingabe) --- */
.config-panel {
background: rgba(74, 144, 226, 0.05);
border: 1px solid rgba(74, 144, 226, 0.3);
border-radius: 16px;
padding: 20px;
margin-bottom: 25px;
animation: slideIn 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275);
}
.config-panel h3 {
margin-top: 0;
color: #4a90e2;
font-size: 1rem;
}
.config-input {
width: 100%;
padding: 12px;
background: rgba(0, 0, 0, 0.2);
border: 1px solid rgba(255, 255, 255, 0.1);
color: white;
border-radius: 10px;
margin-bottom: 15px;
box-sizing: border-box;
font-family: inherit;
}
.config-input:focus {
outline: none;
border-color: #4a90e2;
background: rgba(0, 0, 0, 0.3);
}
.save-btn {
background: #4a90e2;
color: white;
border: none;
padding: 12px;
border-radius: 10px;
cursor: pointer;
width: 100%;
font-weight: 600;
transition: opacity 0.2s;
}
.save-btn:hover {
opacity: 0.9;
}
/* --- Status & Header Buttons --- */
.reload-btn {
background: rgba(255, 255, 255, 0.05);
border: 1px solid rgba(255, 255, 255, 0.1);
border-radius: 10px;
padding: 8px 12px;
cursor: pointer;
font-size: 1.1rem;
transition: all 0.2s;
}
.reload-btn:hover {
background: rgba(255, 255, 255, 0.1);
}
.status-msg {
text-align: center;
color: #a0a0b0;
margin-top: 60px;
font-style: italic;
animation: pulse 2s infinite;
}
.error-card {
border: 1px solid rgba(239, 68, 68, 0.4);
background: rgba(239, 68, 68, 0.05);
padding: 15px;
border-radius: 12px;
color: #ef4444;
font-weight: 500;
}
/* --- Animations --- */
@keyframes slideIn {
from {
opacity: 0;
transform: translateY(-15px);
}
to {
opacity: 1;
transform: translateY(0);
}
}
@keyframes pulse {
0% {
opacity: 0.6;
}
50% {
opacity: 1;
}
100% {
opacity: 0.6;
}
}