Add fluoride mode

model/settings.go

@@ -5,6 +5,7 @@ type Settings struct {
 	CopyScope         bool   `json:"copy_scope"`
 	ThreadInNewTab    bool   `json:"thread_in_new_tab"`
 	MaskNSFW          bool   `json:"mask_nfsw"`
+	FluorideMode      bool   `json:"fluoride_mode"`
 }
 
 func NewSettings() *Settings {
@@ -13,5 +14,6 @@ func NewSettings() *Settings {
 		CopyScope:         true,
 		ThreadInNewTab:    false,
 		MaskNSFW:          true,
+		FluorideMode:      false,
 	}
 }

renderer/model.go

@@ -9,6 +9,7 @@ type HeaderData struct {
 	Title             string
 	NotificationCount int
 	CustomCSS         string
+	FluorideMode      bool
 }
 
 type NavbarData struct {

service/auth.go

@@ -190,7 +190,7 @@ func (s *authService) SaveSettings(ctx context.Context, client io.Writer, c *mod
 	return s.Service.SaveSettings(ctx, client, c, settings)
 }
 
-func (s *authService) Like(ctx context.Context, client io.Writer, c *model.Client, id string) (err error) {
+func (s *authService) Like(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error) {
 	c, err = s.getClient(ctx)
 	if err != nil {
 		return
@@ -198,7 +198,7 @@ func (s *authService) Like(ctx context.Context, client io.Writer, c *model.Clien
 	return s.Service.Like(ctx, client, c, id)
 }
 
-func (s *authService) UnLike(ctx context.Context, client io.Writer, c *model.Client, id string) (err error) {
+func (s *authService) UnLike(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error) {
 	c, err = s.getClient(ctx)
 	if err != nil {
 		return
@@ -206,7 +206,7 @@ func (s *authService) UnLike(ctx context.Context, client io.Writer, c *model.Cli
 	return s.Service.UnLike(ctx, client, c, id)
 }
 
-func (s *authService) Retweet(ctx context.Context, client io.Writer, c *model.Client, id string) (err error) {
+func (s *authService) Retweet(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error) {
 	c, err = s.getClient(ctx)
 	if err != nil {
 		return
@@ -214,7 +214,7 @@ func (s *authService) Retweet(ctx context.Context, client io.Writer, c *model.Cl
 	return s.Service.Retweet(ctx, client, c, id)
 }
 
-func (s *authService) UnRetweet(ctx context.Context, client io.Writer, c *model.Client, id string) (err error) {
+func (s *authService) UnRetweet(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error) {
 	c, err = s.getClient(ctx)
 	if err != nil {
 		return

service/logging.go

@@ -166,7 +166,7 @@ func (s *loggingService) SaveSettings(ctx context.Context, client io.Writer, c *
 	return s.Service.SaveSettings(ctx, client, c, settings)
 }
 
-func (s *loggingService) Like(ctx context.Context, client io.Writer, c *model.Client, id string) (err error) {
+func (s *loggingService) Like(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error) {
 	defer func(begin time.Time) {
 		s.logger.Printf("method=%v, id=%v, took=%v, err=%v\n",
 			"Like", id, time.Since(begin), err)
@@ -174,7 +174,7 @@ func (s *loggingService) Like(ctx context.Context, client io.Writer, c *model.Cl
 	return s.Service.Like(ctx, client, c, id)
 }
 
-func (s *loggingService) UnLike(ctx context.Context, client io.Writer, c *model.Client, id string) (err error) {
+func (s *loggingService) UnLike(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error) {
 	defer func(begin time.Time) {
 		s.logger.Printf("method=%v, id=%v, took=%v, err=%v\n",
 			"UnLike", id, time.Since(begin), err)
@@ -182,7 +182,7 @@ func (s *loggingService) UnLike(ctx context.Context, client io.Writer, c *model.
 	return s.Service.UnLike(ctx, client, c, id)
 }
 
-func (s *loggingService) Retweet(ctx context.Context, client io.Writer, c *model.Client, id string) (err error) {
+func (s *loggingService) Retweet(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error) {
 	defer func(begin time.Time) {
 		s.logger.Printf("method=%v, id=%v, took=%v, err=%v\n",
 			"Retweet", id, time.Since(begin), err)
@@ -190,7 +190,7 @@ func (s *loggingService) Retweet(ctx context.Context, client io.Writer, c *model
 	return s.Service.Retweet(ctx, client, c, id)
 }
 
-func (s *loggingService) UnRetweet(ctx context.Context, client io.Writer, c *model.Client, id string) (err error) {
+func (s *loggingService) UnRetweet(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error) {
 	defer func(begin time.Time) {
 		s.logger.Printf("method=%v, id=%v, took=%v, err=%v\n",
 			"UnRetweet", id, time.Since(begin), err)

service/service.go

@@ -44,10 +44,10 @@ type Service interface {
 	ServeSearchPage(ctx context.Context, client io.Writer, c *model.Client, q string, qType string, offset int) (err error)
 	ServeSettingsPage(ctx context.Context, client io.Writer, c *model.Client) (err error)
 	SaveSettings(ctx context.Context, client io.Writer, c *model.Client, settings *model.Settings) (err error)
-	Like(ctx context.Context, client io.Writer, c *model.Client, id string) (err error)
+	Like(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error)
-	UnLike(ctx context.Context, client io.Writer, c *model.Client, id string) (err error)
+	UnLike(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error)
-	Retweet(ctx context.Context, client io.Writer, c *model.Client, id string) (err error)
+	Retweet(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error)
-	UnRetweet(ctx context.Context, client io.Writer, c *model.Client, id string) (err error)
+	UnRetweet(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error)
 	PostTweet(ctx context.Context, client io.Writer, c *model.Client, content string, replyToID string, format string, visibility string, isNSFW bool, files []*multipart.FileHeader) (id string, err error)
 	Follow(ctx context.Context, client io.Writer, c *model.Client, id string) (err error)
 	UnFollow(ctx context.Context, client io.Writer, c *model.Client, id string) (err error)
@@ -795,6 +795,7 @@ func (svc *service) getCommonData(ctx context.Context, client io.Writer, c *mode
 		Title:             "Web",
 		NotificationCount: 0,
 		CustomCSS:         svc.customCSS,
+		FluorideMode:      c.Session.Settings.FluorideMode,
 	}
 
 	if c != nil && c.Session.IsLoggedIn() {
@@ -826,23 +827,41 @@ func (svc *service) getCommonData(ctx context.Context, client io.Writer, c *mode
 	return
 }
 
-func (svc *service) Like(ctx context.Context, client io.Writer, c *model.Client, id string) (err error) {
+func (svc *service) Like(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error) {
-	_, err = c.Favourite(ctx, id)
+	s, err := c.Favourite(ctx, id)
+	if err != nil {
+		return
+	}
+	count = s.FavouritesCount
 	return
 }
 
-func (svc *service) UnLike(ctx context.Context, client io.Writer, c *model.Client, id string) (err error) {
+func (svc *service) UnLike(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error) {
-	_, err = c.Unfavourite(ctx, id)
+	s, err := c.Unfavourite(ctx, id)
+	if err != nil {
+		return
+	}
+	count = s.FavouritesCount
 	return
 }
 
-func (svc *service) Retweet(ctx context.Context, client io.Writer, c *model.Client, id string) (err error) {
+func (svc *service) Retweet(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error) {
-	_, err = c.Reblog(ctx, id)
+	s, err := c.Reblog(ctx, id)
+	if err != nil {
+		return
+	}
+	if s.Reblog != nil {
+		count = s.Reblog.ReblogsCount
+	}
 	return
 }
 
-func (svc *service) UnRetweet(ctx context.Context, client io.Writer, c *model.Client, id string) (err error) {
+func (svc *service) UnRetweet(ctx context.Context, client io.Writer, c *model.Client, id string) (count int64, err error) {
-	_, err = c.Unreblog(ctx, id)
+	s, err := c.Unreblog(ctx, id)
+	if err != nil {
+		return
+	}
+	count = s.ReblogsCount
 	return
 }
 

service/transport.go

@@ -2,6 +2,8 @@ package service
 
 import (
 	"context"
+	"encoding/json"
+	"io"
 	"mime/multipart"
 	"net/http"
 	"path"
@@ -232,6 +234,70 @@ func NewHandler(s Service, staticDir string) http.Handler {
 		w.WriteHeader(http.StatusFound)
 	}).Methods(http.MethodPost)
 
+	r.HandleFunc("/fluoride/like/{id}", func(w http.ResponseWriter, req *http.Request) {
+		ctx := getContextWithSession(context.Background(), req)
+		id, _ := mux.Vars(req)["id"]
+		count, err := s.Like(ctx, w, nil, id)
+		if err != nil {
+			s.ServeErrorPage(ctx, w, err)
+			return
+		}
+
+		err = serveJson(w, count)
+		if err != nil {
+			s.ServeErrorPage(ctx, w, err)
+			return
+		}
+	}).Methods(http.MethodPost)
+
+	r.HandleFunc("/fluoride/unlike/{id}", func(w http.ResponseWriter, req *http.Request) {
+		ctx := getContextWithSession(context.Background(), req)
+		id, _ := mux.Vars(req)["id"]
+		count, err := s.UnLike(ctx, w, nil, id)
+		if err != nil {
+			s.ServeErrorPage(ctx, w, err)
+			return
+		}
+
+		err = serveJson(w, count)
+		if err != nil {
+			s.ServeErrorPage(ctx, w, err)
+			return
+		}
+	}).Methods(http.MethodPost)
+
+	r.HandleFunc("/fluoride/retweet/{id}", func(w http.ResponseWriter, req *http.Request) {
+		ctx := getContextWithSession(context.Background(), req)
+		id, _ := mux.Vars(req)["id"]
+		count, err := s.Retweet(ctx, w, nil, id)
+		if err != nil {
+			s.ServeErrorPage(ctx, w, err)
+			return
+		}
+
+		err = serveJson(w, count)
+		if err != nil {
+			s.ServeErrorPage(ctx, w, err)
+			return
+		}
+	}).Methods(http.MethodPost)
+
+	r.HandleFunc("/fluoride/unretweet/{id}", func(w http.ResponseWriter, req *http.Request) {
+		ctx := getContextWithSession(context.Background(), req)
+		id, _ := mux.Vars(req)["id"]
+		count, err := s.UnRetweet(ctx, w, nil, id)
+		if err != nil {
+			s.ServeErrorPage(ctx, w, err)
+			return
+		}
+
+		err = serveJson(w, count)
+		if err != nil {
+			s.ServeErrorPage(ctx, w, err)
+			return
+		}
+	}).Methods(http.MethodPost)
+
 	r.HandleFunc("/post", func(w http.ResponseWriter, req *http.Request) {
 		ctx := getContextWithSession(context.Background(), req)
 
@@ -381,11 +447,13 @@ func NewHandler(s Service, staticDir string) http.Handler {
 		copyScope := req.FormValue("copy_scope") == "true"
 		threadInNewTab := req.FormValue("thread_in_new_tab") == "true"
 		maskNSFW := req.FormValue("mask_nsfw") == "true"
+		fluorideMode := req.FormValue("fluoride_mode") == "true"
 		settings := &model.Settings{
 			DefaultVisibility: visibility,
 			CopyScope:         copyScope,
 			ThreadInNewTab:    threadInNewTab,
 			MaskNSFW:          maskNSFW,
+			FluorideMode:      fluorideMode,
 		}
 
 		err := s.SaveSettings(ctx, w, nil, settings)
@@ -430,3 +498,9 @@ func getMultipartFormValue(mf *multipart.Form, key string) (val string) {
 	}
 	return vals[0]
 }
+
+func serveJson(w io.Writer, data interface{}) (err error) {
+	var d = make(map[string]interface{})
+	d["data"] = data
+	return json.NewEncoder(w).Encode(d)
+}

static/fluoride.js

@@ -0,0 +1,106 @@
+var actionIcons = {
+	"like": "/static/icons/star-o.png",
+	"unlike": "/static/icons/liked.png",
+	"retweet": "/static/icons/retweet.png",
+	"unretweet": "/static/icons/retweeted.png"
+};
+
+var reverseActions = {
+	"like": "unlike",
+	"unlike": "like",
+	"retweet": "unretweet",
+	"unretweet": "retweet"
+};
+
+function http(method, url, success, error) {
+	var req = new XMLHttpRequest();
+	req.onload = function() {
+		if (this.status === 200 && typeof success === "function") {
+			success(this.responseText, this.responseType);
+		} else if (typeof error === "function") {
+			error(this.responseText);
+		}
+	};
+	req.onerror = function() {
+		if (typeof error === "function") {
+			error(this.responseText);
+		}
+	};
+	req.open(method, url);
+	req.send();
+}
+
+function updateActionForm(id, f, action) {
+	f.children[1].src = actionIcons[action];
+	f.action = "/" + action + "/" + id;
+	f.dataset.action = action;
+}
+
+function handleLikeForm(id, f) {
+	f.onsubmit = function(event) {
+		event.preventDefault();
+
+		var action = f.dataset.action;
+		var forms = document.querySelectorAll(".status-"+id+" .status-like");
+		forms.forEach(function(f) {
+			updateActionForm(id, f, reverseActions[action]);
+		});
+
+		http("POST", "/fluoride/" + action + "/" + id, function(res, type) {
+			var data = JSON.parse(res);
+			var count = data.data;
+			if (count === 0) {
+				count = "";
+			}
+			var counts = document.querySelectorAll(".status-"+id+" .status-like-count");
+			counts.forEach(function(c) {
+				c.innerHTML = count;
+			});
+		}, function(err) {
+			forms.forEach(function(f) {
+				updateActionForm(id, f, action);
+			});
+		});
+	}
+}
+
+function handleRetweetForm(id, f) {
+	f.onsubmit = function(event) {
+		event.preventDefault();
+
+		var action = f.dataset.action;
+		var forms = document.querySelectorAll(".status-"+id+" .status-retweet");
+		forms.forEach(function(f) {
+			updateActionForm(id, f, reverseActions[action]);
+		});
+
+		http("POST", "/fluoride/" + action + "/" + id, function(res, type) {
+			var data = JSON.parse(res);
+			var count = data.data;
+			if (count === 0) {
+				count = "";
+			}
+			var counts = document.querySelectorAll(".status-"+id+" .status-retweet-count");
+			counts.forEach(function(c) {
+				c.innerHTML = count;
+			});
+		}, function(err) {
+			forms.forEach(function(f) {
+				updateActionForm(id, f, action);
+			});
+		});
+	}
+}
+
+document.addEventListener("DOMContentLoaded", function() { 
+	var statuses = document.querySelectorAll(".status-container");
+	statuses.forEach(function(s) {
+		var id = s.dataset.id;
+
+		var likeForm = s.querySelector(".status-like");
+		handleLikeForm(id, likeForm);
+
+		var retweetForm = s.querySelector(".status-retweet");
+		handleRetweetForm(id, retweetForm);
+	});
+});

static/main.css

@@ -105,7 +105,9 @@
 	width: auto;
 }
 
-.status-action-count span {
+.status-reply-count,
+.status-retweet-count,
+.status-like-count {
 	vertical-align: middle;
 }
 

templates/header.tmpl

@@ -8,5 +8,8 @@
 	{{if .CustomCSS}}
 	<link rel="stylesheet" href="{{.CustomCSS}}">
 	{{end}}
+	{{if .FluorideMode}}
+	<script src="/static/fluoride.js"></script>
+	{{end}}
 </head>
 <body>

templates/settings.tmpl

@@ -24,6 +24,10 @@
 		<input id="mask-nsfw" name="mask_nsfw" type="checkbox" value="true" {{if .Settings.MaskNSFW}}checked{{end}}>
 		<label for="mask-nsfw"> Mask NSFW Attachments </label>
 	</div>
+	<div class="settings-form-field">
+		<input id="fluoride-mode" name="fluoride_mode" type="checkbox" value="true" {{if .Settings.FluorideMode}}checked{{end}}>
+		<label for="fluoride-mode"> Enable Fluoride Mode </label>
+	</div>
 	<button type="submit"> Save </button>
 </form>
 

templates/status.tmpl

@@ -11,7 +11,7 @@
 	{{template "status" .Reblog}}
 	{{else}}
 	{{block "status" .}}
-	<div class="status-container">
+	<div class="status-container status-{{.ID}}" data-id="{{.ID}}">
 		{{if not .HideAccountInfo}}
 		<div class="status-profile-img-container">
 			<a class="img-link" href="/user/{{.Account.ID}}">
@@ -90,8 +90,8 @@
 					<a class="status-you" href="/thread/{{.ID}}?reply=true#status-{{.ID}}" title="reply"> 
 						<img class="icon" src="/static/icons/reply.png" alt="reply" />
 					</a>
-					<a class="status-action-count" href="/thread/{{.ID}}#status-{{.ID}}" {{if .ThreadInNewTab}}target="_blank"{{end}}>
+					<a class="status-reply-count" href="/thread/{{.ID}}#status-{{.ID}}" {{if .ThreadInNewTab}}target="_blank"{{end}}>
-						<span> {{DisplayInteractionCount .RepliesCount}} </span>
+						{{DisplayInteractionCount .RepliesCount}}
 					</a>
 				</div>
 				<div class="status-action">
@@ -101,35 +101,35 @@
 					</a>
 					{{else}}
 					{{if .Reblogged}}
-					<form class="status-retweet" action="/unretweet/{{.ID}}" method="post">
+					<form class="status-retweet" data-action="unretweet" action="/unretweet/{{.ID}}" method="post">
 						<input type="hidden" name="retweeted_by_id" value="{{.RetweetedByID}}" />
 						<input type="image" src="/static/icons/retweeted.png" alt="undo retweet" class="icon" title="undo retweet">
 					</form>
 					{{else}}
-					<form class="status-retweet" action="/retweet/{{.ID}}" method="post">
+					<form class="status-retweet" data-action="retweet" action="/retweet/{{.ID}}" method="post">
 						<input type="hidden" name="retweeted_by_id" value="{{.RetweetedByID}}" />
 						<input type="image" src="/static/icons/retweet.png" alt="retweet" class="icon" title="retweet">
 					</form>
 					{{end}}
 					{{end}}
-					<a class="status-action-count" href="/retweetedby/{{.ID}}" title="click to see the the list"> 
+					<a class="status-retweet-count" href="/retweetedby/{{.ID}}" title="click to see the the list"> 
-						<span> {{DisplayInteractionCount .ReblogsCount}} </span>
+						{{DisplayInteractionCount .ReblogsCount}}
 					</a>
 				</div>
 				<div class="status-action">
 					{{if .Favourited}}
-					<form class="status-like" action="/unlike/{{.ID}}" method="post">
+					<form class="status-like" data-action="unlike" action="/unlike/{{.ID}}" method="post">
 						<input type="hidden" name="retweeted_by_id" value="{{.RetweetedByID}}" />
 						<input type="image" src="/static/icons/liked.png" alt="unlike" class="icon" title="unlike">
 					</form>
 					{{else}}
-					<form class="status-like" action="/like/{{.ID}}" method="post">
+					<form class="status-like" data-action="like" action="/like/{{.ID}}" method="post">
 						<input type="hidden" name="retweeted_by_id" value="{{.RetweetedByID}}" />
 						<input type="image" src="/static/icons/star-o.png" alt="like" class="icon" title="like">
 					</form>
 					{{end}}
-					<a class="status-action-count" href="/likedby/{{.ID}}" title="click to see the the list"> 
+					<a class="status-like-count" href="/likedby/{{.ID}}" title="click to see the the list"> 
-						<span> {{DisplayInteractionCount .FavouritesCount}} </span>
+						{{DisplayInteractionCount .FavouritesCount}}
 					</a>
 				</div>
 				<div class="status-action">