Add more context for authenticated_account

src/raito_fe/api_controller.rs

@@ -108,7 +108,7 @@ pub fn home_timeline(token: &str) -> Result<Vec<Status>, ()> {
                 None,
                 None,
                 None,
-                None,
+                Some(40),
                 AuthorizationHeader(token.to_string()),
             )
             .to_string(),
@@ -124,7 +124,7 @@ pub fn home_timeline(token: &str) -> Result<Vec<Status>, ()> {
 pub fn get_public_timeline(local: bool) -> Result<Vec<Status>, ()> {
     if unsafe { BYPASS_API } == &true {
         match serde_json::from_str(
-            &routes::public_timeline(Some(local), None, None, None, None, None).to_string(),
+            &routes::public_timeline(Some(local), None, None, None, None, Some(40)).to_string(),
         ) {
             Ok(timeline) => Ok(timeline),
             Err(_) => Err(()),
@@ -155,7 +155,7 @@ pub fn get_user_timeline(id: String) -> Result<Vec<Status>, ()> {
                 None,
                 None,
                 None,
-                None,
+                Some(40),
                 None,
             )
             .to_string(),

src/raito_fe/renderer.rs

@@ -18,9 +18,16 @@ pub fn about(configuration: LocalConfiguration, authentication: Authentication)
     context.extend(configuration);
     context.extend(prepare_authentication_context(&authentication));
     context.insert("stylesheet".to_string(), raito_fe::get_stylesheet());
-    context.insert("content".to_string(), fs::read_to_string("static/raito_fe/html/about.html").unwrap_or_else(|_| String::from("<h2>About this node</h2>
+    context.insert(
+        "content".to_string(),
+        fs::read_to_string("static/raito_fe/html/about.html").unwrap_or_else(|_| {
+            String::from(
+                "<h2>About this node</h2>
 This is a placeholder text, it can be edited in \"static/raito_fe/html/about.html\"
-")));
+",
+            )
+        }),
+    );
     return Template::render("raito_fe/about", context);
 }
 
@@ -573,6 +580,14 @@ fn prepare_authentication_context(authentication: &Authentication) -> HashMap<St
                 String::from("authenticated_account_display_name"),
                 (*account.display_name).to_string(),
             );
+            context.insert(
+                String::from("authenticated_account_avatar"),
+                (*account.avatar).to_string(),
+            );
+            context.insert(
+                String::from("authenticated_account_id"),
+                (*account.id).to_string(),
+            );
         }
         None => {
             context.insert(String::from("authenticated_account"), false.to_string());
@@ -580,6 +595,11 @@ fn prepare_authentication_context(authentication: &Authentication) -> HashMap<St
                 String::from("authenticated_account_display_name"),
                 String::from("Guest"),
             );
+            context.insert(
+                String::from("authenticated_account_avatar"),
+                String::from("/static/assets/default_avatar.png"),
+            );
+            context.insert(String::from("authenticated_account_id"), String::from(""));
         }
     }
 
@@ -650,6 +670,7 @@ fn prepare_status_context(status: Status) -> HashMap<String, String> {
         Some(reblog_status) => {
             let reblog: Status = serde_json::from_value(reblog_status).unwrap();
             context.insert(String::from("reblog_account_acct"), reblog.account.acct);
+            context.insert(String::from("reblog_account_avatar"), reblog.account.avatar);
             context.insert(
                 String::from("reblog_account_url"),
                 format!("/account/{}", reblog.id),
@@ -658,6 +679,7 @@ fn prepare_status_context(status: Status) -> HashMap<String, String> {
         }
         None => {
             context.insert(String::from("reblog_account_acct"), String::from(""));
+            context.insert(String::from("reblog_account_avatar"), String::from(""));
             context.insert(String::from("reblog_account_url"), String::from(""));
             context.insert(String::from("reblog_content"), String::from(""));
         }

static/raito_fe/themes/raito_light.css

@@ -213,7 +213,7 @@ textarea {
 
 #account-timeline {
 	margin-top: 10px;
-	height: 60vh;
+	height: 55vh;
 }
 
 #registration-form {

templates/raito_fe/components/status.html.tera

@@ -11,7 +11,7 @@
     <div class="status-content">
     {% if status_reblog == "true" %}
     <span class="status-reblog-divider"><img class="inner-icon" src="/static/raito_fe/fonts/open-iconic/svg/loop-circular.svg">has shared</span>
-    <img src="/static/assets/default_avatar.png" class="status-reblog-avatar">
+    <img src="{{reblog_account_avatar}}" class="status-reblog-avatar">
     <a href="{{reblog_account_url}}" class="status-reblog-username">{{reblog_account_acct}}</a>
     <br />
     <p class="status-reblog-content">{{reblog_content | safe}}</p>

templates/raito_fe/index.html.tera

@@ -10,10 +10,11 @@
             <ul>
                 <li class="dropdown" style="float: right;">
 		    {% if authenticated_account == "true" %}
-		    <img class="account-avatar-small" src="/static/assets/default_avatar.png">
-		    <span style="margin-right: 5px;">{{authenticated_account_display_name}}</span> <i class="icon-arrow-down"></i>
+		    <img class="account-avatar-small" src="{{authenticated_account_avatar}}">
+		    <span style="margin-right: 5px;">{{authenticated_account_display_name}}</span> 
+		    <img class="inner-icon" src="/static/raito_fe/fonts/open-iconic/svg/caret-bottom.svg">
 		    <ul>
-            <li><a href="/account/1">Profile</a></li>
+            <li><a href="/account/{{authenticated_account_id}}">Profile</a></li>
             <li><a href="/logout">Logout</a></li>
             </ul>
 		    {% else %}