diff --git a/internal/webserver/handler_login.go b/internal/webserver/handler_login.go
index 358de19..0f1f9cb 100644
--- a/internal/webserver/handler_login.go
+++ b/internal/webserver/handler_login.go
@@ -107,13 +107,16 @@ func (app *Application) ChangeSession(w http.ResponseWriter, r *http.Request) {
form := struct {
AccountName string `json:"account"`
}{}
- data, err := io.ReadAll(r.Body)
+ formdata, err := io.ReadAll(r.Body)
panic_if(err)
- panic_if(json.Unmarshal(data, &form)) // TODO: HTTP 400 not 500
+ panic_if(json.Unmarshal(formdata, &form)) // TODO: HTTP 400 not 500
err = app.SetActiveUser(scraper.UserHandle(form.AccountName))
if err != nil {
app.error_400_with_message(w, fmt.Sprintf("User not in database: %s", form.AccountName))
return
}
- app.buffered_render_htmx(w, "nav-sidebar", PageGlobalData{}, nil)
+ data := Notifications{
+ NumMessageNotifications: len(app.Profile.GetUnreadConversations(app.ActiveUser.ID)),
+ }
+ app.buffered_render_htmx(w, "nav-sidebar", PageGlobalData{}, data)
}
diff --git a/internal/webserver/renderer_helpers.go b/internal/webserver/renderer_helpers.go
index fb45312..02c9f2f 100644
--- a/internal/webserver/renderer_helpers.go
+++ b/internal/webserver/renderer_helpers.go
@@ -15,11 +15,16 @@ import (
"gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper"
)
+type Notifications struct {
+ NumMessageNotifications int
+}
+
// TODO: this name sucks
type PageGlobalData struct {
scraper.TweetTrove
SearchText string
FocusedTweetID scraper.TweetID
+ Notifications
}
func (d PageGlobalData) Tweet(id scraper.TweetID) scraper.Tweet {
@@ -41,6 +46,9 @@ func (d PageGlobalData) GetSearchText() string {
fmt.Println(d.SearchText)
return d.SearchText
}
+func (d PageGlobalData) GlobalData() PageGlobalData {
+ return d
+}
// Config object for buffered rendering
type renderer struct {
@@ -80,6 +88,8 @@ func (r renderer) BufferedRender(w io.Writer) {
func (app *Application) buffered_render_page(w http.ResponseWriter, tpl_file string, global_data PageGlobalData, tpl_data interface{}) {
partials := append(glob("tpl/includes/*.tpl"), glob("tpl/tweet_page_includes/*.tpl")...)
+ global_data.Notifications.NumMessageNotifications = len(app.Profile.GetUnreadConversations(app.ActiveUser.ID))
+
r := renderer{
Funcs: app.make_funcmap(global_data),
Filenames: append(partials, get_filepath(tpl_file)),
@@ -112,6 +122,7 @@ func (app *Application) make_funcmap(global_data PageGlobalData) template.FuncMa
"space": global_data.Space,
"focused_tweet_id": global_data.GetFocusedTweetID,
"search_text": global_data.GetSearchText,
+ "global_data": global_data.GlobalData, // This fucking sucks
"active_user": func() scraper.User {
return app.ActiveUser
},
diff --git a/internal/webserver/static/styles.css b/internal/webserver/static/styles.css
index fec7a97..12fc017 100644
--- a/internal/webserver/static/styles.css
+++ b/internal/webserver/static/styles.css
@@ -535,8 +535,8 @@ main {
* Create some extra space for the pin icon at the top of a pinned tweet
*/
.pinned-tweet & {
- margin-top: -2em;
- padding-top: 1.5em;
+ margin-top: -2em;
+ padding-top: 1.5em;
}
.timeline > &, .pinned-tweet & {
/* not for nested (i.e., quoted) tweets */
@@ -929,7 +929,24 @@ main {
align-items: flex-start;
padding: 0 2em;
}
-
+ /* Enable positioning the notifications indicator relative to this */
+ .labelled-icon {
+ position: relative;
+ }
+ .nav-sidebar__notifications-count {
+ position: absolute;
+ left: 0.3em;
+ top: 0.3em;
+ background-color: var(--color-twitter-blue);
+ min-width: 1em;
+ line-height: 1em;
+ /* height: 1.2em; */
+ border-radius: 1em;
+ font-size: 0.7em;
+ color: white;
+ text-align: center;
+ padding: 0.2em;
+ }
#logged-in-user-info {
font-size: 0.8em;
margin-top: 1em;
@@ -1210,11 +1227,11 @@ main {
}
.chat-list-entry__unread-indicator {
display: none;
- background-color: var(--color-twitter-blue);
- height: 0.5em;
- width: 0.5em;
- border-radius: 50%;
- flex: auto 0 0; /* Otherwise it gets squished if the message preview is long */
+ background-color: var(--color-twitter-blue);
+ height: 0.5em;
+ width: 0.5em;
+ border-radius: 50%;
+ flex: auto 0 0; /* Otherwise it gets squished if the message preview is long */
.chat-list-entry--unread & {
display: revert;
@@ -1307,15 +1324,15 @@ main {
/**
* Compact mode:
*
- display: inline-block;
- padding: 0.5em 1em;
- background-color: #ddd;
- border-radius: 1em;
- margin: auto;
- min-height: 2em;
- display: flex;
- flex-direction: column;
- justify-content: space-around;
+ display: inline-block;
+ padding: 0.5em 1em;
+ background-color: #ddd;
+ border-radius: 1em;
+ margin: auto;
+ min-height: 2em;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
*/
.our-message & {
background-color: var(--color-twitter-blue-light);
diff --git a/internal/webserver/tpl/includes/base.tpl b/internal/webserver/tpl/includes/base.tpl
index 084d88d..7795976 100644
--- a/internal/webserver/tpl/includes/base.tpl
+++ b/internal/webserver/tpl/includes/base.tpl
@@ -35,7 +35,7 @@
/>
- {{template "nav-sidebar"}}
+ {{template "nav-sidebar" (global_data).Notifications}}
{{template "main" .}}
diff --git a/internal/webserver/tpl/includes/nav_sidebar.tpl b/internal/webserver/tpl/includes/nav_sidebar.tpl
index ef2d238..6ac258e 100644
--- a/internal/webserver/tpl/includes/nav_sidebar.tpl
+++ b/internal/webserver/tpl/includes/nav_sidebar.tpl
@@ -19,16 +19,19 @@
-
-
- 
-
-
-
{{if (not (eq (active_user).Handle "[nobody]"))}}
-
+
+
+
+
+
+
+
diff --git a/internal/webserver/tpl/tweet_page_includes/chat_list_entry.tpl b/internal/webserver/tpl/tweet_page_includes/chat_list_entry.tpl
index 27a3fde..12b6c36 100644
--- a/internal/webserver/tpl/tweet_page_includes/chat_list_entry.tpl
+++ b/internal/webserver/tpl/tweet_page_includes/chat_list_entry.tpl
@@ -1,6 +1,6 @@
{{define "chat-list-entry"}}
{{$room := $.room}}
- 
+ {{if .NumMessageNotifications}}
+
+ {{end}}